From b81e7acdebb5c3bab26c549adb32505c33cb28db Mon Sep 17 00:00:00 2001 From: BlitzTheSquishy <73762869+BlitzTheSquishy@users.noreply.github.com> Date: Sun, 20 Oct 2024 01:05:45 +1100 Subject: [PATCH] Shark tails are DONE also some ftl, fuck you localization! I hate making things legible!! --- .../Locale/en-US/deltav/markings/feroxi.ftl | 58 ++++++++++++++++++ .../Mobs/Customization/Markings/feroxi.yml | 57 +++++++---------- .../Prototypes/DeltaV/Species/feroxi.yml | 6 +- ...i-inner-ears.png => feroxi-ears-inner.png} | Bin ...oxi-tips-ears.png => feroxi-ears-tips.png} | Bin ...{feroxi-plain-ears.png => feroxi-ears.png} | Bin .../ear_markings.rsi/feroxi-plain-fin.png | Bin 325 -> 0 bytes .../Feroxi/ear_markings.rsi/meta.json | 10 +-- ...eroxi-plain-snout.png => feroxi-snout.png} | Bin .../Feroxi/snout_markings.rsi/meta.json | 2 +- 10 files changed, 88 insertions(+), 45 deletions(-) create mode 100644 Resources/Locale/en-US/deltav/markings/feroxi.ftl rename Resources/Textures/DeltaV/Mobs/Customization/Feroxi/ear_markings.rsi/{feroxi-inner-ears.png => feroxi-ears-inner.png} (100%) rename Resources/Textures/DeltaV/Mobs/Customization/Feroxi/ear_markings.rsi/{feroxi-tips-ears.png => feroxi-ears-tips.png} (100%) rename Resources/Textures/DeltaV/Mobs/Customization/Feroxi/ear_markings.rsi/{feroxi-plain-ears.png => feroxi-ears.png} (100%) delete mode 100644 Resources/Textures/DeltaV/Mobs/Customization/Feroxi/ear_markings.rsi/feroxi-plain-fin.png rename Resources/Textures/DeltaV/Mobs/Customization/Feroxi/snout_markings.rsi/{feroxi-plain-snout.png => feroxi-snout.png} (100%) diff --git a/Resources/Locale/en-US/deltav/markings/feroxi.ftl b/Resources/Locale/en-US/deltav/markings/feroxi.ftl new file mode 100644 index 00000000000..b4d54039d48 --- /dev/null +++ b/Resources/Locale/en-US/deltav/markings/feroxi.ftl @@ -0,0 +1,58 @@ +marking-FeroxiEars = Ears +marking-FeroxiEars-feroxi-ears = Base Ears +marking-FeroxiEars-feroxi-ears-inner = Inner Ear + +marking-FeroxiEarsTips = Tipped Ears +marking-FeroxiEarsTips-feroxi-ears = Base Ears +marking-FeroxiEarsTips-feroxi-ears-inner = Inner Ear +marking-FeroxiEarsTips-feroxi-ears-tips = Ear Tips + +marking-FeroxiSnout = Snout (Unfinished) +marking-FeroxiSnout-feroxi-snout = Base Snout + +marking-FeroxiBlitz = Striped Tail with Fin Tips and Dorsal +marking-FeroxiBlitz-feroxi-tail = Base Tail +marking-FeroxiBlitz-feroxi-tail-stripes = Tail Stripes +marking-FeroxiBlitz-feroxi-tail-top-tip = Upper Tail Fin Tip +marking-FeroxiBlitz-feroxi-tail-bottom-tip = Lower Tail Fin Tip +marking-FeroxiBlitz-feroxi-dorsal = Base Dorsal +marking-FeroxiBlitz-feroxi-dorsal-stripes = Dorsal Stripes + +marking-FeroxiBlitzNoDorsal = Striped Tail with Fin Tips +marking-FeroxiBlitzNoDorsal-feroxi-tail = Base Tail +marking-FeroxiBlitzNoDorsal-feroxi-tail-stripes = Tail Stripes +marking-FeroxiBlitzNoDorsal-feroxi-tail-top-tip = Upper Tail Fin Tip +marking-FeroxiBlitzNoDorsal-feroxi-tail-bottom-tip = Lower Tail Fin Tip + +marking-FeroxiStripedTail = Striped Tail +marking-FeroxiStripedTail-feroxi-tail = Base Tail +marking-FeroxiStripedTail-feroxi-tail-stripes = Tail Stripes + +marking-FeroxiStripedTailAndDorsal = Striped Tail with Dorsal +marking-FeroxiStripedTailAndDorsal-feroxi-tail = Base Tail +marking-FeroxiStripedTailAndDorsal-feroxi-tail-stripes = Tail Stripes +marking-FeroxiStripedTailAndDorsal-feroxi-dorsal = Base Dorsal +marking-FeroxiStripedTailAndDorsal-feroxi-dorsal-stripes = Dorsal Stripes + +marking-FeroxiTail = Tail +marking-FeroxiTail-feroxi-tail = Base Tail + +marking-FeroxiTailAndDorsal = Tail & Dorsal +marking-FeroxiTailAndDorsal-feroxi-tail = Base Tail +marking-FeroxiTailAndDorsal-feroxi-dorsal = Base Dorsal + +marking-FeroxiTipTail = Tail with Tips +marking-FeroxiTipTail-feroxi-tail = Base Tail +marking-FeroxiTipTail-feroxi-tail-top-tip = Upper Tail Fin Tip +marking-FeroxiTipTail-feroxi-tail-bottom-tip = Lower Tail Fin Tip +marking-FeroxiTipTail-feroxi-second-dorsal-tip = Secondary Dorsal Fin Tip +marking-FeroxiTipTail-feroxi-dorsal = Base Dorsal + +marking-FeroxiTipTailAndDorsal = Tail with Tips and Dorsal +marking-FeroxiTipTailAndDorsal-feroxi-tail = Base Tail +marking-FeroxiTipTailAndDorsal-feroxi-tail-top-tip = Upper Tail Fin Tip +marking-FeroxiTipTailAndDorsal-feroxi-tail-bottom-tip = Lower Tail Fin Tip +marking-FeroxiTipTailAndDorsal-feroxi-second-dorsal-tip = Secondary Dorsal Fin Tip +marking-FeroxiTipTailAndDorsal-feroxi-dorsal = Base Dorsal +marking-FeroxiTipTailAndDorsal-feroxi-dorsal-tip = Dorsal Tip + diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/feroxi.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/feroxi.yml index 2fb844a22e7..35022ac3892 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/feroxi.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/feroxi.yml @@ -1,17 +1,17 @@ # Default - type: marking - id: FeroxiPlainEars + id: FeroxiEars bodyPart: HeadTop markingCategory: HeadTop speciesRestriction: [Feroxi] sprites: - sprite: DeltaV/Mobs/Customization/Feroxi/ear_markings.rsi - state: feroxi-plain-ears + state: feroxi-ears - sprite: DeltaV/Mobs/Customization/Feroxi/ear_markings.rsi - state: feroxi-inner-ears + state: feroxi-ears-inner - type: marking - id: FeroxiPlainTailAndDorsal + id: FeroxiTailAndDorsal bodyPart: Tail markingCategory: Tail speciesRestriction: [Feroxi] @@ -22,31 +22,31 @@ state: feroxi-dorsal - type: marking - id: FeroxiPlainSnout + id: FeroxiSnout bodyPart: Snout markingCategory: Snout speciesRestriction: [Feroxi] sprites: - sprite: DeltaV/Mobs/Customization/Feroxi/snout_markings.rsi - state: feroxi-plain-snout + state: feroxi-snout # Ears Markings - type: marking - id: FeroxiTipEars + id: FeroxiEarsTips bodyPart: HeadTop markingCategory: HeadTop speciesRestriction: [Feroxi] sprites: - sprite: DeltaV/Mobs/Customization/Feroxi/ear_markings.rsi - state: feroxi-plain-ears + state: feroxi-ears - sprite: DeltaV/Mobs/Customization/Feroxi/ear_markings.rsi - state: feroxi-inner-ears + state: feroxi-ears-inner - sprite: DeltaV/Mobs/Customization/Feroxi/ear_markings.rsi - state: feroxi-tips-ears + state: feroxi-ears-tips # Tail markings - type: marking - id: FeroxiPlainTail + id: FeroxiTail bodyPart: Tail markingCategory: Tail speciesRestriction: [Feroxi] @@ -81,7 +81,7 @@ state: feroxi-dorsal-stripes - type: marking - id: FeroxiTwoTipTail + id: FeroxiTipTail bodyPart: Tail markingCategory: Tail speciesRestriction: [Feroxi] @@ -92,22 +92,11 @@ state: feroxi-tail-top-tip - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi state: feroxi-tail-bottom-tip - -- type: marking - id: FeroxiTwoTipTailWithDorsal - bodyPart: Tail - markingCategory: Tail - speciesRestriction: [Feroxi] - sprites: - - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi - state: feroxi-tail - - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi - state: feroxi-tail-top-tip - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi - state: feroxi-tail-bottom-tip + state: feroxi-tail-second-dorsal-tip - type: marking - id: FeroxiThreeTipTail + id: FeroxiTipTailAndDorsal bodyPart: Tail markingCategory: Tail speciesRestriction: [Feroxi] @@ -120,28 +109,32 @@ state: feroxi-tail-bottom-tip - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi state: feroxi-tail-second-dorsal-tip + - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-dorsal + - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-dorsal-tip - type: marking - id: FeroxiThreeTipTailWithDorsal + id: FeroxiBlitz bodyPart: Tail markingCategory: Tail speciesRestriction: [Feroxi] sprites: - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi state: feroxi-tail + - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-stripes - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi state: feroxi-tail-top-tip - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi state: feroxi-tail-bottom-tip - - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi - state: feroxi-tail-second-dorsal-tip - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi state: feroxi-dorsal - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi - state: feroxi-dorsal-tip + state: feroxi-dorsal-stripes - type: marking - id: FeroxiBlitz + id: FeroxiBlitzNoDorsal bodyPart: Tail markingCategory: Tail speciesRestriction: [Feroxi] @@ -156,7 +149,3 @@ state: feroxi-tail-bottom-tip - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi state: feroxi-tail-stripes - - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi - state: feroxi-dorsal - - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi - state: feroxi-dorsal-stripes diff --git a/Resources/Prototypes/DeltaV/Species/feroxi.yml b/Resources/Prototypes/DeltaV/Species/feroxi.yml index 3289d4dac48..54ccd085f9e 100644 --- a/Resources/Prototypes/DeltaV/Species/feroxi.yml +++ b/Resources/Prototypes/DeltaV/Species/feroxi.yml @@ -48,11 +48,11 @@ HeadTop: points: 1 required: true - defaultMarkings: [ FeroxiPlainEars ] + defaultMarkings: [ FeroxiEars ] Snout: points: 1 required: true - defaultMarkings: [ FeroxiPlainSnout ] + defaultMarkings: [ FeroxiSnout ] Chest: points: 3 required: false @@ -65,7 +65,7 @@ Tail: points: 1 required: true - defaultMarkings: [ FeroxiPlainTailAndDorsal ] + defaultMarkings: [ FeroxiTailAndDorsal ] - type: humanoidBaseSprite id: MobFeroxiHead diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/ear_markings.rsi/feroxi-inner-ears.png b/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/ear_markings.rsi/feroxi-ears-inner.png similarity index 100% rename from Resources/Textures/DeltaV/Mobs/Customization/Feroxi/ear_markings.rsi/feroxi-inner-ears.png rename to Resources/Textures/DeltaV/Mobs/Customization/Feroxi/ear_markings.rsi/feroxi-ears-inner.png diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/ear_markings.rsi/feroxi-tips-ears.png b/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/ear_markings.rsi/feroxi-ears-tips.png similarity index 100% rename from Resources/Textures/DeltaV/Mobs/Customization/Feroxi/ear_markings.rsi/feroxi-tips-ears.png rename to Resources/Textures/DeltaV/Mobs/Customization/Feroxi/ear_markings.rsi/feroxi-ears-tips.png diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/ear_markings.rsi/feroxi-plain-ears.png b/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/ear_markings.rsi/feroxi-ears.png similarity index 100% rename from Resources/Textures/DeltaV/Mobs/Customization/Feroxi/ear_markings.rsi/feroxi-plain-ears.png rename to Resources/Textures/DeltaV/Mobs/Customization/Feroxi/ear_markings.rsi/feroxi-ears.png diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/ear_markings.rsi/feroxi-plain-fin.png b/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/ear_markings.rsi/feroxi-plain-fin.png deleted file mode 100644 index 227231f7f66fa90a8ba764e97a194a65fcd883df..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 325 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0L3?#3!&-4XSoB=)|t_KbrsH&=Z_wL=6QjbkQ zLB^6GzhDN3XE)M-oU*Erh!U67;^d;tf|AVqJO+k}Il*BCMWx@r1Q&e#`b5iHSL@uF z^T8WJ4K5l#c%*aQNAn~@QBUs<3*#W;%f?;`a~@4PGATqMSkv5Yt%kAsatphS8%zxE zT|DaD*=?-4d4)s@gLryWU{an|NA8KGYaYCM&a{n*;lwMs*;x`Zw*p;|;pyTSV$qwN zpul9nq-b>Zz|#ZQ7#7WxxuL+6!5=t93 zN-!S~xhyiHA%fY(Mp$hEXQ(x|+6Er4mdKI;Vst0I{QZL;wH) diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/ear_markings.rsi/meta.json b/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/ear_markings.rsi/meta.json index 32677b72f94..2415368aa0a 100644 --- a/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/ear_markings.rsi/meta.json +++ b/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/ear_markings.rsi/meta.json @@ -5,20 +5,16 @@ "size": {"x": 32, "y": 32}, "states": [ { - "name": "feroxi-plain-ears", + "name": "feroxi-ears", "directions": 4 }, { - "name": "feroxi-tips-ears", + "name": "feroxi-ears-inner", "directions": 4 }, { - "name": "feroxi-inner-ears", + "name": "feroxi-ears-tips", "directions": 4 - }, - { - "name": "feroxi-plain-fin", - "directions": 4 } ] } diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/snout_markings.rsi/feroxi-plain-snout.png b/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/snout_markings.rsi/feroxi-snout.png similarity index 100% rename from Resources/Textures/DeltaV/Mobs/Customization/Feroxi/snout_markings.rsi/feroxi-plain-snout.png rename to Resources/Textures/DeltaV/Mobs/Customization/Feroxi/snout_markings.rsi/feroxi-snout.png diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/snout_markings.rsi/meta.json b/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/snout_markings.rsi/meta.json index 414cf1f009a..7f6d6974c35 100644 --- a/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/snout_markings.rsi/meta.json +++ b/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/snout_markings.rsi/meta.json @@ -6,7 +6,7 @@ "states": [ { - "name": "feroxi-plain-snout", + "name": "feroxi-snout", "directions": 4 } ]