diff --git a/assets/common/items/crafting_ing/bamboo.ron b/assets/common/items/crafting_ing/bamboo.ron new file mode 100644 index 0000000000..f87c3d03a7 --- /dev/null +++ b/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: [], +) \ No newline at end of file diff --git a/assets/common/items/crafting_ing/basalt.ron b/assets/common/items/crafting_ing/basalt.ron new file mode 100644 index 0000000000..a6e6890922 --- /dev/null +++ b/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: [], +) \ No newline at end of file diff --git a/assets/common/items/crafting_ing/dragon_scale.ron b/assets/common/items/crafting_ing/dragon_scale.ron new file mode 100644 index 0000000000..c951ab4a96 --- /dev/null +++ b/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: [], +) \ No newline at end of file diff --git a/assets/common/items/crafting_ing/gold_ingot.ron b/assets/common/items/crafting_ing/gold_ingot.ron new file mode 100644 index 0000000000..6f4b138fb8 --- /dev/null +++ b/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: [], +) \ No newline at end of file diff --git a/assets/common/items/crafting_ing/gold_ore.ron b/assets/common/items/crafting_ing/gold_ore.ron new file mode 100644 index 0000000000..c02774463d --- /dev/null +++ b/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: [], +) \ No newline at end of file diff --git a/assets/common/items/crafting_ing/granite.ron b/assets/common/items/crafting_ing/granite.ron new file mode 100644 index 0000000000..75891e2b36 --- /dev/null +++ b/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: [], +) \ No newline at end of file diff --git a/assets/common/items/crafting_ing/ironwood_logs.ron b/assets/common/items/crafting_ing/ironwood_logs.ron new file mode 100644 index 0000000000..4f6c5fbc1d --- /dev/null +++ b/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: [], +) \ No newline at end of file diff --git a/assets/common/items/crafting_ing/leather.ron b/assets/common/items/crafting_ing/leather.ron new file mode 100644 index 0000000000..f4ab458650 --- /dev/null +++ b/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: [], +) \ No newline at end of file diff --git a/assets/common/items/crafting_ing/lifecoth.ron b/assets/common/items/crafting_ing/lifecoth.ron new file mode 100644 index 0000000000..f697021012 --- /dev/null +++ b/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: [], +) \ No newline at end of file diff --git a/assets/common/items/crafting_ing/linen.ron b/assets/common/items/crafting_ing/linen.ron new file mode 100644 index 0000000000..60373574c7 --- /dev/null +++ b/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: [], +) \ No newline at end of file diff --git a/assets/common/items/crafting_ing/moonweave.ron b/assets/common/items/crafting_ing/moonweave.ron new file mode 100644 index 0000000000..8e0d07334a --- /dev/null +++ b/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: [], +) \ No newline at end of file diff --git a/assets/common/items/crafting_ing/obsidian.ron b/assets/common/items/crafting_ing/obsidian.ron new file mode 100644 index 0000000000..46423b0afd --- /dev/null +++ b/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: [], +) \ No newline at end of file diff --git a/assets/common/items/crafting_ing/orichalcum_ingot.ron b/assets/common/items/crafting_ing/orichalcum_ingot.ron new file mode 100644 index 0000000000..cbf39356ec --- /dev/null +++ b/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: [], +) \ No newline at end of file diff --git a/assets/common/items/crafting_ing/plates.ron b/assets/common/items/crafting_ing/plate.ron similarity index 73% rename from assets/common/items/crafting_ing/plates.ron rename to assets/common/items/crafting_ing/plate.ron index 462c5e6218..291da9d76c 100644 --- a/assets/common/items/crafting_ing/plates.ron +++ b/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: [], ) \ No newline at end of file diff --git a/assets/common/items/crafting_ing/rawhide.ron b/assets/common/items/crafting_ing/rawhide.ron new file mode 100644 index 0000000000..ce406dbf45 --- /dev/null +++ b/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: [], +) \ No newline at end of file diff --git a/assets/common/items/crafting_ing/rock.ron b/assets/common/items/crafting_ing/rock.ron new file mode 100644 index 0000000000..143f3fe9c4 --- /dev/null +++ b/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: [], +) \ No newline at end of file diff --git a/assets/common/items/crafting_ing/scales.ron b/assets/common/items/crafting_ing/scales.ron index de1cc1963a..c6cfe1b49b 100644 --- a/assets/common/items/crafting_ing/scales.ron +++ b/assets/common/items/crafting_ing/scales.ron @@ -4,6 +4,6 @@ ItemDef( kind: Ingredient( kind: "Scale", ), - quality: Common, + quality: Moderate, tags: [], ) \ No newline at end of file diff --git a/assets/common/items/crafting_ing/silk.ron b/assets/common/items/crafting_ing/silk.ron new file mode 100644 index 0000000000..b5708cacb9 --- /dev/null +++ b/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: [], +) \ No newline at end of file diff --git a/assets/common/items/crafting_ing/silver_ingot.ron b/assets/common/items/crafting_ing/silver_ingot.ron new file mode 100644 index 0000000000..4993010da9 --- /dev/null +++ b/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: [], +) \ No newline at end of file diff --git a/assets/common/items/crafting_ing/silver_ore.ron b/assets/common/items/crafting_ing/silver_ore.ron new file mode 100644 index 0000000000..1f7be426e9 --- /dev/null +++ b/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: [], +) \ No newline at end of file diff --git a/assets/common/items/crafting_ing/sunsilk.ron b/assets/common/items/crafting_ing/sunsilk.ron new file mode 100644 index 0000000000..9422b96370 --- /dev/null +++ b/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: [], +) \ No newline at end of file diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron index ec18da9f45..34ce0dce67 100644 --- a/assets/voxygen/item_image_manifest.ron +++ b/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", ), diff --git a/assets/voxygen/voxel/object/gold_ore.vox b/assets/voxygen/voxel/object/gold_ore.vox new file mode 100644 index 0000000000..9e3a3531a6 Binary files /dev/null and b/assets/voxygen/voxel/object/gold_ore.vox differ diff --git a/assets/voxygen/voxel/object/silver_ore.vox b/assets/voxygen/voxel/object/silver_ore.vox new file mode 100644 index 0000000000..89fa659249 Binary files /dev/null and b/assets/voxygen/voxel/object/silver_ore.vox differ diff --git a/assets/voxygen/voxel/object_manifest.ron b/assets/voxygen/voxel/object_manifest.ron index 1c7d9175e6..b699d3d78a 100644 --- a/assets/voxygen/voxel/object_manifest.ron +++ b/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"), + ) + ), }) diff --git a/assets/voxygen/voxel/sprite/crafting_ing/dragon_scale.vox b/assets/voxygen/voxel/sprite/crafting_ing/dragon_scale.vox new file mode 100644 index 0000000000..f1805fbd15 Binary files /dev/null and b/assets/voxygen/voxel/sprite/crafting_ing/dragon_scale.vox differ diff --git a/assets/voxygen/voxel/sprite/crafting_ing/gold_ingot.vox b/assets/voxygen/voxel/sprite/crafting_ing/gold_ingot.vox new file mode 100644 index 0000000000..ee6f994253 Binary files /dev/null and b/assets/voxygen/voxel/sprite/crafting_ing/gold_ingot.vox differ diff --git a/assets/voxygen/voxel/sprite/crafting_ing/gold_ore_drop.vox b/assets/voxygen/voxel/sprite/crafting_ing/gold_ore_drop.vox new file mode 100644 index 0000000000..cc8fcc9cab Binary files /dev/null and b/assets/voxygen/voxel/sprite/crafting_ing/gold_ore_drop.vox differ diff --git a/assets/voxygen/voxel/sprite/crafting_ing/leather.vox b/assets/voxygen/voxel/sprite/crafting_ing/leather.vox new file mode 100644 index 0000000000..1d28e6b544 Binary files /dev/null and b/assets/voxygen/voxel/sprite/crafting_ing/leather.vox differ diff --git a/assets/voxygen/voxel/sprite/crafting_ing/orichalcum_ingot.vox b/assets/voxygen/voxel/sprite/crafting_ing/orichalcum_ingot.vox new file mode 100644 index 0000000000..e998abeece Binary files /dev/null and b/assets/voxygen/voxel/sprite/crafting_ing/orichalcum_ingot.vox differ diff --git a/assets/voxygen/voxel/sprite/crafting_ing/plate.vox b/assets/voxygen/voxel/sprite/crafting_ing/plate.vox new file mode 100644 index 0000000000..90c7f83c2b Binary files /dev/null and b/assets/voxygen/voxel/sprite/crafting_ing/plate.vox differ diff --git a/assets/voxygen/voxel/sprite/crafting_ing/scale.vox b/assets/voxygen/voxel/sprite/crafting_ing/scale.vox new file mode 100644 index 0000000000..46f1d06d27 Binary files /dev/null and b/assets/voxygen/voxel/sprite/crafting_ing/scale.vox differ diff --git a/assets/voxygen/voxel/sprite/crafting_ing/silver_ingot.vox b/assets/voxygen/voxel/sprite/crafting_ing/silver_ingot.vox new file mode 100644 index 0000000000..a08b4120bd Binary files /dev/null and b/assets/voxygen/voxel/sprite/crafting_ing/silver_ingot.vox differ diff --git a/assets/voxygen/voxel/sprite/crafting_ing/silver_ore_drop.vox b/assets/voxygen/voxel/sprite/crafting_ing/silver_ore_drop.vox new file mode 100644 index 0000000000..82c11655c8 Binary files /dev/null and b/assets/voxygen/voxel/sprite/crafting_ing/silver_ore_drop.vox differ diff --git a/common/src/comp/body/object.rs b/common/src/comp/body/object.rs index ccdf3bc3bb..ae4103adf8 100644 --- a/common/src/comp/body/object.rs +++ b/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 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)