Skip to content

Commit

Permalink
Cherry-pick Harpy Updates (#1641)
Browse files Browse the repository at this point in the history
* 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 <[email protected]>
Co-authored-by: Danger Revolution! <[email protected]>

* Birbs Have Wings Too (#477)

# Description

During PR #464, somehow Moth's got back their ability to move with their
wings whenever the gravity gets shut off. Well, I'm here to correct the
injustice by also putting it on Harpies. In fact, Harpies have a much
bigger claim to it, their wings are absolutely massive compared to
Moths.

# Changelog

:cl:
- add: Harpies remembered that just like moths; they also have wings,
and can zoom whenever the gravity turns off.

Co-authored-by: Danger Revolution! <[email protected]>

* Harpy Sprite Update 3 (#556)

This will be my third sprite update pack for Harpies, with new sprites
courtesy of StillxIcarus (Discord). These include owl wings, and forked
tails. I've also personally made a new "Large Ear Tufts" variation. Many
sprites have been split between Huescale and Whitescale variations, with
Huescale offering greater variety of colors, while Whitescale offers
better pure whites(A notable weakness of having only huescale options
was that white winged harpies ended up a yellow-cream color).

Additionally, I have updated all of the Harpy Hardsuit and Softsuit
variations to now include **Wing Sleeves**, with some hardsuits even
having personalized color schemes for their sleeves, depending on how
important the wearer may be. Of course, all of the syndicate hardsuits
have received their own unique schemes for each suit, including for the
first time a species-specific Elite Syndicate Suit.

![image](https://github.com/user-attachments/assets/f4e90e0d-6869-47de-bd26-a6668f8e3e2b)

![image](https://github.com/user-attachments/assets/ecc98a25-936c-46a4-bddc-ff3a25b27b25)

Additionally, I am taking this as a convenient time to move a majority
of the Harpy files to the core EE Directory, as I am taking direct
responsibility for maintaining my creation here, rather than anywhere
else.

:cl:
- add: Harpy Update 3, New markings for Harpies, all new
species-specific hardsuit & softsuit variations that feature wing
sleeves.

* White Dream Harpy Markings (#696)

ONIKS was kind enough to provide me with several new Harpy markings,
consisting of alternate Bat-wings, Haven Tail, Long Forked Tail, and
Swallow Tail. I have also taken the liberty of actually making a basic
set of "Bionic Wings", which are just a slightly edited version of the
"harpsuit" wing sleeve, including hardsuit lights. Unfortunately due to
limitations in the game's code concerning markings, I couldn't make the
lights use the unshaded shader. This limitation irritates me. I'll
probably fix that in a separate PR.

I actually also received a pack of Arachnid and Felinid sprites! But I'm
going to add those in a different PR entirely.

<details><summary><h1>Media</h1></summary>
<p>

Bionic wings

![image](https://github.com/user-attachments/assets/6acc64a9-be6b-435b-9c61-91287ef65c10)

Bat Wings

![image](https://github.com/user-attachments/assets/e44fe12e-8410-47ca-a4c1-5e644fd36b8a)

Haven tail

![image](https://github.com/user-attachments/assets/2adadcdd-04fc-458d-8491-61bd52a3b4d1)

Swallow tail

![image](https://github.com/user-attachments/assets/615391eb-0314-4e6d-a87b-101d0a307955)

Long Forked Tail

![image](https://github.com/user-attachments/assets/e3d672f7-b8cb-4497-a2a3-87d0c224847d)

</p>
</details>

:cl:
- add: The following new markings have been added for Harpies: Bat
Wings, Simple Bionic Wings, Haven Tail, Swallow tail, and Long Forked
Tail

* Split files

* Harpy Hotfix (Cherry-Pick Broke Things) (#570)

Captain's Carapace inherited HidesHarpyWings because wizden made it
parent off Large outerwear for reasons. I've moved HidesHarpyWings to
only LargeOuterwear that actually have harpy sprites so that this won't
happen again.

![image](https://github.com/user-attachments/assets/84ee06e3-eeeb-4193-8cb0-492bd1d3d82e)

![image](https://github.com/user-attachments/assets/ac9493b3-75e7-4696-b531-18b00d1332a5)

* Uncommented digitigrade inv template

* Removed duplicate locale entry

* Add comment

---------

Signed-off-by: VMSolidus <[email protected]>
Co-authored-by: VMSolidus <[email protected]>
Co-authored-by: Danger Revolution! <[email protected]>
  • Loading branch information
3 people authored Aug 27, 2024
1 parent f270c1b commit 5e7b191
Show file tree
Hide file tree
Showing 109 changed files with 686 additions and 261 deletions.
52 changes: 0 additions & 52 deletions Resources/Locale/en-US/deltav/markings/harpy.ftl

This file was deleted.

94 changes: 94 additions & 0 deletions Resources/Locale/en-US/einstein-engines/markings/harpy.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
marking-HarpyWingDefaultHuescale = Basic Wings (Huescale)
marking-HarpyWingDefaultHuescale-huescale_harpy = Wings
marking-HarpyWingDefaultWhitescale = Basic Wings (Whitescale)
marking-HarpyWingDefaultWhitescale-whitescale_harpy = Wings
marking-HarpyWingFoldedHuescale = Folded Wings (Huescale)
marking-HarpyWingFoldedHuescale-huescale_harpy_folded = Wings
marking-HarpyWingFoldedWhitescale = Folded Wings (Whitescale)
marking-HarpyWingFoldedWhitescale-whitescale_harpy_folded = Wings
marking-HarpyWingOwlHuescale = Owl Wings (Huescale)
marking-HarpyWingOwlHuescale-huescale_harpy_wing_owl = Wings
marking-HarpyWingOwlWhitescale = Owl Wings (Whitescale)
marking-HarpyWingOwlWhitescale-whitescale_harpy_wing_owl = Wings
marking-HarpyWingClassic = Classic Wings
marking-HarpyWingClassic-classic_harpy = Wings
marking-HarpyWing2ToneClassic = Classic Two Tone Wings
marking-HarpyWing2ToneClassic-harpy_2tone_1 = Top Half
marking-HarpyWing2ToneClassic-harpy_2tone_2 = Bottom Half
marking-HarpyWing3ToneClassic = Classic Three Tone Wings
marking-HarpyWing3ToneClassic-harpy_3tone_1 = Top Third
marking-HarpyWing3ToneClassic-harpy_3tone_2 = Middle Third
marking-HarpyWing3ToneClassic-harpy_3tone_3 = Bottom Third
marking-HarpyWingSpeckledClassic = Speckled Classic Wings
marking-HarpyWingSpeckledClassic-harpy_speckled_1 = Main
marking-HarpyWingSpeckledClassic-harpy_speckled_2 = Speckles
marking-HarpyWingUndertoneClassic = Classic Wings with Undertone
marking-HarpyWingUndertoneClassic-harpy_undertone_1 = Front
marking-HarpyWingUndertoneClassic-harpy_undertone_2 = Back
marking-HarpyWingTipsClassic = Classic Wings with Feather Tips
marking-HarpyWingTipsClassic-harpy_wingtip_1 = Main
marking-HarpyWingTipsClassic-harpy_wingtip_2 = Feathertips
marking-HarpyWingBat = Bat Wings (Whitescale)
marking-HarpyWingBat-bat_wings_tone_1 = Limbs
marking-HarpyWingBat-bat_wings_tone_2 = Membrane
marking-HarpyWingBionic = Simple Bionic Wings (Whitescale)
marking-HarpyWingBionic-bionic_wings_tone_1 = Wings
marking-HarpyWingBionic-bionic_wings_tone_2 = Lights (Unshaded)
marking-HarpyEarsDefault = Feather Tufts
marking-HarpyEarsDefault-harpy_ears_default = Tufts
marking-HarpyEarsLarge = Large Feather Tufts
marking-HarpyEarsLarge-harpy_ears_large = Tufts
marking-HarpyTailPhoenix = Basic Tail
marking-HarpyTailPhoenix-phoenix_tail = Tail
marking-HarpyTailRooster = Rooster Tail
marking-HarpyTailRooster-rooster_tail = Tail
marking-HarpyTailFinch = Finch Tail
marking-HarpyTailFinch-finch_tail = Tail
marking-HarpyTailForkedHuescale = Forked Tailfin (Huescale)
marking-HarpyTailForkedHuescale-huescale_forked_tailfin = Tail
marking-HarpyTailForkedWhitescale = Forked Tailfin (Whitescale)
marking-HarpyTailForkedWhitescale-whitescale_forked_tailfin = Tail
marking-HarpyTailPeacock = Peacock Tail
marking-HarpyTailPeacock-peacock_tail_feathers = Feathers
marking-HarpyTailPeacock-peacock_tail_eyes = Eyes
marking-HarpyTailHaven = Haven Tail (Whitescale)
marking-HarpyTailHaven-haven_tone_1 = Outer Feathers
marking-HarpyTailHaven-haven_tone_2 = Inner Feathers
marking-HarpyTailForkedLong = Long Forked Tail (Whitescale)
marking-HarpyTailForkedLong-forked_long = Tail
marking-HarpyTailSwallow = Swallow Tail (Whitescale)
marking-HarpyChestDefault = Wing & Groin Under-Clothes
marking-HarpyChestDefault-upper = Wing Under-Clothes
marking-HarpyChestDefault-lower = Groin Under-Clothes
marking-HarpyLegsDefault = Avian Legs
marking-HarpyLegsDefault-thighs = Thighs
marking-HarpyFeetDefault = Avian Feet
marking-HarpyFeetDefault-feet = Feet
marking-HarpyFeetDefault-talons = Talons
Original file line number Diff line number Diff line change
@@ -1,57 +1,5 @@
# All the Harpy customization

# Ears Markings
- type: marking
id: HarpyWingDefault
bodyPart: RArm
markingCategory: Arms
speciesRestriction: [Harpy]
coloring:
default:
type:
!type:CategoryColoring
category: Hair
fallbackTypes:
- !type:SimpleColoring
color: "#964b00"
sprites:
- sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
state: harpy

- type: marking
id: HarpyWingClassic
bodyPart: RArm
markingCategory: Arms
speciesRestriction: [Harpy]
coloring:
default:
type:
!type:CategoryColoring
category: Hair
fallbackTypes:
- !type:SimpleColoring
color: "#964b00"
sprites:
- sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
state: classicharpy

- type: marking
id: HarpyWingFolded
bodyPart: RArm
markingCategory: Arms
speciesRestriction: [Harpy]
coloring:
default:
type:
!type:CategoryColoring
category: Hair
fallbackTypes:
- !type:SimpleColoring
color: "#964b00"
sprites:
- sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
state: harpyfolded

- type: marking
id: HarpyEarsDefault
bodyPart: Head
Expand Down Expand Up @@ -102,7 +50,6 @@
- sprite: DeltaV/Mobs/Customization/Harpy/harpy_tails.rsi
state: rooster_tail


- type: marking
id: HarpyTailFinch
bodyPart: Tail
Expand All @@ -116,66 +63,9 @@
fallbackTypes:
- !type:SimpleColoring
sprites:
- sprite: DeltaV/Mobs/Customization/Harpy/harpy_tailsx72.rsi
- sprite: DeltaV/Mobs/Customization/Harpy/harpy_tails36x32.rsi
state: finch_tail

- type: marking
id: HarpyWing2ToneClassic
bodyPart: RArm
markingCategory: Arms
speciesRestriction: [Harpy]
sprites:
- sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
state: harpy2tone1
- sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
state: harpy2tone2

- type: marking
id: HarpyWing3ToneClassic
bodyPart: RArm
markingCategory: Arms
speciesRestriction: [Harpy]
sprites:
- sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
state: harpy3tone1
- sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
state: harpy3tone2
- sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
state: harpy3tone3

- type: marking
id: HarpyWingSpeckledClassic
bodyPart: RArm
markingCategory: Arms
speciesRestriction: [Harpy]
sprites:
- sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
state: harpyspeckled1
- sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
state: harpyspeckled2

- type: marking
id: HarpyWingUndertoneClassic
bodyPart: RArm
markingCategory: Arms
speciesRestriction: [Harpy]
sprites:
- sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
state: harpyundertone1
- sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
state: harpyundertone2

- type: marking
id: HarpyWingTipsClassic
bodyPart: RArm
markingCategory: Arms
speciesRestriction: [Harpy]
sprites:
- sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
state: harpywingtip1
- sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
state: harpywingtip2

- type: marking
id: HarpyChestDefault
bodyPart: Chest
Expand Down
11 changes: 8 additions & 3 deletions Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@
visible: false
- map: [ "id" ]
- map: [ "gloves" ]
- map: [ "shoes" ]
- map: [ "ears" ]
- map: [ "outerClothing" ]
- map: [ "eyes" ]
Expand Down Expand Up @@ -125,9 +124,10 @@
- type: MovementSpeedModifier
baseWalkSpeed: 2.5
baseSprintSpeed: 5.0
weightlessAcceleration: 2.5
- type: Inventory
speciesId: harpy
# templateId: digitigrade
templateId: digitigrade # Einstein Engines
displacements:
jumpsuit:
sizeMaps:
Expand All @@ -136,6 +136,11 @@
state: jumpsuit
- type: HarpyVisuals
- type: UltraVision
- type: Tag
tags:
- CanPilot
- FootstepSound
- DoorBumpOpener

- type: entity
save: false
Expand All @@ -155,6 +160,7 @@
32:
sprite: DeltaV/Mobs/Species/Harpy/displacement.rsi
state: jumpsuit
templateId: digitigrade
- type: Sprite
scale: 0.9, 0.9
layers:
Expand All @@ -175,7 +181,6 @@
- map: ["enum.HumanoidVisualLayers.RHand"]
- map: [ "id" ]
- map: [ "gloves" ]
- map: [ "shoes" ]
- map: [ "ears" ]
- map: [ "outerClothing" ]
- map: [ "eyes" ]
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/DeltaV/Species/harpy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
Arms:
points: 1
required: false
defaultMarkings: [ HarpyWingDefault ]
defaultMarkings: [ HarpyWingDefaultHuescale ]

- type: humanoidBaseSprite
id: MobHarpyHead
Expand Down
Loading

0 comments on commit 5e7b191

Please sign in to comment.