Skip to content

Commit

Permalink
final QA pass
Browse files Browse the repository at this point in the history
  • Loading branch information
VMSolidus committed Feb 12, 2024
1 parent d479b51 commit 8621098
Show file tree
Hide file tree
Showing 19 changed files with 46 additions and 24 deletions.
52 changes: 36 additions & 16 deletions Resources/Locale/en-US/deltav/markings/harpy.ftl
Original file line number Diff line number Diff line change
@@ -1,26 +1,32 @@
marking-HarpyWingDefault = Basic Wings
marking-HarpyWingDefault-harpy = Wings
marking-HarpyWing2Tone = Two Tone Wings
marking-HarpyWing2Tone-harpy2tone1 = Top Half
marking-HarpyWing2Tone-harpy2tone2 = Bottom Half
marking-HarpyWingFolded = Folded Wings
marking-HarpyWingFolded-harpyfolded = Wings
marking-HarpyWing3Tone = Three Tone Wings
marking-HarpyWing3Tone-harpy3tone1 = Top Third
marking-HarpyWing3Tone-harpy3tone2 = Middle Third
marking-HarpyWing3tone-harpy3tone3 = Bottom Third
marking-HarpyWingClassic = Classic Wings
marking-HarpyWingClassic-classicharpy = Wings
marking-HarpyWingSpeckled = Speckled Wings
marking-HarpyWingSpeckled-harpyspeckled1 = Main
marking-HarpyWingSpeckled-harpyspeckled2 = Speckles
marking-HarpyWing2ToneClassic = Classic Two Tone Wings
marking-HarpyWing2ToneClassic-harpy2tone1 = Top Half
marking-HarpyWing2ToneClassic-harpy2tone2 = Bottom Half
marking-HarpyWingUndertone = Wings with Undertone
marking-HarpyWingUndertone-harpyundertone1 = Front
marking-HarpyWingUndertone-harpyundertone2 = Back
marking-HarpyWing3ToneClassic = Classic Three Tone Wings
marking-HarpyWing3ToneClassic-harpy3tone1 = Top Third
marking-HarpyWing3ToneClassic-harpy3tone2 = Middle Third
marking-HarpyWing3ToneClassic-harpy3tone3 = Bottom Third
marking-HarpyWingTips = Wings with Feather Tips
marking-HarpyWingTips-harpywingtip1 = Main
marking-HarpyWingTips-harpywingtip2 = Feathertips
marking-HarpyWingSpeckledClassic = Speckled Classic Wings
marking-HarpyWingSpeckledClassic-harpyspeckled1 = Main
marking-HarpyWingSpeckledClassic-harpyspeckled2 = Speckles
marking-HarpyWingUndertoneClassic = Classic Wings with Undertone
marking-HarpyWingUndertoneClassic-harpyundertone1 = Front
marking-HarpyWingUndertoneClassic-harpyundertone2 = Back
marking-HarpyWingTipsClassic = Classic Wings with Feather Tips
marking-HarpyWingTipsClassic-harpywingtip1 = Main
marking-HarpyWingTipsClassic-harpywingtip2 = Feathertips
marking-HarpyEarsDefault = Feather Tufts
marking-HarpyEarsDefault-harpy_ears_default = Tufts
Expand All @@ -30,3 +36,17 @@ marking-HarpyTailPhoenix-phoenix_tail = Tail
marking-HarpyTailRooster = Rooster Tail
marking-HarpyTailRooster-rooster_tail = Tail
marking-HarpyTailFinch = Finch Tail
marking-HarpyTailFinch-finch_tail = Tail
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
Expand Up @@ -192,6 +192,8 @@
sprites:
- sprite: DeltaV/Mobs/Customization/Harpy/harpy_chest.rsi
state: upper
- sprite: DeltaV/Mobs/Customization/Harpy/harpy_chest.rsi
state: lower

- type: marking
id: HarpyLegsDefault
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
id: GauzeLefteyePatch
bodyPart: Eyes
markingCategory: Head
speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin
speciesRestriction: [Moth, Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin
coloring:
default:
type:
Expand All @@ -16,7 +16,7 @@
id: GauzeLefteyeTape
bodyPart: Eyes
markingCategory: Head
speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin
speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin
coloring:
default:
type:
Expand All @@ -30,7 +30,7 @@
id: GauzeRighteyePatch
bodyPart: Eyes
markingCategory: Head
speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin
speciesRestriction: [Moth, Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin
coloring:
default:
type:
Expand All @@ -44,7 +44,7 @@
id: GauzeRighteyeTape
bodyPart: Eyes
markingCategory: Head
speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin
speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin
coloring:
default:
type:
Expand Down Expand Up @@ -72,7 +72,7 @@
id: GauzeShoulder
bodyPart: Chest
markingCategory: Chest
speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin
speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin
coloring:
default:
type:
Expand All @@ -86,7 +86,7 @@
id: GauzeStomach
bodyPart: Chest
markingCategory: Chest
speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin
speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin
coloring:
default:
type:
Expand All @@ -100,7 +100,7 @@
id: GauzeUpperArmRight
bodyPart: RArm
markingCategory: Arms
speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Vulpkanin] # Delta V - Felinid, Vulpkanin
speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid, Felinid, Vulpkanin] # Delta V - Felinid, Vulpkanin
coloring:
default:
type:
Expand Down Expand Up @@ -291,4 +291,4 @@
color: "#FFFFFF"
sprites:
- sprite: Mobs/Customization/gauze.rsi
state: gauze_lizardblindfold
state: gauze_lizardblindfold
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 8621098

Please sign in to comment.