Marking default coloring (#13039)

* Marking coloring WIP * EnsureDefault now supports coloring! * Now markings have coloring when they get added * Many things * yml files * cleanup * Some requested changes * Nullable type and WIP caching * Time to resolve that thing with deprecated hair fields * Latest reviews + im still trying to use these hair markings * FirstOrDefault thing and Tattoo docs * IDK * It's now works a bit more properly in preferences GUI * THEY SYNCING! However preferences GUI still broken and doesn't work properly * Markings now updating when changing in GUI. However they still don't work properly with bald humanoids * Forgor... * Default hair-colored markings will not color to hair if there is no hair * Fixed default colors for customizable markings * Fixed bug in prefs GUI that set current hair to null * Now markings that must match skin color because of limb (e.x. Slimes) - will match skin color * final tweaks: if hair uses skin color then markings will use skin color as hair color (slimes) * fix * fixed dirty. no more funni invis bug * Mirrors and client profile loading * default colors soon TM * review + better coloring * Hardcode is gone * diona markings * oh my god * fixed CategoryColoring * cool fallback, clean up and some other tweaks * code style * more style * a
2023-03-05 08:59:07 +06:00
parent 0ad9af7ae2
commit 8b3d7728d7
26 changed files with 863 additions and 83 deletions
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/cat_parts.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/cat_parts.yml
@@ -3,6 +3,18 @@
  bodyPart: HeadTop
  markingCategory: HeadTop
  speciesRestriction: [Human]
+  coloring:
+    default:
+      type:
+        !type:CategoryColoring
+          category: Hair
+      fallbackTypes:
+        - !type:SkinColoring
+    layers:
+      ears_cat_inner:
+        type:
+          !type:SimpleColoring
+            color: "#FFFFFF"
  sprites:
  - sprite: Mobs/Customization/cat_parts.rsi
    state: ears_cat_outer
@@ -14,6 +26,15 @@
  bodyPart: Tail
  markingCategory: Tail
  speciesRestriction: [Human]
+  coloring:
+    default:
+      type:
+        !type:CategoryColoring
+          category: Hair
+      fallbackTypes:
+        - !type:CategoryColoring
+          category: FacialHair
+        - !type:SkinColoring
  sprites:
  - sprite: Mobs/Customization/cat_parts.rsi
    state: tail_cat
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/diona.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/diona.yml
@@ -3,6 +3,11 @@
  bodyPart: Head
  markingCategory: Head
  speciesRestriction: [Diona]
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#FFFFFF"
  sprites:
  - sprite: Mobs/Customization/diona.rsi
    state: thorns_head
@@ -12,6 +17,11 @@
  bodyPart: Chest
  markingCategory: Chest
  speciesRestriction: [Diona]
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#FFFFFF"
  sprites:
  - sprite: Mobs/Customization/diona.rsi
    state: thorns_body
@@ -21,6 +31,11 @@
  bodyPart: Head
  markingCategory: Head
  speciesRestriction: [Diona]
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#FFFFFF"
  sprites:
  - sprite: Mobs/Customization/diona.rsi
    state: flowers_head
@@ -30,6 +45,11 @@
  bodyPart: Chest
  markingCategory: Chest
  speciesRestriction: [Diona]
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#FFFFFF"
  sprites:
  - sprite: Mobs/Customization/diona.rsi
    state: flowers_body
@@ -39,6 +59,10 @@
  bodyPart: Chest
  markingCategory: Chest
  speciesRestriction: [Diona]
+  coloring:
+    default:
+      type:
+        !type:SkinColoring
  sprites:
  - sprite: Mobs/Customization/diona.rsi
    state: leaf_cover
@@ -48,6 +72,11 @@
  bodyPart: Head
  markingCategory: Head
  speciesRestriction: [Diona]
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#FFFFFF"
  sprites:
  - sprite: Mobs/Customization/diona.rsi
    state: bloom
@@ -57,6 +86,11 @@
  bodyPart: Head
  markingCategory: Head
  speciesRestriction: [Diona]
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#FFFFFF"
  sprites:
  - sprite: Mobs/Customization/diona.rsi
    state: bracket
@@ -66,6 +100,10 @@
  bodyPart: Head
  markingCategory: Head
  speciesRestriction: [Diona]
+  coloring:
+    default:
+      type:
+        !type:SkinColoring
  sprites:
  - sprite: Mobs/Customization/diona.rsi
    state: brush
@@ -75,6 +113,11 @@
  bodyPart: Head
  markingCategory: Head
  speciesRestriction: [Diona]
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#FFFFFF"
  sprites:
  - sprite: Mobs/Customization/diona.rsi
    state: cornflower
@@ -84,6 +127,11 @@
  bodyPart: Head
  markingCategory: Head
  speciesRestriction: [Diona]
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#FFFFFF"
  sprites:
  - sprite: Mobs/Customization/diona.rsi
    state: ficus
@@ -93,6 +141,11 @@
  bodyPart: Head
  markingCategory: Head
  speciesRestriction: [Diona]
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#FFFFFF"
  sprites:
  - sprite: Mobs/Customization/diona.rsi
    state: garland
@@ -102,6 +155,11 @@
  bodyPart: Head
  markingCategory: Head
  speciesRestriction: [Diona]
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#FFFFFF"
  sprites:
  - sprite: Mobs/Customization/diona.rsi
    state: king
@@ -111,6 +169,11 @@
  bodyPart: Head
  markingCategory: Head
  speciesRestriction: [Diona]
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#FFFFFF"
  sprites:
  - sprite: Mobs/Customization/diona.rsi
    state: laurel
@@ -120,6 +183,11 @@
  bodyPart: HeadTop
  markingCategory: HeadTop
  speciesRestriction: [Diona]
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#FFFFFF"
  sprites:
  - sprite: Mobs/Customization/diona.rsi
    state: leafy
@@ -129,6 +197,11 @@
  bodyPart: Head
  markingCategory: Head
  speciesRestriction: [Diona]
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#FFFFFF"
  sprites:
  - sprite: Mobs/Customization/diona.rsi
    state: lotus
@@ -138,6 +211,11 @@
  bodyPart: HeadTop
  markingCategory: HeadTop
  speciesRestriction: [Diona]
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#FFFFFF"
  sprites:
  - sprite: Mobs/Customization/diona.rsi
    state: meadow
@@ -147,6 +225,11 @@
  bodyPart: Head
  markingCategory: Head
  speciesRestriction: [Diona]
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#FFFFFF"
  sprites:
  - sprite: Mobs/Customization/diona.rsi
    state: oak
@@ -156,6 +239,11 @@
  bodyPart: Head
  markingCategory: Head
  speciesRestriction: [Diona]
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#FFFFFF"
  sprites:
  - sprite: Mobs/Customization/diona.rsi
    state: palm
@@ -165,6 +253,11 @@
  bodyPart: Head
  markingCategory: Head
  speciesRestriction: [Diona]
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#FFFFFF"
  sprites:
  - sprite: Mobs/Customization/diona.rsi
    state: root
@@ -174,6 +267,11 @@
  bodyPart: Head
  markingCategory: Head
  speciesRestriction: [Diona]
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#FFFFFF"
  sprites:
  - sprite: Mobs/Customization/diona.rsi
    state: rose
@@ -183,6 +281,11 @@
  bodyPart: Head
  markingCategory: Head
  speciesRestriction: [Diona]
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#FFFFFF"
  sprites:
  - sprite: Mobs/Customization/diona.rsi
    state: rosey
@@ -192,6 +295,11 @@
  bodyPart: HeadTop
  markingCategory: HeadTop
  speciesRestriction: [Diona]
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#FFFFFF"
  sprites:
  - sprite: Mobs/Customization/diona.rsi
    state: shrub
@@ -201,6 +309,11 @@
  bodyPart: HeadSide
  markingCategory: HeadSide
  speciesRestriction: [Diona]
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#FFFFFF"
  sprites:
  - sprite: Mobs/Customization/diona.rsi
    state: spinner
@@ -210,6 +323,11 @@
  bodyPart: HeadSide
  markingCategory: HeadSide
  speciesRestriction: [Diona]
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#FFFFFF"
  sprites:
  - sprite: Mobs/Customization/diona.rsi
    state: sprout
@@ -219,6 +337,11 @@
  bodyPart: HeadTop
  markingCategory: HeadTop
  speciesRestriction: [Diona]
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#FFFFFF"
  sprites:
  - sprite: Mobs/Customization/diona.rsi
    state: vine
@@ -228,6 +351,11 @@
  bodyPart: Head
  markingCategory: Head
  speciesRestriction: [Diona]
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#FFFFFF"
  sprites:
  - sprite: Mobs/Customization/diona.rsi
    state: vinel
@@ -237,6 +365,11 @@
  bodyPart: Head
  markingCategory: Head
  speciesRestriction: [Diona]
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#FFFFFF"
  sprites:
  - sprite: Mobs/Customization/diona.rsi
    state: vines
@@ -246,6 +379,11 @@
  bodyPart: Head
  markingCategory: Head
  speciesRestriction: [Diona]
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#FFFFFF"
  sprites:
  - sprite: Mobs/Customization/diona.rsi
    state: wildflower
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml
@@ -157,7 +157,7 @@
  id: LizardSnoutRound
  bodyPart: Snout
  markingCategory: Snout
-  followSkinColor: true
+  forcedColoring: true
  speciesRestriction: [Reptilian]
  sprites:
  - sprite: Mobs/Customization/reptilian_parts.rsi
@@ -167,7 +167,7 @@
  id: LizardSnoutSharp
  bodyPart: Snout
  markingCategory: Snout
-  followSkinColor: true
+  forcedColoring: true
  speciesRestriction: [Reptilian]
  sprites:
  - sprite: Mobs/Customization/reptilian_parts.rsi
@@ -177,8 +177,7 @@
  id: LizardChestTiger
  bodyPart: Chest
  markingCategory: Chest
-  followSkinColor: false
  speciesRestriction: [Reptilian]
  sprites:
  - sprite: Mobs/Customization/reptilian_parts.rsi
-    state: body_tiger
+    state: body_tiger
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml
@@ -3,6 +3,11 @@
  bodyPart: Chest
  markingCategory: Chest
  speciesRestriction: [Human]
+  coloring:
+    default:
+      type:
+        !type:TattooColoring
+      fallbackColor: "#666666"
  sprites:
  - sprite: Mobs/Customization/tattoos.rsi
    state: tattoo_hive_chest
@@ -12,6 +17,11 @@
  bodyPart: Chest
  markingCategory: Chest
  speciesRestriction: [Human]
+  coloring:
+    default:
+      type:
+        !type:TattooColoring
+      fallbackColor: "#666666"
  sprites:
  - sprite: Mobs/Customization/tattoos.rsi
    state: tattoo_nightling
@@ -21,6 +31,11 @@
  bodyPart: LLeg
  markingCategory: Legs
  speciesRestriction: [Human]
+  coloring:
+    default:
+      type:
+        !type:TattooColoring
+      fallbackColor: "#666666"
  sprites:
  - sprite: Mobs/Customization/tattoos.rsi
    state: tattoo_silverburgh_l_leg
@@ -30,6 +45,11 @@
  bodyPart: RLeg
  markingCategory: Legs
  speciesRestriction: [Human]
+  coloring:
+    default:
+      type:
+        !type:TattooColoring
+      fallbackColor: "#666666"
  sprites:
  - sprite: Mobs/Customization/tattoos.rsi
    state: tattoo_silverburgh_r_leg
@@ -39,6 +59,11 @@
  bodyPart: LArm
  markingCategory: Arms
  speciesRestriction: [Human]
+  coloring:
+    default:
+      type:
+        !type:TattooColoring
+      fallbackColor: "#666666"
  sprites:
  - sprite: Mobs/Customization/tattoos.rsi
    state: tattoo_campbell_l_arm
@@ -48,6 +73,11 @@
  bodyPart: RArm
  markingCategory: Arms
  speciesRestriction: [Human]
+  coloring:
+    default:
+      type:
+        !type:TattooColoring
+      fallbackColor: "#666666"
  sprites:
  - sprite: Mobs/Customization/tattoos.rsi
    state: tattoo_campbell_r_arm
@@ -57,6 +87,11 @@
  bodyPart: LLeg
  markingCategory: Legs
  speciesRestriction: [Human]
+  coloring:
+    default:
+      type:
+        !type:TattooColoring
+      fallbackColor: "#666666"
  sprites:
  - sprite: Mobs/Customization/tattoos.rsi
    state: tattoo_campbell_l_leg
@@ -66,6 +101,11 @@
  bodyPart: RLeg
  markingCategory: Legs
  speciesRestriction: [Human]
+  coloring:
+    default:
+      type:
+        !type:TattooColoring
+      fallbackColor: "#666666"
  sprites:
  - sprite: Mobs/Customization/tattoos.rsi
    state: tattoo_campbell_r_leg
@@ -75,6 +115,11 @@
  bodyPart: Eyes
  markingCategory: Head
  speciesRestriction: [Human, SlimePerson, Reptilian]
+  coloring:
+    default:
+      type:
+        !type:EyeColoring
+          negative: true
  sprites:
  - sprite: Mobs/Customization/tattoos.rsi
    state: tattoo_eye_r
@@ -84,6 +129,11 @@
  bodyPart: Eyes
  markingCategory: Head
  speciesRestriction: [Human, SlimePerson, Reptilian]
+  coloring:
+    default:
+      type:
+        !type:EyeColoring
+          negative: true
  sprites:
  - sprite: Mobs/Customization/tattoos.rsi
    state: tattoo_eye_l