From 1aa99ed9eb1c0c58feabab66c5f36e0b56cb256c Mon Sep 17 00:00:00 2001 From: Dvir Date: Fri, 31 Jan 2025 16:43:12 +0200 Subject: [PATCH] Fix --- Resources/Prototypes/_DV/Body/Parts/harpy.yml | 190 ++---------------- 1 file changed, 18 insertions(+), 172 deletions(-) diff --git a/Resources/Prototypes/_DV/Body/Parts/harpy.yml b/Resources/Prototypes/_DV/Body/Parts/harpy.yml index 858ac283cba..28b050b5e5d 100644 --- a/Resources/Prototypes/_DV/Body/Parts/harpy.yml +++ b/Resources/Prototypes/_DV/Body/Parts/harpy.yml @@ -1,215 +1,61 @@ - type: entity - id: PartHarpy - parent: [BaseItem, BasePart] # Frontier: add BasePart, consistency with upstream - name: "harpy body part" abstract: true - components: - # Frontier: commented out lines below, inherited from BasePart - # - type: Damageable - # damageContainer: Biological - # - type: BodyPart - # - type: ContainerContainer - # containers: - # bodypart: !type:Container - # ents: [] - # - type: StaticPrice #DynamicPrice - # price: 100 - # - type: Tag - # tags: - # - Trash - # End Frontier: inherited from BasePart - # Frontier: added lines below, consistency with upstream - - type: Extractable - juiceSolution: - reagents: - - ReagentId: Fat - Quantity: 3 - - ReagentId: Blood - Quantity: 10 - # End Frontier: consistency with upstream - -- type: entity - id: TorsoHarpy - name: "harpy torso" - parent: [PartHarpy, BaseTorso] # Frontier: add BaseTorso + parent: BasePart + id: PartHarpyBase components: - type: Sprite - netsync: false sprite: _DV/Mobs/Species/Harpy/parts.rsi - state: "torso_m" - type: Icon sprite: _DV/Mobs/Species/Harpy/parts.rsi - state: "torso_m" - # - type: BodyPart # Frontier: inherited from BaseTorso - # partType: Torso # Frontier: inherited from BaseTorso - # Frontier: added lines below, consistency with upstream - - type: Extractable - juiceSolution: - reagents: - - ReagentId: Fat - Quantity: 10 - - ReagentId: Blood - Quantity: 20 - # End Frontier: consistency with upstream + - type: BodyPart + species: Harpy + +- type: entity + parent: [ PartHarpyBase, BaseTorso ] + id: TorsoHarpy + name: "harpy torso" - type: entity + parent: [ PartHarpyBase, BaseHead ] id: HeadHarpy name: "harpy head" - parent: [PartHarpy, BaseHead] # Frontier: add BaseHead - components: - - type: Sprite - netsync: false - sprite: _DV/Mobs/Species/Harpy/parts.rsi - state: "head_m" - - type: Icon - sprite: _DV/Mobs/Species/Harpy/parts.rsi - state: "head_m" - # - type: BodyPart # Frontier: inherited from BaseHead - # partType: Head # Frontier: inherited from BaseHead - # vital: true # Frontier: inherited from BaseHead - # - type: Input # Frontier: inherited from BaseHead - # context: "ghost" # Frontier: inherited from BaseHead - # - type: InputMover # Frontier: consistency with upstream (moved to the brain) - # - type: GhostOnMove # Frontier: consistency with upstream (added by BrainSystem) - # - type: Tag # Frontier: inherited from BaseHead - # tags: # Frontier: inherited from BaseHead - # - Head # Frontier: inherited from BaseHead - # Frontier: added lines below, consistency with upstream - - type: Extractable - juiceSolution: - reagents: - - ReagentId: Fat - Quantity: 5 - - ReagentId: Blood - Quantity: 10 - # End Frontier: consistency with upstream - type: entity + parent: [ PartHarpyBase, BaseLeftArm ] id: LeftArmHarpy name: "left harpy arm" - parent: [PartHarpy, BaseLeftArm] # Frontier: add BaseLeftArm - components: - - type: Sprite - netsync: false - sprite: _DV/Mobs/Species/Harpy/parts.rsi - state: "l_arm" - - type: Icon - sprite: _DV/Mobs/Species/Harpy/parts.rsi - state: "l_arm" - # - type: BodyPart # Frontier: inherited from BaseLeftArm - # partType: Arm # Frontier: inherited from BaseLeftArm - # symmetry: Left # Frontier: inherited from BaseLeftArm - type: entity + parent: [ PartHarpyBase, BaseRightArm ] id: RightArmHarpy name: "right harpy arm" - parent: [PartHarpy, BaseRightArm] # Frontier: add BaseRightArm - components: - - type: Sprite - netsync: false - sprite: _DV/Mobs/Species/Harpy/parts.rsi - state: "r_arm" - - type: Icon - sprite: _DV/Mobs/Species/Harpy/parts.rsi - state: "r_arm" - # - type: BodyPart # Frontier: inherited from BaseRightArm - # partType: Arm # Frontier: inherited from BaseRightArm - # symmetry: Right # Frontier: inherited from BaseRightArm - type: entity + parent: [ PartHarpyBase, BaseLeftHand ] id: LeftHandHarpy name: "left harpy hand" - parent: [PartHarpy, BaseLeftHand] # Frontier: add BaseLeftHand - components: - - type: Sprite - netsync: false - sprite: _DV/Mobs/Species/Harpy/parts.rsi - state: "l_hand" - - type: Icon - sprite: _DV/Mobs/Species/Harpy/parts.rsi - state: "l_hand" - # - type: BodyPart # Frontier: inherited from BaseLeftHand - # partType: Hand # Frontier: inherited from BaseLeftHand - # symmetry: Left # Frontier: inherited from BaseLeftHand - type: entity + parent: [ PartHarpyBase, BaseRightHand ] id: RightHandHarpy name: "right harpy hand" - parent: [PartHarpy, BaseRightHand] # Frontier: add BaseRightHand - components: - - type: Sprite - netsync: false - sprite: _DV/Mobs/Species/Harpy/parts.rsi - state: "r_hand" - - type: Icon - sprite: _DV/Mobs/Species/Harpy/parts.rsi - state: "r_hand" - # - type: BodyPart # Frontier: inherited from BaseRightHand - # partType: Hand # Frontier: inherited from BaseRightHand - # symmetry: Right # Frontier: inherited from BaseRightHand - type: entity + parent: [ PartHarpyBase, BaseLeftLeg ] id: LeftLegHarpy name: "left harpy leg" - parent: [PartHarpy, BaseLeftLeg] # Frontier: add BaseLeftLeg - components: - - type: Sprite - netsync: false - sprite: _DV/Mobs/Species/Harpy/parts.rsi - state: "l_leg" - - type: Icon - sprite: _DV/Mobs/Species/Harpy/parts.rsi - state: "l_leg" - # - type: BodyPart # Frontier: inherited from BaseLeftLeg - # partType: Leg # Frontier: inherited from BaseLeftLeg - # symmetry: Left # Frontier: inherited from BaseLeftLeg - # - type: MovementBodyPart # Frontier: commented out for upstream consistency (handled elsewhere) - type: entity + parent: [ PartHarpyBase, BaseRightLeg ] id: RightLegHarpy name: "right harpy leg" - parent: [PartHarpy, BaseRightLeg] # Frontier: add BaseRightLeg - components: - - type: Sprite - netsync: false - sprite: _DV/Mobs/Species/Harpy/parts.rsi - state: "r_leg" - - type: Icon - sprite: _DV/Mobs/Species/Harpy/parts.rsi - state: "r_leg" - # - type: BodyPart # Frontier: inherited from BaseRightLeg - # partType: Leg # Frontier: inherited from BaseRightLeg - # symmetry: Right # Frontier: inherited from BaseRightLeg - # - type: MovementBodyPart # Frontier: commented out for upstream consistency (handled elsewhere) - type: entity + parent: [ PartHarpyBase, BaseLeftFoot ] id: LeftFootHarpy name: "left harpy foot" - parent: [PartHarpy, BaseLeftFoot] # Frontier: add BaseLeftFoot - components: - - type: Sprite - netsync: false - sprite: _DV/Mobs/Species/Harpy/parts.rsi - state: "l_foot" - - type: Icon - sprite: _DV/Mobs/Species/Harpy/parts.rsi - state: "l_foot" - # - type: BodyPart # Frontier: inherited from BaseLeftFoot - # partType: Foot # Frontier: inherited from BaseLeftFoot - # symmetry: Left # Frontier: inherited from BaseLeftFoot - type: entity + parent: [ PartHarpyBase, BaseRightFoot ] id: RightFootHarpy name: "right harpy foot" - parent: [PartHarpy, BaseRightFoot] # Frontier: add BaseRightFoot - components: - - type: Sprite - netsync: false - sprite: _DV/Mobs/Species/Harpy/parts.rsi - state: "r_foot" - - type: Icon - sprite: _DV/Mobs/Species/Harpy/parts.rsi - state: "r_foot" - # - type: BodyPart # Frontier: inherited from BaseRightFoot - # partType: Foot # Frontier: inherited from BaseRightFoot - # symmetry: Right # Frontier: inherited from BaseRightFoot