From d1cae9a4394ce0f4281c8c86feea21561c6d44d1 Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Thu, 20 Jun 2024 18:07:28 -0400 Subject: [PATCH] Harpy Peacock Tail (#428) Courtesy of @StillIcarus This adds a new Peacock tail marking to Harpies. I'm also taking this time to update them to the recent DeltaV changes to the birbs. ![image](https://github.com/Simple-Station/Einstein-Engines/assets/16548818/4f776006-700e-4d92-802c-03e6dd201491) ![image](https://github.com/Simple-Station/Einstein-Engines/assets/16548818/5fd143ab-069f-4d1c-b5e0-ee982a95b4b6) The backside is semi cursed, but that's something I can't do within the scope of this PR due to sprite system limitations that Death has planned improvements for. Just ignore them. :) Have a birb as consolation. ![faridaiscute](https://github.com/Simple-Station/Einstein-Engines/assets/16548818/09373a57-f32f-48eb-b52b-6d12143f62ff) :cl: VMSolidus - add: Peacock Tails have been added for Harpies --------- Signed-off-by: VMSolidus Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> --- .../Locale/en-US/deltav/markings/harpy.ftl | 4 ++ .../Mobs/Customization/Markings/harpy.yml | 64 +++++++++++------- .../DeltaV/Entities/Mobs/Species/harpy.yml | 22 ++++-- .../digitigrade_inventory_template.yml | 7 -- .../Harpy/harpy_chest.rsi/lower.png | Bin .../Harpy/harpy_chest.rsi/meta.json | 0 .../Harpy/harpy_chest.rsi/upper.png | Bin .../harpy_ears.rsi/harpy_ears_default.png | Bin .../Harpy/harpy_ears.rsi/meta.json | 0 .../Harpy/harpy_legs.rsi/feet.png | Bin .../Harpy/harpy_legs.rsi/meta.json | 0 .../Harpy/harpy_legs.rsi/talons.png | Bin .../Harpy/harpy_legs.rsi/thighs.png | Bin .../Harpy/harpy_tails.rsi/meta.json | 0 .../Harpy/harpy_tails.rsi/phoenix_tail.png | Bin .../Harpy/harpy_tails.rsi/rooster_tail.png | Bin .../harpy_tails36x36.rsi}/finch_tail.png | Bin .../Harpy/harpy_tails36x36.rsi}/meta.json | 0 .../Harpy/harpy_tails48x48.rsi/meta.json | 19 ++++++ .../peacock_tail_eyes.png | Bin 0 -> 772 bytes .../peacock_tail_feathers.png | Bin 0 -> 1669 bytes .../Customization/Harpy/harpy_wingcover.png | Bin .../Harpy/harpy_wings.rsi/classicharpy.png | Bin .../Harpy/harpy_wings.rsi/harpy.png | Bin .../Harpy/harpy_wings.rsi/harpy2tone1.png | Bin .../Harpy/harpy_wings.rsi/harpy2tone2.png | Bin .../Harpy/harpy_wings.rsi/harpy3tone1.png | Bin .../Harpy/harpy_wings.rsi/harpy3tone2.png | Bin .../Harpy/harpy_wings.rsi/harpy3tone3.png | Bin .../Harpy/harpy_wings.rsi/harpyfolded.png | Bin .../Harpy/harpy_wings.rsi/harpyspeckled1.png | Bin .../Harpy/harpy_wings.rsi/harpyspeckled2.png | Bin .../Harpy/harpy_wings.rsi/harpyundertone1.png | Bin .../Harpy/harpy_wings.rsi/harpyundertone2.png | Bin .../Harpy/harpy_wings.rsi/harpywingtip1.png | Bin .../Harpy/harpy_wings.rsi/harpywingtip2.png | Bin .../Harpy/harpy_wings.rsi/meta.json | 0 37 files changed, 81 insertions(+), 35 deletions(-) rename Resources/Textures/{DeltaV => }/Mobs/Customization/Harpy/harpy_chest.rsi/lower.png (100%) rename Resources/Textures/{DeltaV => }/Mobs/Customization/Harpy/harpy_chest.rsi/meta.json (100%) rename Resources/Textures/{DeltaV => }/Mobs/Customization/Harpy/harpy_chest.rsi/upper.png (100%) rename Resources/Textures/{DeltaV => }/Mobs/Customization/Harpy/harpy_ears.rsi/harpy_ears_default.png (100%) rename Resources/Textures/{DeltaV => }/Mobs/Customization/Harpy/harpy_ears.rsi/meta.json (100%) rename Resources/Textures/{DeltaV => }/Mobs/Customization/Harpy/harpy_legs.rsi/feet.png (100%) rename Resources/Textures/{DeltaV => }/Mobs/Customization/Harpy/harpy_legs.rsi/meta.json (100%) rename Resources/Textures/{DeltaV => }/Mobs/Customization/Harpy/harpy_legs.rsi/talons.png (100%) rename Resources/Textures/{DeltaV => }/Mobs/Customization/Harpy/harpy_legs.rsi/thighs.png (100%) rename Resources/Textures/{DeltaV => }/Mobs/Customization/Harpy/harpy_tails.rsi/meta.json (100%) rename Resources/Textures/{DeltaV => }/Mobs/Customization/Harpy/harpy_tails.rsi/phoenix_tail.png (100%) rename Resources/Textures/{DeltaV => }/Mobs/Customization/Harpy/harpy_tails.rsi/rooster_tail.png (100%) rename Resources/Textures/{DeltaV/Mobs/Customization/Harpy/harpy_tailsx72.rsi => Mobs/Customization/Harpy/harpy_tails36x36.rsi}/finch_tail.png (100%) rename Resources/Textures/{DeltaV/Mobs/Customization/Harpy/harpy_tailsx72.rsi => Mobs/Customization/Harpy/harpy_tails36x36.rsi}/meta.json (100%) create mode 100644 Resources/Textures/Mobs/Customization/Harpy/harpy_tails48x48.rsi/meta.json create mode 100644 Resources/Textures/Mobs/Customization/Harpy/harpy_tails48x48.rsi/peacock_tail_eyes.png create mode 100644 Resources/Textures/Mobs/Customization/Harpy/harpy_tails48x48.rsi/peacock_tail_feathers.png rename Resources/Textures/{DeltaV => }/Mobs/Customization/Harpy/harpy_wingcover.png (100%) rename Resources/Textures/{DeltaV => }/Mobs/Customization/Harpy/harpy_wings.rsi/classicharpy.png (100%) rename Resources/Textures/{DeltaV => }/Mobs/Customization/Harpy/harpy_wings.rsi/harpy.png (100%) rename Resources/Textures/{DeltaV => }/Mobs/Customization/Harpy/harpy_wings.rsi/harpy2tone1.png (100%) rename Resources/Textures/{DeltaV => }/Mobs/Customization/Harpy/harpy_wings.rsi/harpy2tone2.png (100%) rename Resources/Textures/{DeltaV => }/Mobs/Customization/Harpy/harpy_wings.rsi/harpy3tone1.png (100%) rename Resources/Textures/{DeltaV => }/Mobs/Customization/Harpy/harpy_wings.rsi/harpy3tone2.png (100%) rename Resources/Textures/{DeltaV => }/Mobs/Customization/Harpy/harpy_wings.rsi/harpy3tone3.png (100%) rename Resources/Textures/{DeltaV => }/Mobs/Customization/Harpy/harpy_wings.rsi/harpyfolded.png (100%) rename Resources/Textures/{DeltaV => }/Mobs/Customization/Harpy/harpy_wings.rsi/harpyspeckled1.png (100%) rename Resources/Textures/{DeltaV => }/Mobs/Customization/Harpy/harpy_wings.rsi/harpyspeckled2.png (100%) rename Resources/Textures/{DeltaV => }/Mobs/Customization/Harpy/harpy_wings.rsi/harpyundertone1.png (100%) rename Resources/Textures/{DeltaV => }/Mobs/Customization/Harpy/harpy_wings.rsi/harpyundertone2.png (100%) rename Resources/Textures/{DeltaV => }/Mobs/Customization/Harpy/harpy_wings.rsi/harpywingtip1.png (100%) rename Resources/Textures/{DeltaV => }/Mobs/Customization/Harpy/harpy_wings.rsi/harpywingtip2.png (100%) rename Resources/Textures/{DeltaV => }/Mobs/Customization/Harpy/harpy_wings.rsi/meta.json (100%) diff --git a/Resources/Locale/en-US/deltav/markings/harpy.ftl b/Resources/Locale/en-US/deltav/markings/harpy.ftl index 3c1a2e3b9b2..871f2f17290 100644 --- a/Resources/Locale/en-US/deltav/markings/harpy.ftl +++ b/Resources/Locale/en-US/deltav/markings/harpy.ftl @@ -40,6 +40,10 @@ marking-HarpyTailRooster-rooster_tail = Tail marking-HarpyTailFinch = Finch Tail marking-HarpyTailFinch-finch_tail = Tail +marking-HarpyTailPeacock = Peacock Tail +marking-HarpyTailPeacock-peacock_tail_feathers = Feathers +marking-HarpyTailPeacock-peacock_tail_eyes = Eyes + marking-HarpyChestDefault = Wing & Groin Under-Clothes marking-HarpyChestDefault-upper = Wing Under-Clothes marking-HarpyChestDefault-lower = Groin Under-Clothes diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/harpy.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/harpy.yml index 4f65046ce9c..bd1ad12a326 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/harpy.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/harpy.yml @@ -15,7 +15,7 @@ - !type:SimpleColoring color: "#964b00" sprites: - - sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi + - sprite: Mobs/Customization/Harpy/harpy_wings.rsi state: harpy - type: marking @@ -32,7 +32,7 @@ - !type:SimpleColoring color: "#964b00" sprites: - - sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi + - sprite: Mobs/Customization/Harpy/harpy_wings.rsi state: classicharpy - type: marking @@ -49,7 +49,7 @@ - !type:SimpleColoring color: "#964b00" sprites: - - sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi + - sprite: Mobs/Customization/Harpy/harpy_wings.rsi state: harpyfolded - type: marking @@ -66,7 +66,7 @@ - !type:SimpleColoring color: "#964b00" sprites: - - sprite: DeltaV/Mobs/Customization/Harpy/harpy_ears.rsi + - sprite: Mobs/Customization/Harpy/harpy_ears.rsi state: harpy_ears_default - type: marking @@ -83,7 +83,7 @@ - !type:SimpleColoring color: "#964b00" sprites: - - sprite: DeltaV/Mobs/Customization/Harpy/harpy_tails.rsi + - sprite: Mobs/Customization/Harpy/harpy_tails.rsi state: phoenix_tail - type: marking @@ -99,7 +99,7 @@ fallbackTypes: - !type:SimpleColoring sprites: - - sprite: DeltaV/Mobs/Customization/Harpy/harpy_tails.rsi + - sprite: Mobs/Customization/Harpy/harpy_tails.rsi state: rooster_tail @@ -116,18 +116,36 @@ fallbackTypes: - !type:SimpleColoring sprites: - - sprite: DeltaV/Mobs/Customization/Harpy/harpy_tailsx72.rsi + - sprite: Mobs/Customization/Harpy/harpy_tails36x36.rsi state: finch_tail +- type: marking + id: HarpyTailPeacock + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [Harpy] + coloring: + default: + type: + !type:CategoryColoring + category: Hair + fallbackTypes: + - !type:SimpleColoring + sprites: + - sprite: Mobs/Customization/Harpy/harpy_tails48x48.rsi + state: peacock_tail_feathers + - sprite: Mobs/Customization/Harpy/harpy_tails48x48.rsi + state: peacock_tail_eyes + - type: marking id: HarpyWing2ToneClassic bodyPart: RArm markingCategory: Arms speciesRestriction: [Harpy] sprites: - - sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi + - sprite: Mobs/Customization/Harpy/harpy_wings.rsi state: harpy2tone1 - - sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi + - sprite: Mobs/Customization/Harpy/harpy_wings.rsi state: harpy2tone2 - type: marking @@ -136,11 +154,11 @@ markingCategory: Arms speciesRestriction: [Harpy] sprites: - - sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi + - sprite: Mobs/Customization/Harpy/harpy_wings.rsi state: harpy3tone1 - - sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi + - sprite: Mobs/Customization/Harpy/harpy_wings.rsi state: harpy3tone2 - - sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi + - sprite: Mobs/Customization/Harpy/harpy_wings.rsi state: harpy3tone3 - type: marking @@ -149,9 +167,9 @@ markingCategory: Arms speciesRestriction: [Harpy] sprites: - - sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi + - sprite: Mobs/Customization/Harpy/harpy_wings.rsi state: harpyspeckled1 - - sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi + - sprite: Mobs/Customization/Harpy/harpy_wings.rsi state: harpyspeckled2 - type: marking @@ -160,9 +178,9 @@ markingCategory: Arms speciesRestriction: [Harpy] sprites: - - sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi + - sprite: Mobs/Customization/Harpy/harpy_wings.rsi state: harpyundertone1 - - sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi + - sprite: Mobs/Customization/Harpy/harpy_wings.rsi state: harpyundertone2 - type: marking @@ -171,9 +189,9 @@ markingCategory: Arms speciesRestriction: [Harpy] sprites: - - sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi + - sprite: Mobs/Customization/Harpy/harpy_wings.rsi state: harpywingtip1 - - sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi + - sprite: Mobs/Customization/Harpy/harpy_wings.rsi state: harpywingtip2 - type: marking @@ -190,9 +208,9 @@ - !type:SimpleColoring color: "#964b00" sprites: - - sprite: DeltaV/Mobs/Customization/Harpy/harpy_chest.rsi + - sprite: Mobs/Customization/Harpy/harpy_chest.rsi state: upper - - sprite: DeltaV/Mobs/Customization/Harpy/harpy_chest.rsi + - sprite: Mobs/Customization/Harpy/harpy_chest.rsi state: lower - type: marking @@ -209,7 +227,7 @@ - !type:SimpleColoring color: "#964b00" sprites: - - sprite: DeltaV/Mobs/Customization/Harpy/harpy_legs.rsi + - sprite: Mobs/Customization/Harpy/harpy_legs.rsi state: thighs - type: marking @@ -223,7 +241,7 @@ - !type:SimpleColoring color: "#964b00" sprites: - - sprite: DeltaV/Mobs/Customization/Harpy/harpy_legs.rsi + - sprite: Mobs/Customization/Harpy/harpy_legs.rsi state: feet - - sprite: DeltaV/Mobs/Customization/Harpy/harpy_legs.rsi + - sprite: Mobs/Customization/Harpy/harpy_legs.rsi state: talons diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml index a4498299c9a..0ddce8b0e65 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml @@ -54,7 +54,6 @@ visible: false - map: [ "id" ] - map: [ "gloves" ] - - map: [ "shoes" ] - map: [ "ears" ] - map: [ "outerClothing" ] - map: [ "eyes" ] @@ -122,12 +121,25 @@ - type: MovementSpeedModifier baseWalkSpeed: 2.5 baseSprintSpeed: 5.0 - - type: Inventory + - type: Inventory speciesId: harpy templateId: digitigrade - type: HarpyVisuals - type: UltraVision - + - type: Tag + tags: + - CanPilot + - FootstepSound + - DoorBumpOpener + - ShoesRequiredStepTriggerImmune + - type: LanguageSpeaker + speaks: + - GalacticCommon + - SolCommon + understands: + - GalacticCommon + - SolCommon + - type: entity save: false name: Urist McHands @@ -138,8 +150,9 @@ components: - type: HumanoidAppearance species: Harpy - - type: Inventory + - type: Inventory speciesId: harpy + templateId: digitigrade - type: Sprite scale: 0.9, 0.9 layers: @@ -160,7 +173,6 @@ - map: ["enum.HumanoidVisualLayers.RHand"] - map: [ "id" ] - map: [ "gloves" ] - - map: [ "shoes" ] - map: [ "ears" ] - map: [ "outerClothing" ] - map: [ "eyes" ] diff --git a/Resources/Prototypes/DeltaV/InventoryTemplates/digitigrade_inventory_template.yml b/Resources/Prototypes/DeltaV/InventoryTemplates/digitigrade_inventory_template.yml index 158541571aa..fc7dbda9321 100644 --- a/Resources/Prototypes/DeltaV/InventoryTemplates/digitigrade_inventory_template.yml +++ b/Resources/Prototypes/DeltaV/InventoryTemplates/digitigrade_inventory_template.yml @@ -1,13 +1,6 @@ - type: inventoryTemplate id: digitigrade slots: - - name: shoes - slotTexture: shoes - slotFlags: FEET - stripTime: 3 - uiWindowPos: 1,0 - strippingWindowPos: 1,3 - displayName: Shoes - name: jumpsuit slotTexture: uniform slotFlags: INNERCLOTHING diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_chest.rsi/lower.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_chest.rsi/lower.png similarity index 100% rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_chest.rsi/lower.png rename to Resources/Textures/Mobs/Customization/Harpy/harpy_chest.rsi/lower.png diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_chest.rsi/meta.json b/Resources/Textures/Mobs/Customization/Harpy/harpy_chest.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_chest.rsi/meta.json rename to Resources/Textures/Mobs/Customization/Harpy/harpy_chest.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_chest.rsi/upper.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_chest.rsi/upper.png similarity index 100% rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_chest.rsi/upper.png rename to Resources/Textures/Mobs/Customization/Harpy/harpy_chest.rsi/upper.png diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_ears.rsi/harpy_ears_default.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_ears.rsi/harpy_ears_default.png similarity index 100% rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_ears.rsi/harpy_ears_default.png rename to Resources/Textures/Mobs/Customization/Harpy/harpy_ears.rsi/harpy_ears_default.png diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_ears.rsi/meta.json b/Resources/Textures/Mobs/Customization/Harpy/harpy_ears.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_ears.rsi/meta.json rename to Resources/Textures/Mobs/Customization/Harpy/harpy_ears.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_legs.rsi/feet.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_legs.rsi/feet.png similarity index 100% rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_legs.rsi/feet.png rename to Resources/Textures/Mobs/Customization/Harpy/harpy_legs.rsi/feet.png diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_legs.rsi/meta.json b/Resources/Textures/Mobs/Customization/Harpy/harpy_legs.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_legs.rsi/meta.json rename to Resources/Textures/Mobs/Customization/Harpy/harpy_legs.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_legs.rsi/talons.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_legs.rsi/talons.png similarity index 100% rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_legs.rsi/talons.png rename to Resources/Textures/Mobs/Customization/Harpy/harpy_legs.rsi/talons.png diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_legs.rsi/thighs.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_legs.rsi/thighs.png similarity index 100% rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_legs.rsi/thighs.png rename to Resources/Textures/Mobs/Customization/Harpy/harpy_legs.rsi/thighs.png diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_tails.rsi/meta.json b/Resources/Textures/Mobs/Customization/Harpy/harpy_tails.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_tails.rsi/meta.json rename to Resources/Textures/Mobs/Customization/Harpy/harpy_tails.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_tails.rsi/phoenix_tail.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_tails.rsi/phoenix_tail.png similarity index 100% rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_tails.rsi/phoenix_tail.png rename to Resources/Textures/Mobs/Customization/Harpy/harpy_tails.rsi/phoenix_tail.png diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_tails.rsi/rooster_tail.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_tails.rsi/rooster_tail.png similarity index 100% rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_tails.rsi/rooster_tail.png rename to Resources/Textures/Mobs/Customization/Harpy/harpy_tails.rsi/rooster_tail.png diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_tailsx72.rsi/finch_tail.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_tails36x36.rsi/finch_tail.png similarity index 100% rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_tailsx72.rsi/finch_tail.png rename to Resources/Textures/Mobs/Customization/Harpy/harpy_tails36x36.rsi/finch_tail.png diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_tailsx72.rsi/meta.json b/Resources/Textures/Mobs/Customization/Harpy/harpy_tails36x36.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_tailsx72.rsi/meta.json rename to Resources/Textures/Mobs/Customization/Harpy/harpy_tails36x36.rsi/meta.json diff --git a/Resources/Textures/Mobs/Customization/Harpy/harpy_tails48x48.rsi/meta.json b/Resources/Textures/Mobs/Customization/Harpy/harpy_tails48x48.rsi/meta.json new file mode 100644 index 00000000000..2961db3707d --- /dev/null +++ b/Resources/Textures/Mobs/Customization/Harpy/harpy_tails48x48.rsi/meta.json @@ -0,0 +1,19 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Peacock by stillxicarus (Discord)", + "size": { + "x": 48, + "y": 48 + }, + "states": [ + { + "name": "peacock_tail_feathers", + "directions": 4 + }, + { + "name": "peacock_tail_eyes", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Mobs/Customization/Harpy/harpy_tails48x48.rsi/peacock_tail_eyes.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_tails48x48.rsi/peacock_tail_eyes.png new file mode 100644 index 0000000000000000000000000000000000000000..71af693afd78b3c3a6c81ca03fc2f9db5913e590 GIT binary patch literal 772 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD3?#3*wSy!Wi-X*q7}lMWc?smOq&xaLGB9lH z=l+w(3gjyW_=LDtRW-hRc_J~f)7Q5xIl1%y|NjRL)R&hxZQ4}w>eVTrswZhYEkKI9 zB*-rqC<_G)UjB@qfWn*w9+AZi419+`m{C;2tAT-mDb&-&F(kwJ?aYg1hZQ*5k~e10 z{$Brpago!NU2e0xW%tk3W#hDWniRY{_rH<%g404TKGm}><1}Z=edpY|?DrC%?a|r+ ziTh6)CY;Y=;b(Y|{LP=f6PN*cE&-(I*n^FCEgYD{zpYy*y3!b(03e(!E zKL`01i1hql(XgD6?f9(?EOWQBzM3eNHgmzM_EX0vel@o(`2AOc=Uq`{@2{S%a=%h`o2b+9s8C>H zpx0*yEwdB-39}Z23B0Y`x5Z?^jjt+SxTNGfYPsrC93*qJxYysE%nl!b?@pzv*U&iA`jFQoxf?#_u}_@Wt{T0h^_`Kmq5-Qe-3bVZ$zPv?|c7GX8cfPYi| zF5rmun;0aqnJMW_X<*)qO$>Wd3>w3)UDTFXBJC*Z#k%g2a+7tPH~ z8~6Kli1^Msdz2|;NuW<-AJbu7wHyIefqy3r9y)gaUz_lS%i`Mur58n?E#mK{Sn_>b rcXDyRWMReq*qBB78xS7c@P5B*c|60ulNK9*sgA+Z)z4*}Q$iB}zuHxD literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/Harpy/harpy_tails48x48.rsi/peacock_tail_feathers.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_tails48x48.rsi/peacock_tail_feathers.png new file mode 100644 index 0000000000000000000000000000000000000000..d56b093d6ca8a5584adf01c6e4e1d6aeca3c48ec GIT binary patch literal 1669 zcmV;027394P)Px#1ZP1_K>z@;j|==^1poj5Fi=cXMd|6tqoZ=bz<>Y$|LW?>va)pD-K~$0cTG)( zVPT1SdV#O6bBBj|V`GVTcY*)_02e%JDgXcg5Oh*bQ~&?}|NsC0|NsC0|NsC00N^8C z82|tP32;bRa{vGi!vFvd!vV){sAK>D1;R;0K~!i%?U;>{<0uS-L0}Aw9p3+K?-R!V z-t&wzTUT|J-kk(+TaAQJY)tvf_z2wMKNI*h;XfI&?fbj<V&TN zX92Zr#EV|h_8lr`n$Q*hBp{uBIBwy)yZ52;=Luc#j{?DkQhHCz_pSG@m>BbfF8Esk zbx;DIQOOb+3EH}Fykg-m6T0AU1ausF7fP!AR6@rs?aCP|f1c14erbGk6Vlyuz{Dr)qluDwijhP!vLFZkDj*VZtyaYi zETM=pm9iZwUwuFUvzigu*ZJ@Hi+~Nd8S^n;B*!Er9CejXVAMsXp14iOC=C|Lz2mR3 z#Z$?uyw`A3GX(`b!ZQTYXaB>P#@ z((^})b*SSjf3avpLhdhO-7}+85-ofiT_&UYgo4Q~l2;<+dSlH3*yX>bLG5lqk}xZ4GI|5E(?9K<)WWz!{6v zNvCx{bP0#;p`gxu?2@H*UZc}I<|@1 zH;mPvG`&7hL@i}ii!lAH#ut7QAh9Lt*y}ZUP_M`F_0l#~V86zVAG??GaXRIsU+`ZY z;~V}gkO^DrUJ_%j9#oYv$0)BZ5%9eOdp_J4_2Y^^3zR&J8j^fi18!k_INJX{e-UV? zQ(3U@UE!906!>*~1a9#WxWz}{79W9I{LcjTPY#c2{jSyu)K>e0tSWlK=&Th%D{73 z>&^l`pdfa71%C^J73>E+A5lyKJa4lwA?EV~){l`hFHwdUh}rb?Ik3cm_uH^$@Dn&a z^val$VJ{FmO(LXS8+iz$5>eBr(_F113h8(n7Q7>g53d?O0`DbGt+2wO9T2wpnqa!2 zZiTn@v+m&_QHBnK(@^`8&J@#SJx!~}e9thQMD@8EYx8UZ#dz{6>w#Es7q5cfLUej0 z7=%>xele^cI_2J*RK#*wPv4$FkM4q%l8l~lPWd%^ohQ>P{h;AsgL}M#} zLa#?*lv+o%eT*0!B_H#BKmVjH0@ZG>#pIn*p`}c#M4TO%1=Kk%^nG7Mo+?CcttLvp z26`6Y>Okn&Z{F7-nYH*8|ok5T^=iMCu={%a5Dy4XTnavu>e%1H$aYHq;)Fx9{dG-1a9#WxWz}{2BrK1WWU*nv@q8v P00000NkvXXu0mjfjI1Qj literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wingcover.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_wingcover.png similarity index 100% rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wingcover.png rename to Resources/Textures/Mobs/Customization/Harpy/harpy_wingcover.png diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/classicharpy.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/classicharpy.png similarity index 100% rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/classicharpy.png rename to Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/classicharpy.png diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpy.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpy.png similarity index 100% rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpy.png rename to Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpy.png diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpy2tone1.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpy2tone1.png similarity index 100% rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpy2tone1.png rename to Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpy2tone1.png diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpy2tone2.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpy2tone2.png similarity index 100% rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpy2tone2.png rename to Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpy2tone2.png diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpy3tone1.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpy3tone1.png similarity index 100% rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpy3tone1.png rename to Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpy3tone1.png diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpy3tone2.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpy3tone2.png similarity index 100% rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpy3tone2.png rename to Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpy3tone2.png diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpy3tone3.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpy3tone3.png similarity index 100% rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpy3tone3.png rename to Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpy3tone3.png diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpyfolded.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpyfolded.png similarity index 100% rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpyfolded.png rename to Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpyfolded.png diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpyspeckled1.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpyspeckled1.png similarity index 100% rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpyspeckled1.png rename to Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpyspeckled1.png diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpyspeckled2.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpyspeckled2.png similarity index 100% rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpyspeckled2.png rename to Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpyspeckled2.png diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpyundertone1.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpyundertone1.png similarity index 100% rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpyundertone1.png rename to Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpyundertone1.png diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpyundertone2.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpyundertone2.png similarity index 100% rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpyundertone2.png rename to Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpyundertone2.png diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpywingtip1.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpywingtip1.png similarity index 100% rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpywingtip1.png rename to Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpywingtip1.png diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpywingtip2.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpywingtip2.png similarity index 100% rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpywingtip2.png rename to Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpywingtip2.png diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/meta.json b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/meta.json rename to Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/meta.json