Gauze Markings 3 - Revenge of the Wrap (#25481)

* Insectoid Gauze, Added racial marks to variants

* removed excess r from gauze_moth_lowerleg_r

* Update gauze.ftl

* moved all markings to Overlay Category

* fixed localization error

* a

Resources/Locale/en-US/markings/gauze.ftl

@@ -1,17 +1,17 @@
 marking-GauzeLefteyePatch-gauze_lefteye_2 = Gauze eyepatch (Left)
 marking-GauzeLefteyePatch = Gauze eyepatch (Left)
 
-marking-GauzeLefteyeTape-gauze_lefteye_1 = Gauze eyepad (Left)
-marking-GauzeLefteyeTape = Gauze eyepad (Left)
+marking-GauzeLefteyePad-gauze_lefteye_1 = Gauze eyepad (Left)
+marking-GauzeLefteyePad = Gauze eyepad (Left)
 
 marking-GauzeRighteyePatch-gauze_righteye_2 = Gauze eyepatch (Right)
 marking-GauzeRighteyePatch = Gauze eyepatch (Right)
 
-marking-GauzeRighteyeTape-gauze_righteye_1 = Gauze eyepad (Right)
-marking-GauzeRighteyeTape = Gauze eyepad (Right)
+marking-GauzeRighteyePad-gauze_righteye_1 = Gauze eyepad (Right)
+marking-GauzeRighteyePad = Gauze eyepad (Right)
 
-marking-GauzeShoulder-gauze_shoulder = Gauze Shoulder
-marking-GauzeShoulder = Gauze Shoulder
+marking-GauzeShoulder-gauze_shoulder = Gauze Shoulder Sling
+marking-GauzeShoulder = Gauze Shoulder Sling
 
 marking-GauzeStomach-gauze_abdomen = Gauze Stomach Wrap
 marking-GauzeStomach = Gauze Stomach Wrap
@@ -46,17 +46,57 @@ marking-GauzeUpperLegRight = Gauze Thigh Wrap (Right)
 marking-GauzeBlindfold-gauze_blindfold = Gauze Blindfold
 marking-GauzeBlindfold = Gauze Blindfold
 
-marking-GauzeLizardBlindfold-gauze_lizardblindfold = Gauze Blindfold
+marking-GauzeLizardBlindfold-gauze_lizard_blindfold = Gauze Blindfold
 marking-GauzeLizardBlindfold = Gauze Blindfold
 
-marking-GauzeLizardFootRight-gauze_lizardfoot_r = Gauze Foot Wrap (Right)
+marking-GauzeLizardFootRight-gauze_lizard_foot_r = Gauze Foot Wrap (Right)
 marking-GauzeLizardFootRight = Gauze Foot Wrap (Right)
 
-marking-GauzeLizardFootLeft-gauze_lizardfoot_l = Gauze Foot Wrap (Left)
+marking-GauzeLizardFootLeft-gauze_lizard_foot_l = Gauze Foot Wrap (Left)
 marking-GauzeLizardFootLeft = Gauze Foot Wrap (Left)
 
-marking-GauzeLizardLefteyePatch-gauze_lizardlefteye = Adjusted Gauze eyepatch (Left)
-marking-GauzeLizardLefteyePatch = Adjusted Gauze eyepatch (Left)
+marking-GauzeLizardLefteyePatch-gauze_lizard_lefteye = Reptilian Gauze eyepatch (Left)
+marking-GauzeLizardLefteyePatch = Reptilian Gauze eyepatch (Left)
+
+marking-GauzeLizardRighteyePatch-gauze_lizard_righteye = Reptilian Gauze eyepatch (Right)
+marking-GauzeLizardRighteyePatch = Reptilian Gauze Eyepatch (Right)
+
+marking-GauzeMothStomach-gauze_moth_abdomen = Insectoid Stomach Wrap
+marking-GauzeMothStomach = Insectoid Stomach Wrap
+
+marking-GauzeMothShoulder-gauze_moth_shoulder = Insectoid Shoulder Sling
+marking-GauzeMothShoulder = Insectoid Shoulder Sling
+
+marking-GauzeMothBlindfold-gauze_moth_blindfold = Insectoid Blindfold
+marking-GauzeMothBlindfold = Insectoid Blindfold
+
+marking-GauzeMothLeftEyePatch-gauze_moth_lefteye_2 = Insectoid Gauze eyepatch (Left)
+marking-GauzeMothLeftEyePatch = Insectoid Gauze eyepatch (Left)
+
+marking-GauzeMothLeftEyePad-gauze_moth_lefteye_1 = Insectoid Gauze eyepad (Left)
+marking-GauzeMothLeftEyePad = Insectoid Gauze eyepad (Left)
+
+marking-GauzeMothRightEyePatch-gauze_moth_righteye_2 = Insectoid Gauze eyepatch (Right)
+marking-GauzeMothRightEyePatch = Insectoid Gauze eyepatch (Right)
+
+marking-GauzeMothRightEyePad-gauze_moth_righteye_1 = Insectoid Gauze eyepad (Right)
+marking-GauzeMothRightEyePad = Insectoid Gauze eyepad (Right)
+
+marking-GauzeMothUpperArmRight-gauze_moth_upperarm_r = Insectoid Gauze Forearm Wrap (Right)
+marking-GauzeMothUpperArmRight = Insectoid Gauze Forearm Wrap (Right)
+
+marking-GauzeMothUpperArmLeft-gauze_moth_upperarm_l = Insectoid Gauze Forearm Wrap (Left)
+marking-GauzeMothUpperArmLeft = Insectoid Gauze Forearm Wrap (Left)
+
+marking-GauzeMothUpperLegRight-gauze_moth_upperleg_r = Insectoid Gauze Thigh Wrap (Right)
+marking-GauzeMothUpperLegRight = Insectoid Insectoid Gauze Thigh Wrap (Right)
+
+marking-GauzeMothUpperLegLeft-gauze_moth_upperleg_l = Insectoid Gauze Thigh Wrap (Left)
+marking-GauzeMothUpperLegLeft = Insectoid Gauze Thigh Wrap (Left)
+
+marking-GauzeMothLowerLegRight-gauze_moth_lowerleg_r = Insectoid Gauze Shin Wrap (Right)
+marking-GauzeMothLowerLegRight = Insectoid Gauze Shin Wrap (Right)
+
+marking-GauzeMothLowerLegLeft-gauze_moth_lowerleg_l = Insectoid Gauze Shin Wrap (Left)
+marking-GauzeMothLowerLegLeft = Insectoid Gauze Shin Wrap (Left)
 
-marking-GauzeLizardRighteyePatch-gauze_lizardrighteye = Adjusted Gauze eyepatch (Right)
-marking-GauzeLizardRighteyePatch = Adjusted Gauze Eyepatch (Right)

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

@@ -1,8 +1,8 @@
 - type: marking
   id: GauzeLefteyePatch
   bodyPart: Eyes
-  markingCategory: Head
-  speciesRestriction: [Moth, Dwarf, Human, Arachnid]
+  markingCategory: Overlay
+  speciesRestriction: [Dwarf, Human, Arachnid]
   coloring:
     default:
       type:
@@ -13,10 +13,10 @@
     state: gauze_lefteye_2
 
 - type: marking
-  id: GauzeLefteyeTape
+  id: GauzeLefteyePad
   bodyPart: Eyes
-  markingCategory: Head
-  speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid]
+  markingCategory: Overlay
+  speciesRestriction: [Dwarf, Human, Reptilian, Arachnid]
   coloring:
     default:
       type:
@@ -29,8 +29,8 @@
 - type: marking
   id: GauzeRighteyePatch
   bodyPart: Eyes
-  markingCategory: Head
-  speciesRestriction: [Moth, Dwarf, Human, Arachnid]
+  markingCategory: Overlay
+  speciesRestriction: [Dwarf, Human, Arachnid]
   coloring:
     default:
       type:
@@ -41,10 +41,10 @@
     state: gauze_righteye_2
 
 - type: marking
-  id: GauzeRighteyeTape
+  id: GauzeRighteyePad
   bodyPart: Eyes
-  markingCategory: Head
-  speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid]
+  markingCategory: Overlay
+  speciesRestriction: [Dwarf, Human, Reptilian, Arachnid]
   coloring:
     default:
       type:
@@ -57,8 +57,8 @@
 - type: marking
   id: GauzeBlindfold
   bodyPart: Eyes
-  markingCategory: Head
-  speciesRestriction: [Moth, Dwarf, Human, Arachnid]
+  markingCategory: Overlay
+  speciesRestriction: [Dwarf, Human, Arachnid]
   coloring:
     default:
       type:
@@ -71,8 +71,8 @@
 - type: marking
   id: GauzeShoulder
   bodyPart: Chest
-  markingCategory: Chest
-  speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid]
+  markingCategory: Overlay
+  speciesRestriction: [Dwarf, Human, Reptilian, Arachnid]
   coloring:
     default:
       type:
@@ -85,8 +85,8 @@
 - type: marking
   id: GauzeStomach
   bodyPart: Chest
-  markingCategory: Chest
-  speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid]
+  markingCategory: Overlay
+  speciesRestriction: [Dwarf, Human, Reptilian, Arachnid]
   coloring:
     default:
       type:
@@ -99,8 +99,8 @@
 - type: marking
   id: GauzeUpperArmRight
   bodyPart: RArm
-  markingCategory: Arms
-  speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid]
+  markingCategory: Overlay
+  speciesRestriction: [Dwarf, Human, Reptilian, Arachnid]
   coloring:
     default:
       type:
@@ -113,8 +113,8 @@
 - type: marking
   id: GauzeLowerArmRight
   bodyPart: RArm, RHand
-  markingCategory: Arms
-  speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid]
+  markingCategory: Overlay
+  speciesRestriction: [Dwarf, Human, Reptilian, Arachnid]
   coloring:
     default:
       type:
@@ -127,8 +127,8 @@
 - type: marking
   id: GauzeLeftArm
   bodyPart: LArm, LHand
-  markingCategory: Arms
-  speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid]
+  markingCategory: Overlay
+  speciesRestriction: [Dwarf, Human, Reptilian, Arachnid]
   coloring:
     default:
       type:
@@ -141,8 +141,8 @@
 - type: marking
   id: GauzeLowerLegLeft
   bodyPart: LFoot
-  markingCategory: Legs
-  speciesRestriction: [Moth, Dwarf, Human, Arachnid]
+  markingCategory: Overlay
+  speciesRestriction: [Dwarf, Human, Arachnid]
   coloring:
     default:
       type:
@@ -155,8 +155,8 @@
 - type: marking
   id: GauzeUpperLegLeft
   bodyPart: LLeg
-  markingCategory: Legs
-  speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid]
+  markingCategory: Overlay
+  speciesRestriction: [Dwarf, Human, Reptilian, Arachnid]
   coloring:
     default:
       type:
@@ -169,8 +169,8 @@
 - type: marking
   id: GauzeUpperLegRight
   bodyPart: RLeg
-  markingCategory: Legs
-  speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid]
+  markingCategory: Overlay
+  speciesRestriction: [Dwarf, Human, Reptilian, Arachnid]
   coloring:
     default:
       type:
@@ -183,8 +183,8 @@
 - type: marking
   id: GauzeLowerLegRight
   bodyPart: RFoot
-  markingCategory: Legs
-  speciesRestriction: [Moth, Dwarf, Human, Arachnid]
+  markingCategory: Overlay
+  speciesRestriction: [Dwarf, Human, Arachnid]
   coloring:
     default:
       type:
@@ -197,8 +197,8 @@
 - type: marking
   id: GauzeBoxerWrapRight
   bodyPart: RHand
-  markingCategory: Arms
-  speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid]
+  markingCategory: Overlay
+  speciesRestriction: [Dwarf, Human, Reptilian, Arachnid]
   coloring:
     default:
       type:
@@ -211,8 +211,8 @@
 - type: marking
   id: GauzeBoxerWrapLeft
   bodyPart: LHand
-  markingCategory: Arms
-  speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid]
+  markingCategory: Overlay
+  speciesRestriction: [Dwarf, Human, Reptilian, Arachnid]
   coloring:
     default:
       type:
@@ -226,7 +226,7 @@
 - type: marking
   id: GauzeLizardLefteyePatch
   bodyPart: Eyes
-  markingCategory: Head
+  markingCategory: Overlay
   speciesRestriction: [Reptilian]
   coloring:
     default:
@@ -235,12 +235,12 @@
           color: "#FFFFFF"
   sprites:
   - sprite: Mobs/Customization/gauze.rsi
-    state: gauze_lizardlefteye
+    state: gauze_lizard_lefteye
 
 - type: marking
   id: GauzeLizardRighteyePatch
   bodyPart: Eyes
-  markingCategory: Head
+  markingCategory: Overlay
   speciesRestriction: [Reptilian]
   coloring:
     default:
@@ -249,12 +249,12 @@
           color: "#FFFFFF"
   sprites:
   - sprite: Mobs/Customization/gauze.rsi
-    state: gauze_lizardrighteye
+    state: gauze_lizard_righteye
 
 - type: marking
   id: GauzeLizardFootRight
   bodyPart: RFoot
-  markingCategory: Legs
+  markingCategory: Overlay
   speciesRestriction: [Reptilian]
   coloring:
     default:
@@ -263,12 +263,12 @@
           color: "#FFFFFF"
   sprites:
   - sprite: Mobs/Customization/gauze.rsi
-    state: gauze_lizardfoot_r
+    state: gauze_lizard_foot_r
 
 - type: marking
   id: GauzeLizardFootLeft
   bodyPart: LFoot
-  markingCategory: Legs
+  markingCategory: Overlay
   speciesRestriction: [Reptilian]
   coloring:
     default:
@@ -277,12 +277,12 @@
           color: "#FFFFFF"
   sprites:
   - sprite: Mobs/Customization/gauze.rsi
-    state: gauze_lizardfoot_l
+    state: gauze_lizard_foot_l
 
 - type: marking
   id: GauzeLizardBlindfold
   bodyPart: Eyes
-  markingCategory: Head
+  markingCategory: Overlay
   speciesRestriction: [Reptilian]
   coloring:
     default:
@@ -291,5 +291,187 @@
           color: "#FFFFFF"
   sprites:
   - sprite: Mobs/Customization/gauze.rsi
-    state: gauze_lizardblindfold
+    state: gauze_lizard_blindfold
 
+# Moth Specific Markings
+- type: marking
+  id: GauzeMothBlindfold
+  bodyPart: Eyes
+  markingCategory: Overlay
+  speciesRestriction: [Moth]
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#FFFFFF"
+  sprites:
+  - sprite: Mobs/Customization/gauze.rsi
+    state: gauze_moth_blindfold
+
+- type: marking
+  id: GauzeMothShoulder
+  bodyPart: Chest
+  markingCategory: Overlay
+  speciesRestriction: [Moth]
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#FFFFFF"
+  sprites:
+  - sprite: Mobs/Customization/gauze.rsi
+    state: gauze_moth_shoulder
+
+- type: marking
+  id: GauzeMothStomach
+  bodyPart: Chest
+  markingCategory: Overlay
+  speciesRestriction: [Moth]
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#FFFFFF"
+  sprites:
+  - sprite: Mobs/Customization/gauze.rsi
+    state: gauze_moth_abdomen
+
+- type: marking
+  id: GauzeMothLeftEyePatch
+  bodyPart: Eyes
+  markingCategory: Overlay
+  speciesRestriction: [Moth]
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#FFFFFF"
+  sprites:
+  - sprite: Mobs/Customization/gauze.rsi
+    state: gauze_moth_lefteye_2
+
+- type: marking
+  id: GauzeMothLeftEyePad
+  bodyPart: Eyes
+  markingCategory: Overlay
+  speciesRestriction: [Moth]
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#FFFFFF"
+  sprites:
+  - sprite: Mobs/Customization/gauze.rsi
+    state: gauze_moth_lefteye_1
+
+- type: marking
+  id: GauzeMothRightEyePatch
+  bodyPart: Eyes
+  markingCategory: Overlay
+  speciesRestriction: [Moth]
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#FFFFFF"
+  sprites:
+  - sprite: Mobs/Customization/gauze.rsi
+    state: gauze_moth_righteye_2
+
+- type: marking
+  id: GauzeMothRightEyePad
+  bodyPart: Eyes
+  markingCategory: Overlay
+  speciesRestriction: [Moth]
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#FFFFFF"
+  sprites:
+  - sprite: Mobs/Customization/gauze.rsi
+    state: gauze_moth_righteye_1
+
+- type: marking
+  id: GauzeMothUpperArmRight
+  bodyPart: RArm
+  markingCategory: Overlay
+  speciesRestriction: [Moth]
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#FFFFFF"
+  sprites:
+  - sprite: Mobs/Customization/gauze.rsi
+    state: gauze_moth_upperarm_r
+
+- type: marking
+  id: GauzeMothUpperArmLeft
+  bodyPart: LArm
+  markingCategory: Overlay
+  speciesRestriction: [Moth]
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#FFFFFF"
+  sprites:
+  - sprite: Mobs/Customization/gauze.rsi
+    state: gauze_moth_upperarm_l
+
+- type: marking
+  id: GauzeMothUpperLegRight
+  bodyPart: RLeg
+  markingCategory: Overlay
+  speciesRestriction: [Moth]
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#FFFFFF"
+  sprites:
+  - sprite: Mobs/Customization/gauze.rsi
+    state: gauze_moth_upperleg_r
+
+- type: marking
+  id: GauzeMothUpperLegLeft
+  bodyPart: LLeg
+  markingCategory: Overlay
+  speciesRestriction: [Moth]
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#FFFFFF"
+  sprites:
+  - sprite: Mobs/Customization/gauze.rsi
+    state: gauze_moth_upperleg_l
+
+- type: marking
+  id: GauzeMothLowerLegRight
+  bodyPart: RFoot
+  markingCategory: Overlay
+  speciesRestriction: [Moth]
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#FFFFFF"
+  sprites:
+  - sprite: Mobs/Customization/gauze.rsi
+    state: gauze_moth_lowerleg_r
+
+- type: marking
+  id: GauzeMothLowerLegLeft
+  bodyPart: LFoot
+  markingCategory: Overlay
+  speciesRestriction: [Moth]
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#FFFFFF"
+  sprites:
+  - sprite: Mobs/Customization/gauze.rsi
+    state: gauze_moth_lowerleg_l

Resources/Textures/Mobs/Customization/gauze.rsi/meta.json

@@ -72,23 +72,75 @@
       "directions": 4
     },
 	{
-      "name": "gauze_lizardblindfold",
+      "name": "gauze_lizard_blindfold",
       "directions": 4
     },
 	{
-      "name": "gauze_lizardrighteye",
+      "name": "gauze_lizard_righteye",
       "directions": 4
     },
     {
-      "name": "gauze_lizardlefteye",
+      "name": "gauze_lizard_lefteye",
       "directions": 4
     },
     {
-      "name": "gauze_lizardfoot_r",
+      "name": "gauze_lizard_foot_r",
       "directions": 4
     },
     {
-      "name": "gauze_lizardfoot_l",
+      "name": "gauze_lizard_foot_l",
+      "directions": 4
+    },
+    {
+      "name": "gauze_moth_abdomen",
+      "directions": 4
+    },
+    {
+      "name": "gauze_moth_shoulder",
+      "directions": 4
+    },
+    {
+      "name": "gauze_moth_blindfold",
+      "directions": 4
+    },
+    {
+      "name": "gauze_moth_righteye_1",
+      "directions": 4
+    },
+    {
+      "name": "gauze_moth_righteye_2",
+      "directions": 4
+    },
+    {
+      "name": "gauze_moth_lefteye_1",
+      "directions": 4
+    },
+    {
+      "name": "gauze_moth_lefteye_2",
+      "directions": 4
+    },
+    {
+      "name": "gauze_moth_upperarm_r",
+      "directions": 4
+    },
+    {
+      "name": "gauze_moth_upperarm_l",
+      "directions": 4
+    },
+    {
+      "name": "gauze_moth_upperleg_r",
+      "directions": 4
+    },
+    {
+      "name": "gauze_moth_upperleg_l",
+      "directions": 4
+    },
+    {
+      "name": "gauze_moth_lowerleg_r",
+      "directions": 4
+    },
+    {
+      "name": "gauze_moth_lowerleg_l",
       "directions": 4
     }
   ]