hides/leathers

assets/common/items/crafting_ing/hide/animal_hide.ron

@@ -1,9 +1,9 @@
 ItemDef(
-    name: "Animal Pelt",
+    name: "Animal Hide",
     description: "A pelt from an animal. Becomes leather.",
     kind: Ingredient(
-        kind: "AnimalPelt",
+        kind: "AnimalHide",
     ),
     quality: Common,
-    tags: [],
+    tags: [LeatherItem],
 )

assets/common/items/crafting_ing/hide/tough_hide.ron

@@ -0,0 +1,9 @@
+ItemDef(
+    name: "Tough Hide",
+    description: "A pelt from something fierce. Becomes leather.",
+    kind: Ingredient(
+        kind: "ToughHide",
+    ),
+    quality: Common,
+    tags: [LeatherItem],
+)

assets/common/items/crafting_ing/leather/leather_strips.ron

@@ -0,0 +1,9 @@
+ItemDef(
+    name: "Leather Strips",
+    description: "Simple and versatile.",
+    kind: Ingredient(
+        kind: "LeatherStrips",
+    ),
+    quality: Common,
+    tags: [BaseMaterial],
+)

assets/common/items/crafting_ing/leather/simple_leather.ron

@@ -0,0 +1,9 @@
+ItemDef(
+    name: "Simple Leather",
+    description: "Light and flexible.",
+    kind: Ingredient(
+        kind: "SimpleLeather",
+    ),
+    quality: Common,
+    tags: [BaseMaterial],
+)

assets/common/items/crafting_ing/leather/thick_leather.ron

@@ -0,0 +1,9 @@
+ItemDef(
+    name: "Thick Leather",
+    description: "Strong and durable.",
+    kind: Ingredient(
+        kind: "ThickLeather",
+    ),
+    quality: Common,
+    tags: [BaseMaterial],
+)

assets/common/items/crafting_ing/leather_scraps.ron

@@ -1,9 +0,0 @@
-ItemDef(
-    name: "Leather Scraps",
-    description: "Looted from animals.",
-    kind: Ingredient(
-        kind: "LeatherScraps",
-    ),
-    quality: Common,
-    tags: [BaseMaterial],
-)

assets/common/loot_tables/creature/bird_medium.ron

@@ -1,3 +1,3 @@
 [
-    (1.0, Item("common.items.crafting_ing.leather_scraps")),
+    (1.0, Item("common.items.crafting_ing.hide.animal_hide")),
 ]

assets/common/loot_tables/creature/quad_low/default.ron

@@ -1,5 +1,4 @@
 [
-    (1.5, Item("common.items.food.meat.tough_raw")),
+    (1.0, Item("common.items.food.meat.tough_raw")),
-    (0.5, Item("common.items.food.meat.tough_raw")),
+    (3.0, Item("common.items.crafting_ing.leather.leather_strips")),
-    (3.0, Item("common.items.crafting_ing.leather_scraps")),
 ]

assets/common/loot_tables/creature/quad_medium/default.ron

@@ -1,5 +1,5 @@
 [
     (1.5, Item("common.items.food.meat.beast_small_raw")),
     (0.5, Item("common.items.food.meat.beast_large_raw")),
-    (3.0, Item("common.items.crafting_ing.leather_scraps")),
+    (3.0, Item("common.items.crafting_ing.hide.tough_hide")),
 ]

assets/common/loot_tables/creature/quad_medium/ice.ron

@@ -1,4 +1,4 @@
 [
-    (1.0, Item("common.items.crafting_ing.leather_scraps")),
+    (1.0, Item("common.items.crafting_ing.hide.tough_hide")),
     (1.0, Item("common.items.crafting_ing.icy_fang")),
 ]

assets/common/loot_tables/creature/quad_small/default.ron

@@ -1,3 +1,3 @@
 [
-    (1.0, Item("common.items.crafting_ing.leather_scraps")),
+    (1.0, Item("common.items.crafting_ing.hide.animal_hide")),
 ]

assets/common/loot_tables/creature/theropod/default.ron

@@ -1,3 +1,3 @@
 [
-    (1.0, Item("common.items.crafting_ing.leather_scraps")),
+    (1.0, Item("common.items.crafting_ing.hide.tough_hide")),
 ]

assets/common/loot_tables/creature/theropod/raptor.ron

@@ -1,4 +1,4 @@
 [
-    (1.0, Item("common.items.crafting_ing.leather_scraps")),
+    (1.0, Item("common.items.crafting_ing.hide.tough_hide")),
     (1.0, Item("common.items.crafting_ing.raptor_feather")),
 ]

assets/common/loot_tables/materials/common.ron

@@ -2,5 +2,5 @@
     (1.0, Item("common.items.crafting_ing.bowl")),
     (1.0, Item("common.items.crafting_ing.empty_vial")),
     (2.0, Item("common.items.crafting_ing.cloth_scraps")),
-    (1.0, Item("common.items.crafting_ing.leather_scraps")),
+    (1.0, Item("common.items.crafting_ing.leather.leather_strips")),
 ]

assets/common/recipe_book.ron

@@ -19,7 +19,6 @@
     "sewing_set": (
         output: ("common.items.crafting_tools.sewing_set", 1),
         inputs: [
-            (Item("common.items.crafting_ing.leather_scraps"), 2),
             (Item("common.items.crafting_ing.twigs"), 4),
             (Item("common.items.crafting_ing.stones"), 2),
         ],
@@ -53,7 +52,7 @@
     "collar_basic": (
         output: ("common.items.utility.collar", 1),
         inputs: [
-            (Item("common.items.crafting_ing.leather_scraps"), 5),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 5),
             (Item("common.items.crafting_ing.ruby"), 1),
         ],
     ),
@@ -171,6 +170,20 @@
         ],
         craft_sprite: Some(CookingPot),
     ),
+    "simple_leather": (
+        output: ("common.items.crafting_ing.leather.simple_leather", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.hide.animal_hide"), 1),
+        ],
+        craft_sprite: Some(CraftingBench),
+    ),
+    "thick_leather": (
+        output: ("common.items.crafting_ing.leather.thick_leather", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.hide.tough_hide"), 1),
+        ],
+        craft_sprite: Some(CraftingBench),
+    ),
     "salad_plain": (
         output: ("common.items.food.plainsalad", 1),
         inputs: [
@@ -214,7 +227,7 @@
         output: ("common.items.glider.glider_basic_white", 1),
         inputs: [
             (Item("common.items.crafting_ing.twigs"), 5),
-            (Item("common.items.crafting_ing.leather_scraps"), 5),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 5),
             (Item("common.items.crafting_ing.cloth_scraps"), 10),
             (Item("common.items.tool.craftsman_hammer"), 0),
             (Item("common.items.crafting_tools.sewing_set"), 0),
@@ -226,7 +239,7 @@
         inputs: [
             (Item("common.items.crafting_ing.twigs"), 5),
             (Item("common.items.crafting_ing.cloth_scraps_red"), 10),
-            (Item("common.items.crafting_ing.leather_scraps"), 5),
+            (Item("common.items.crafting_ing.leather.thick_leather"), 4),
             (Item("common.items.tool.craftsman_hammer"), 0),
             (Item("common.items.crafting_tools.sewing_set"), 0),
         ],
@@ -236,7 +249,7 @@
         output: ("common.items.glider.glider_leaves", 1),
         inputs: [
             (Item("common.items.crafting_ing.twigs"), 5),
-            (Item("common.items.crafting_ing.leather_scraps"), 5),
+            (Item("common.items.crafting_ing.leather.thick_leather"), 4),
             (Item("common.items.crafting_ing.cloth_scraps"), 5),
             (Item("common.items.crafting_ing.emerald"), 1),
             (Item("common.items.tool.craftsman_hammer"), 0),
@@ -249,7 +262,7 @@
         inputs: [
             (Item("common.items.crafting_ing.raptor_feather"), 6),
             (Item("common.items.crafting_ing.twigs"), 5),
-            (Item("common.items.crafting_ing.leather_scraps"), 5),
+            (Item("common.items.crafting_ing.leather.thick_leather"), 4),
             (Item("common.items.crafting_ing.cloth_scraps"), 5),
             (Item("common.items.crafting_ing.ruby"), 1),
             (Item("common.items.tool.craftsman_hammer"), 0),
@@ -262,7 +275,7 @@
         inputs: [
             (Item("common.items.crafting_ing.raptor_feather"), 6),
             (Item("common.items.crafting_ing.twigs"), 5),
-            (Item("common.items.crafting_ing.leather_scraps"), 5),
+            (Item("common.items.crafting_ing.leather.thick_leather"), 4),
             (Item("common.items.crafting_ing.cloth_scraps"), 5),
             (Item("common.items.crafting_ing.icy_fang"), 1),
             (Item("common.items.crafting_ing.ruby"), 1),
@@ -276,7 +289,7 @@
         inputs: [
             (Item("common.items.crafting_ing.raptor_feather"), 6),
             (Item("common.items.crafting_ing.twigs"), 15),
-            (Item("common.items.crafting_ing.leather_scraps"), 5),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 5),
             (Item("common.items.crafting_ing.cloth_scraps"), 5),
             (Item("common.items.crafting_ing.ruby"), 1),
             (Item("common.items.tool.craftsman_hammer"), 0),
@@ -296,7 +309,7 @@
     "Hunting Bow": (
         output: ("common.items.weapons.bow.wood-2", 1),
         inputs: [
-            (Item("common.items.crafting_ing.leather_scraps"), 8),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 8),
             (Item("common.items.crafting_ing.twigs"), 6),
             (Item("common.items.crafting_ing.stones"), 0),
         ],
@@ -305,7 +318,7 @@
     "Forest Spirit": (
         output: ("common.items.weapons.sword.wood-2", 1),
         inputs: [
-            (Item("common.items.crafting_ing.leather_scraps"), 4),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 4),
             (Item("common.items.crafting_ing.twigs"), 10),
             (Item("common.items.ore.veloritefrag"), 1),
             (Item("common.items.crafting_ing.stones"), 0),
@@ -314,37 +327,58 @@
     ),
     "adventure back": (
         output: ("common.items.armor.agile.back", 1),
-        inputs: [(Item("common.items.crafting_ing.leather_scraps"), 4)],
+        inputs: [
+            (Item("common.items.crafting_ing.leather.simple_leather"), 4),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
+        ],        
         craft_sprite: Some(CraftingBench),
     ),
     "adventure belt": (
         output: ("common.items.armor.agile.belt", 1),
-        inputs: [(Item("common.items.crafting_ing.leather_scraps"), 2)],
+        inputs: [
+            (Item("common.items.crafting_ing.leather.simple_leather"), 2),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
+        ],            
         craft_sprite: Some(CraftingBench),
     ),
     "adventure chest": (
         output: ("common.items.armor.agile.chest", 1),
-        inputs: [(Item("common.items.crafting_ing.leather_scraps"), 12)],
+        inputs: [
+            (Item("common.items.crafting_ing.leather.simple_leather"), 10),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 4),
+        ],    
         craft_sprite: Some(CraftingBench),
     ),
     "adventure feet": (
         output: ("common.items.armor.agile.foot", 1),
-        inputs: [(Item("common.items.crafting_ing.leather_scraps"), 3)],
+        inputs: [
+            (Item("common.items.crafting_ing.leather.simple_leather"), 4),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
+        ],    
         craft_sprite: Some(CraftingBench),
     ),
     "adventure hands": (
         output: ("common.items.armor.agile.hand", 1),
-        inputs: [(Item("common.items.crafting_ing.leather_scraps"), 4)],
+        inputs: [
+            (Item("common.items.crafting_ing.leather.simple_leather"), 4),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
+        ],    
         craft_sprite: Some(CraftingBench),
     ),
     "adventure pants": (
         output: ("common.items.armor.agile.pants", 1),
-        inputs: [(Item("common.items.crafting_ing.leather_scraps"), 8)],
+        inputs: [
+            (Item("common.items.crafting_ing.leather.simple_leather"), 8),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 4),
+        ],    
         craft_sprite: Some(CraftingBench),
     ),
     "adventure shoulder": (
         output: ("common.items.armor.agile.shoulder", 1),
-        inputs: [(Item("common.items.crafting_ing.leather_scraps"), 12)],
+        inputs: [
+            (Item("common.items.crafting_ing.leather.simple_leather"), 10),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 6),
+        ],    
         craft_sprite: Some(CraftingBench),
     ),
     "Seashell Necklace": (
@@ -375,7 +409,7 @@
     "tiny leather pouch": (
         output: ("common.items.armor.misc.bag.tiny_leather_pouch", 1),
         inputs: [
-            (Item("common.items.crafting_ing.leather_scraps"), 6),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 6),
             (Item("common.items.crafting_tools.sewing_set"), 0),
         ],
     ),
@@ -401,7 +435,7 @@
             (Item("common.items.crafting_ing.diamond"), 2),
             (Item("common.items.crafting_ing.twigs"), 2),
             (Item("common.items.crafting_ing.cloth_scraps"), 3),
-            (Item("common.items.crafting_ing.leather_scraps"), 3),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 3),
             (Item("common.items.armor.misc.bag.tiny_leather_pouch"), 2),
             (Item("common.items.crafting_tools.sewing_set"), 0),
         ],
@@ -412,6 +446,7 @@
         inputs: [
             (Item("common.items.crafting_ing.diamond"), 2),
             (Item("common.items.crafting_ing.cloth_scraps_red"), 3),
+            (Item("common.items.crafting_ing.leather.thick_leather"), 3),
             (Item("common.items.armor.misc.bag.woven_red_bag"), 1),
             (Item("common.items.crafting_tools.sewing_set"), 0),
         ],
@@ -420,7 +455,7 @@
         output: ("common.items.armor.misc.bag.troll_hide_pack", 1),
         inputs: [
             (Item("common.items.crafting_ing.leather_troll"), 10),
-            (Item("common.items.crafting_ing.leather_scraps"), 10),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 10),
             (Item("common.items.crafting_ing.diamond"), 1),
             (Item("common.items.crafting_tools.sewing_set"), 0),
         ],
@@ -429,7 +464,7 @@
         output: ("common.items.armor.misc.bag.mindflayer_spellbag", 1),
         inputs: [
             (Item("common.items.crafting_ing.mindflayer_bag_damaged"), 1),
-            (Item("common.items.crafting_ing.leather_scraps"), 10),
+            (Item("common.items.crafting_ing.leather.thick_leather"), 8),
             (Item("common.items.crafting_ing.diamond"), 4),
             (Item("common.items.ore.veloritefrag"), 10),
             (Item("common.items.crafting_tools.sewing_set"), 0),
@@ -452,8 +487,8 @@
             (Item("common.items.crafting_tools.sewing_set"), 0),
         ],
     ),
-    "leather_scraps": (
+    "leather_strips": (
-        output: ("common.items.crafting_ing.leather_scraps", 1),
+        output: ("common.items.crafting_ing.leather.leather_strips", 1),
         inputs: [
             (Tag(LeatherItem), 1),
             (Item("common.items.crafting_tools.sewing_set"), 0),

assets/voxygen/item_image_manifest.ron

@@ -2003,8 +2003,24 @@
         "voxel.sprite.twigs.twigs-0",
         (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9,
     ),
-    Ingredient("AnimalPelt"): VoxTrans(
+    Ingredient("AnimalHide"): VoxTrans(
-        "voxel.sprite.crafting_ing.pelt",
+        "voxel.sprite.crafting_ing.hide.animal_hide",
+        (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9,
+    ),
+    Ingredient("ToughHide"): VoxTrans(
+        "voxel.sprite.crafting_ing.hide.tough_hide",
+        (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9,
+    ),
+    Ingredient("SimpleLeather"): VoxTrans(
+        "voxel.sprite.crafting_ing.leather.simple_leather",
+        (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9,
+    ),
+    Ingredient("ThickLeather"): VoxTrans(
+        "voxel.sprite.crafting_ing.leather.thick_leather",
+        (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9,
+    ),
+    Ingredient("LeatherStrips"): VoxTrans(
+        "voxel.sprite.crafting_ing.leather.leather_strips",
         (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9,
     ),
     Ingredient("Claw"): VoxTrans(
@@ -2050,9 +2066,6 @@
     Ingredient("Honey"): Png(
         "element.items.item_honey",
     ),
-    Ingredient("LeatherScraps"): Png(
-        "element.items.item_leather0",
-    ),
     Ingredient("TrollLeather"): Png(
         "element.items.item_leather_green",
     ),