From a6532a2801a81966014447d211d546216dca74a7 Mon Sep 17 00:00:00 2001 From: Nim <128169402+Nimfar11@users.noreply.github.com> Date: Sun, 6 Oct 2024 17:12:31 +0300 Subject: [PATCH] fix (#480) --- .../Prototypes/_CP14/Body/Parts/zombie.yml | 95 +++++++++++++++++++ .../_CP14/Body/Prototypes/zombie.yml | 18 ++-- .../_CP14/Entities/Mobs/Species/zombie.yml | 9 +- 3 files changed, 107 insertions(+), 15 deletions(-) create mode 100644 Resources/Prototypes/_CP14/Body/Parts/zombie.yml diff --git a/Resources/Prototypes/_CP14/Body/Parts/zombie.yml b/Resources/Prototypes/_CP14/Body/Parts/zombie.yml new file mode 100644 index 0000000000..514eb42ff8 --- /dev/null +++ b/Resources/Prototypes/_CP14/Body/Parts/zombie.yml @@ -0,0 +1,95 @@ +- type: entity + id: CP14TorsoZombie + parent: CP14TorsoHuman + components: + - type: Sprite + sprite: _CP14/Mobs/Species/Zombie/parts.rsi + state: torso + +- type: entity + id: CP14HeadZombie + parent: CP14HeadHuman + components: + - type: Sprite + sprite: _CP14/Mobs/Species/Zombie/parts.rsi + state: head + +- type: entity + id: CP14LeftArmZombie + parent: CP14LeftArmHuman + components: + - type: Sprite + sprite: _CP14/Mobs/Species/Zombie/parts.rsi + +- type: entity + id: CP14RightArmZombie + parent: CP14RightArmHuman + components: + - type: Sprite + sprite: _CP14/Mobs/Species/Zombie/parts.rsi + +- type: entity + id: CP14LeftHandZombie + parent: CP14LeftHandHuman + components: + - type: Sprite + sprite: _CP14/Mobs/Species/Zombie/parts.rsi + +- type: entity + id: CP14RightHandZombie + parent: CP14RightHandHuman + components: + - type: Sprite + sprite: _CP14/Mobs/Species/Zombie/parts.rsi + +- type: entity + id: CP14LeftLegZombie + name: "left zombie leg" + parent: CP14LeftLegHuman + components: + - type: Sprite + sprite: _CP14/Mobs/Species/Zombie/parts.rsi + state: "l_leg" + - type: Icon + sprite: _CP14/Mobs/Species/Zombie/parts.rsi + state: "l_leg" + - type: BodyPart + partType: Leg + symmetry: Left + - type: MovementBodyPart + walkSpeed: 3 + sprintSpeed: 3 + acceleration: 10 + +- type: entity + id: CP14RightLegZombie + name: "right zombie leg" + parent: CP14RightLegHuman + components: + - type: Sprite + sprite: _CP14/Mobs/Species/Zombie/parts.rsi + state: "r_leg" + - type: Icon + sprite: _CP14/Mobs/Species/Zombie/parts.rsi + state: "r_leg" + - type: BodyPart + partType: Leg + symmetry: Right + - type: MovementBodyPart + walkSpeed: 3 + sprintSpeed: 3 + acceleration: 10 + +- type: entity + id: CP14LeftFootZombie + parent: CP14LeftFootHuman + components: + - type: Sprite + sprite: _CP14/Mobs/Species/Zombie/parts.rsi + +- type: entity + id: CP14RightFootZombie + parent: CP14RightFootHuman + components: + - type: Sprite + sprite: _CP14/Mobs/Species/Zombie/parts.rsi diff --git a/Resources/Prototypes/_CP14/Body/Prototypes/zombie.yml b/Resources/Prototypes/_CP14/Body/Prototypes/zombie.yml index 63fe00937e..7fcd9b9f14 100644 --- a/Resources/Prototypes/_CP14/Body/Prototypes/zombie.yml +++ b/Resources/Prototypes/_CP14/Body/Prototypes/zombie.yml @@ -4,7 +4,7 @@ root: torso slots: head: - part: CP14HeadHuman + part: CP14HeadZombie connections: - torso organs: @@ -24,26 +24,26 @@ liver: OrganHumanLiver kidneys: OrganHumanKidneys right_arm: - part: CP14RightArmHuman + part: CP14RightArmZombie connections: - right_hand left_arm: - part: CP14LeftArmHuman + part: CP14LeftArmZombie connections: - left_hand right_hand: - part: CP14RightHandHuman + part: CP14RightHandZombie left_hand: - part: CP14LeftHandHuman + part: CP14LeftHandZombie right_leg: - part: CP14RightLegHuman + part: CP14RightLegZombie connections: - right_foot left_leg: - part: CP14LeftLegHuman + part: CP14LeftLegZombie connections: - left_foot right_foot: - part: CP14RightFootHuman + part: CP14RightFootZombie left_foot: - part: CP14LeftFootHuman + part: CP14LeftFootZombie diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Species/zombie.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Species/zombie.yml index 7f91e47f60..ef56f04baa 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Species/zombie.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Species/zombie.yml @@ -20,9 +20,6 @@ - type: Body prototype: CP14Zombie requiredLegs: 2 - - type: MovementSpeedModifier - baseWalkSpeed: 2 - baseSprintSpeed: 2.5 - type: MobState allowedStates: - Alive @@ -30,11 +27,11 @@ - type: MobThresholds thresholds: 0: Alive - 150: Dead + 140: Dead - type: SlowOnDamage speedModifierThresholds: 80: 0.8 - 120: 0.4 + 110: 0.4 - type: StatusEffects allowed: - KnockedDown @@ -63,7 +60,7 @@ - type: PassiveDamage allowedStates: - Alive - damageCap: 140 + damageCap: 130 damage: groups: Brute: -0.3