Harpy Visual Rework #677

VMSolidus · 2024-01-15T07:28:40Z

About the PR

This is the third and final update to Harpies, after this PR is merged, they will finally be at a state I would consider to be finished. This PR functions as a complete visual rework to Harpies, adding several new visual features to them, including a complete rework of their layering mechanics. This alleviates several of the clipping issues they've had, and finally allows for me to create bespoke new species sprites for their clothing.

In addition, @ps3moira and @stillxicarus have contributed entirely new sprites for use with Harpies. They now have new high-detail wing marking options, as well as fully avian limbs.

Why / Balance

Birds.

Technical details

A new visual system is being added, for handling selectively hiding markings from Harpies when they equip a specific kind of outerwear(Hardsuits & Softsuits). This novel technique involves selectively toggling visibility to their wings and tail, while we can then replace their wing with that of a covered hardsuit variant when such clothing is equipped. It's likely that I could of course re-use this technique for Lamia and Drider, in order to address some issues they have had in the past.

Media

New multi-shape wing markings, enabling a wider variety of marking options. These now feature hueshift maps to allow the wings to be more colorful than ever before.
https://github.com/DeltaV-Station/Delta-v/assets/16548818/8c121e36-62c3-4660-b6fd-b61375924775

New Ultravision feature that allows Harpies to see in the same light spectrum as real life birds.

I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Changelog
🆑 VMSolidus, PS3Moira, Stillxicarus

add: Harpies have received a full visual rework. Featuring clothing sprites, new markings, a complete overhaul of their layering, as well as visual systems.
add: Harpies now have bird related speech verbs
add: Two new traits have been added related to birds. Harpies now start by default with the new Ultraviolet Vision trait, letting them see a whole new spectrum of colors. This trait can be taken by other curious people. Harpies that wish to see in RGB colors can instead take the new Normal Vision trait.

github-actions · 2024-01-15T07:29:16Z

RSI Diff Bot; head commit 5f9c737 merging into e42d139
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_ears.rsi

State	Old	New	Status
harpy_ears_default			Modified

Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_tails.rsi

State	Old	New	Status
phoenix_tail			Modified
rooster_tail			Modified

Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi

State	Old	New	Status
harpy			Modified
harpy2tone1			Modified
harpy2tone2			Modified
harpy3tone1			Modified
harpy3tone2			Modified
harpy3tone3			Modified
harpyspeckled1			Modified
harpyspeckled2			Modified
harpyundertone1			Modified
harpyundertone2			Modified
harpywingtip1			Modified
harpywingtip2			Modified
classicharpy			Added
harpyfolded			Added

Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi

State	Old	New	Status
equipped-head-harpy			Added

Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi

State	Old	New	Status
off-equipped-HELMET-harpy			Added
on-equipped-HELMET-harpy			Added

Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi

State	Old	New	Status
equipped-HELMET-harpy			Added

Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi

State	Old	New	Status
off-equipped-HELMET-harpy			Added
on-equipped-HELMET-harpy			Added

Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-harpy			Added

Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-harpy			Added

Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-harpy			Added

Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-harpy			Added

Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-harpy			Added

Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-harpy			Added

Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-harpy			Added

Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-harpy			Added

Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-harpy			Added

Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-harpy			Added

Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-harpy			Added

Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-harpy			Added

Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-harpy			Added

Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/hos.rsi

State	Old	New	Status
off-equipped-HELMET-harpy			Added
on-equipped-HELMET-harpy			Added

Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/officer.rsi

State	Old	New	Status
off-equipped-HELMET-harpy			Added
on-equipped-HELMET-harpy			Added

Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/standard.rsi

State	Old	New	Status
off-equipped-HELMET-harpy			Added
on-equipped-HELMET-harpy			Added

Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/advanced.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-harpy			Added

Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/corpsman.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-harpy			Added

Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/hos.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-harpy			Added

Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/medical.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-harpy			Added

Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/officer.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-harpy			Added

Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/riot.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-harpy			Added

Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/standard.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-harpy			Added

Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/warden.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-harpy			Added

Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_chest.rsi

State	Old	New	Status
lower			Added
upper			Added

Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_legs.rsi

State	Old	New	Status
feet			Added
talons			Added
thighs			Added

Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_tailsx72.rsi

State	Old	New	Status
finch_tail			Added

Resources/Textures/DeltaV/Mobs/Species/Harpy/organs.rsi

State	Old	New	Status
lung-l			Added
lung-r			Added

Resources/Textures/DeltaV/Mobs/Species/Harpy/parts.rsi

State	Old	New	Status
full			Added
head_f			Added
head_m			Added
l_arm			Added
l_foot			Added
l_hand			Added
l_leg			Added
r_arm			Added
r_foot			Added
r_hand			Added
r_leg			Added
torso_f			Added
torso_m			Added

Edit: diff updated after 5f9c737

DebugOk · 2024-01-15T07:37:25Z

I'm not sure how I feel about custom sprites for every jumpsuit, and I don't want that to be the standard. @leonardo-dabepis what are your thoughts on this? We already have vulps requiring custom sprites, and I'm not sure expanding that list is worth it. But I'm willing to let harpies be the only exception if you're okay with it

leonardo-dabepis · 2024-01-15T07:41:15Z

I'm not sure how I feel about custom sprites for every jumpsuit, and I don't want that to be the standard. @leonardo-dabepis what are your thoughts on this? We already have vulps requiring custom sprites, and I'm not sure expanding that list is worth it. But I'm willing to let harpies be the only exception if you're okay with it

I think this is fine. The custom sprites look good on the harpy and the edits that would need to be made to accommodate new clothing items are minimal.

VMSolidus · 2024-01-15T07:44:02Z

So as with some new novel techniques I've come up with for the layering, it isn't 100% necessary for them to look good with existing sprites. However, they do look nicer with species variations. As in the example above, the Atmos tech right now has a custom jumpsuit sprite. Whereas the Mystagogue doesn't have one yet.

They also don't require new sprites at all for jumpskirt variations.

VMSolidus · 2024-01-15T07:49:54Z

But basically, the gist of how I accomplished this was that the marking layer for their wings is partially on the torso instead of the arms. Effectively, their wings are partially above and beneath clothing. This allowed me a previously impossible degree of flexibility in their appearance. These new techniques I learned are going to be useful for when we get around to bringing back Arachne, since I'll be able to put all these layering tech to good use for improving their sprites.

… work correctly. Helmetbug is gone.

github-actions · 2024-01-21T19:00:44Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

Signed-off-by: VMSolidus <[email protected]>

VMSolidus · 2024-02-06T02:20:03Z

This PR is now ready for review.

github-actions · 2024-02-08T15:40:51Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

Signed-off-by: VMSolidus <[email protected]>

DebugOk

Didn't test, beyond my one comment I'll assume its fine

Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml

VMSolidus · 2024-02-12T22:00:07Z

My final QA pass has been completed. All Harpy markings have had a hueshift map applied to them for the sake of consistency, and all missing localizations have been added. There was also a missing marking state for the chest layer that I added in.

DebugOk · 2024-02-12T22:07:42Z

Please don't try to self merge without my review. Not that it would've worked as my request blocks it, and dismissing it would cause it to hang on the codeowner requirement

VMSolidus · 2024-02-12T22:08:31Z

Oh my bad, I had mistakenly though you had set an approval on it. I apologize for the misunderstanding.

DebugOk · 2024-02-12T22:09:45Z

Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml

@@ -100,7 +100,7 @@
  id: GauzeUpperArmRight
  bodyPart: RArm
  markingCategory: Arms
-  speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin


Whats going on here?

DebugOk · 2024-02-12T22:09:59Z

Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml

@@ -58,7 +58,7 @@
  id: TattooCampbellLeftArm
  bodyPart: LArm
  markingCategory: Arms
-  speciesRestriction: [Human, Dwarf, Felinid, Oni] # Delta V - Felinid, Oni


DebugOk · 2024-02-12T22:10:09Z

Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml

@@ -72,7 +72,7 @@
  id: TattooCampbellRightArm
  bodyPart: RArm
  markingCategory: Arms
-  speciesRestriction: [Human, Dwarf, Felinid, Oni] # Delta V - Felinid, Oni


Looks like more cases where this PR previously conflicted with another PR that added certain markings to more species. It conflicted with this PR at the time since it was allowing Harpies to use markings that in this PR would conflict with their new visuals. I've submitted a fix for these conflicts.

VMSolidus · 2024-02-12T22:11:00Z

And here's the new look for the full body markings with hueshifts

DebugOk

I dont like the fact this adds new sprites for clothing, but oh well

It begins

88526e1

github-actions bot added Changes: C# Changes any cs files Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an rsi Changes: YML Changes any yml files labels Jan 15, 2024

Delete error.txt

51d9465

VMSolidus added 15 commits January 15, 2024 17:35

Patch by Debug

4f54a9c

Merge branch 'master' into Harpy-Update-3

b52b11a

HIDING WINGS NOW WORKS

9ab22d0

Runs smoother from Shared

c5eba53

Delete HarpyVisualsSystem.cs

36f01ff

The entire clientside script is no longer needed, and the visuals now…

29a9a03

… work correctly. Helmetbug is gone.

Update HarpyVisualsSystem.cs

e6f0b4d

First completed Harpy Hardsuit

57e5116

Captain and Atmos tech birdsuits

db1d9cb

Update hardsuit-helmets.yml

35d1da7

And more content

88efc64

Adding new finch tail <3

62ab5e9

whoops

ede5b15

guh

ebb5ae2

I swear the tail works now, I just need the adhd meds to kick in

84b80e4

github-actions bot added the Status: Merge Conflict Fix your PR! label Jan 21, 2024

Merge branch 'master' into Harpy-Update-3

c29d07b

Signed-off-by: VMSolidus <[email protected]>

github-actions bot removed the Status: Merge Conflict Fix your PR! label Jan 21, 2024

VMSolidus added 6 commits February 4, 2024 20:57

Trait that removes Ultravision

955fab5

Code optimizations

0bb0f7b

Adding hueshift maps to all harpy markings

9644f8e

No more jumpsuits

9a2227f

1984 the harpy jumpsuits, they are no longer needed

4c5c582

last 2

78280a6

VMSolidus marked this pull request as ready for review February 6, 2024 02:19

VMSolidus requested a review from DebugOk as a code owner February 6, 2024 02:19

github-actions bot added the Status: Needs Review label Feb 6, 2024

github-actions bot added the Status: Merge Conflict Fix your PR! label Feb 8, 2024

Merge branch 'master' into Harpy-Update-3

d479b51

Signed-off-by: VMSolidus <[email protected]>

github-actions bot removed the Status: Merge Conflict Fix your PR! label Feb 8, 2024

DebugOk suggested changes Feb 12, 2024

View reviewed changes

Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml Show resolved Hide resolved

final QA pass

8621098

VMSolidus enabled auto-merge (squash) February 12, 2024 22:00

VMSolidus disabled auto-merge February 12, 2024 22:03

VMSolidus enabled auto-merge (squash) February 12, 2024 22:03

DebugOk disabled auto-merge February 12, 2024 22:07

DebugOk suggested changes Feb 12, 2024

View reviewed changes

shennanigans related to an earlier merge conflict

5f9c737

DebugOk approved these changes Feb 12, 2024

View reviewed changes

DebugOk enabled auto-merge (squash) February 12, 2024 22:23

DebugOk merged commit 1f3128c into DeltaV-Station:master Feb 12, 2024
12 checks passed

DeltaV-Bot pushed a commit that referenced this pull request Feb 12, 2024

Automatic Changelog Update (#677)

ac1af5b

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Harpy Visual Rework #677

Harpy Visual Rework #677

VMSolidus commented Jan 15, 2024 •

edited

Loading

github-actions bot commented Jan 15, 2024 •

edited

Loading

DebugOk commented Jan 15, 2024

leonardo-dabepis commented Jan 15, 2024

VMSolidus commented Jan 15, 2024

VMSolidus commented Jan 15, 2024

github-actions bot commented Jan 21, 2024

VMSolidus commented Feb 6, 2024

github-actions bot commented Feb 8, 2024

DebugOk left a comment

VMSolidus commented Feb 12, 2024

DebugOk commented Feb 12, 2024

VMSolidus commented Feb 12, 2024

DebugOk Feb 12, 2024

DebugOk Feb 12, 2024

DebugOk Feb 12, 2024

VMSolidus Feb 12, 2024

VMSolidus commented Feb 12, 2024

DebugOk left a comment •

edited

Loading

Harpy Visual Rework #677

Harpy Visual Rework #677

Conversation

VMSolidus commented Jan 15, 2024 • edited Loading

About the PR

Why / Balance

Technical details

Media

github-actions bot commented Jan 15, 2024 • edited Loading

DebugOk commented Jan 15, 2024

leonardo-dabepis commented Jan 15, 2024

VMSolidus commented Jan 15, 2024

VMSolidus commented Jan 15, 2024

github-actions bot commented Jan 21, 2024

VMSolidus commented Feb 6, 2024

github-actions bot commented Feb 8, 2024

DebugOk left a comment

Choose a reason for hiding this comment

VMSolidus commented Feb 12, 2024

DebugOk commented Feb 12, 2024

VMSolidus commented Feb 12, 2024

DebugOk Feb 12, 2024

Choose a reason for hiding this comment

DebugOk Feb 12, 2024

Choose a reason for hiding this comment

DebugOk Feb 12, 2024

Choose a reason for hiding this comment

VMSolidus Feb 12, 2024

Choose a reason for hiding this comment

VMSolidus commented Feb 12, 2024

DebugOk left a comment • edited Loading

Choose a reason for hiding this comment

VMSolidus commented Jan 15, 2024 •

edited

Loading

github-actions bot commented Jan 15, 2024 •

edited

Loading

DebugOk left a comment •

edited

Loading