Leather rework (#1638)

* remove salt

* crafting rework

* Stacks

* corrected count

* linter fix

* Bellt crafts

* delete leather

* resize

* Hide in belt

* Sprites fix

* linter fix

* remove static price from backpacks base

* explosive resistance

* belt cost

* Lets fix cost warnings

* satchels static price for balance with backpacks

* ScrapHideRecipe cost

* lets try increase leather units in hide

* return scrap recipe back

* Lets FINISH that costs!

* hide suffix

* trying to fix stack warning

* placeholder suffix

* Hide => Leather

* Lets try again!!!!

* name and description

* another

* Update Resources/Prototypes/_CP14/Entities/Objects/Ingredients/ingredients.yml

* Update Resources/Prototypes/_CP14/Materials/simple.yml

* Update Resources/Prototypes/_CP14/Entities/Objects/Ingredients/ingredients.yml

Resources/Locale/en-US/_CP14/materials/materials.ftl

@@ -13,3 +13,4 @@ cp14-material-coal = hard coal
 cp14-material-lucens-planks = lucens planks
 cp14-material-flora = flora material
 cp14-material-ash = ash
+cp14-material-leather = leather

Resources/Locale/en-US/_CP14/stack/materials.ftl

@@ -20,8 +20,6 @@ cp14-stack-iron-ore = iron ore
 cp14-stack-gold-ore = gold ore
 cp14-stack-mithril-ore = mithril ore
 
-cp14-stack-salt-stone = salt stone
-
 cp14-stack-wallpaper = rolls of wallpaper
 
 cp14-stack-glass-sheet = glass
@@ -29,3 +27,7 @@ cp14-stack-glass-sheet = glass
 cp14-stack-ash-pile = pile of ashes
 
 cp14-stack-group-wooden-planks-any = planks (any)
+
+cp14-stack-hide-thin = thin hide
+cp14-stack-hide = coarse hide
+cp14-stack-hide-rugged = rugged hide

Resources/Locale/ru-RU/_CP14/materials/materials.ftl

@@ -13,3 +13,4 @@ cp14-material-coal = каменный уголь
 cp14-material-lucens-planks = люценсовые доски
 cp14-material-flora = растительный материал
 cp14-material-ash = пепел
+cp14-material-leather = кожа

Resources/Locale/ru-RU/_CP14/stack/materials.ftl

@@ -20,14 +20,15 @@ cp14-stack-iron-ore = железная руда
 cp14-stack-gold-ore = золотая руда
 cp14-stack-mithril-ore = мифриловая руда
 
-cp14-stack-salt-stone = соляной камень
-
 cp14-stack-wallpaper = рулон обоев
 
 cp14-stack-glass-sheet = стекло
 
 cp14-stack-ash-pile = кучка пепла
 
+cp14-stack-hide-thin = тонкая шкура
+cp14-stack-hide = грубая шкура
+cp14-stack-hide-rugged = прочная шкура
 
 
 cp14-stack-group-wooden-planks-any = доски (любые)

Resources/Prototypes/_CP14/Entities/Clothing/Back/backpacks.yml

@@ -34,9 +34,8 @@
     - 0,0,4,2 # 5*3=15
   - type: PhysicalComposition
     materialComposition:
-      CP14Cloth: 120 # 100u CP14Cloth (10x10u) + 20u CP14String (4x5u)
-      CP14Iron: 2 # 2u CP14IronBuckle (1x2u)
-      # Cost: (120×0.3) + (2×2) = 36 + 4 = 40 copper coins
+      CP14Cloth: 60 # 50u CP14Cloth (10x10u) + 10u CP14String
+      # Cost: (60×0.3) = 18 copper coins
 
 - type: entity
   parent: CP14ClothingBackBackpackT0
@@ -55,21 +54,18 @@
     - 0,0,5,3 # 6*4=24
   - type: PhysicalComposition
     materialComposition:
-      CP14Leather: 46 # 40u CP14Leather (8x5u) + 6u CP14LeatherStrap (2x3u)
-      CP14SaltStone: 46 # 40u (8x5u) + 6u (2x3u)
+      CP14Leather: 18 # 20u CP14Leather (4x5u) ~~~ and -2u for cost balance
       CP14Iron: 2 # 2u CP14IronBuckle (1x2u)
-      # Cost: (46×1.2) + (46×0.4) + (2×2) = 55.2 + 18.4 + 4 = 77.6 copper coins
+      # Cost: (20×1.2) + (2×2) = 24 + 4 = 28 copper coins
   - type: Armor
     modifiers:
       coefficients:
-        Blunt: 0.94
-        Slash: 0.98
-        Heat: 0.94
-        Caustic: 0.94
-  - type: ClothingSpeedModifier
-    walkModifier: 0.95
-    sprintModifier: 0.95
-  - type: HeldSpeedModifier
+        Blunt: 0.95
+        Slash: 0.95
+        Heat: 0.90
+        Caustic: 0.90
+  - type: ExplosionResistance
+    damageCoefficient: 0.9
 
 - type: entity
   parent: CP14ClothingBackBackpackT1
@@ -87,21 +83,22 @@
     - 11,1,12,3 #2*3=6
   - type: PhysicalComposition
     materialComposition:
-      CP14Leather: 92 # 80u CP14Leather (8x10u) + 12u CP14LeatherStrap (4x3u)
-      CP14SaltStone: 92 # 80u (8x10u) + 12u (4x3u)
+      CP14Leather: 60 # 20u thin (4x5u) + 40u regular (4x10u)
       CP14Iron: 4 # 4u CP14IronBuckle (2x2u)
-      # Cost: (92×1.2) + (92×0.4) + (4×2) = 110.4 + 36.8 + 8 = 155.2 copper coins
+      # Cost: (60×1.2) + (4×2) = 72 + 8 = 80 copper coins
   - type: Armor
     modifiers:
       coefficients:
-        Blunt: 0.90
-        Slash: 0.94
-        Heat: 0.90
-        Caustic: 0.90
+        Blunt: 0.85
+        Slash: 0.90
+        Piercing: 0.95
+        Heat: 0.85
+        Caustic: 0.85
+  - type: ExplosionResistance
+    damageCoefficient: 0.8
   - type: ClothingSpeedModifier
-    walkModifier: 0.80
-    sprintModifier: 0.80
-  - type: HeldSpeedModifier
+    sprintModifier: 0.95
+  - type: HeldSpeedModifier # Slow down when hold
 
 - type: entity
   parent: CP14ClothingBackBackpackT2
@@ -119,22 +116,22 @@
     - 0,3,9,6 # 10*4=40
   - type: PhysicalComposition
     materialComposition:
-      CP14Leather: 224 # 200u CP14Leather (8x25u) + 24u CP14RuggedStrap (4x6u)
-      CP14SaltStone: 180 # 160u (8x20u) + 20u (4x5u)
+      CP14Leather: 115 # 40u regular (4x10u) + 75u rugged (3x25u)
       CP14Iron: 4 # 4u CP14IronBuckle (2x2u)
-      # Cost: (224×1.2) + (180×0.4) + (4×2) = 268.8 + 72 + 8 = 348.8 copper coins
+      # Cost: (115×1.2) + (4×2) = 138 + 8 = 146 copper coins
   - type: Armor
     modifiers:
       coefficients:
-        Blunt: 0.86
-        Slash: 0.90
-        Piercing: 0.98
-        Heat: 0.86
-        Caustic: 0.86
+        Blunt: 0.80
+        Slash: 0.80
+        Piercing: 0.90
+        Heat: 0.70
+        Caustic: 0.70
+  - type: ExplosionResistance
+    damageCoefficient: 0.7
   - type: ClothingSpeedModifier
-    walkModifier: 0.70
-    sprintModifier: 0.70
-  - type: HeldSpeedModifier
+    sprintModifier: 0.90
+  - type: HeldSpeedModifier # Slow down when hold
   - type: Clothing
     equipDelay: 1.2
     unequipDelay: 0.8
@@ -162,21 +159,22 @@
     - 4,6,5,6 # 2*1=2
   - type: PhysicalComposition
     materialComposition:
-      CP14Leather: 110 # 80u CP14Leather (8x10u) + 30u CP14LeatherStrap (10x3u)
-      CP14SaltStone: 110 # 80u (8x10u) + 30u (10x3u)
-      CP14Iron: 8 # 8u CP14IronBuckle (4x2u)
-      # Cost: (110×1.2) + (110×0.4) + (8×2) = 132 + 44 + 16 = 192 copper coins
+      CP14Leather: 60 # 20u thin (4x5u) + 40u regular (4x10u)
+      CP14Iron: 24 # 20u + 4u CP14IronBuckle (2x2u)
+      # Cost: (60×1.2) + (24×2) = 72 + 48 = 120 copper coins
   - type: Armor
     modifiers:
       coefficients:
-        Blunt: 0.86
-        Slash: 0.92
-        Piercing: 0.95
-        Heat: 0.92
+        Blunt: 0.85
+        Slash: 0.80
+        Piercing: 0.90
+        Heat: 0.85
+        Caustic: 0.85
+  - type: ExplosionResistance
+    damageCoefficient: 0.70
   - type: ClothingSpeedModifier
-    walkModifier: 0.82
-    sprintModifier: 0.82
-  - type: HeldSpeedModifier
+    sprintModifier: 0.94
+  - type: HeldSpeedModifier # Slow down when hold
 
 - type: entity
   parent: CP14ClothingBackBackpackT2
@@ -196,11 +194,11 @@
     - 1,6,6,6 # 6*1=6
   - type: PhysicalComposition
     materialComposition:
-      CP14Leather: 96 # 60u CP14Leather (6x10u) + 36u CP14LeatherStrap (12x3u)
-      CP14SaltStone: 96 # 60u (6x10u) + 36u (12x3u)
-      CP14Iron: 12 # 12u CP14IronBuckle (6x2u)
-      # Cost: (96×1.2) + (96×0.4) + (12×2) = 115.2 + 38.4 + 24 = 177.6 copper coins
+      CP14Leather: 80 # 20 + 20u thin (4x5u) + 40u regular (4x10u)
+      CP14Iron: 4 # 4u CP14IronBuckle (2x2u)
+      # Cost: (80×1.2) + (4×2) = 96 + 8 = 104 copper coins
+  - type: ExplosionResistance
+    damageCoefficient: 0.85
   - type: ClothingSpeedModifier
-    walkModifier: 0.84
-    sprintModifier: 0.84
-  - type: HeldSpeedModifier
+    sprintModifier: 0.97
+  - type: HeldSpeedModifier # Slow down when hold

Resources/Prototypes/_CP14/Entities/Clothing/Back/backpacks_explorer.yml

@@ -38,9 +38,9 @@
 #     - 13,2,14,2 # 2x1=2
 #   - type: PhysicalComposition
 #     materialComposition:
-#       CP14Cloth: 80 # 60u CP14Cloth (6x10u) + 20u CP14String (4x5u)
+#       CP14Cloth: 30 # 30u CP14Cloth (3x10u)
 #       CP14Iron: 16 # 16u CP14IronBuckle (8x2u)
-#       # Cost: (80×0.3) + (16×2) = 24 + 32 = 56 copper coins
+#       # Cost: (30×0.3) + (16×2) = 9 + 32 = 41 copper coins
 
 # - type: entity
 #   parent: CP14ClothingBackExplorerBackpackT0
@@ -62,10 +62,9 @@
 #     - 5,3,7,4 # 3x2=6
 #   - type: PhysicalComposition
 #     materialComposition:
-#       CP14Leather: 36 # 30u CP14Leather (6x5u) + 6u CP14LeatherStrap (2x3u)
-#       CP14SaltStone: 36 # 30u (6x5u) + 6u (2x3u)
+#       CP14Leather: 15 # 15u CP14Leather (3x5u)
 #       CP14Iron: 20 # 20u CP14IronBuckle (10x2u)
-#       # Cost: (36×1.2) + (36×0.4) + (20×2) = 43.2 + 14.4 + 40 = 97.6 copper coins
+#       # Cost: (15×1.2) + (20×2) = 18 + 40 = 58 copper coins
 
 # - type: entity
 #   parent: CP14ClothingBackExplorerBackpackT1
@@ -91,10 +90,9 @@
 #     - 11,3,12,5 # 2x3=6
 #   - type: PhysicalComposition
 #     materialComposition:
-#       CP14Leather: 72 # 60u CP14Leather (6x10u) + 12u CP14LeatherStrap (4x3u)
-#       CP14SaltStone: 72 # 60u (6x10u) + 12u (4x3u)
+#       CP14Leather: 45 # 15u thin (3x5u) + 30u regular (3x10u)
 #       CP14Iron: 24 # 24u CP14IronBuckle (12x2u)
-#       # Cost: (72×1.2) + (72×0.4) + (24×2) = 86.4 + 28.8 + 48 = 163.2 copper coins
+#       # Cost: (45×1.2) + (24×2) = 54 + 48 = 102 copper coins
 
 # - type: entity
 #   parent: CP14ClothingBackExplorerBackpackT2
@@ -122,7 +120,6 @@
 #     - 16,4,16,6 # 1x3=3
 #   - type: PhysicalComposition
 #     materialComposition:
-#       CP14Leather: 174 # 150u CP14Leather (6x25u) + 24u CP14RuggedStrap (4x6u)
-#       CP14SaltStone: 140 # 120u (6x20u) + 20u (4x5u)
+#       CP14Leather: 80 # 30u regular (3x10u) + 50u rugged (2x25u)
 #       CP14Iron: 24 # 24u CP14IronBuckle (12x2u)
-#       # Cost: (174×1.2) + (140×0.4) + (24×2) = 208.8 + 56 + 48 = 312.8 copper coins
+#       # Cost: (80×1.2) + (24×2) = 96 + 48 = 144 copper coins

Resources/Prototypes/_CP14/Entities/Clothing/Back/backpacks_satchels.yml

@@ -49,9 +49,9 @@
     - 7,1,8,2 # 2x2=4
   - type: PhysicalComposition
     materialComposition:
-      CP14Cloth: 120 # 80u CP14Cloth (8x10u) + 40u CP14String (8x5u)
-      CP14Iron: 6 # 6u CP14IronBuckle (3x2u)
-      # Cost: (120×0.3) + (6×2) = 36 + 12 = 48 copper coins
+      CP14Cloth: 50 # 40u CP14Cloth (8x10u) + 10u CP14String
+      CP14Iron: 2 # 2u CP14Iron
+      # Cost: (50×0.3) + (2×2) = 19 copper coins
 
 - type: entity
   parent: CP14ClothingBackSatchelT0
@@ -75,13 +75,12 @@
     - 11,1,12,3 # 2x3=6
   - type: PhysicalComposition
     materialComposition:
-      CP14Leather: 60 # 30u CP14Leather (6x5u) + 30u CP14LeatherStrap (10x3u)
-      CP14SaltStone: 60 # 30u (6x5u) + 30u (10x3u)
-      CP14Iron: 8 # 8u CP14IronBuckle (4x2u)
-      # Cost: (60×1.2) + (60×0.4) + (8×2) = 72 + 24 + 16 = 112 copper coins
-  - type: ClothingSpeedModifier
-    sprintModifier: 0.97
-  - type: HeldSpeedModifier
+      CP14Leather: 15 # 15u CP14Leather (3x5u)
+      CP14Iron: 6 # 6u CP14IronBuckle (3x2u)
+      CP14Cloth: 50 # 40u CP14Cloth (8x10u) + 10u CP14String ~~~ 15 additional coppers
+      # Cost: (15×1.2) + (6×2) = 18 + 12 = 30 copper coins
+  - type: StaticPrice
+    price: 15 # Balance with backpack
 
 - type: entity
   parent: CP14ClothingBackSatchelT1
@@ -105,18 +104,17 @@
     - 11,3,12,4 # 2x2=4
   - type: PhysicalComposition
     materialComposition:
-      CP14Leather: 96 # 60u CP14Leather (6x10u) + 36u CP14LeatherStrap (12x3u)
-      CP14SaltStone: 96 # 60u (6x10u) + 36u (12x3u)
+      CP14Leather: 45 # 15u thin (3x5u) + 30u regular (3x10u)
       CP14Iron: 12 # 12u CP14IronBuckle (6x2u)
-      # Cost: (96×1.2) + (96×0.4) + (12×2) = 115.2 + 38.4 + 24 = 177.6 copper coins
+      CP14Cloth: 50 # 40u CP14Cloth (8x10u) + 10u CP14String ~~~ 15 additional coppers
+      # Cost: (45×1.2) + (12×2) = 54 + 24 = 78 copper coins
   - type: Armor
     modifiers:
       coefficients:
-        Heat: 0.98
-        Caustic: 0.96
-  - type: ClothingSpeedModifier
-    sprintModifier: 0.85
-  - type: HeldSpeedModifier
+        Blunt: 0.95
+        Slash: 0.95
+  - type: StaticPrice
+    price: 30 # Balance with backpack
 
 - type: entity
   parent: CP14ClothingBackSatchelBase
@@ -137,20 +135,22 @@
     - 11,3,12,6 # 2x4=8
   - type: PhysicalComposition
     materialComposition:
-      CP14Leather: 222 # 150u CP14Leather (6x25u) + 72u CP14RuggedStrap (12x6u)
-      CP14SaltStone: 180 # 120u (6x20u) + 60u (12x5u)
+      CP14Leather: 80 # 30u regular (3x10u) + 50u rugged (2x25u)
       CP14Iron: 12 # 12u CP14IronBuckle (6x2u)
-      # Cost: (222×1.2) + (180×0.4) + (12×2) = 266.4 + 72 + 24 = 362.4 copper coins
+      CP14Cloth: 50 # 40u CP14Cloth (8x10u) + 10u CP14String ~~~ 15 additional coppers
+      # Cost: (80×1.2) + (12×2) = 96 + 24 = 120 copper coins
   - type: Armor
     modifiers:
       coefficients:
-        Blunt: 0.96
-        Slash: 0.96
-        Heat: 0.94
-        Caustic: 0.90
+        Blunt: 0.90
+        Slash: 0.90
+  - type: ExplosionResistance
+    damageCoefficient: 0.9
   - type: ClothingSpeedModifier
-    sprintModifier: 0.75
-  - type: HeldSpeedModifier
+    sprintModifier: 0.95
+  - type: HeldSpeedModifier # Slow down when hold
+  - type: StaticPrice
+    price: 60 # Balance with backpack
 
 # ========================
 # Special
@@ -177,17 +177,14 @@
     - 5,5,7,5 # 3x1=3
   - type: PhysicalComposition
     materialComposition:
-      CP14Leather: 102 # 60u CP14Leather (6x10u) + 42u CP14LeatherStrap (14x3u)
-      CP14SaltStone: 102 # 60u (6x10u) + 42u (14x3u)
-      CP14Iron: 12 # 12u CP14IronBuckle (6x2u)
-      # Cost: (102×1.2) + (102×0.4) + (12×2) = 122.4 + 40.8 + 24 = 187.2 copper coins
+      CP14Leather: 45 # 15u thin (3x5u) + 30u regular (3x10u)
+      CP14Iron: 32 # 20 + 12u CP14IronBuckle (6x2u)
+      # Cost: (45×1.2) + (32×2) = 54 + 64 = 118 copper coins
   - type: Armor
     modifiers:
       coefficients:
-        Blunt: 0.91
-        Slash: 0.94
-        Piercing: 0.97
-        Heat: 0.98
-  - type: ClothingSpeedModifier
-    sprintModifier: 0.88
-  - type: HeldSpeedModifier
+        Blunt: 0.90
+        Slash: 0.90
+        Piercing: 0.95
+  - type: ExplosionResistance
+    damageCoefficient: 0.85

Resources/Prototypes/_CP14/Entities/Clothing/Back/container_base.yml

@@ -34,5 +34,3 @@
     interfaces:
       enum.StorageUiKey.Key:
         type: StorageBoundUserInterface
-  - type: StaticPrice
-    price: 30 # for crafting

Resources/Prototypes/_CP14/Entities/Clothing/Belt/pouch.yml

@@ -33,7 +33,6 @@
     fillBaseName: fill-
   - type: PhysicalComposition
     materialComposition:
-      CP14Leather: 19 # 10u CP14Leather (1x10u) + 9u CP14LeatherStrap (3x3u)
-      CP14SaltStone: 19 # 10u (1x10u) + 9u (3x3u)
+      CP14Leather: 10 # 10u CP14Leather
       CP14Cloth: 20 # 20u CP14String (4x5u)
-      # Cost: (19×1.2) + (19×0.4) + (20×0.3) = 22.8 + 7.6 + 6 = 36.4 copper coins
+  # Cost: (10×1.2) + (20×0.3) = 12 + 6 = 18 copper coins

Resources/Prototypes/_CP14/Entities/Clothing/Belt/quiver.yml

@@ -33,10 +33,9 @@
     fillBaseName: fill-
   - type: PhysicalComposition
     materialComposition:
-      CP14Leather: 36 # 30u CP14Leather (3x10u) + 6u CP14LeatherStrap (2x3u)
-      CP14SaltStone: 36 # 30u (3x10u) + 6u (2x3u)
+      CP14Leather: 20 # 20u CP14Leather (2x10u)
       CP14Cloth: 20 # 20u CP14String (4x5u)
-      # Cost: (36×1.2) + (36×0.4) + (20×0.3) = 43.2 + 14.4 + 6 = 63.6 copper coins
+  # Cost: (20×1.2) + (20×0.3) = 24 + 6 = 30 copper coins
 
 - type: entity
   parent: CP14ClothingBeltQuiver

Resources/Prototypes/_CP14/Entities/Mobs/NPC/animals.yml

@@ -69,7 +69,7 @@
     spawned:
     - id: CP14FoodMeatRabbit
       amount: 4
-    - id: CP14ThinAnimalHide
+    - id: CP14ThinLeather1
       amount: 1
       maxAmount: 2
     - id: CP14Fur
@@ -161,7 +161,7 @@
     - id: CP14FoodMeatPigLeg
       amount: 1
       prob: 0.3
-    - id: CP14AnimalHide
+    - id: CP14Leather1
       amount: 1
       maxAmount: 3
   - type: Bloodstream
@@ -211,14 +211,14 @@
     spawned:
     - id: CP14FoodMeatBoar
       amount: 4
-    - id: CP14AnimalHide
+    - id: CP14Leather1
       amount: 2
       maxAmount: 4
-    - id: CP14ScrapAnimalHide
+    - id: CP14ScrapLeather
       amount: 1
       maxAmount: 3
       prob: 0.5
-    - id: CP14RuggedAnimalHide
+    - id: CP14RuggedLeather1
       amount: 1
       prob: 0.1
     - id: CP14CheapFur
@@ -315,7 +315,7 @@
     spawned:
     - id: CP14FoodMeatFrogLeg
       amount: 2
-    - id: CP14ScrapAnimalHide
+    - id: CP14ScrapLeather
       amount: 1
       prob: 0.5
   - type: MeleeWeapon
@@ -434,10 +434,10 @@
     - id: CP14String # As long as there are no mechanics to shearing wool, the only way to get string.
       amount: 4
       maxAmount: 16
-    - id: CP14ThinAnimalHide
+    - id: CP14ThinLeather1
       amount: 2
       maxAmount: 5
-    - id: CP14ScrapAnimalHide
+    - id: CP14ScrapLeather
       amount: 1
       maxAmount: 5
       prob: 0.3
@@ -524,10 +524,10 @@
     spawned:
     - id: CP14FoodMeatBoar # TODO
       amount: 5
-    - id: CP14RuggedAnimalHide
+    - id: CP14RuggedLeather1
       amount: 2
       maxAmount: 5
-    - id: CP14ScrapAnimalHide
+    - id: CP14ScrapLeather
       amount: 2
       maxAmount: 6
       prob: 0.5

Resources/Prototypes/_CP14/Entities/Mobs/NPC/dinosaurs.yml

@@ -94,11 +94,11 @@
     spawned:
     - id: CP14FoodMeatDino
       amount: 4
-    - id: CP14RuggedAnimalHide
+    - id: CP14RuggedLeather1
       amount: 1
       maxAmount: 2
       prob: 0.2
-    - id: CP14AnimalHide
+    - id: CP14Leather1
       amount: 2
       maxAmount: 4
   - type: Bloodstream
@@ -173,10 +173,10 @@
     spawned:
     - id: CP14FoodMeatHydra
       amount: 2
-    - id: CP14AnimalHide
+    - id: CP14Leather1
       amount: 1
       prob: 0.5
-    - id: CP14ScrapAnimalHide
+    - id: CP14ScrapLeather
       amount: 1
       maxAmount: 3
       prob: 0.75

Resources/Prototypes/_CP14/Entities/Mobs/NPC/mole.yml

@@ -79,13 +79,13 @@
     - id: CP14FoodMeatMonsterLeg
       amount: 1
       prob: 0.6
-    - id: CP14RuggedAnimalHide
+    - id: CP14RuggedLeather1
       amount: 1
       prob: 0.2
-    - id: CP14AnimalHide
+    - id: CP14Leather1
       amount: 1
       maxAmount: 4
-    - id: CP14ScrapAnimalHide
+    - id: CP14ScrapLeather
       amount: 1
       maxAmount: 2
       prob: 0.5

Resources/Prototypes/_CP14/Entities/Mobs/NPC/watcher.yml

@@ -107,7 +107,7 @@
     - id: CP14ModularInlayQuartzWater
       amount: 1
       prob: 0.1
-    - id: CP14ScrapAnimalHide
+    - id: CP14ScrapLeather
       amount: 1
       maxAmount: 3
       prob: 0.5
@@ -142,7 +142,7 @@
     - id: CP14ModularInlayQuartzFire
       amount: 1
       prob: 0.1
-    - id: CP14ScrapAnimalHide
+    - id: CP14ScrapLeather
       amount: 1
       maxAmount: 3
       prob: 0.5

Resources/Prototypes/_CP14/Entities/Objects/Ingredients/hide.yml

@@ -1,3 +1,11 @@
+# T0 - Rawhide Leather [None]
+# T1 - Thin Leather [By PhantomRU]
+# T2 - Coarse Leather [By PhantomRU]
+# T3 - Rugged Leather [By PhantomRU]
+# T4 - Thick Leather [None]
+# T5 - Hardened Leather [None]
+# Rough Leather ?
+
 - type: entity
   id: CP14HideBase
   parent: BaseItem
@@ -5,63 +13,165 @@
   categories: [ ForkFiltered ]
   components:
   - type: Item
-    size: Normal
+    size: Small
+    shape:
+    - 0,0,1,0 # 2x1
   - type: Sprite
     sprite: _CP14/Objects/Ingredients/hide.rsi
 
 # ================
 # Hide Types
+
+# Thin
 - type: entity
-  id: CP14ThinAnimalHide
+  id: CP14ThinLeather1
   parent: CP14HideBase
-  name: thin animal hide
+  name: thin hide
   description: Untreated thin animal hide. It seems you can push it with your finger!
+  suffix: leather T1 (1)
   components:
+  - type: Appearance
+  - type: Item
+    size: Normal
   - type: Sprite
-    state: thin_hide
+    sprite: _CP14/Objects/Ingredients/hide.rsi
+    layers:
+      - state: thin_hide1
+        map: ["base"]
+  - type: Stack
+    stackType: CP14ThinLeather
+    count: 1
+    baseLayer: base
+    layerStates:
+    - thin_hide1
+    - thin_hide2
+    - thin_hide3
+  - type: Material
   - type: PhysicalComposition
     materialComposition:
-      CP14Leather: 10 # 5*2 ~~~ Gives 2 leather when crafted on a tanner table (LeatherWorking/tanner.yml)
+      CP14Leather: 5
 
 - type: entity
-  id: CP14AnimalHide
+  id: CP14ThinLeather3
+  parent: CP14ThinLeather1
+  suffix: leather T1 (3)
+  components:
+    - type: Stack
+      count: 2
+
+- type: entity
+  id: CP14ThinLeather5
+  parent: CP14ThinLeather1
+  suffix: leather T1 (5)
+  components:
+    - type: Stack
+      count: 5
+
+# Coarse
+- type: entity
+  id: CP14Leather1
   parent: CP14HideBase
-  name: animal hide
+  name: coarse hide
   description: Untreated animal hide. It would make a great pouch.
+  suffix: leather T2 (1)
   components:
+  - type: Appearance
+  - type: Item
+    size: Normal
+    shape:
+    - 0,0,1,1 # 2x2
   - type: Sprite
-    state: hide
+    sprite: _CP14/Objects/Ingredients/hide.rsi
+    layers:
+      - state: hide1
+        map: ["base"]
+  - type: Stack
+    stackType: CP14Leather
+    count: 1
+    baseLayer: base
+    layerStates:
+    - hide1
+    - hide2
+    - hide3
+  - type: Material
   - type: PhysicalComposition
     materialComposition:
-      CP14Leather: 20 # 10*2 ~~~ Gives 2 leather when crafted on a tanner table (LeatherWorking/tanner.yml)
+      CP14Leather: 12 # 10 + 2 additional
 
 - type: entity
-  id: CP14RuggedAnimalHide
+  id: CP14Leather3
+  parent: CP14Leather1
+  suffix: leather T2 (3)
+  components:
+    - type: Stack
+      count: 3
+
+- type: entity
+  id: CP14Leather5
+  parent: CP14Leather1
+  suffix: leather T2 (5)
+  components:
+    - type: Stack
+      count: 5
+
+# Rugged
+- type: entity
+  id: CP14RuggedLeather1
   parent: CP14HideBase
   name: rugged hide
   description: Durable animal hide. It would make great expensive boots or even protect against cuts.
+  suffix: leather T3 (1)
   components:
+  - type: Appearance
   - type: Item
     size: Normal
     shape:
     - 0,0,2,1 # 3x2
   - type: Sprite
-    state: rugged_hide
+    sprite: _CP14/Objects/Ingredients/hide.rsi
+    layers:
+      - state: rugged_hide1
+        map: ["base"]
+  - type: Stack
+    stackType: CP14RuggedLeather
+    count: 1
+    baseLayer: base
+    layerStates:
+    - rugged_hide1
+    - rugged_hide2
+    - rugged_hide3
+  - type: Material
   - type: PhysicalComposition
     materialComposition:
-      CP14Leather: 50 # 25*2 ~~~ Gives 2 leather when crafted on a tanner table (LeatherWorking/tanner.yml)
+      CP14Leather: 27 # 25 + 3 additional
+
+- type: entity
+  id: CP14RuggedLeather3
+  parent: CP14RuggedLeather1
+  suffix: leather T3 (3)
+  components:
+    - type: Stack
+      count: 3
+
+- type: entity
+  id: CP14RuggedLeather5
+  parent: CP14RuggedLeather1
+  suffix: leather T3 (5)
+  components:
+    - type: Stack
+      count: 5
 
 # Pieces of hide to assemble whole hide.
 - type: entity
-  id: CP14ScrapAnimalHide
+  id: CP14ScrapLeather
   parent: CP14HideBase
   name: scraps of hide
   description: Scraps of skin, someone cut it off carelessly!
   components:
   - type: Item
-    size: Tiny
+    size: Tiny # 1x1
   - type: Sprite
     state: scrap_hide
   - type: PhysicalComposition
     materialComposition:
-      CP14Leather: 3
+      CP14Leather: 3

Resources/Prototypes/_CP14/Entities/Objects/Ingredients/leather.yml

@@ -1,106 +0,0 @@
-# T0 - Rawhide Leather [None]
-# T1 - Thin Leather [By PhantomRU]
-# T2 - Coarse Leather [By PhantomRU]
-# T3 - Rugged Leather [By PhantomRU]
-# T4 - Thick Leather [None]
-# T5 - Hardened Leather [None]
-# Rough Leather ?
-
-- type: entity
-  id: CP14LeatherBase
-  parent: BaseItem
-  abstract: true
-  categories: [ ForkFiltered ]
-  components:
-  - type: Item
-    size: Small
-  - type: Sprite
-    sprite: _CP14/Objects/Ingredients/leather.rsi
-
-# ================
-# Leather Types
-- type: entity
-  id: CP14ThinLeather
-  parent: CP14LeatherBase
-  name: thin leather
-  description: Soft and flexible leather, perfect for lightweight items.
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/Ingredients/leather.rsi
-    state: thin_leather
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Leather: 5 # x0.5 Leather from hide
-      CP14SaltStone: 5 # x0.5 Salt
-
-- type: entity
-  id: CP14Leather
-  parent: CP14LeatherBase
-  name: coarse leather
-  description: Standard quality leather for various crafts.
-  components:
-  - type: Item
-    size: Normal
-  - type: Sprite
-    sprite: _CP14/Objects/Ingredients/leather.rsi
-    state: leather
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Leather: 10 # x1 Leather from hide
-      CP14SaltStone: 10 # x1 Salt
-
-- type: entity
-  id: CP14RuggedLeather
-  parent: CP14LeatherBase
-  name: rugged leather
-  description: Thick and durable leather.
-  components:
-  - type: Item
-    size: Normal
-  - type: Sprite
-    sprite: _CP14/Objects/Ingredients/leather.rsi
-    state: rugged_leather
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Leather: 25 # x2.5 Leather from hide
-      CP14SaltStone: 20 # x2 Salt
-
-# ================
-# Straps
-- type: entity
-  id: CP14LeatherStrap
-  parent: CP14LeatherBase
-  name: leather strap
-  description: A flexible strap made of leather, used in various crafts.
-  components:
-  - type: Item
-    size: Small
-    shape:
-    - 0,0,1,0 # 2x1
-  - type: Sprite
-    sprite: _CP14/Objects/Ingredients/leather.rsi
-    state: strap
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Leather: 3 # 2.5 ~~~ 1/4 leather (10u)
-      CP14SaltStone: 3 # 1/4 Salt (10u)
-      CP14Cloth: 3 # 2.5 ~~~ 1/2 CP14String (5u)
-
-- type: entity
-  id: CP14RuggedStrap
-  parent: CP14LeatherBase
-  name: reinforced strap
-  description: A sturdy strap reinforced with additional layers.
-  components:
-  - type: Item
-    size: Small
-    shape:
-    - 0,0,1,0 # 2x1
-  - type: Sprite
-    sprite: _CP14/Objects/Ingredients/leather.rsi
-    state: rugged_strap
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Leather: 6 # 6.25 or 1/4 rugged leather (25u)
-      CP14SaltStone: 5 # 1/4 Salt (20u)
-      CP14Cloth: 5 # 1x CP14String (5u)

Resources/Prototypes/_CP14/Entities/Objects/Materials/misc.yml

@@ -118,48 +118,3 @@
   components:
   - type: Stack
     count: 10
-
-# Salt
-- type: entity
-  id: CP14SaltStone1
-  parent: BaseItem
-  name: Salt
-  description: A crystalline mineral used to season and preserve food.
-  categories: [ ForkFiltered ]
-  components:
-  - type: Item
-    size: Normal
-  - type: Appearance
-  - type: Sprite
-    sprite: _CP14/Objects/Materials/salt_stone.rsi
-    layers:
-      - state: salt1
-        map: ["base"]
-  - type: Stack
-    stackType: CP14SaltStone
-    count: 1
-    baseLayer: base
-    layerStates:
-    - salt1
-    - salt2
-    - salt3
-  - type: Material
-  - type: PhysicalComposition
-    materialComposition:
-      CP14SaltStone: 10
-
-- type: entity
-  id: CP14SaltStone5
-  parent: CP14SaltStone1
-  suffix: 5
-  components:
-  - type: Stack
-    count: 5
-
-- type: entity
-  id: CP14SaltStone10
-  parent: CP14SaltStone1
-  suffix: 10
-  components:
-  - type: Stack
-    count: 10

Resources/Prototypes/_CP14/Materials/simple.yml

@@ -131,18 +131,9 @@
   color: "#2d313c"
   price: 0
 
-- type: material
-  id: CP14SaltStone
-  stackEntity: CP14SaltStone1
-  name: cp14-material-salt
-  unit: cp14-materials-unit-pile
-  icon: { sprite: _CP14/Objects/Materials/salt_stone.rsi, state: salt1 }
-  color: "#85a6a8"
-  price: 0.4
-
 - type: material
   id: CP14Leather
-  #stackEntity: CP14Leather
+  stackEntity: CP14Leather1
   name: cp14-material-leather
   unit: materials-unit-roll
   icon: { sprite: _CP14/Objects/Ingredients/leather.rsi, state: leather }

Resources/Prototypes/_CP14/Recipes/Workbench/LeatherWorking/backpacks.yml

@@ -6,13 +6,10 @@
   requirements:
   - !type:StackResource
     stack: CP14Cloth
-    count: 10 # 100u CP14Cloth ~~~ CP14Cloth (10u)
+    count: 5 # 50u CP14Cloth ~~~ CP14Cloth (10u)
   - !type:ProtoIdResource
     protoId: CP14String
-    count: 4 # 20u CP14Cloth ~~~ 1/2 CP14Cloth (5u)
-  - !type:ProtoIdResource
-    protoId: CP14IronBuckle
-    count: 1 # 2u CP14Iron ~~~ 1/5 iron bar (10u)
+    count: 2 # 10u CP14Cloth ~~~ 1/2 CP14Cloth (5u)
   result: CP14ClothingBackBackpackT0
 
 - type: CP14Recipe
@@ -20,103 +17,103 @@
   tag: CP14RecipeLeatherWorking
   craftTime: 4
   requirements:
-  - !type:ProtoIdResource
-    protoId: CP14ThinLeather
-    count: 8 # 40u CP14Leather ~~~ 1/2 CP14Leather (5u)
-  - !type:ProtoIdResource
-    protoId: CP14LeatherStrap
-    count: 2 # 6u CP14Leather ~~~ 1/4 CP14Leather (2.5u)
+  - !type:StackResource
+    stack: CP14ThinLeather
+    count: 4 # 20u CP14Leather ~~~ 1/2 CP14Leather (5u)
   - !type:ProtoIdResource
     protoId: CP14IronBuckle
     count: 1 # 2u CP14Iron ~~~ 1/5 iron bar (10u)
   result: CP14ClothingBackBackpackT1
+  # Total Leather: 20u (4x thin hide)
 
 - type: CP14Recipe
   id: CP14ClothingBackBackpackT2
   tag: CP14RecipeLeatherWorking
   craftTime: 6
   requirements:
-  - !type:ProtoIdResource
-    protoId: CP14Leather
-    count: 8 # 80u CP14Leather ~~~ CP14Leather (10u)
-  - !type:ProtoIdResource
-    protoId: CP14LeatherStrap
-    count: 4 # 12u CP14Leather ~~~ 1/4 CP14Leather (2.5u)
+  - !type:StackResource
+    stack: CP14ThinLeather
+    count: 4 # 20u CP14Leather ~~~ 1/2 CP14Leather (5u)
+  - !type:StackResource
+    stack: CP14Leather
+    count: 4 # 40u CP14Leather ~~~ CP14Leather (10u)
   - !type:ProtoIdResource
     protoId: CP14IronBuckle
     count: 2 # 4u CP14Iron ~~~ 1/5 iron bar (10u)
   result: CP14ClothingBackBackpackT2
+  # Total Leather: 60u (20u thin + 40u regular)
 
 - type: CP14Recipe
   id: CP14ClothingBackBackpackT3
   tag: CP14RecipeLeatherWorking
   craftTime: 10
   requirements:
-  - !type:ProtoIdResource
-    protoId: CP14RuggedLeather
-    count: 8 # 200u CP14Leather ~~~ CP14RuggedLeather (25u)
-  - !type:ProtoIdResource
-    protoId: CP14RuggedStrap
-    count: 4 # 24u CP14Leather ~~~ 1/4 CP14RuggedLeather (6.25u)
+  - !type:StackResource
+    stack: CP14Leather
+    count: 4 # 40u CP14Leather ~~~ CP14Leather (10u)
+  - !type:StackResource
+    stack: CP14RuggedLeather
+    count: 3 # 75u CP14Leather ~~~ CP14RuggedLeather (25u)
   - !type:ProtoIdResource
     protoId: CP14IronBuckle
-    count: 2 # 4u CP14Iron ~~~ 1/5 iron bar (10u)
+    count: 3 # 6u CP14Iron ~~~ 1/5 iron bar (10u)
   result: CP14ClothingBackBackpackT3
+  # Total Leather: 105u (40u regular + 75u rugged)
 
 # ======================================
 # Upgrade Recipes with Material Tracking
 # ======================================
 
-# Backpack T1 Upgrade (Precise Leather Calculation)
+# Backpack T1 Upgrade
 - type: CP14Recipe
   id: CP14ClothingBackBackpackT1_Upgrade
   tag: CP14RecipeLeatherWorking
   craftTime: 6
   requirements:
   - !type:ProtoIdResource
-    protoId: CP14ClothingBackBackpackT0  # Contains 100u CP14Cloth (10u)
+    protoId: CP14ClothingBackBackpackT0  # Base backpack
     count: 1
-  - !type:ProtoIdResource
-    protoId: CP14Leather             # +20u CP14Leather (2x10u)
+  - !type:StackResource
+    stack: CP14ThinLeather         # +10u CP14Leather (2x5u)
     count: 2
   - !type:ProtoIdResource
-    protoId: CP14LeatherStrap        # 6u CP14Leather (2x3u)
-    count: 2
+    protoId: CP14IronBuckle
+    count: 1 # 2u CP14Iron
   result: CP14ClothingBackBackpackT1
-  # Total Leather: 100u (cloth) + 20u + 6u = 36u vs original 40u+6u=46u
+  # Total Materials: 50u cloth + 10u leather
 
-# Backpack T2 Upgrade (Exact Leather Carryover)
+# Backpack T2 Upgrade
 - type: CP14Recipe
   id: CP14ClothingBackBackpackT2_Upgrade
   tag: CP14RecipeLeatherWorking
   craftTime: 8
   requirements:
   - !type:ProtoIdResource
-    protoId: CP14ClothingBackBackpackT1  # 40u (thin) + 6u (straps)
+    protoId: CP14ClothingBackBackpackT1  # Contains 20u leather
     count: 1
-  - !type:ProtoIdResource
-    protoId: CP14Leather             # +40u CP14Leather (4x10u)
+  - !type:StackResource
+    stack: CP14Leather             # +30u CP14Leather (3x10u)
     count: 4
   - !type:ProtoIdResource
-    protoId: CP14LeatherStrap        # 12u CP14Leather (4x3u)
-    count: 4
+    protoId: CP14IronBuckle
+    count: 1 # Additional 2u iron
   result: CP14ClothingBackBackpackT2
-  # Total Leather: 40u+6u + 40u+12u = 98u vs original 80u+12u=92u
+  # Total Materials: 50u leather (20u + 30u)
 
-# Backpack T3 Upgrade (Rugged Conversion)
+# Backpack T3 Upgrade
 - type: CP14Recipe
   id: CP14ClothingBackBackpackT3_Upgrade
   tag: CP14RecipeLeatherWorking
   craftTime: 12
   requirements:
   - !type:ProtoIdResource
-    protoId: CP14ClothingBackBackpackT2  # 80u + 12u = 92u (46u rugged equiv)
+    protoId: CP14ClothingBackBackpackT2  # Contains 60u leather
     count: 1
+  - !type:StackResource
+    stack: CP14RuggedLeather       # +50u CP14Leather (2x25u)
+    count: 2
   - !type:ProtoIdResource
-    protoId: CP14RuggedLeather       # 100u CP14Leather (4x25u)
-    count: 4
-  - !type:ProtoIdResource
-    protoId: CP14RuggedStrap         # 24u CP14Leather (4x6u)
-    count: 4
+    protoId: CP14IronBuckle
+    count: 1 # Additional 2u iron
   result: CP14ClothingBackBackpackT3
-  # Total Leather: 92u + 100u + 24u = 216u (108u rugged equiv) vs original 200u+24u=224u
+  # Total Materials: 110u leather (60u + 50u)

Resources/Prototypes/_CP14/Recipes/Workbench/LeatherWorking/backpacks_explorer.yml

@@ -6,13 +6,7 @@
 #   requirements:
 #   - !type:StackResource
 #     stack: CP14Cloth
-#     count: 6 # 60u CP14Cloth ~~~ CP14Cloth (10u)
-#   - !type:StackResource
-#     stack: CP14String
-#     count: 4 # 20u CP14Cloth ~~~ CP14Cloth (5u)
-#   - !type:ProtoIdResource
-#     protoId: CP14IronBuckle
-#     count: 8 # 16u CP14Iron ~~~ 1/5 iron bar (10u)
+#     count: 3 # 30u CP14Cloth ~~~ CP14Cloth (10u)
 #   result: CP14ClothingBackExplorerBackpackT0
 
 # - type: CP14Recipe
@@ -20,15 +14,12 @@
 #   tag: CP14RecipeLeatherWorking
 #   craftTime: 4
 #   requirements:
-#   - !type:ProtoIdResource
-#     protoId: CP14ThinLeather
-#     count: 6 # 30u CP14Leather ~~~ CP14ThinLeather (5u)
-#   - !type:ProtoIdResource
-#     protoId: CP14LeatherStrap
-#     count: 2 # 6u CP14Leather ~~~ CP14LeatherStrap (3u)
+#   - !type:StackResource
+#     stack: CP14ThinLeather
+#     count: 3 # 15u CP14Leather ~~~ CP14ThinLeather (5u)
 #   - !type:ProtoIdResource
 #     protoId: CP14IronBuckle
-#     count: 10 # 20u CP14Iron ~~~ 1/5 iron bar (10u)
+#     count: 8 # 16u CP14Iron ~~~ 1/5 iron bar (10u)
 #   result: CP14ClothingBackExplorerBackpackT1
 
 # - type: CP14Recipe
@@ -36,15 +27,15 @@
 #   tag: CP14RecipeLeatherWorking
 #   craftTime: 6
 #   requirements:
-#   - !type:ProtoIdResource
-#     protoId: CP14Leather
-#     count: 6 # 60u CP14Leather ~~~ CP14Leather (10u)
-#   - !type:ProtoIdResource
-#     protoId: CP14LeatherStrap
-#     count: 4 # 12u CP14Leather ~~~ CP14LeatherStrap (3u)
+#   - !type:StackResource
+#     stack: CP14ThinLeather
+#     count: 3 # 15u CP14Leather ~~~ CP14ThinLeather (5u)
+#   - !type:StackResource
+#     stack: CP14Leather
+#     count: 3 # 30u CP14Leather ~~~ CP14Leather (10u)
 #   - !type:ProtoIdResource
 #     protoId: CP14IronBuckle
-#     count: 12 # 24u CP14Iron ~~~ 1/5 iron bar (10u)
+#     count: 10 # 20u CP14Iron ~~~ 1/5 iron bar (10u)
 #   result: CP14ClothingBackExplorerBackpackT2
 
 # - type: CP14Recipe
@@ -52,15 +43,15 @@
 #   tag: CP14RecipeLeatherWorking
 #   craftTime: 10
 #   requirements:
-#   - !type:ProtoIdResource
-#     protoId: CP14RuggedLeather
-#     count: 6 # 150u CP14Leather ~~~ CP14RuggedLeather (25u)
-#   - !type:ProtoIdResource
-#     protoId: CP14RuggedStrap
-#     count: 4 # 24u CP14Leather ~~~ CP14RuggedStrap (6u)
+#   - !type:StackResource
+#     stack: CP14Leather
+#     count: 3 # 30u CP14Leather ~~~ CP14Leather (10u)
+#   - !type:StackResource
+#     stack: CP14RuggedLeather
+#     count: 2 # 50u CP14Leather ~~~ CP14RuggedLeather (25u)
 #   - !type:ProtoIdResource
 #     protoId: CP14IronBuckle
-#     count: 12 # 24u CP14Iron ~~~ 1/5 iron bar (10u)
+#     count: 10 # 20u CP14Iron ~~~ 1/5 iron bar (10u)
 #   result: CP14ClothingBackExplorerBackpackT3
 
 # # ======================================
@@ -74,19 +65,16 @@
 #   craftTime: 6
 #   requirements:
 #   - !type:ProtoIdResource
-#     protoId: CP14ClothingBackExplorerBackpackT0  # 60u cloth + 20u string = 80u (8u leather equiv)
+#     protoId: CP14ClothingBackExplorerBackpackT0  # 60u cloth (6u)
+#     count: 1
+#   - !type:StackResource
+#     stack: CP14ThinLeather                 # +15u CP14Leather (3x5u)
 #     count: 1
 #   - !type:ProtoIdResource
-#     protoId: CP14ThinLeather                 # +15u CP14Leather (3x5u)
-#     count: 3
-#   - !type:ProtoIdResource
-#     protoId: CP14IronBuckle                  # +16u CP14Iron (8x2u)
-#     count: 8
+#     protoId: CP14IronBuckle
+#     count: 8 # 16u CP14Iron ~~~ 1/5 iron bar (10u)
 #   result: CP14ClothingBackExplorerBackpackT1
-#   # Leather Logic:
-#   # T0 provides 3 leather, needs 6 total (3 new thin = 1.5 normal)
-#   # Net 4.5/6 leather (75%) since buckles are main cost
-#   # Total Leather: 8u + 15u = 23u vs original 30u
+#   # Total Leather: 60u (cloth) + 15u = 75u
 
 # # Explorer T2 Upgrade (Leather Accumulation)
 # - type: CP14Recipe
@@ -95,20 +83,16 @@
 #   craftTime: 8
 #   requirements:
 #   - !type:ProtoIdResource
-#     protoId: CP14ClothingBackExplorerBackpackT1  # 30u + 6u = 36u
+#     protoId: CP14ClothingBackExplorerBackpackT1  # 15u (thin)
 #     count: 1
-#   - !type:ProtoIdResource
-#     protoId: CP14Leather                     # +30u CP14Leather (3x10u)
+#   - !type:StackResource
+#     stack: CP14Leather                     # +30u CP14Leather (3x10u)
 #     count: 3
 #   - !type:ProtoIdResource
-#     protoId: CP14IronBuckle                  # +20u CP14Iron (10x2u)
-#     count: 10
+#     protoId: CP14IronBuckle
+#     count: 2 # 4u CP14Iron ~~~ 1/5 iron bar (10u)
 #   result: CP14ClothingBackExplorerBackpackT2
-#   # Progression:
-#   # T1 provides 4.5/6 leather (75%)
-#   # T2 adds 3/6 (50%) for total 7.5/12 (62.5%)
-#   # Buckles reduced by 16% to compensate
-#   # Total Leather: 36u + 30u = 66u vs original 60u
+#   # Total Leather: 15u + 30u = 45u
 
 # # Explorer T3 Upgrade (Rugged Premium)
 # - type: CP14Recipe
@@ -117,17 +101,10 @@
 #   craftTime: 12
 #   requirements:
 #   - !type:ProtoIdResource
-#     protoId: CP14ClothingBackExplorerBackpackT2  # 60u + 12u = 72u (36u rugged equiv)
+#     protoId: CP14ClothingBackExplorerBackpackT2  # 15u + 30u = 45u
 #     count: 1
-#   - !type:ProtoIdResource
-#     protoId: CP14RuggedLeather               # +75u CP14Leather (3x25u)
-#     count: 3
-#   - !type:ProtoIdResource
-#     protoId: CP14IronBuckle                  # +20u CP14Iron (10x2u)
-#     count: 10
+#   - !type:StackResource
+#     stack: CP14RuggedLeather               # +50u CP14Leather (2x25u)
+#     count: 2
 #   result: CP14ClothingBackExplorerBackpackT3
-#   # Final Balance:
-#   # T2's 7.5 normal = 3.75 rugged
-#   # Add 3 new rugged = 6.75 total vs original 6
-#   # Slight overpayment compensates for buckle savings
-#   # Total Leather: 72u + 75u = 147u (73.5u rugged equiv) vs original 150u
+#   # Total Leather: 45u + 50u = 95u

Resources/Prototypes/_CP14/Recipes/Workbench/LeatherWorking/backpacks_satchels.yml

@@ -6,13 +6,13 @@
   requirements:
   - !type:StackResource
     stack: CP14Cloth
-    count: 8 # 80u CP14Cloth ~~~ CP14Cloth (10u)
+    count: 4 # 40u CP14Cloth ~~~ CP14Cloth (10u)
   - !type:ProtoIdResource
     protoId: CP14String
-    count: 8 # 40u CP14Cloth ~~~ CP14Cloth (5u)
+    count: 2 # 10u CP14Cloth ~~~ 1/2 CP14Cloth (5u)
   - !type:ProtoIdResource
     protoId: CP14IronBuckle
-    count: 3 # 6u CP14Iron ~~~ 1/5 iron bar (10u)
+    count: 1 # 2u CP14Iron ~~~ 1/5 iron bar (10u)
   result: CP14ClothingBackSatchelT0
 
 - type: CP14Recipe
@@ -20,15 +20,12 @@
   tag: CP14RecipeLeatherWorking
   craftTime: 4
   requirements:
-  - !type:ProtoIdResource
-    protoId: CP14ThinLeather
-    count: 6 # 30u CP14Leather ~~~ CP14ThinLeather (5u)
-  - !type:ProtoIdResource
-    protoId: CP14LeatherStrap
-    count: 10 # 30u CP14Leather ~~~ CP14LeatherStrap (3u)
+  - !type:StackResource
+    stack: CP14ThinLeather
+    count: 3 # 15u CP14Leather ~~~ CP14ThinLeather (5u)
   - !type:ProtoIdResource
     protoId: CP14IronBuckle
-    count: 4 # 8u CP14Iron ~~~ 1/5 iron bar (10u)
+    count: 3 # 6u CP14Iron ~~~ 1/5 iron bar (10u)
   result: CP14ClothingBackSatchelT1
 
 - type: CP14Recipe
@@ -36,15 +33,15 @@
   tag: CP14RecipeLeatherWorking
   craftTime: 6
   requirements:
-  - !type:ProtoIdResource
-    protoId: CP14Leather
-    count: 6 # 60u CP14Leather ~~~ CP14Leather (10u)
-  - !type:ProtoIdResource
-    protoId: CP14LeatherStrap
-    count: 12 # 36u CP14Leather ~~~ CP14LeatherStrap (3u)
+  - !type:StackResource
+    stack: CP14ThinLeather
+    count: 3 # 15u CP14Leather ~~~ CP14ThinLeather (5u)
+  - !type:StackResource
+    stack: CP14Leather
+    count: 3 # 30u CP14Leather ~~~ CP14Leather (10u)
   - !type:ProtoIdResource
     protoId: CP14IronBuckle
-    count: 6 # 12u CP14Iron ~~~ 1/5 iron bar (10u)
+    count: 5 # 10u CP14Iron ~~~ 1/5 iron bar (10u)
   result: CP14ClothingBackSatchelT2
 
 - type: CP14Recipe
@@ -52,15 +49,15 @@
   tag: CP14RecipeLeatherWorking
   craftTime: 10
   requirements:
-  - !type:ProtoIdResource
-    protoId: CP14RuggedLeather
-    count: 6 # 150u CP14Leather ~~~ CP14RuggedLeather (25u)
-  - !type:ProtoIdResource
-    protoId: CP14RuggedStrap
-    count: 12 # 72u CP14Leather ~~~ CP14RuggedStrap (6u)
+  - !type:StackResource
+    stack: CP14Leather
+    count: 3 # 30u CP14Leather ~~~ CP14Leather (10u)
+  - !type:StackResource
+    stack: CP14RuggedLeather
+    count: 2 # 50u CP14Leather ~~~ CP14RuggedLeather (25u)
   - !type:ProtoIdResource
     protoId: CP14IronBuckle
-    count: 6 # 12u CP14Iron ~~~ 1/5 iron bar (10u)
+    count: 7 # 14u CP14Iron ~~~ 1/5 iron bar (10u)
   result: CP14ClothingBackSatchelT3
 
 # ======================================
@@ -74,16 +71,16 @@
   craftTime: 6
   requirements:
   - !type:ProtoIdResource
-    protoId: CP14ClothingBackSatchelT0  # 80u cloth + 40u string = 120u (12u leather equiv)
+    protoId: CP14ClothingBackSatchelT0  # 40u cloth
+    count: 1
+  - !type:StackResource
+    stack: CP14ThinLeather        # +15u CP14Leather (3x5u)
     count: 1
   - !type:ProtoIdResource
-    protoId: CP14ThinLeather        # +10u CP14Leather (2x5u)
-    count: 2
-  - !type:ProtoIdResource
-    protoId: CP14LeatherStrap       # +30u CP14Leather (10x3u)
-    count: 6
+    protoId: CP14IronBuckle
+    count: 3 # 6u CP14Iron ~~~ 1/5 iron bar (10u)
   result: CP14ClothingBackSatchelT1
-  # Total Leather: 12u + 10u + 30u = 52u vs original 30u+30u=60u
+  # Total Materials: 40u cloth + 15u Leather
 
 # Satchel T2 Upgrade (Leather Optimization)
 - type: CP14Recipe
@@ -92,16 +89,16 @@
   craftTime: 8
   requirements:
   - !type:ProtoIdResource
-    protoId: CP14ClothingBackSatchelT1  # 30u + 30u = 60u
+    protoId: CP14ClothingBackSatchelT1  # 15u (thin)
     count: 1
+  - !type:StackResource
+    stack: CP14Leather            # +30u CP14Leather (3x10u)
+    count: 3
   - !type:ProtoIdResource
-    protoId: CP14Leather            # +20u CP14Leather (2x10u)
-    count: 2
-  - !type:ProtoIdResource
-    protoId: CP14LeatherStrap       # +18u CP14Leather (6x3u)
-    count: 6
+    protoId: CP14IronBuckle
+    count: 2 # 4u CP14Iron ~~~ 1/5 iron bar (10u)
   result: CP14ClothingBackSatchelT2
-  # Total Leather: 60u + 20u + 18u = 98u vs original 60u+36u=96u
+  # Total Leather: 15u + 30u = 45u
 
 # Satchel T3 Upgrade (Rugged Transition)
 - type: CP14Recipe
@@ -110,13 +107,13 @@
   craftTime: 12
   requirements:
   - !type:ProtoIdResource
-    protoId: CP14ClothingBackSatchelT2  # 60u + 36u = 96u (48u rugged equiv)
+    protoId: CP14ClothingBackSatchelT2  # 15u + 30u = 45u
     count: 1
-  - !type:ProtoIdResource
-    protoId: CP14RuggedLeather       # +50u CP14Leather (2x25u)
+  - !type:StackResource
+    stack: CP14RuggedLeather       # +50u CP14Leather (2x25u)
     count: 2
   - !type:ProtoIdResource
-    protoId: CP14RuggedStrap         # +36u CP14Leather (6x6u)
-    count: 6
+    protoId: CP14IronBuckle
+    count: 2 # 4u CP14Iron ~~~ 1/5 iron bar (10u)
   result: CP14ClothingBackSatchelT3
-  # Total Leather: 96u + 50u + 36u = 182u vs original 150u+72u=222u
+  # Total Leather: 45u + 50u = 95u

Resources/Prototypes/_CP14/Recipes/Workbench/LeatherWorking/belts.yml

@@ -0,0 +1,34 @@
+
+# ================
+# Leather belts crafting
+
+- type: CP14Recipe
+  id: CP14ClothingBeltQuiverRecipe
+  tag: CP14RecipeLeatherWorking
+  craftTime: 1
+  requirements:
+  - !type:StackResource
+    stack: CP14Leather
+    count: 2 # 20u leather
+  - !type:ProtoIdResource
+    protoId: CP14String
+    count: 4 # 20u cloth
+  result: CP14ClothingBeltQuiver
+  # Cost: (20×1.2) + (20×0.3) = 24 + 6 = 30 copper coins
+
+- type: CP14Recipe
+  id: CP14ClothingBeltPouchPotionsRecipe
+  tag: CP14RecipeLeatherWorking
+  craftTime: 1
+  requirements:
+  - !type:StackResource
+    stack: CP14Leather
+    count: 1 # 10u leather
+  - !type:StackResource
+    stack: CP14Cloth
+    count: 1 # 10u cloth
+  - !type:ProtoIdResource
+    protoId: CP14String
+    count: 4 # 20u cloth
+  result: CP14ClothingBeltPouchPotions
+  # Cost: (15×1.2) + (20×0.3) + (10×0.3) = 12 + 6 + 3 = 21 copper coins

Resources/Prototypes/_CP14/Recipes/Workbench/LeatherWorking/tanner.yml

@@ -2,180 +2,31 @@
 # Hide
 # ================
 # Crafting Recipes
-# Leather Processing
-- type: CP14Recipe
-  id: CP14ThinHideRecipe
-  tag: CP14RecipeLeatherWorking
-  craftTime: 1
-  requirements:
-  - !type:ProtoIdResource
-    protoId: CP14ThinAnimalHide
-    count: 1 # 10u leather
-  - !type:StackResource
-    stack: CP14SaltStone
-    count: 1 # 10u salt
-  result: CP14ThinLeather
-  resultCount: 2 # 2x thin leather (5u leather + 5u salt each)
-  # Cost: (10×1.2) + (10×0.4) = 12 + 4 = 16 copper coins
-
-- type: CP14Recipe
-  id: CP14HideRecipe
-  tag: CP14RecipeLeatherWorking
-  craftTime: 1
-  requirements:
-  - !type:ProtoIdResource
-    protoId: CP14AnimalHide
-    count: 1 # 20u leather
-  - !type:StackResource
-    stack: CP14SaltStone
-    count: 2 # 20u salt
-  result: CP14Leather
-  resultCount: 2 # 2x leather (10u leather + 10u salt each)
-  # Cost: (20×1.2) + (20×0.4) = 24 + 8 = 32 copper coins
-
-- type: CP14Recipe
-  id: CP14RuggedAnimalHideRecipe
-  tag: CP14RecipeLeatherWorking
-  craftTime: 2
-  requirements:
-  - !type:ProtoIdResource
-    protoId: CP14RuggedAnimalHide
-    count: 1 # 50u leather
-  - !type:StackResource
-    stack: CP14SaltStone
-    count: 4 # 40u salt
-  result: CP14RuggedLeather
-  resultCount: 2 # 2x rugged leather (25u leather + 20u salt total, 12.5u + 10u each)
-  # Cost: (50×1.2) + (40×0.4) = 60 + 16 = 76 copper coins
-
+# Hide Crafting
 - type: CP14Recipe
   id: CP14ScrapHideRecipe
   tag: CP14RecipeLeatherWorking
   craftTime: 2
   requirements:
   - !type:ProtoIdResource
-    protoId: CP14ScrapAnimalHide
-    count: 3 # 3x scraps (15u total)
+    protoId: CP14ScrapLeather
+    count: 3 # 3x scraps (9u total)
   - !type:ProtoIdResource
     protoId: CP14String
-    count: 3 # 15u cloth
-  result: CP14AnimalHide
-  resultCount: 1 # 1x hide (20u) = 24 copper coins
-  # Cost: (15×1.2) + (15×0.3) = 18 + 4.5 = 22.5 copper coins
+    count: 1 # 5u cloth
+  result: CP14Leather1
+  # Cost: (15×1.2) + (5×0.3) = 18 + 1.5 = 19.5 copper coins
 
-# ================
-# Leather Crafting
 - type: CP14Recipe
-  id: CP14ThinToNormalLeatherRecipe
+  id: CP14ThinToRegularHideRecipe
   tag: CP14RecipeLeatherWorking
   craftTime: 2
   requirements:
-  - !type:ProtoIdResource
-    protoId: CP14LeatherStrap
-    count: 2 # 6u leather + 6u salt
+  - !type:StackResource
+    stack: CP14ThinLeather # 5u
+    count: 2 # 10u CP14Leather
   - !type:ProtoIdResource
     protoId: CP14String
-    count: 3 # 15u cloth
-  result: CP14Leather
-  resultCount: 1 # 10u leather + 10u salt
-  # Cost: (6×1.2) + (6×0.4) + (15×0.3) = 7.2 + 2.4 + 4.5 = 14.1 copper coins
-
-# ================
-# Straps Crafting
-- type: CP14Recipe
-  id: CP14ThinLeatherStrapRecipe
-  tag: CP14RecipeLeatherWorking
-  craftTime: 1
-  requirements:
-  - !type:ProtoIdResource
-    protoId: CP14ThinLeather
-    count: 1 # 5u leather + 5u salt
-  - !type:ProtoIdResource
-    protoId: CP14String
-    count: 4 # 20u cloth
-  result: CP14LeatherStrap
-  resultCount: 3 # 3x straps (3u leather + 3u salt total, 1u + 1u each)
-  # Cost: (5×1.2) + (5×0.4) + (20×0.3) = 6 + 2 + 6 = 14 copper coins
-
-- type: CP14Recipe
-  id: CP14LeatherStrapRecipe
-  tag: CP14RecipeLeatherWorking
-  craftTime: 1
-  requirements:
-  - !type:ProtoIdResource
-    protoId: CP14Leather
-    count: 1 # 10u leather + 10u salt
-  - !type:ProtoIdResource
-    protoId: CP14String
-    count: 2 # 10u cloth
-  result: CP14LeatherStrap
-  resultCount: 4 # 4x straps (3u leather + 3u salt total, 0.6u + 0.6u each)
-  # Cost: (10×1.2) + (10×0.4) + (10×0.3) = 12 + 4 + 3 = 19 copper coins
-
-- type: CP14Recipe
-  id: CP14StringedRuggedStrapRecipe
-  tag: CP14RecipeLeatherWorking
-  craftTime: 2
-  requirements:
-  - !type:ProtoIdResource
-    protoId: CP14Leather
-    count: 1 # 10u leather + 10u salt
-  - !type:ProtoIdResource
-    protoId: CP14String
-    count: 8 # 40u cloth
-  result: CP14RuggedStrap
-  resultCount: 3 # 2x straps (6u leather + 5u salt total, 1.5u + 1.25u each)
-  # Cost: (10×1.2) + (10×0.4) + (40×0.3) = 12 + 4 + 12 = 28 copper coins
-
-- type: CP14Recipe
-  id: CP14RuggedStrapRecipe
-  tag: CP14RecipeLeatherWorking
-  craftTime: 2
-  requirements:
-  - !type:ProtoIdResource
-    protoId: CP14RuggedLeather
-    count: 1 # 25u leather + 20u salt
-  - !type:ProtoIdResource
-    protoId: CP14String
-    count: 3 # 15u cloth
-  result: CP14RuggedStrap
-  resultCount: 4 # 4x straps (6u leather + 5u salt total, 1.5u + 1.25u each)
-  # Cost: (25×1.2) + (20×0.4) + (15×0.3) = 30 + 8 + 4.5 = 42.5 copper coins
-
-
-# ================
-# Leather belts crafting
-
-- type: CP14Recipe
-  id: CP14ClothingBeltQuiverRecipe
-  tag: CP14RecipeLeatherWorking
-  craftTime: 1
-  requirements:
-  - !type:ProtoIdResource
-    protoId: CP14Leather
-    count: 3 # 30u leather + 30u salt
-  - !type:ProtoIdResource
-    protoId: CP14LeatherStrap
-    count: 2 # 6u leather + 6u salt
-  - !type:ProtoIdResource
-    protoId: CP14String
-    count: 4 # 20u cloth
-  result: CP14ClothingBeltQuiver
-  # Cost: (36×1.2) + (36×0.4) + (20×0.3) = 43.2 + 14.4 + 6 = 63.6 copper coins
-
-- type: CP14Recipe
-  id: CP14ClothingBeltPouchPotionsRecipe
-  tag: CP14RecipeLeatherWorking
-  craftTime: 1
-  requirements:
-  - !type:ProtoIdResource
-    protoId: CP14Leather
-    count: 1 # 10u leather + 10u salt
-  - !type:ProtoIdResource
-    protoId: CP14LeatherStrap
-    count: 3 # 9u leather + 9u salt
-  - !type:ProtoIdResource
-    protoId: CP14String
-    count: 4 # 20u cloth
-  result: CP14ClothingBeltPouchPotions
-  # Cost: (19×1.2) + (19×0.4) + (20×0.3) = 22.8 + 7.6 + 6 = 36.4 copper coins
+    count: 1 # 5u cloth
+  result: CP14Leather1 # 1x hide (10u)
+  # Cost: (10×1.2) + (5×0.3) = 12 + 1.5 = 13.5 copper coins

Resources/Prototypes/_CP14/Stacks/materials.yml

@@ -118,8 +118,22 @@
   maxCount: 10
 
 - type: stack
-  id: CP14SaltStone
-  name: cp14-stack-salt-stone
-  icon: { sprite: _CP14/Objects/Materials/salt_stone.rsi, state: salt1 }
-  spawn: CP14SaltStone1
-  maxCount: 10
+  id: CP14ThinLeather
+  name: cp14-stack-hide-thin
+  icon: { sprite: "_CP14/Objects/Ingredients/hide.rsi", state: thin_hide1 }
+  spawn: CP14ThinLeather1
+  maxCount: 5
+
+- type: stack
+  id: CP14Leather
+  name: cp14-stack-hide
+  icon: { sprite: "_CP14/Objects/Ingredients/hide.rsi", state: hide1 }
+  spawn: CP14Leather1
+  maxCount: 5
+
+- type: stack
+  id: CP14RuggedLeather
+  name: cp14-stack-hide-rugged
+  icon: { sprite: "_CP14/Objects/Ingredients/hide.rsi", state: rugged_hide1 }
+  spawn: CP14RuggedLeather1
+  maxCount: 5

Resources/Prototypes/_CP14/Trading/BuyPositions/butchers.yml

@@ -171,37 +171,36 @@
 # Hide
 
 - type: cp14TradingPosition
-  id: CP14ThinAnimalHide
+  id: CP14ThinLeather
   faction: Butchers
   reputationLevel: 1
   uiPosition: 7
   icon:
     sprite: _CP14/Objects/Ingredients/hide.rsi
-    state: thin_hide
+    state: thin_hide1
   service: !type:CP14BuyItemsService
-    product: CP14ThinAnimalHide
-    count: 1
+    product: CP14ThinLeather1
 
 - type: cp14TradingPosition
-  id: CP14AnimalHide
+  id: CP14Leather
   faction: Butchers
   reputationLevel: 2
   uiPosition: 7
   icon:
     sprite: _CP14/Objects/Ingredients/hide.rsi
-    state: hide
+    state: hide1
   service: !type:CP14BuyItemsService
-    product: CP14AnimalHide
+    product: CP14Leather1
     count: 1
 
 - type: cp14TradingPosition
-  id: CP14RuggedAnimalHide
+  id: CP14RuggedLeather
   faction: Butchers
   reputationLevel: 3
   uiPosition: 7
   icon:
     sprite: _CP14/Objects/Ingredients/hide.rsi
-    state: rugged_hide
+    state: rugged_hide1
   service: !type:CP14BuyItemsService
-    product: CP14RuggedAnimalHide
+    product: CP14RuggedLeather1
     count: 1

Resources/Prototypes/_CP14/Trading/BuyPositions/dwarf_mining.yml

@@ -77,17 +77,6 @@
   service: !type:CP14BuyItemsService
     product: CP14Lighter
 
-- type: cp14TradingPosition
-  id: CP14SaltStone5
-  faction: DwarfMining
-  reputationLevel: 1
-  uiPosition: 1
-  icon:
-    sprite: _CP14/Objects/Materials/salt_stone.rsi
-    state: salt1
-  service: !type:CP14BuyItemsService
-    product: CP14SaltStone5
-
 # Rep 2
 
 - type: cp14TradingPosition

Resources/Textures/_CP14/Objects/Ingredients/hide.rsi/meta.json

@@ -6,18 +6,36 @@
   },
   "license": "CC-BY-SA-4.0",
   "copyright": "Created by PhantornRU (Github)",
-  "states": [
-    {
-      "name": "thin_hide"
-    },
-    {
-      "name": "hide"
-    },
-    {
-      "name": "rugged_hide"
-    },
-    {
-      "name": "scrap_hide"
-    }
-  ]
+    "states": [
+        {
+            "name": "thin_hide1"
+        },
+        {
+            "name": "thin_hide2"
+        },
+        {
+            "name": "thin_hide3"
+        },
+        {
+            "name": "hide1"
+        },
+        {
+            "name": "hide2"
+        },
+        {
+            "name": "hide3"
+        },
+        {
+            "name": "rugged_hide1"
+        },
+        {
+            "name": "rugged_hide2"
+        },
+        {
+            "name": "rugged_hide3"
+        },
+        {
+            "name": "scrap_hide"
+        }
+    ]
 }