Gob hairs (#1250)

* renorma

* gobhairs

Resources/Locale/en-US/_CP14/markings/goblin-hair.ftl

@@ -1,3 +0,0 @@
-marking-CP14GoblinHairAntenna = Unruly Strands
-marking-CP14GoblinHairBedHead2 = Bedhead 2
-marking-CP14GoblinHairDoubleBun = Double Bun

Resources/Locale/ru-RU/_CP14/markings/goblin-hair.ftl

@@ -1,3 +0,0 @@
-marking-CP14GoblinHairAntenna = Непослушные пряди
-marking-CP14GoblinHairBedHead2 = С бодуна 2
-marking-CP14GoblinHairDoubleBun = Два пунпона

Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/goblin_hairs.yml

@@ -1,26 +0,0 @@
-- type: marking
-  id: CP14GoblinHairAntenna
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [ CP14Goblin ]
-  sprites:
-    - sprite: _CP14/Mobs/Customization/goblin_hair.rsi
-      state: antenna
-
-- type: marking
-  id: CP14GoblinHairBedHead2
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [ CP14Goblin ]
-  sprites:
-    - sprite: _CP14/Mobs/Customization/goblin_hair.rsi
-      state: bedheadv2
-
-- type: marking
-  id: CP14GoblinHairDoubleBun
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [ CP14Goblin ]
-  sprites:
-    - sprite: _CP14/Mobs/Customization/goblin_hair.rsi
-      state: doublebun

Resources/Prototypes/_CP14/Entities/Mobs/Species/goblin.yml

@@ -58,6 +58,15 @@
       visible: false
   - type: HumanoidAppearance
     species: CP14Goblin
+    markingsDisplacement:
+      Hair:
+        sizeMaps:
+          32:
+            sprite: _CP14/Mobs/Species/Goblin/displacement.rsi
+            state: hair
+          48:
+            sprite: _CP14/Mobs/Species/Goblin/displacement48.rsi
+            state: hair
   - type: Hunger
     starvationDamage:
       types:
@@ -188,6 +197,15 @@
   components:
   - type: HumanoidAppearance
     species: CP14Goblin
+    markingsDisplacement:
+      Hair:
+        sizeMaps:
+          32:
+            sprite: _CP14/Mobs/Species/Goblin/displacement.rsi
+            state: hair
+          48:
+            sprite: _CP14/Mobs/Species/Goblin/displacement48.rsi
+            state: hair
   - type: Inventory
     templateId: CP14Human
     speciesId: goblin

Resources/Prototypes/_CP14/Recipes/Crafting/Graphs/improvised/gauze.yml

@@ -8,7 +8,7 @@
       steps:
       - material: CP14Cloth
         amount: 2
-        doAfter: 4
+        doAfter: 3
 
   - node: cp14gauze
     entity: CP14Gauze1

Resources/Prototypes/_CP14/Recipes/Crafting/Graphs/improvised/herbal_bandage.yml

@@ -7,10 +7,8 @@
     - to: cp14herbbandage
       steps:
       - material: CP14FloraMaterial
-        amount: 2
-      - material: CP14FloraMaterial
-        amount: 2
-        doAfter: 4
+        amount: 3
+        doAfter: 3
 
   - node: cp14herbbandage
     entity: CP14HerbalBandage1

Resources/Prototypes/_CP14/Species/goblin.yml

@@ -33,7 +33,6 @@
 
 - type: markingPoints
   id: CP14MobGoblinMarkingLimits
-  onlyWhitelisted: true
   points:
     Hair:
       points: 1
@@ -41,23 +40,29 @@
     FacialHair:
       points: 1
       required: false
+      onlyWhitelisted: true
     Snout:
       points: 1
       required: true
       defaultMarkings: [ CP14GoblinNose ]
+      onlyWhitelisted: true
     HeadTop:
       points: 1
       required: true
       defaultMarkings: [ CP14GoblinEars ]
+      onlyWhitelisted: true
     Chest:
       points: 1
       required: false
+      onlyWhitelisted: true
     Legs:
       points: 2
       required: false
+      onlyWhitelisted: true
     Arms:
       points: 2
       required: false
+      onlyWhitelisted: true
 
 - type: humanoidBaseSprite
   id: CP14MobGoblinEyes

Resources/Textures/_CP14/Mobs/Customization/goblin_hair.rsi/meta.json

@@ -1,23 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-4.0",
-  "copyright": "Created by TheShuEd (Github)",
-  "size": {
-    "x": 48,
-    "y": 48
-  },
-  "states": [
-    {
-      "name": "antenna",
-      "directions": 4
-    },
-    {
-      "name": "bedheadv2",
-      "directions": 4
-    },
-    {
-      "name": "doublebun",
-      "directions": 4
-    }
-  ]
-}

Resources/Textures/_CP14/Mobs/Species/Goblin/displacement.rsi/meta.json

@@ -26,6 +26,10 @@
       "name": "gloves",
       "directions": 4
     },
+    {
+      "name": "hair",
+      "directions": 4
+    },
     {
       "name": "hands",
       "directions": 4

Resources/Textures/_CP14/Mobs/Species/Goblin/displacement48.rsi/meta.json

@@ -13,6 +13,10 @@
     {
       "name": "head",
       "directions": 4
+    },
+    {
+      "name": "hair",
+      "directions": 4
     }
   ]
 }