crafting item partial re-organization, armor recipes, some specific animal drops

assets/common/items/crafting_ing/animal_misc/grim_eyeball.ron

@@ -0,0 +1,9 @@
+ItemDef(
+    name: "Grim Eyeball",
+    description: "Casts a petrifying gaze.",
+    kind: Ingredient(
+        kind: "GrimEyeball",
+    ),
+    quality: Common,
+    tags: [],
+)

assets/common/items/crafting_ing/leather.ron

@@ -1,9 +0,0 @@
-ItemDef(
-    name: "Leather",
-    description: "A fabric made from animal hides or skins.",
-    kind: Ingredient(
-        kind: "Leather",
-    ),
-    quality: Common,
-    tags: [],
-)

assets/common/items/crafting_ing/rawhide.ron

@@ -1,9 +0,0 @@
-ItemDef(
-    name: "Rawhide",
-    description: "A hide that has not been exposed to tanning.",
-    kind: Ingredient(
-        kind: "Rawhide",
-    ),
-    quality: Low,
-    tags: [],
-)

assets/common/items/tag_examples/metal_ingot.ron

@@ -3,13 +3,13 @@ ItemDef(
     description: "Ingots made from various metals.",
     kind: TagExamples(
         item_ids: [
-            "common.items.crafting_ing.bloodsteel_ingot",
-            "common.items.crafting_ing.bronze_ingot",
-            "common.items.crafting_ing.cobalt_ingot",
-            "common.items.crafting_ing.copper_ingot",
-            "common.items.crafting_ing.iron_ingot",
-            "common.items.crafting_ing.steel_ingot",
-            "common.items.crafting_ing.tin_ingot",
+            "common.items.mineral.ingot.bloodsteel_ingot",
+            "common.items.mineral.ingot.bronze_ingot",
+            "common.items.mineral.ingot.cobalt_ingot",
+            "common.items.mineral.ingot.copper_ingot",
+            "common.items.mineral.ingot.iron_ingot",
+            "common.items.mineral.ingot.steel_ingot",
+            "common.items.mineral.ingot.tin_ingot",
         ],
     ),
     quality: Common,

assets/common/loot_tables/creature/biped_large/wendigo.ron

@@ -1,6 +1,6 @@
 [
     (1.0, LootTable("common.loot_tables.food.prepared")),
-    (1.0, Item("common.items.crafting_ing.icy_fang")),
+    (1.0, Item("common.items.crafting_ing.animal_misc.icy_fang")),
     (1.0, LootTable("common.loot_tables.weapons.tier-2")),
     (4.0, LootTable("common.loot_tables.cave_large")),
 ]

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

@@ -0,0 +1,6 @@
+[
+    (1.0, Item("common.items.food.meat.tough_raw")),
+    (2.0, Item("common.items.crafting_ing.hide.plate")),
+    (2.0, Item("common.items.crafting_ing.animal_misc.grim_eyeball")),
+
+]

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

@@ -0,0 +1,4 @@
+[
+    (1.0, Item("common.items.food.meat.tough_raw")),
+    (3.0, Item("common.items.crafting_ing.hide.carapace")),
+]

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

@@ -1,4 +1,4 @@
 [
     (1.0, Item("common.items.food.meat.tough_raw")),
-    (3.0, Item("common.items.crafting_ing.scales")),
+    (3.0, Item("common.items.crafting_ing.hide.scales")),
 ]

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

@@ -0,0 +1,6 @@
+[
+    (1.0, Item("common.items.food.meat.tough_raw")),
+    (2.0, Item("common.items.crafting_ing.hide.scales")),
+    (2.0, Item("common.items.crafting_ing.animal_misc.fang")),
+
+]

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

@@ -1,4 +0,0 @@
-[
-    (1.0, Item("common.items.food.meat.tough_raw")),
-    (3.0, Item("common.items.crafting_ing.carapace")),
-]

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

@@ -0,0 +1,5 @@
+[
+    (1.0, Item("common.items.food.meat.tough_raw")),
+    (2.0, Item("common.items.crafting_ing.animal_misc.venomsac")),
+    (2.0, Item("common.items.crafting_ing.hide.scales")),
+]

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

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

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

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

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

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

assets/common/loot_tables/materials/common.ron

@@ -1,6 +1,6 @@
 [
     (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")),
+    (2.0, Item("common.items.crafting_ing.cloth.cloth_scraps")),
     (1.0, Item("common.items.crafting_ing.leather.leather_strips")),
 ]

assets/common/loot_tables/materials/gems.ron

@@ -1,8 +1,8 @@
 [
-    (3.0, Item("common.items.crafting_ing.topaz")),
-    (3.0, Item("common.items.crafting_ing.amethyst")),
-    (1.6, Item("common.items.crafting_ing.sapphire")),
-    (1.2, Item("common.items.crafting_ing.emerald")),
-    (0.8, Item("common.items.crafting_ing.ruby")),
-    (0.4, Item("common.items.crafting_ing.diamond")),
+    (3.0, Item("common.items.mineral.gem.topaz")),
+    (3.0, Item("common.items.mineral.gem.amethyst")),
+    (1.6, Item("common.items.mineral.gem.sapphire")),
+    (1.2, Item("common.items.mineral.gem.emerald")),
+    (0.8, Item("common.items.mineral.gem.ruby")),
+    (0.4, Item("common.items.mineral.gem.diamond")),
 ]

assets/common/loot_tables/trading.ron

@@ -1,5 +1,5 @@
 // Loot table that exists purely for price rationalisation
 [
     (1.0, Item("common.items.crafting_ing.honey")),
-    (0.5, Item("common.items.crafting_ing.icy_fang")),
+    (0.5, Item("common.items.crafting_ing.animal_misc.icy_fang")),
 ]

assets/common/material_stats_manifest.ron

@@ -1,6 +1,6 @@
 // Keep in mind that material stats are multiplied by the form stats, not added (e.g. equip_time_secs is most sensitive to this)
 ({
-    "common.items.crafting_ing.bloodsteel_ingot": (
+    "common.items.mineral.ingot.bloodsteel_ingot": (
         equip_time_secs: 1.0,
         power: 1.75,
         poise_strength: 1.75,
@@ -8,7 +8,7 @@
         crit_chance: 1.75,
         crit_mult: 1.75,
     ),
-    "common.items.crafting_ing.bronze_ingot": (
+    "common.items.mineral.ingot.bronze_ingot": (
         equip_time_secs: 1.0,
         power: 0.75,
         poise_strength: 0.75,
@@ -16,7 +16,7 @@
         crit_chance: 0.75,
         crit_mult: 0.75,
     ),
-    "common.items.crafting_ing.cobalt_ingot": (
+    "common.items.mineral.ingot.cobalt_ingot": (
         equip_time_secs: 1.0,
         power: 1.5,
         poise_strength: 1.5,
@@ -24,7 +24,7 @@
         crit_chance: 1.5,
         crit_mult: 1.5,
     ),
-    "common.items.crafting_ing.copper_ingot": (
+    "common.items.mineral.ingot.copper_ingot": (
         equip_time_secs: 1.0,
         power: 0.4,
         poise_strength: 0.4,
@@ -32,7 +32,7 @@
         crit_chance: 0.4,
         crit_mult: 0.4,
     ),
-    "common.items.crafting_ing.iron_ingot": (
+    "common.items.mineral.ingot.iron_ingot": (
         equip_time_secs: 1.0,
         power: 1.0,
         poise_strength: 1.0,
@@ -40,7 +40,7 @@
         crit_chance: 1.0,
         crit_mult: 1.0,
     ),
-    "common.items.crafting_ing.steel_ingot": (
+    "common.items.mineral.ingot.steel_ingot": (
         equip_time_secs: 1.0,
         power: 1.25,
         poise_strength: 1.25,
@@ -48,7 +48,7 @@
         crit_chance: 1.25,
         crit_mult: 1.25,
     ),
-    "common.items.crafting_ing.tin_ingot": (
+    "common.items.mineral.ingot.tin_ingot": (
         equip_time_secs: 1.0,
         power: 0.25,
         poise_strength: 0.25,

assets/common/recipe_book.ron

@@ -25,9 +25,9 @@
         craft_sprite: Some(CraftingBench),
     ),
     "velorite_frag": (
-        output: ("common.items.ore.veloritefrag", 2),
+        output: ("common.items.mineral.ore.veloritefrag", 2),
         inputs: [
-            (Item("common.items.ore.velorite"), 1),
+            (Item("common.items.mineral.ore.velorite"), 1),
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
         craft_sprite: Some(Anvil),
@@ -45,7 +45,7 @@
         output: ("common.items.consumable.potion_med", 1),
         inputs: [
             (Item("common.items.consumable.potion_minor"), 2),
-            (Item("common.items.ore.veloritefrag"), 4),
+            (Item("common.items.mineral.ore.veloritefrag"), 4),
         ],
         craft_sprite: Some(Cauldron),
     ),
@@ -53,7 +53,7 @@
         output: ("common.items.utility.collar", 1),
         inputs: [
             (Item("common.items.crafting_ing.leather.leather_strips"), 5),
-            (Item("common.items.crafting_ing.ruby"), 1),
+            (Item("common.items.mineral.gem.ruby"), 1),
         ],
     ),
     "bomb_coconut": (
@@ -61,7 +61,7 @@
         inputs: [
             (Item("common.items.crafting_ing.stones"), 10),
             (Item("common.items.food.coconut"), 2),
-            (Item("common.items.ore.veloritefrag"), 2),
+            (Item("common.items.mineral.ore.veloritefrag"), 2),
             (Item("common.items.crafting_tools.mortar_pestle"), 0),
         ],
         craft_sprite: Some(CraftingBench),
@@ -72,7 +72,7 @@
             (Item("common.items.crafting_ing.twigs"), 1),
             (Item("common.items.crafting_ing.stones"), 1),
             (Item("common.items.food.coconut"), 1),
-            (Item("common.items.ore.veloritefrag"), 1),
+            (Item("common.items.mineral.ore.veloritefrag"), 1),
             (Item("common.items.crafting_tools.mortar_pestle"), 0),
         ],
         craft_sprite: Some(CraftingBench),
@@ -83,7 +83,7 @@
             (Item("common.items.crafting_ing.twigs"), 1),
             (Item("common.items.crafting_ing.stones"), 1),
             (Item("common.items.food.coconut"), 1),
-            (Item("common.items.ore.veloritefrag"), 1),
+            (Item("common.items.mineral.ore.veloritefrag"), 1),
             (Item("common.items.crafting_tools.mortar_pestle"), 0),
         ],
         craft_sprite: Some(CraftingBench),
@@ -94,7 +94,7 @@
             (Item("common.items.crafting_ing.twigs"), 1),
             (Item("common.items.crafting_ing.stones"), 1),
             (Item("common.items.food.coconut"), 1),
-            (Item("common.items.ore.veloritefrag"), 1),
+            (Item("common.items.mineral.ore.veloritefrag"), 1),
             (Item("common.items.crafting_tools.mortar_pestle"), 0),
         ],
         craft_sprite: Some(CraftingBench),
@@ -105,7 +105,7 @@
             (Item("common.items.crafting_ing.twigs"), 1),
             (Item("common.items.crafting_ing.stones"), 1),
             (Item("common.items.food.coconut"), 1),
-            (Item("common.items.ore.veloritefrag"), 1),
+            (Item("common.items.mineral.ore.veloritefrag"), 1),
             (Item("common.items.crafting_tools.mortar_pestle"), 0),
         ],
         craft_sprite: Some(CraftingBench),
@@ -116,7 +116,7 @@
             (Item("common.items.crafting_ing.twigs"), 1),
             (Item("common.items.crafting_ing.stones"), 1),
             (Item("common.items.food.coconut"), 1),
-            (Item("common.items.ore.veloritefrag"), 1),
+            (Item("common.items.mineral.ore.veloritefrag"), 1),
             (Item("common.items.crafting_tools.mortar_pestle"), 0),
         ],
         craft_sprite: Some(CraftingBench),
@@ -127,7 +127,7 @@
             (Item("common.items.crafting_ing.twigs"), 1),
             (Item("common.items.crafting_ing.stones"), 1),
             (Item("common.items.food.coconut"), 1),
-            (Item("common.items.ore.veloritefrag"), 1),
+            (Item("common.items.mineral.ore.veloritefrag"), 1),
             (Item("common.items.crafting_tools.mortar_pestle"), 0),
         ],
         craft_sprite: Some(CraftingBench),
@@ -217,7 +217,7 @@
         output: ("common.items.food.sunflower_icetea", 4),
         inputs: [
             (Item("common.items.crafting_ing.empty_vial"), 1),
-            (Item("common.items.crafting_ing.icy_fang"), 1),
+            (Item("common.items.crafting_ing.animal_misc.icy_fang"), 1),
             (Item("common.items.flowers.sunflower"), 4),
             (Item("common.items.crafting_ing.honey"), 1),
         ],
@@ -228,7 +228,7 @@
         inputs: [
             (Item("common.items.crafting_ing.twigs"), 5),
             (Item("common.items.crafting_ing.leather.leather_strips"), 5),
-            (Item("common.items.crafting_ing.cloth_scraps"), 10),
+            (Item("common.items.crafting_ing.cloth.cloth_scraps"), 10),
             (Item("common.items.tool.craftsman_hammer"), 0),
             (Item("common.items.crafting_tools.sewing_set"), 0),
         ],
@@ -238,7 +238,7 @@
         output: ("common.items.glider.glider_basic_red", 1),
         inputs: [
             (Item("common.items.crafting_ing.twigs"), 5),
-            (Item("common.items.crafting_ing.cloth_scraps_red"), 10),
+            (Item("common.items.crafting_ing.cloth.cloth_scraps_red"), 10),
             (Item("common.items.crafting_ing.leather.thick_leather"), 4),
             (Item("common.items.tool.craftsman_hammer"), 0),
             (Item("common.items.crafting_tools.sewing_set"), 0),
@@ -250,8 +250,8 @@
         inputs: [
             (Item("common.items.crafting_ing.twigs"), 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.crafting_ing.cloth.cloth_scraps"), 5),
+            (Item("common.items.mineral.gem.emerald"), 1),
             (Item("common.items.tool.craftsman_hammer"), 0),
             (Item("common.items.crafting_tools.sewing_set"), 0),
         ],
@@ -260,11 +260,11 @@
     "Sand Raptor Wings": (
         output: ("common.items.glider.glider_sandraptor", 1),
         inputs: [
-            (Item("common.items.crafting_ing.raptor_feather"), 6),
+            (Item("common.items.crafting_ing.animal_misc.raptor_feather"), 6),
             (Item("common.items.crafting_ing.twigs"), 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.crafting_ing.cloth.cloth_scraps"), 5),
+            (Item("common.items.mineral.gem.ruby"), 1),
             (Item("common.items.tool.craftsman_hammer"), 0),
             (Item("common.items.crafting_tools.sewing_set"), 0),
         ],
@@ -273,12 +273,12 @@
     "Snow Raptor Wings": (
         output: ("common.items.glider.glider_snowraptor", 1),
         inputs: [
-            (Item("common.items.crafting_ing.raptor_feather"), 6),
+            (Item("common.items.crafting_ing.animal_misc.raptor_feather"), 6),
             (Item("common.items.crafting_ing.twigs"), 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),
+            (Item("common.items.crafting_ing.cloth.cloth_scraps"), 5),
+            (Item("common.items.crafting_ing.animal_misc.icy_fang"), 1),
+            (Item("common.items.mineral.gem.ruby"), 1),
             (Item("common.items.tool.craftsman_hammer"), 0),
             (Item("common.items.crafting_tools.sewing_set"), 0),
         ],
@@ -287,11 +287,11 @@
     "Wood Raptor Wings": (
         output: ("common.items.glider.glider_woodraptor", 1),
         inputs: [
-            (Item("common.items.crafting_ing.raptor_feather"), 6),
+            (Item("common.items.crafting_ing.animal_misc.raptor_feather"), 6),
             (Item("common.items.crafting_ing.twigs"), 15),
             (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.crafting_ing.cloth.cloth_scraps"), 5),
+            (Item("common.items.mineral.gem.ruby"), 1),
             (Item("common.items.tool.craftsman_hammer"), 0),
             (Item("common.items.crafting_tools.sewing_set"), 0),
         ],
@@ -301,8 +301,8 @@
         output: ("common.items.weapons.sceptre.loops0", 1),
         inputs: [
             (Item("common.items.crafting_ing.twigs"), 20),
-            (Item("common.items.ore.veloritefrag"), 8),
-            (Item("common.items.crafting_ing.ruby"), 4),
+            (Item("common.items.mineral.ore.veloritefrag"), 8),
+            (Item("common.items.mineral.gem.ruby"), 4),
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
     ),
@@ -320,11 +320,12 @@
         inputs: [
             (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.mineral.ore.veloritefrag"), 1),
             (Item("common.items.crafting_ing.stones"), 0),
         ],
         craft_sprite: Some(Anvil),
     ),
+//ARMOR/LEATHER/ADVENTURER
     "adventure back": (
         output: ("common.items.armor.agile.back", 1),
         inputs: [
@@ -381,20 +382,249 @@
         ],    
         craft_sprite: Some(CraftingBench),
     ),
+//ARMOR/LEATHER/SCALE
+    "scale back": (
+        output: ("common.items.armor.scale.back", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.hide.scales"), 4),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
+        ],        
+        craft_sprite: Some(CraftingBench),
+    ),
+    "scale belt": (
+        output: ("common.items.armor.scale.belt", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.hide.scales"), 2),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
+        ],            
+        craft_sprite: Some(CraftingBench),
+    ),
+    "scale chest": (
+        output: ("common.items.armor.scale.chest", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.hide.scales"), 10),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 4),
+        ],    
+        craft_sprite: Some(CraftingBench),
+    ),
+    "scale feet": (
+        output: ("common.items.armor.scale.foot", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.hide.scales"), 4),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
+        ],    
+        craft_sprite: Some(CraftingBench),
+    ),
+    "scale hands": (
+        output: ("common.items.armor.scale.hand", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.hide.scales"), 4),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
+        ],    
+        craft_sprite: Some(CraftingBench),
+    ),
+    "scale pants": (
+        output: ("common.items.armor.scale.pants", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.hide.scales"), 8),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 4),
+        ],    
+        craft_sprite: Some(CraftingBench),
+    ),
+    "scale shoulder": (
+        output: ("common.items.armor.scale.shoulder", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.hide.scales"), 10),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 6),
+        ],    
+        craft_sprite: Some(CraftingBench),
+    ),
+//ARMOR/LEATHER/CARAPACE
+    "carapace back": (
+        output: ("common.items.armor.carapace.back", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.hide.carapace"), 4),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
+        ],        
+        craft_sprite: Some(CraftingBench),
+    ),
+    "carapace belt": (
+        output: ("common.items.armor.carapace.belt", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.hide.carapace"), 2),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
+        ],            
+        craft_sprite: Some(CraftingBench),
+    ),
+    "carapace chest": (
+        output: ("common.items.armor.carapace.chest", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.hide.carapace"), 10),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 4),
+        ],    
+        craft_sprite: Some(CraftingBench),
+    ),
+    "carapace feet": (
+        output: ("common.items.armor.carapace.foot", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.hide.carapace"), 4),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
+        ],    
+        craft_sprite: Some(CraftingBench),
+    ),
+    "carapace hands": (
+        output: ("common.items.armor.carapace.hand", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.hide.carapace"), 4),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
+        ],    
+        craft_sprite: Some(CraftingBench),
+    ),
+    "carapace pants": (
+        output: ("common.items.armor.carapace.pants", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.hide.carapace"), 8),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 4),
+        ],    
+        craft_sprite: Some(CraftingBench),
+    ),
+    "carapace shoulder": (
+        output: ("common.items.armor.carapace.shoulder", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.hide.carapace"), 10),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 6),
+        ],    
+        craft_sprite: Some(CraftingBench),
+    ),
+//ARMOR/LEATHER/PLATESCALE
+    "platescale back": (
+        output: ("common.items.armor.platescale.back", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.hide.plate"), 4),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
+        ],        
+        craft_sprite: Some(CraftingBench),
+    ),
+    "platescale belt": (
+        output: ("common.items.armor.platescale.belt", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.hide.plate"), 2),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
+        ],            
+        craft_sprite: Some(CraftingBench),
+    ),
+    "platescale chest": (
+        output: ("common.items.armor.platescale.chest", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.hide.plate"), 10),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 4),
+        ],    
+        craft_sprite: Some(CraftingBench),
+    ),
+    "platescale feet": (
+        output: ("common.items.armor.platescale.foot", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.hide.plate"), 4),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
+        ],    
+        craft_sprite: Some(CraftingBench),
+    ),
+    "platescale hands": (
+        output: ("common.items.armor.platescale.hand", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.hide.plate"), 4),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
+        ],    
+        craft_sprite: Some(CraftingBench),
+    ),
+    "platescale pants": (
+        output: ("common.items.armor.platescale.pants", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.hide.plate"), 8),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 4),
+        ],    
+        craft_sprite: Some(CraftingBench),
+    ),
+    "platescale shoulder": (
+        output: ("common.items.armor.platescale.shoulder", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.hide.plate"), 10),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 6),
+        ],    
+        craft_sprite: Some(CraftingBench),
+    ),
+//ARMOR/LEATHER/DRAGONSCALE
+    "dragonscale back": (
+        output: ("common.items.armor.dragonscale.back", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.hide.dragon_scale"), 4),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
+        ],        
+        craft_sprite: Some(CraftingBench),
+    ),
+    "dragonscale belt": (
+        output: ("common.items.armor.dragonscale.belt", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.hide.dragon_scale"), 2),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
+        ],            
+        craft_sprite: Some(CraftingBench),
+    ),
+    "dragonscale chest": (
+        output: ("common.items.armor.dragonscale.chest", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.hide.dragon_scale"), 10),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 4),
+        ],    
+        craft_sprite: Some(CraftingBench),
+    ),
+    "dragonscale feet": (
+        output: ("common.items.armor.dragonscale.foot", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.hide.dragon_scale"), 4),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
+        ],    
+        craft_sprite: Some(CraftingBench),
+    ),
+    "dragonscale hands": (
+        output: ("common.items.armor.dragonscale.hand", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.hide.dragon_scale"), 4),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
+        ],    
+        craft_sprite: Some(CraftingBench),
+    ),
+    "dragonscale pants": (
+        output: ("common.items.armor.dragonscale.pants", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.hide.dragon_scale"), 8),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 4),
+        ],    
+        craft_sprite: Some(CraftingBench),
+    ),
+    "dragonscale shoulder": (
+        output: ("common.items.armor.dragonscale.shoulder", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.hide.dragon_scale"), 10),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 6),
+        ],    
+        craft_sprite: Some(CraftingBench),
+    ),
+
     "Seashell Necklace": (
         output: ("common.items.armor.misc.neck.shell", 1),
         inputs: [
-            (Item("common.items.crafting_ing.cloth_scraps"), 2),
-            (Item("common.items.crafting_ing.sapphire"), 1),
+            (Item("common.items.crafting_ing.cloth.cloth_scraps"), 2),
+            (Item("common.items.mineral.gem.sapphire"), 1),
             (Item("common.items.crafting_ing.seashells"), 3),
             (Item("common.items.crafting_tools.sewing_set"), 0),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     "red cloth": (
-        output: ("common.items.crafting_ing.cloth_scraps_red", 1),
+        output: ("common.items.crafting_ing.cloth.cloth_scraps_red", 1),
         inputs: [
-            (Item("common.items.crafting_ing.cloth_scraps"), 1),
+            (Item("common.items.crafting_ing.cloth.cloth_scraps"), 1),
             (Item("common.items.flowers.red"), 1),
             (Item("common.items.crafting_tools.mortar_pestle"), 0),
         ],
@@ -402,7 +632,7 @@
     "tiny red pouch": (
         output: ("common.items.armor.misc.bag.tiny_red_pouch", 1),
         inputs: [
-            (Item("common.items.crafting_ing.cloth_scraps_red"), 3),
+            (Item("common.items.crafting_ing.cloth.cloth_scraps_red"), 3),
             (Item("common.items.crafting_tools.sewing_set"), 0),
         ],
     ),
@@ -416,7 +646,7 @@
     "knitted red pouch": (
         output: ("common.items.armor.misc.bag.knitted_red_pouch", 1),
         inputs: [
-            (Item("common.items.crafting_ing.cloth_scraps_red"), 3),
+            (Item("common.items.crafting_ing.cloth.cloth_scraps_red"), 3),
             (Item("common.items.armor.misc.bag.tiny_red_pouch"), 2),
             (Item("common.items.crafting_tools.sewing_set"), 0),
         ],
@@ -424,7 +654,7 @@
     "woven red bag": (
         output: ("common.items.armor.misc.bag.woven_red_bag", 1),
         inputs: [
-            (Item("common.items.crafting_ing.cloth_scraps_red"), 6),
+            (Item("common.items.crafting_ing.cloth.cloth_scraps_red"), 6),
             (Item("common.items.armor.misc.bag.knitted_red_pouch"), 1),
             (Item("common.items.crafting_tools.sewing_set"), 0),
         ],
@@ -432,9 +662,9 @@
     "traveler backpack": (
         output: ("common.items.armor.misc.back.backpack", 1),
         inputs: [
-            (Item("common.items.crafting_ing.diamond"), 2),
+            (Item("common.items.mineral.gem.diamond"), 2),
             (Item("common.items.crafting_ing.twigs"), 2),
-            (Item("common.items.crafting_ing.cloth_scraps"), 3),
+            (Item("common.items.crafting_ing.cloth.cloth_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),
@@ -444,8 +674,8 @@
     "sturdy red backpack": (
         output: ("common.items.armor.misc.bag.sturdy_red_backpack", 1),
         inputs: [
-            (Item("common.items.crafting_ing.diamond"), 2),
-            (Item("common.items.crafting_ing.cloth_scraps_red"), 3),
+            (Item("common.items.mineral.gem.diamond"), 2),
+            (Item("common.items.crafting_ing.cloth.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),
@@ -454,9 +684,9 @@
     "troll hide pack": (
         output: ("common.items.armor.misc.bag.troll_hide_pack", 1),
         inputs: [
-            (Item("common.items.crafting_ing.leather_troll"), 10),
+            (Item("common.items.crafting_ing.hide.leather_troll"), 10),
             (Item("common.items.crafting_ing.leather.leather_strips"), 10),
-            (Item("common.items.crafting_ing.diamond"), 1),
+            (Item("common.items.mineral.gem.diamond"), 1),
             (Item("common.items.crafting_tools.sewing_set"), 0),
         ],
     ),
@@ -465,15 +695,15 @@
         inputs: [
             (Item("common.items.crafting_ing.mindflayer_bag_damaged"), 1),
             (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.mineral.gem.diamond"), 4),
+            (Item("common.items.mineral.ore.veloritefrag"), 10),
             (Item("common.items.crafting_tools.sewing_set"), 0),
         ],
     ),
     "pickaxe": (
         output: ("common.items.tool.pick", 1),
         inputs: [
-            (Item("common.items.crafting_ing.cloth_scraps"), 1), // TODO: Replace with plant fiber when obtainable
+            (Item("common.items.crafting_ing.cloth.cloth_scraps"), 1), // TODO: Replace with plant fiber when obtainable
             (Item("common.items.crafting_ing.stones"), 5), // TODO: Replace with iron ingots when obtainable
             (Item("common.items.crafting_ing.twigs"), 4),
             (Item("common.items.tool.craftsman_hammer"), 0),
@@ -481,7 +711,7 @@
         craft_sprite: Some(Anvil),
     ),
     "cloth_scraps": (
-        output: ("common.items.crafting_ing.cloth_scraps", 1),
+        output: ("common.items.crafting_ing.cloth.cloth_scraps", 1),
         inputs: [
             (Tag(ClothItem), 1),
             (Item("common.items.crafting_tools.sewing_set"), 0),

common/src/comp/inventory/item/mod.rs

@@ -726,18 +726,18 @@ impl Item {
             SpriteKind::VialEmpty => "common.items.crafting_ing.empty_vial",
             SpriteKind::Bowl => "common.items.crafting_ing.bowl",
             SpriteKind::PotionMinor => "common.items.consumable.potion_minor",
-            SpriteKind::Amethyst => "common.items.crafting_ing.amethyst",
-            SpriteKind::Ruby => "common.items.crafting_ing.ruby",
-            SpriteKind::Diamond => "common.items.crafting_ing.diamond",
-            SpriteKind::Sapphire => "common.items.crafting_ing.sapphire",
-            SpriteKind::Topaz => "common.items.crafting_ing.topaz",
-            SpriteKind::Emerald => "common.items.crafting_ing.emerald",
-            SpriteKind::AmethystSmall => "common.items.crafting_ing.amethyst",
-            SpriteKind::TopazSmall => "common.items.crafting_ing.topaz",
-            SpriteKind::DiamondSmall => "common.items.crafting_ing.diamond",
-            SpriteKind::RubySmall => "common.items.crafting_ing.ruby",
-            SpriteKind::EmeraldSmall => "common.items.crafting_ing.emerald",
-            SpriteKind::SapphireSmall => "common.items.crafting_ing.sapphire",
+            SpriteKind::Amethyst => "common.items.mineral.gem.amethyst",
+            SpriteKind::Ruby => "common.items.mineral.gem.ruby",
+            SpriteKind::Diamond => "common.items.mineral.gem.diamond",
+            SpriteKind::Sapphire => "common.items.mineral.gem.sapphire",
+            SpriteKind::Topaz => "common.items.mineral.gem.topaz",
+            SpriteKind::Emerald => "common.items.mineral.emerald",
+            SpriteKind::AmethystSmall => "common.items.mineral.gem.amethyst",
+            SpriteKind::TopazSmall => "common.items.mineral.gem.topaz",
+            SpriteKind::DiamondSmall => "common.items.mineral.gem.diamond",
+            SpriteKind::RubySmall => "common.items.mineral.gem.ruby",
+            SpriteKind::EmeraldSmall => "common.items.mineral.emerald",
+            SpriteKind::SapphireSmall => "common.items.mineral.gem.sapphire",
             SpriteKind::Seashells => "common.items.crafting_ing.seashells",
             // Containers
             // IMPORTANT: Add any new container to `SpriteKind::is_container`

server/src/events/entity_manipulation.rs

@@ -401,7 +401,19 @@ pub fn handle_destroy(server: &mut Server, entity: EcsEntity, cause: HealthSourc
                             "common.loot_tables.creature.quad_low.maneater"
                         },
                         quadruped_low::Species::Lavadrake => {
-                            "common.loot_tables.creature.quad_low.lavadrake"
+                            "common.loot_tables.creature.quad_low.carapace"
+                        },
+                        quadruped_low::Species::Rocksnapper => {
+                            "common.loot_tables.creature.quad_low.carapace"
+                        },
+                        quadruped_low::Species::Asp => {
+                            "common.loot_tables.creature.quad_low.venemous"
+                        },
+                        quadruped_low::Species::Hakulaq => {
+                            "common.loot_tables.creature.quad_low.fanged"
+                        },
+                        quadruped_low::Species::Basilisk => {
+                            "common.loot_tables.creature.quad_low.basilisk"
                         },
                         _ => "common.loot_tables.creature.quad_low.default",
                     }