Snowram/craft mats

assets/common/items/crafting_ing/bamboo.ron

@@ -0,0 +1,9 @@
+ItemDef(
+    name: "Bamboo",
+    description: "A giant woody grass.",
+    kind: Ingredient(
+        kind: "Bamboo",
+    ),
+    quality: Common,
+    tags: [],
+)

assets/common/items/crafting_ing/basalt.ron

@@ -0,0 +1,9 @@
+ItemDef(
+    name: "Basalt",
+    description: "A dark volcanic rock.",
+    kind: Ingredient(
+        kind: "Basalt",
+    ),
+    quality: High,
+    tags: [],
+)

assets/common/items/crafting_ing/dragon_scale.ron

@@ -0,0 +1,9 @@
+ItemDef(
+    name: "Dragon Scale",
+    description: "Tough scale from a legendary beast.",
+    kind: Ingredient(
+        kind: "DragonScale",
+    ),
+    quality: Legendary,
+    tags: [],
+)

assets/common/items/crafting_ing/gold_ingot.ron

@@ -0,0 +1,9 @@
+ItemDef(
+    name: "Gold Ingot",
+    description: "An ingot made of refined metallic gold.",
+    kind: Ingredient(
+        kind: "GoldIngot",
+    ),
+    quality: Epic,
+    tags: [],
+)

assets/common/items/crafting_ing/gold_ore.ron

@@ -0,0 +1,9 @@
+ItemDef(
+    name: "Gold Ore",
+    description: "A precious yellow metal.",
+    kind: Ingredient(
+        kind: "GoldOre",
+    ),
+    quality: Epic,
+    tags: [],
+)

assets/common/items/crafting_ing/granite.ron

@@ -0,0 +1,9 @@
+ItemDef(
+    name: "Granite",
+    description: "A light-colored igneous rock.",
+    kind: Ingredient(
+        kind: "Granite",
+    ),
+    quality: Common,
+    tags: [],
+)

assets/common/items/crafting_ing/ironwood_logs.ron

@@ -0,0 +1,9 @@
+ItemDef(
+    name: "Ironwood Logs",
+    description: "A particularly sturdy wood.",
+    kind: Ingredient(
+        kind: "IronwoodLogs",
+    ),
+    quality: High,
+    tags: [],
+)

assets/common/items/crafting_ing/leather.ron

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

assets/common/items/crafting_ing/lifecoth.ron

@@ -0,0 +1,9 @@
+ItemDef(
+    name: "Lifecloth",
+    description: "A fabric imbued with special properties.",
+    kind: Ingredient(
+        kind: "Lifecloth",
+    ),
+    quality: High,
+    tags: [],
+)

assets/common/items/crafting_ing/linen.ron

@@ -0,0 +1,9 @@
+ItemDef(
+    name: "Linen",
+    description: "A textile made from the fibers of a plant.",
+    kind: Ingredient(
+        kind: "Linen",
+    ),
+    quality: Low,
+    tags: [],
+)

assets/common/items/crafting_ing/moonweave.ron

@@ -0,0 +1,9 @@
+ItemDef(
+    name: "Moonweave",
+    description: "A light yet very sturdy textile.",
+    kind: Ingredient(
+        kind: "Moonweave",
+    ),
+    quality: Epic,
+    tags: [],
+)

assets/common/items/crafting_ing/obsidian.ron

@@ -0,0 +1,9 @@
+ItemDef(
+    name: "Obsidian",
+    description: "An igneous rock that comes from melted rock.",
+    kind: Ingredient(
+        kind: "Obsidian",
+    ),
+    quality: Epic,
+    tags: [],
+)

assets/common/items/crafting_ing/orichalcum_ingot.ron

@@ -0,0 +1,9 @@
+ItemDef(
+    name: "Orichalcum Ingot",
+    description: "An ingot made of refined orichalcum.",
+    kind: Ingredient(
+        kind: "OrichalcumIngot",
+    ),
+    quality: Epic,
+    tags: [],
+)

assets/common/items/crafting_ing/plate.ron

@@ -1,9 +1,9 @@
 ItemDef(
-    name: "Durable Plate",
+    name: "Plate",
     description: "Durable plate from an armored animal.",
     kind: Ingredient(
         kind: "Plate",
     ),
-    quality: Common,
+    quality: Epic,
     tags: [],
 )

assets/common/items/crafting_ing/rawhide.ron

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

assets/common/items/crafting_ing/rock.ron

@@ -0,0 +1,9 @@
+ItemDef(
+    name: "Rock",
+    description: "A solid made up of a bunch of different minerals.",
+    kind: Ingredient(
+        kind: "Rock",
+    ),
+    quality: Low,
+    tags: [],
+)

assets/common/items/crafting_ing/scales.ron

@@ -4,6 +4,6 @@ ItemDef(
     kind: Ingredient(
         kind: "Scale",
     ),
-    quality: Common,
+    quality: Moderate,
     tags: [],
 )

assets/common/items/crafting_ing/silk.ron

@@ -0,0 +1,9 @@
+ItemDef(
+    name: "Silk",
+    description: "A fine and strong fibre produced by silkworms.",
+    kind: Ingredient(
+        kind: "Silk",
+    ),
+    quality: Moderate,
+    tags: [],
+)

assets/common/items/crafting_ing/silver_ingot.ron

@@ -0,0 +1,9 @@
+ItemDef(
+    name: "Silver Ingot",
+    description: "An ingot made of refined metallic silver.",
+    kind: Ingredient(
+        kind: "SilverIngot",
+    ),
+    quality: Epic,
+    tags: [],
+)

assets/common/items/crafting_ing/silver_ore.ron

@@ -0,0 +1,9 @@
+ItemDef(
+    name: "Silver Ore",
+    description: "A precious shiny greyish-white metal.",
+    kind: Ingredient(
+        kind: "SilverOre",
+    ),
+    quality: Epic,
+    tags: [],
+)

assets/common/items/crafting_ing/sunsilk.ron

@@ -0,0 +1,9 @@
+ItemDef(
+    name: "Sunsilk",
+    description: "A supernaturally strong texile.",
+    kind: Ingredient(
+        kind: "Sunsilk",
+    ),
+    quality: Legendary,
+    tags: [],
+)

assets/voxygen/item_image_manifest.ron

@@ -1954,6 +1954,42 @@
         "voxel.sprite.crafting_ing.claw",
         (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9,
     ),
+    Ingredient("Plate"): VoxTrans(
+        "voxel.sprite.crafting_ing.plate",
+        (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 1.0,
+    ),
+    Ingredient("Leather"): VoxTrans(
+        "voxel.sprite.crafting_ing.leather",
+        (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9,
+    ),
+    Ingredient("DragonScale"): VoxTrans(
+        "voxel.sprite.crafting_ing.dragon_scale",
+        (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9,
+    ),
+    Ingredient("SilverIngot"): VoxTrans(
+        "voxel.sprite.crafting_ing.silver_ingot",
+        (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9,
+    ),
+    Ingredient("GoldIngot"): VoxTrans(
+        "voxel.sprite.crafting_ing.gold_ingot",
+        (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9,
+    ),
+    Ingredient("GoldOre"): VoxTrans(
+        "voxel.sprite.crafting_ing.gold_ore_drop",
+        (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9,
+    ),
+    Ingredient("SilverOre"): VoxTrans(
+        "voxel.sprite.crafting_ing.silver_ore_drop",
+        (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.8,
+    ),
+    Ingredient("OrichalcumIngot"): VoxTrans(
+        "voxel.sprite.crafting_ing.orichalcum_ingot",
+        (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9,
+    ),
+    Ingredient("Scale"): VoxTrans(
+        "voxel.sprite.crafting_ing.scale",
+        (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9,
+    ),
     Ingredient("Honey"): Png(
         "element.items.item_honey",
     ),

assets/voxygen/voxel/object_manifest.ron

@@ -669,4 +669,24 @@
             central: ("armor.empty"),
         )
     ),
+    SilverOre: (
+        bone0: (
+            offset: (-4.5, -5.0, 0.0),
+            central: ("object.silver_ore"),
+        )
+        bone1: (
+            offset: (0.0, 0.0, 0.0),
+            central: ("armor.empty"),
+        )
+    ),
+    GoldOre: (
+        bone0: (
+            offset: (-4.5, -5.0, 0.0),
+            central: ("object.gold_ore"),
+        )
+        bone1: (
+            offset: (0.0, 0.0, 0.0),
+            central: ("armor.empty"),
+        )
+    ),
 })

common/src/comp/body/object.rs

@@ -79,6 +79,8 @@ make_case_elim!(
         Crossbow = 64,
         ArrowTurret = 65,
         Coins = 66,
+        GoldOre = 67,
+        SilverOre = 68,
     }
 );
 
@@ -89,7 +91,7 @@ impl Body {
     }
 }
 
-pub const ALL_OBJECTS: [Body; 67] = [
+pub const ALL_OBJECTS: [Body; 69] = [
     Body::Arrow,
     Body::Bomb,
     Body::Scarecrow,
@@ -157,6 +159,8 @@ pub const ALL_OBJECTS: [Body; 67] = [
     Body::Crossbow,
     Body::ArrowTurret,
     Body::Coins,
+    Body::SilverOre,
+    Body::GoldOre,
 ];
 
 impl From<Body> for super::Body {
@@ -233,6 +237,8 @@ impl Body {
             Body::Crossbow => "crossbow",
             Body::ArrowTurret => "arrow_turret",
             Body::Coins => "coins",
+            Body::SilverOre => "silver_ore",
+            Body::GoldOre => "gold_ore",
         }
     }
 
@@ -320,6 +326,8 @@ impl Body {
             Body::Tent => 50.0,
             Body::TrainingDummy => 60.0,
             Body::WindowSpooky => 10.0,
+            Body::SilverOre => 1000.0,
+            Body::GoldOre => 1000.0,
         };
 
         Mass(m)