From 948d711336d68bba5ceea0091fca073b06628c62 Mon Sep 17 00:00:00 2001 From: Ed <96445749+TheShuEd@users.noreply.github.com> Date: Thu, 10 Apr 2025 22:28:50 +0300 Subject: [PATCH] Bunch of bugfixes (#1165) * watcher fix * fix #1162 * fix #1111 * make watcher move smoothly * s * Delete test_xeno.yml --- Content.IntegrationTests/Tests/EntityTest.cs | 3 + .../Spawners/Constrained/test_xeno.yml | 45 ---------- .../_CP14/Entities/Mobs/NPC/watcher.yml | 6 +- .../_CP14/Entities/Mobs/NPC/xeno_test.yml | 84 ------------------ .../Entities/Structures/Floor/floorWater.yml | 1 - .../Demiplane/Modifiers/Danger/mobs.yml | 4 +- Resources/Prototypes/_CP14/Species/silva.yml | 1 + .../Tools/crystal_lamp.rsi/equipped-BELT1.png | Bin 399 -> 400 bytes .../Tools/crystal_lamp.rsi/equipped-BELT2.png | Bin 399 -> 404 bytes 9 files changed, 10 insertions(+), 134 deletions(-) delete mode 100644 Resources/Prototypes/_CP14/Entities/Markers/Spawners/Constrained/test_xeno.yml delete mode 100644 Resources/Prototypes/_CP14/Entities/Mobs/NPC/xeno_test.yml diff --git a/Content.IntegrationTests/Tests/EntityTest.cs b/Content.IntegrationTests/Tests/EntityTest.cs index 6b8b59a12c..78baca49e8 100644 --- a/Content.IntegrationTests/Tests/EntityTest.cs +++ b/Content.IntegrationTests/Tests/EntityTest.cs @@ -40,6 +40,7 @@ namespace Content.IntegrationTests.Tests .Where(p => !pair.IsTestPrototype(p)) .Where(p => !p.Components.ContainsKey("MapGrid")) // This will smash stuff otherwise. .Where(p => !p.Components.ContainsKey("RoomFill")) // This comp can delete all entities, and spawn others + .Where(p => !p.Components.ContainsKey("CP14BiomeSpawner")) // CP14 this component delete all entities on this tile .Select(p => p.ID) .ToList(); @@ -103,6 +104,7 @@ namespace Content.IntegrationTests.Tests .Where(p => !pair.IsTestPrototype(p)) .Where(p => !p.Components.ContainsKey("MapGrid")) // This will smash stuff otherwise. .Where(p => !p.Components.ContainsKey("RoomFill")) // This comp can delete all entities, and spawn others + .Where(p => !p.Components.ContainsKey("CP14BiomeSpawner")) // CP14 this component delete all entities on this tile .Select(p => p.ID) .ToList(); foreach (var protoId in protoIds) @@ -344,6 +346,7 @@ namespace Content.IntegrationTests.Tests "DebugExceptionStartup", "GridFill", "RoomFill", + "CP14BiomeSpawner", // CP14 this component delete all entities on this tile "Map", // We aren't testing a map entity in this test "MapGrid", "Broadphase", diff --git a/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Constrained/test_xeno.yml b/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Constrained/test_xeno.yml deleted file mode 100644 index 0c66e703cd..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Constrained/test_xeno.yml +++ /dev/null @@ -1,45 +0,0 @@ -- type: entity - id: CP14ConstrainedSpawnerBase - abstract: true - parent: MarkerBase - description: lol - categories: [ ForkFiltered ] - components: - - type: Sprite - layers: - - state: red - - type: Physics - bodyType: Static - fixedRotation: true - - type: Fixtures - fixtures: - spawn: - shape: - !type:PhysShapeCircle - radius: 15 - hard: false - layer: - - AllMask - - type: TriggerOnCollide - fixtureID: spawn - - type: StepTrigger - requiredTriggeredSpeed: 0 - stepOn: true - -- type: entity - parent: CP14ConstrainedSpawnerBase - id: CP14ConstrainedSpawnerXeno - name: xeno constrained spawner - components: - - type: TriggerOnCollide - fixtureID: spawn - - type: CP14ConstrainedSpawnerOnTrigger - prototypes: - - CP14MobXeno - - CP14MobXenoDrone - - CP14MobSpaceCobra - - CP14MobSmallPurpleSnake - - CP14MobPurpleSnake - - MobLuminousEntity - - MobLuminousObject - - CP14MobWatcherMagmawing \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/watcher.yml b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/watcher.yml index 937ad9e32c..ba4309ccda 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/watcher.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/watcher.yml @@ -45,8 +45,10 @@ 0: Alive 50: Dead - type: MovementSpeedModifier - baseWalkSpeed: 5 - baseSprintSpeed: 7 + baseWalkSpeed: 2 + baseSprintSpeed: 4 + friction: 0.5 + acceleration: 3 - type: ProjectileBatteryAmmoProvider proto: WatcherBolt fireCost: 50 diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/xeno_test.yml b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/xeno_test.yml deleted file mode 100644 index 30eb20cfc0..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/xeno_test.yml +++ /dev/null @@ -1,84 +0,0 @@ -- type: entity - id: CP14MobXeno - parent: MobXeno - categories: [ ForkFiltered ] - components: - - type: NpcFactionMember - factions: - - CP14Monster - -- type: entity - id: CP14MobXenoDrone - parent: MobXenoDrone - categories: [ ForkFiltered ] - components: - - type: NpcFactionMember - factions: - - CP14Monster - -- type: entity - id: CP14MobSpaceCobra - name: cobra - parent: MobCobraSpace - categories: [ ForkFiltered ] - components: - - type: NpcFactionMember - factions: - - CP14Monster - - type: MeleeChemicalInjector - transferAmount: 2 - - type: MeleeWeapon - hidden: true - soundHit: - path: /Audio/Effects/bite.ogg - angle: 0 - animation: WeaponArcBite - damage: - types: - Piercing: 2 - Poison: 2 - -- type: entity - id: CP14MobPurpleSnake - parent: MobPurpleSnake - categories: [ ForkFiltered ] - components: - - type: NpcFactionMember - factions: - - CP14Monster - - type: MeleeWeapon - angle: 0 - animation: WeaponArcBite - damage: - types: - Piercing: 1 - - type: MeleeChemicalInjector - transferAmount: 3 - -- type: entity - id: CP14MobSmallPurpleSnake - parent: MobSmallPurpleSnake - categories: [ ForkFiltered ] - components: - - type: NpcFactionMember - factions: - - CP14Monster - - type: SolutionTransfer - maxTransferAmount: 0.2 - - type: MeleeWeapon - angle: 0 - animation: WeaponArcBite - damage: - types: - Piercing: 0.5 - - type: MeleeChemicalInjector - transferAmount: 2 - -- type: entity - id: CP14MobWatcherMagmawing - parent: MobWatcherMagmawing - categories: [ ForkFiltered ] - components: - - type: NpcFactionMember - factions: - - CP14Monster diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Floor/floorWater.yml b/Resources/Prototypes/_CP14/Entities/Structures/Floor/floorWater.yml index 8f748dbe9a..da0df938e3 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Floor/floorWater.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Floor/floorWater.yml @@ -71,7 +71,6 @@ suffix: Deep, Air damage components: - type: Sprite - drawdepth: OverMobs color: "#869dc2" - type: SpeedModifierContacts walkSpeedModifier: 0.2 diff --git a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Danger/mobs.yml b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Danger/mobs.yml index b3b5f55279..5725278888 100644 --- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Danger/mobs.yml +++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Danger/mobs.yml @@ -220,7 +220,7 @@ - CP14DemiplaneHot layers: - !type:OreDunGen - entity: CP14MobSlimeBase + entity: CP14MobWatcherIce count: 2 minGroupSize: 2 maxGroupSize: 3 @@ -239,7 +239,7 @@ - CP14DemiplaneCold layers: - !type:OreDunGen - entity: CP14MobSlimeBase + entity: CP14MobWatcherMagma count: 2 minGroupSize: 2 maxGroupSize: 3 diff --git a/Resources/Prototypes/_CP14/Species/silva.yml b/Resources/Prototypes/_CP14/Species/silva.yml index f9158b1170..e408bb0607 100644 --- a/Resources/Prototypes/_CP14/Species/silva.yml +++ b/Resources/Prototypes/_CP14/Species/silva.yml @@ -10,6 +10,7 @@ defaultSkinTone: "#6c741d" maleFirstNames: CP14_Names_Silva_Male_First femaleFirstNames: CP14_Names_Silva_Female_First + naming: First - type: speciesBaseSprites id: CP14MobSilvaSprites diff --git a/Resources/Textures/_CP14/Objects/Tools/crystal_lamp.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/Tools/crystal_lamp.rsi/equipped-BELT1.png index 5e390940699f80bc4b886062beb5285c8b12664b..8b9006d5cb77e8d5a23d0ef2b008bb90eec9893b 100644 GIT binary patch delta 360 zcmV-u0hj)d1CRrdF@H))L_t(|obB4bO2beT$MK_dFDM~NL+j8X0dWutSsX$Kp#=wr zDuM{&>T|ehR$s>_a7{pGsj(e82<_18}>9f=>9Sn=ndZt$d{$(C!W7`hV(D&d)CNQ(4sR4eBWz zbVBug)U$&by7@}q0gL%ePUAiOM3yb)Gp+Td8<6yeQhdy0XV=jVWmD20YOOEbfGo>p z>FvvOQfP;=Da-OrM*si-00000002N`j_VsA%$6RF{X};jUxnA|8sD!{10K>xRogs% zg(wQeb(%(NHeuF1G3bQqK25d9(N$zwE)s>-_WPCN`f8NK>frFm>JJm9-vetu0$!^t zuG5sr@)aq@Z(Anot=)j>q>yo={eS22j_a#BK1%=q*z*NUbxtA1vChc=00006 delta 359 zcmV-t0hs=f1CIlcF@H%(L_t(|obB2%OT$1Ihw;BsbhDs@w8qrIAsKWK3SAtEgHXZ2 zp^CGspTkjCo%=;}baG8W7g0181sw!k;!rGfP_cP04t;)*^||nd%W@|H00000001L9 zXm4bP`&-$6zsFxpT7`mIl$~F_>GJx~DmkRxY&aQg$ttwFvwx?BprYHm2kGp>DmxI? zTTZ%Wf?AY)J+AsLx@KEIlC~R*`gnh}Ob)o}nhjuf&QscZQFDFMDmlbe*K7dKPd%x+ ztR(4LC5O1`0ssI2000000AN&}Umef;0aE`AzcRmMnf!IVybaR<_+D9Y99brR6xLfh zIzGuY1hWegl3K}E(w0j@}yrsjZy3!O#M z!|mG_ue18z{o=)wSq*wg7iVm9W_M&i@2Ha!u(48K^4A}Q*Z&Vm>z$T$aDf7ot&=Ol z=gPfbz3cvC`)5m?`kt?Ty*vEQz5O1l+>bP_7)3a1mDE=hv`kBWyzxIz%w3OE^*d$m z-r+ruf4=&C@#^)9qPLkCF7RIe@Xu_TkKc<|UAzgEM_ueBlyBXf>?H=~o1FQWn6Ka& zv@)e}ot_{P@IAd{*5*okh96dkw})R>om{^ze4C;b!|5Caj+&EC*54^(Pk%1Hv`rzk z%#n$~=oyYd=ss#kr{W@+R< zowMLfy?Y5msP`n1nGcgp&b+Rh`fEnm<||?fN{b@DaSCz=yGaS~#WDbar>mdKI;Vst E0P{$vM*si- delta 359 zcmV-t0hs=j1CIlcF@H%(L_t(|obB4bO2beT$MK_dFDM~RL*vjP8FUZ|SsX$Kp#=wr zD1r#$>T|ehS6{~`a7{pGiJ=8M2<>v6+^Xa@H@AY{4`jPJ_s7Y<;Y0)g0000009fhn z=0x45$7<6#Oxv!y@cH#!o?br155hm)gfxk@@>Om?Z!nVUtA9&5KfBORWl?W1YNoIs zgzEcfW(PBL^HshBmW#QZ#(VmSEL$$-TI(w}AQ_IOC_iLp*U=7TQ!*TDt*_jGEXzf_ zeVI*5?NBylS-$BA00000000000I1DzJ>!Gf%A>KL=+5Ko=ydzW_p8-_hsmRAY#zTt z6oukCZKE|?>tLSf2cf#3Oti<*b!1sC5{1_G`<3H*DotW_aCl_(hY8c~fwdojPPZ?v z)0W8c6)B6iEtB=uZoq6>O3~{5-+8>_da8-f5&!`9d;v=tO(BVD4zB