diff --git a/assets/common/items/armor/mail/orichalcum/chest.ron b/assets/common/items/armor/mail/orichalcum/chest.ron index 3d0ac55438..688311cc99 100644 --- a/assets/common/items/armor/mail/orichalcum/chest.ron +++ b/assets/common/items/armor/mail/orichalcum/chest.ron @@ -4,11 +4,11 @@ ItemDef( kind: Armor(( kind: Chest("Orichalcum"), stats: ( - protection: Normal(30.0), - poise_resilience: Normal(1.0), - energy_max: 0, - energy_recovery: 0.0, - crit_power: 0.0, + protection: Normal(250.0), + poise_resilience: Normal(0.0), + energy_max: 1000, + energy_recovery: 3.0, + crit_power: 2.0, stealth: 0.0, ), )), diff --git a/assets/common/items/crafting_ing/animal_misc/horn.ron b/assets/common/items/crafting_ing/animal_misc/horn.ron deleted file mode 100644 index cc14fdc450..0000000000 --- a/assets/common/items/crafting_ing/animal_misc/horn.ron +++ /dev/null @@ -1,9 +0,0 @@ -ItemDef( - name: "Sharp Horn", - description: "A sharp horn from an animal.", - kind: Ingredient( - kind: "Horn", - ), - quality: Common, - tags: [], -) \ No newline at end of file diff --git a/assets/common/items/crafting_ing/animal_misc/large_horn.ron b/assets/common/items/crafting_ing/animal_misc/large_horn.ron new file mode 100644 index 0000000000..1751ded592 --- /dev/null +++ b/assets/common/items/crafting_ing/animal_misc/large_horn.ron @@ -0,0 +1,9 @@ +ItemDef( + name: "Large Horn", + description: "A huge sharp horn from an animal.", + kind: Ingredient( + kind: "LargeHorn", + ), + quality: Common, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/crafting_ing/animal_misc/fang.ron b/assets/common/items/crafting_ing/animal_misc/sharp_fang.ron similarity index 73% rename from assets/common/items/crafting_ing/animal_misc/fang.ron rename to assets/common/items/crafting_ing/animal_misc/sharp_fang.ron index 2accdeb1ad..c181eb3dc2 100644 --- a/assets/common/items/crafting_ing/animal_misc/fang.ron +++ b/assets/common/items/crafting_ing/animal_misc/sharp_fang.ron @@ -1,8 +1,8 @@ ItemDef( - name: "Predator Fang", + name: "Sharp Fang", description: "Incredibly sharp tooth from a predatory animal.", kind: Ingredient( - kind: "Fang", + kind: "SharpFang", ), quality: Common, tags: [], diff --git a/assets/common/items/crafting_ing/cloth/cotton.ron b/assets/common/items/crafting_ing/cloth/cotton.ron new file mode 100644 index 0000000000..48b5b78d9d --- /dev/null +++ b/assets/common/items/crafting_ing/cloth/cotton.ron @@ -0,0 +1,9 @@ +ItemDef( + name: "Cotton", + description: "Easy to work with and multi-functional.", + kind: Ingredient( + kind: "Cotton", + ), + quality: Low, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/crafting_ing/cotton_boll.ron b/assets/common/items/crafting_ing/cotton_boll.ron new file mode 100644 index 0000000000..fb46d92f60 --- /dev/null +++ b/assets/common/items/crafting_ing/cotton_boll.ron @@ -0,0 +1,9 @@ +ItemDef( + name: "Cotton Boll", + description: "Plucked from a common cotton plant.", + kind: Ingredient( + kind: "CottonBoll", + ), + quality: Common, + tags: [], +) diff --git a/assets/common/items/crafting_ing/plant_fiber.ron b/assets/common/items/flowers/plant_fiber.ron similarity index 100% rename from assets/common/items/crafting_ing/plant_fiber.ron rename to assets/common/items/flowers/plant_fiber.ron diff --git a/assets/common/recipe_book.ron b/assets/common/recipe_book.ron index 943e6863df..60d1bd7385 100644 --- a/assets/common/recipe_book.ron +++ b/assets/common/recipe_book.ron @@ -189,14 +189,14 @@ inputs: [ (Item("common.items.mineral.ore.gold_ore"), 1), ], - craft_sprite: Some(CraftingBench), + craft_sprite: Some(Forge), ), "silver ingot": ( output: ("common.items.mineral.ingot.silver", 1), inputs: [ (Item("common.items.mineral.ore.silver_ore"), 1), ], - craft_sprite: Some(CraftingBench), + craft_sprite: Some(Forge), ), "iron ingot": ( @@ -204,21 +204,21 @@ inputs: [ (Item("common.items.mineral.ore.iron_ore"), 1), ], - craft_sprite: Some(CraftingBench), + craft_sprite: Some(Forge), ), "cobalt ingot": ( output: ("common.items.mineral.ingot.cobalt", 1), inputs: [ (Item("common.items.mineral.ore.cobalt_ore"), 1), ], - craft_sprite: Some(CraftingBench), + craft_sprite: Some(Forge), ), "tin ingot": ( output: ("common.items.mineral.ingot.tin", 2), inputs: [ (Item("common.items.mineral.ore.tin_ore"), 1), ], - craft_sprite: Some(CraftingBench), + craft_sprite: Some(Forge), ), "orichalcum ingot": ( output: ("common.items.mineral.ingot.orichalcum", 2), @@ -226,14 +226,14 @@ (Item("common.items.mineral.ore.gold_ore"), 1), (Item("common.items.mineral.ore.silver_ore"), 1), ], - craft_sprite: Some(CraftingBench), + craft_sprite: Some(Forge), ), "copper ingot": ( output: ("common.items.mineral.ingot.copper", 2), inputs: [ (Item("common.items.mineral.ore.copper_ore"), 1), ], - craft_sprite: Some(CraftingBench), + craft_sprite: Some(Forge), ), "bloodsteel ingot": ( output: ("common.items.mineral.ingot.bloodsteel", 2), @@ -242,7 +242,7 @@ (Item("common.items.mineral.ore.iron_ore"), 1), (Item("common.items.mineral.ore.coal"), 1), ], - craft_sprite: Some(CraftingBench), + craft_sprite: Some(Forge), ), "steel ingot": ( output: ("common.items.mineral.ingot.steel", 1), @@ -250,7 +250,7 @@ (Item("common.items.mineral.ore.iron_ore"), 1), (Item("common.items.mineral.ore.coal"), 1), ], - craft_sprite: Some(CraftingBench), + craft_sprite: Some(Forge), ), "bronze ingot": ( output: ("common.items.mineral.ingot.bronze", 2), @@ -258,42 +258,49 @@ (Item("common.items.mineral.ore.copper_ore"), 1), (Item("common.items.mineral.ore.tin_ore"), 1), ], - craft_sprite: Some(CraftingBench), + craft_sprite: Some(Forge), + ), + "cotton": ( + output: ("common.items.crafting_ing.cloth.cotton", 1), + inputs: [ + (Item("common.items.crafting_ing.cotton_boll"), 1), + ], + craft_sprite: Some(SpinningWheel), ), "linen": ( output: ("common.items.crafting_ing.cloth.linen", 1), inputs: [ - (Item("common.items.crafting_ing.plant_fiber"), 1), + (Item("common.items.flowers.plant_fiber"), 1), ], - craft_sprite: Some(CraftingBench), + craft_sprite: Some(SpinningWheel), ), "silk": ( output: ("common.items.crafting_ing.cloth.silk", 1), inputs: [ (Item("common.items.crafting_ing.sticky_thread"), 1), ], - craft_sprite: Some(CraftingBench), + craft_sprite: Some(SpinningWheel), ), "lifecloth": ( output: ("common.items.crafting_ing.cloth.lifecloth", 1), inputs: [ (Item("common.items.crafting_ing.cloth.lifecloth"), 1), ], - craft_sprite: Some(CraftingBench), + craft_sprite: Some(SpinningWheel), ), "moonweave": ( output: ("common.items.crafting_ing.cloth.moonweave", 1), inputs: [ (Item("common.items.flowers.moonbell"), 1), ], - craft_sprite: Some(CraftingBench), + craft_sprite: Some(SpinningWheel), ), "sunsilk": ( output: ("common.items.crafting_ing.cloth.sunsilk", 1), inputs: [ (Item("common.items.flowers.pyrebloom"), 1), ], - craft_sprite: Some(CraftingBench), + craft_sprite: Some(SpinningWheel), ), "salad_plain": ( output: ("common.items.food.plainsalad", 1), @@ -785,7 +792,7 @@ (Item("common.items.crafting_ing.cloth.linen"), 4), (Item("common.items.crafting_ing.leather.leather_strips"), 2), ], - craft_sprite: Some(CraftingBench), + craft_sprite: Some(Loom), ), "linen belt": ( output: ("common.items.armor.cloth.linen.belt", 1), @@ -793,7 +800,7 @@ (Item("common.items.crafting_ing.cloth.linen"), 2), (Item("common.items.crafting_ing.leather.leather_strips"), 2), ], - craft_sprite: Some(CraftingBench), + craft_sprite: Some(Loom), ), "linen chest": ( output: ("common.items.armor.cloth.linen.chest", 1), @@ -801,7 +808,7 @@ (Item("common.items.crafting_ing.cloth.linen"), 10), (Item("common.items.crafting_ing.leather.leather_strips"), 4), ], - craft_sprite: Some(CraftingBench), + craft_sprite: Some(Loom), ), "linen feet": ( output: ("common.items.armor.cloth.linen.foot", 1), @@ -809,7 +816,7 @@ (Item("common.items.crafting_ing.cloth.linen"), 4), (Item("common.items.crafting_ing.leather.leather_strips"), 2), ], - craft_sprite: Some(CraftingBench), + craft_sprite: Some(Loom), ), "linen hands": ( output: ("common.items.armor.cloth.linen.hand", 1), @@ -817,7 +824,7 @@ (Item("common.items.crafting_ing.cloth.linen"), 4), (Item("common.items.crafting_ing.leather.leather_strips"), 2), ], - craft_sprite: Some(CraftingBench), + craft_sprite: Some(Loom), ), "linen pants": ( output: ("common.items.armor.cloth.linen.pants", 1), @@ -825,7 +832,7 @@ (Item("common.items.crafting_ing.cloth.linen"), 8), (Item("common.items.crafting_ing.leather.leather_strips"), 4), ], - craft_sprite: Some(CraftingBench), + craft_sprite: Some(Loom), ), "linen shoulder": ( output: ("common.items.armor.cloth.linen.shoulder", 1), @@ -833,7 +840,7 @@ (Item("common.items.crafting_ing.cloth.linen"), 10), (Item("common.items.crafting_ing.leather.leather_strips"), 6), ], - craft_sprite: Some(CraftingBench), + craft_sprite: Some(Loom), ), //ARMOR/CLOTH/WOOLEN "woolen back": ( @@ -842,7 +849,7 @@ (Item("common.items.crafting_ing.cloth.wool"), 4), (Item("common.items.crafting_ing.leather.leather_strips"), 2), ], - craft_sprite: Some(CraftingBench), + craft_sprite: Some(Loom), ), "woolen belt": ( output: ("common.items.armor.cloth.woolen.belt", 1), @@ -850,7 +857,7 @@ (Item("common.items.crafting_ing.cloth.wool"), 2), (Item("common.items.crafting_ing.leather.leather_strips"), 2), ], - craft_sprite: Some(CraftingBench), + craft_sprite: Some(Loom), ), "woolen chest": ( output: ("common.items.armor.cloth.woolen.chest", 1), @@ -858,7 +865,7 @@ (Item("common.items.crafting_ing.cloth.wool"), 10), (Item("common.items.crafting_ing.leather.leather_strips"), 4), ], - craft_sprite: Some(CraftingBench), + craft_sprite: Some(Loom), ), "woolen feet": ( output: ("common.items.armor.cloth.woolen.foot", 1), @@ -866,7 +873,7 @@ (Item("common.items.crafting_ing.cloth.wool"), 4), (Item("common.items.crafting_ing.leather.leather_strips"), 2), ], - craft_sprite: Some(CraftingBench), + craft_sprite: Some(Loom), ), "woolen hands": ( output: ("common.items.armor.cloth.woolen.hand", 1), @@ -874,7 +881,7 @@ (Item("common.items.crafting_ing.cloth.wool"), 4), (Item("common.items.crafting_ing.leather.leather_strips"), 2), ], - craft_sprite: Some(CraftingBench), + craft_sprite: Some(Loom), ), "woolen pants": ( output: ("common.items.armor.cloth.woolen.pants", 1), @@ -882,7 +889,7 @@ (Item("common.items.crafting_ing.cloth.wool"), 8), (Item("common.items.crafting_ing.leather.leather_strips"), 4), ], - craft_sprite: Some(CraftingBench), + craft_sprite: Some(Loom), ), "woolen shoulder": ( output: ("common.items.armor.cloth.woolen.shoulder", 1), @@ -890,7 +897,7 @@ (Item("common.items.crafting_ing.cloth.wool"), 10), (Item("common.items.crafting_ing.leather.leather_strips"), 6), ], - craft_sprite: Some(CraftingBench), + craft_sprite: Some(Loom), ), //ARMOR/CLOTH/SILKEN "silken back": ( @@ -899,7 +906,7 @@ (Item("common.items.crafting_ing.cloth.silk"), 4), (Item("common.items.crafting_ing.leather.leather_strips"), 2), ], - craft_sprite: Some(CraftingBench), + craft_sprite: Some(Loom), ), "silken belt": ( output: ("common.items.armor.cloth.silken.belt", 1), @@ -907,7 +914,7 @@ (Item("common.items.crafting_ing.cloth.silk"), 2), (Item("common.items.crafting_ing.leather.leather_strips"), 2), ], - craft_sprite: Some(CraftingBench), + craft_sprite: Some(Loom), ), "silken chest": ( output: ("common.items.armor.cloth.silken.chest", 1), @@ -915,7 +922,7 @@ (Item("common.items.crafting_ing.cloth.silk"), 10), (Item("common.items.crafting_ing.leather.leather_strips"), 4), ], - craft_sprite: Some(CraftingBench), + craft_sprite: Some(Loom), ), "silken feet": ( output: ("common.items.armor.cloth.silken.foot", 1), @@ -923,7 +930,7 @@ (Item("common.items.crafting_ing.cloth.silk"), 4), (Item("common.items.crafting_ing.leather.leather_strips"), 2), ], - craft_sprite: Some(CraftingBench), + craft_sprite: Some(Loom), ), "silken hands": ( output: ("common.items.armor.cloth.silken.hand", 1), @@ -931,7 +938,7 @@ (Item("common.items.crafting_ing.cloth.silk"), 4), (Item("common.items.crafting_ing.leather.leather_strips"), 2), ], - craft_sprite: Some(CraftingBench), + craft_sprite: Some(Loom), ), "silken pants": ( output: ("common.items.armor.cloth.silken.pants", 1), @@ -939,7 +946,7 @@ (Item("common.items.crafting_ing.cloth.silk"), 8), (Item("common.items.crafting_ing.leather.leather_strips"), 4), ], - craft_sprite: Some(CraftingBench), + craft_sprite: Some(Loom), ), "silken shoulder": ( output: ("common.items.armor.cloth.silken.shoulder", 1), @@ -947,7 +954,7 @@ (Item("common.items.crafting_ing.cloth.silk"), 10), (Item("common.items.crafting_ing.leather.leather_strips"), 6), ], - craft_sprite: Some(CraftingBench), + craft_sprite: Some(Loom), ), //ARMOR/CLOTH/DRUID "druid back": ( @@ -956,7 +963,7 @@ (Item("common.items.crafting_ing.cloth.lifecloth"), 4), (Item("common.items.crafting_ing.leather.leather_strips"), 2), ], - craft_sprite: Some(CraftingBench), + craft_sprite: Some(Loom), ), "druid belt": ( output: ("common.items.armor.cloth.druid.belt", 1), @@ -964,7 +971,7 @@ (Item("common.items.crafting_ing.cloth.lifecloth"), 2), (Item("common.items.crafting_ing.leather.leather_strips"), 2), ], - craft_sprite: Some(CraftingBench), + craft_sprite: Some(Loom), ), "druid chest": ( output: ("common.items.armor.cloth.druid.chest", 1), @@ -972,7 +979,7 @@ (Item("common.items.crafting_ing.cloth.lifecloth"), 10), (Item("common.items.crafting_ing.leather.leather_strips"), 4), ], - craft_sprite: Some(CraftingBench), + craft_sprite: Some(Loom), ), "druid feet": ( output: ("common.items.armor.cloth.druid.foot", 1), @@ -980,7 +987,7 @@ (Item("common.items.crafting_ing.cloth.lifecloth"), 4), (Item("common.items.crafting_ing.leather.leather_strips"), 2), ], - craft_sprite: Some(CraftingBench), + craft_sprite: Some(Loom), ), "druid hands": ( output: ("common.items.armor.cloth.druid.hand", 1), @@ -988,7 +995,7 @@ (Item("common.items.crafting_ing.cloth.lifecloth"), 4), (Item("common.items.crafting_ing.leather.leather_strips"), 2), ], - craft_sprite: Some(CraftingBench), + craft_sprite: Some(Loom), ), "druid pants": ( output: ("common.items.armor.cloth.druid.pants", 1), @@ -996,7 +1003,7 @@ (Item("common.items.crafting_ing.cloth.lifecloth"), 8), (Item("common.items.crafting_ing.leather.leather_strips"), 4), ], - craft_sprite: Some(CraftingBench), + craft_sprite: Some(Loom), ), "druid shoulder": ( output: ("common.items.armor.cloth.druid.shoulder", 1), @@ -1004,7 +1011,7 @@ (Item("common.items.crafting_ing.cloth.lifecloth"), 10), (Item("common.items.crafting_ing.leather.leather_strips"), 6), ], - craft_sprite: Some(CraftingBench), + craft_sprite: Some(Loom), ), //ARMOR/CLOTH/MOONWEAVE "moonweave back": ( @@ -1013,7 +1020,7 @@ (Item("common.items.crafting_ing.cloth.moonweave"), 4), (Item("common.items.crafting_ing.leather.leather_strips"), 2), ], - craft_sprite: Some(CraftingBench), + craft_sprite: Some(Loom), ), "moonweave belt": ( output: ("common.items.armor.cloth.moonweave.belt", 1), @@ -1021,7 +1028,7 @@ (Item("common.items.crafting_ing.cloth.moonweave"), 2), (Item("common.items.crafting_ing.leather.leather_strips"), 2), ], - craft_sprite: Some(CraftingBench), + craft_sprite: Some(Loom), ), "moonweave chest": ( output: ("common.items.armor.cloth.moonweave.chest", 1), @@ -1029,7 +1036,7 @@ (Item("common.items.crafting_ing.cloth.moonweave"), 10), (Item("common.items.crafting_ing.leather.leather_strips"), 4), ], - craft_sprite: Some(CraftingBench), + craft_sprite: Some(Loom), ), "moonweave feet": ( output: ("common.items.armor.cloth.moonweave.foot", 1), @@ -1037,7 +1044,7 @@ (Item("common.items.crafting_ing.cloth.moonweave"), 4), (Item("common.items.crafting_ing.leather.leather_strips"), 2), ], - craft_sprite: Some(CraftingBench), + craft_sprite: Some(Loom), ), "moonweave hands": ( output: ("common.items.armor.cloth.moonweave.hand", 1), @@ -1045,7 +1052,7 @@ (Item("common.items.crafting_ing.cloth.moonweave"), 4), (Item("common.items.crafting_ing.leather.leather_strips"), 2), ], - craft_sprite: Some(CraftingBench), + craft_sprite: Some(Loom), ), "moonweave pants": ( output: ("common.items.armor.cloth.moonweave.pants", 1), @@ -1053,7 +1060,7 @@ (Item("common.items.crafting_ing.cloth.moonweave"), 8), (Item("common.items.crafting_ing.leather.leather_strips"), 4), ], - craft_sprite: Some(CraftingBench), + craft_sprite: Some(Loom), ), "moonweave shoulder": ( output: ("common.items.armor.cloth.moonweave.shoulder", 1), @@ -1061,7 +1068,7 @@ (Item("common.items.crafting_ing.cloth.moonweave"), 10), (Item("common.items.crafting_ing.leather.leather_strips"), 6), ], - craft_sprite: Some(CraftingBench), + craft_sprite: Some(Loom), ), //ARMOR/CLOTH/SUNSILK "sunsilk back": ( @@ -1070,7 +1077,7 @@ (Item("common.items.crafting_ing.cloth.sunsilk"), 4), (Item("common.items.crafting_ing.leather.leather_strips"), 2), ], - craft_sprite: Some(CraftingBench), + craft_sprite: Some(Loom), ), "sunsilk belt": ( output: ("common.items.armor.cloth.sunsilk.belt", 1), @@ -1078,7 +1085,7 @@ (Item("common.items.crafting_ing.cloth.sunsilk"), 2), (Item("common.items.crafting_ing.leather.leather_strips"), 2), ], - craft_sprite: Some(CraftingBench), + craft_sprite: Some(Loom), ), "sunsilk chest": ( output: ("common.items.armor.cloth.sunsilk.chest", 1), @@ -1086,7 +1093,7 @@ (Item("common.items.crafting_ing.cloth.sunsilk"), 10), (Item("common.items.crafting_ing.leather.leather_strips"), 4), ], - craft_sprite: Some(CraftingBench), + craft_sprite: Some(Loom), ), "sunsilk feet": ( output: ("common.items.armor.cloth.sunsilk.foot", 1), @@ -1094,7 +1101,7 @@ (Item("common.items.crafting_ing.cloth.sunsilk"), 4), (Item("common.items.crafting_ing.leather.leather_strips"), 2), ], - craft_sprite: Some(CraftingBench), + craft_sprite: Some(Loom), ), "sunsilk hands": ( output: ("common.items.armor.cloth.sunsilk.hand", 1), @@ -1102,7 +1109,7 @@ (Item("common.items.crafting_ing.cloth.sunsilk"), 4), (Item("common.items.crafting_ing.leather.leather_strips"), 2), ], - craft_sprite: Some(CraftingBench), + craft_sprite: Some(Loom), ), "sunsilk pants": ( output: ("common.items.armor.cloth.sunsilk.pants", 1), @@ -1110,7 +1117,7 @@ (Item("common.items.crafting_ing.cloth.sunsilk"), 8), (Item("common.items.crafting_ing.leather.leather_strips"), 4), ], - craft_sprite: Some(CraftingBench), + craft_sprite: Some(Loom), ), "sunsilk shoulder": ( output: ("common.items.armor.cloth.sunsilk.shoulder", 1), @@ -1118,7 +1125,7 @@ (Item("common.items.crafting_ing.cloth.sunsilk"), 10), (Item("common.items.crafting_ing.leather.leather_strips"), 6), ], - craft_sprite: Some(CraftingBench), + craft_sprite: Some(Loom), ), //ARMOR/MAIL/BRONZE "bronze back": ( diff --git a/assets/voxygen/i18n/en/hud/crafting.ron b/assets/voxygen/i18n/en/hud/crafting.ron index 985f4c3bd4..53f020d10c 100644 --- a/assets/voxygen/i18n/en/hud/crafting.ron +++ b/assets/voxygen/i18n/en/hud/crafting.ron @@ -14,6 +14,9 @@ "hud.crafting.cauldron": "Cauldron", "hud.crafting.cooking_pot": "Cooking Pot", "hud.crafting.crafting_bench": "Crafting Bench", + "hud.crafting.forge": "Forge", + "hud.crafting.loom": "Loom", + "hud.crafting.spinning_wheel": "Spinning Wheel", // Tabs "hud.crafting.tabs.all": "All", "hud.crafting.tabs.armor": "Armor", diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron index b8f8a832bf..3732bd1dc2 100644 --- a/assets/voxygen/item_image_manifest.ron +++ b/assets/voxygen/item_image_manifest.ron @@ -19,6 +19,18 @@ "voxel.sprite.crafting_bench.crafting_bench-0", (0.0, 0.0, 0.0), (-50.0, 40.0, 20.0), 1.0, ), + Tool("Forge"): VoxTrans( + "voxel.object.forge", + (0.0, 0.0, 0.0), (-50.0, 40.0, 20.0), 1.0, + ), + Tool("Loom"): VoxTrans( + "voxel.object.loom", + (0.0, 0.0, 0.0), (-50.0, 40.0, 20.0), 1.0, + ), + Tool("SpinningWheel"): VoxTrans( + "voxel.object.spinning_wheel", + (0.0, 0.0, 0.0), (-50.0, 40.0, 20.0), 1.0, + ), // Weapons // Diary Example Images Tool("example_utility"): VoxTrans( @@ -2466,13 +2478,33 @@ (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9, ), Ingredient("VenomSac"): VoxTrans( - "voxel.sprite.crafting_ing.venom_sac", + "voxel.sprite.crafting_ing.animal_misc.venom_sac", (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9, ), + Ingredient("SharpFang"): VoxTrans( + "voxel.sprite.crafting_ing.animal_misc.sharp_fang", + (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9, + ), + Ingredient("LargeHorn"): VoxTrans( + "voxel.sprite.crafting_ing.animal_misc.large_horn", + (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9, + ), + Ingredient("GrimEyeball"): VoxTrans( + "voxel.sprite.crafting_ing.animal_misc.grim_eyeball", + (0.0, 0.0, 0.0), (-60.0, 30.0, 20.0), 0.8, + ), Ingredient("PlantFiber"): VoxTrans( "voxel.sprite.crafting_ing.plant_fiber", (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9, ), + Ingredient("CottonBoll"): VoxTrans( + "voxel.sprite.crafting_ing.cotton_boll", + (0.0, 0.0, 0.0), (-65.0, 0.0, 20.0), 0.9, + ), + Ingredient("Cotton"): VoxTrans( + "voxel.sprite.crafting_ing.cloth.cotton", + (0.0, 0.0, 0.0), (-65.0, 0.0, 20.0), 0.9, + ), Ingredient("Linen"): VoxTrans( "voxel.sprite.crafting_ing.cloth.linen", (0.0, 0.0, 0.0), (-65.0, 0.0, 20.0), 0.9, @@ -2569,6 +2601,10 @@ "voxel.sprite.mineral.ore.tin", (0.0, 0.0, 0.0), (-60.0, 30.0, 20.0), 0.8, ), + Ingredient("Coal"): VoxTrans( + "voxel.sprite.mineral.ore.coal", + (0.0, 0.0, 0.0), (-60.0, 30.0, 20.0), 0.8, + ), Ingredient("Honey"): Png( "element.items.item_honey", ), diff --git a/assets/voxygen/voxel/object/forge.vox b/assets/voxygen/voxel/object/forge.vox new file mode 100644 index 0000000000..195bbfcf9e --- /dev/null +++ b/assets/voxygen/voxel/object/forge.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bfa2e90a535f4c1e3639681f9bd0d2cc29d497f853de708b74f8573ef6ecb345 +size 3944 diff --git a/assets/voxygen/voxel/object/loom.vox b/assets/voxygen/voxel/object/loom.vox new file mode 100644 index 0000000000..424bc4b918 --- /dev/null +++ b/assets/voxygen/voxel/object/loom.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:90d38d6742493c07a02ee5e5e8db2f2af9d48610e4885b9495330d399491e17c +size 2072 diff --git a/assets/voxygen/voxel/object/spinning_wheel.vox b/assets/voxygen/voxel/object/spinning_wheel.vox new file mode 100644 index 0000000000..82f4e344e3 --- /dev/null +++ b/assets/voxygen/voxel/object/spinning_wheel.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:acd0f4701ba86053a93d3c6743ce1ac460da2c45cd71c46d020a699ed38c05f3 +size 2448 diff --git a/assets/voxygen/voxel/object_manifest.ron b/assets/voxygen/voxel/object_manifest.ron index cb43158072..97643b7f85 100644 --- a/assets/voxygen/voxel/object_manifest.ron +++ b/assets/voxygen/voxel/object_manifest.ron @@ -99,6 +99,36 @@ central: ("armor.empty"), ) ), + Forge: ( + bone0: ( + offset: (-6.5, -6.0, 0.0), + central: ("object.forge"), + ), + bone1: ( + offset: (0.0, 0.0, 0.0), + central: ("armor.empty"), + ) + ), + Loom: ( + bone0: ( + offset: (-6.0, -4.0, 0.0), + central: ("object.loom"), + ), + bone1: ( + offset: (0.0, 0.0, 0.0), + central: ("armor.empty"), + ) + ), + SpinningWheel: ( + bone0: ( + offset: (-7.5, -5.0, 0.0), + central: ("object.spinning_wheel"), + ), + bone1: ( + offset: (0.0, 0.0, 0.0), + central: ("armor.empty"), + ) + ), ChestVines: ( bone0: ( offset: (-7.5, -6.0, 0.0), diff --git a/assets/voxygen/voxel/sprite/crafting_ing/animal_misc/grim_eyeball.vox b/assets/voxygen/voxel/sprite/crafting_ing/animal_misc/grim_eyeball.vox new file mode 100644 index 0000000000..21dd363cc8 --- /dev/null +++ b/assets/voxygen/voxel/sprite/crafting_ing/animal_misc/grim_eyeball.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:64367c752f08e479b9735ac5566304c3a5c57584f3695fc2be468cfb34db495f +size 1860 diff --git a/assets/voxygen/voxel/sprite/crafting_ing/animal_misc/large_horn.vox b/assets/voxygen/voxel/sprite/crafting_ing/animal_misc/large_horn.vox new file mode 100644 index 0000000000..fa090cef89 --- /dev/null +++ b/assets/voxygen/voxel/sprite/crafting_ing/animal_misc/large_horn.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b5ed0cf35706481db968548affddaf272501cc5ccad30969e26431cd7e9ed06d +size 1652 diff --git a/assets/voxygen/voxel/sprite/crafting_ing/animal_misc/sharp_fang.vox b/assets/voxygen/voxel/sprite/crafting_ing/animal_misc/sharp_fang.vox new file mode 100644 index 0000000000..e7aa2f3a4f --- /dev/null +++ b/assets/voxygen/voxel/sprite/crafting_ing/animal_misc/sharp_fang.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:23bfff03e4ed721ffda835dcc9ab53205873c70266e4d8ac961ffae76a7b468b +size 1444 diff --git a/assets/voxygen/voxel/sprite/crafting_ing/cloth/cotton.vox b/assets/voxygen/voxel/sprite/crafting_ing/cloth/cotton.vox new file mode 100644 index 0000000000..b770e25568 --- /dev/null +++ b/assets/voxygen/voxel/sprite/crafting_ing/cloth/cotton.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a2f959c471d8826a325aaf663194aca0bd70a3793602c586093fab76303f97ce +size 1672 diff --git a/assets/voxygen/voxel/sprite/crafting_ing/cotton_boll.vox b/assets/voxygen/voxel/sprite/crafting_ing/cotton_boll.vox new file mode 100644 index 0000000000..971907c728 --- /dev/null +++ b/assets/voxygen/voxel/sprite/crafting_ing/cotton_boll.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6b2ba7aab868bfce31658fd9e0cac992daabee540fc89fcdcfab1c39214faa1e +size 1724 diff --git a/assets/voxygen/voxel/sprite/flowers/cotton.vox b/assets/voxygen/voxel/sprite/flowers/cotton.vox new file mode 100644 index 0000000000..1eb6022384 --- /dev/null +++ b/assets/voxygen/voxel/sprite/flowers/cotton.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d60a7258b7a1e90edef70ad74a0979668730e128db45d4f4da9a94e6eb71a05a +size 1704 diff --git a/assets/voxygen/voxel/sprite/food/meat/beast_large_cooked.vox b/assets/voxygen/voxel/sprite/food/meat/beast_large_cooked.vox index 0a695ea72b..012358136f 100644 --- a/assets/voxygen/voxel/sprite/food/meat/beast_large_cooked.vox +++ b/assets/voxygen/voxel/sprite/food/meat/beast_large_cooked.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ac268d850fc99139cbedc110da8371510d2fbddee57a0d85d3f2e6d45762e634 -size 2912 +oid sha256:2890a4916f30ec18880ee3e69a0815651e8567727ca8e7975541296c903aeec7 +size 2988 diff --git a/assets/voxygen/voxel/sprite/food/meat/beast_large_raw.vox b/assets/voxygen/voxel/sprite/food/meat/beast_large_raw.vox index edfe97d0eb..768d7d8560 100644 --- a/assets/voxygen/voxel/sprite/food/meat/beast_large_raw.vox +++ b/assets/voxygen/voxel/sprite/food/meat/beast_large_raw.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:54e2b243ea6a8dc0ddc87ca48dee8318128abb6ce4a3b2e9dc326c4b2c1f4de3 -size 2928 +oid sha256:4c23f880c88e22373ba67b337c9c962fba85df192095981ad8cd18fd20e9f841 +size 2988 diff --git a/assets/voxygen/voxel/sprite/food/meat/beast_small_cooked.vox b/assets/voxygen/voxel/sprite/food/meat/beast_small_cooked.vox index 70b7223888..4d90fe552f 100644 --- a/assets/voxygen/voxel/sprite/food/meat/beast_small_cooked.vox +++ b/assets/voxygen/voxel/sprite/food/meat/beast_small_cooked.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:69689ff227505bccfdbae0e2b436e75abef10ce275fe97ff3ded960cecef4a89 -size 1768 +oid sha256:d60806aebbb549d0dc5033ac866d0a82121fdb908663921029b509b99b9e4406 +size 2224 diff --git a/assets/voxygen/voxel/sprite/food/meat/beast_small_raw.vox b/assets/voxygen/voxel/sprite/food/meat/beast_small_raw.vox index 6fe7a11372..7c872bcc8c 100644 --- a/assets/voxygen/voxel/sprite/food/meat/beast_small_raw.vox +++ b/assets/voxygen/voxel/sprite/food/meat/beast_small_raw.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:057cc3e21725e6c7b59732869bec6efc274df8c72ba02efb9b0c806cd5ff008d -size 1768 +oid sha256:28ed3f2a0851c2a23d08fbae29540834eadce853018e113c85aabcf6a8e2aeee +size 2224 diff --git a/assets/voxygen/voxel/sprite/food/meat/bird_cooked.vox b/assets/voxygen/voxel/sprite/food/meat/bird_cooked.vox new file mode 100644 index 0000000000..7e4a7874de --- /dev/null +++ b/assets/voxygen/voxel/sprite/food/meat/bird_cooked.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a7febdd31f6934727fe5fc589b8fee9a013a8ee166688990ab30bc2babc159a4 +size 1696 diff --git a/assets/voxygen/voxel/sprite/food/meat/bird_raw.vox b/assets/voxygen/voxel/sprite/food/meat/bird_raw.vox new file mode 100644 index 0000000000..b8690b066a --- /dev/null +++ b/assets/voxygen/voxel/sprite/food/meat/bird_raw.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aee563fdbb3dad20383146ba4890e8796d98247bfbdf529856a1120cb0790f63 +size 1696 diff --git a/assets/voxygen/voxel/sprite/food/meat/fish_cooked.vox b/assets/voxygen/voxel/sprite/food/meat/fish_cooked.vox index 92fc650944..20fb7bd8c9 100644 --- a/assets/voxygen/voxel/sprite/food/meat/fish_cooked.vox +++ b/assets/voxygen/voxel/sprite/food/meat/fish_cooked.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4bcc3d957abf63b5412a5b0878499c36cb3e17537dd97bb1d82a4b67c401b1db +oid sha256:25e81b97aff3c863936e6d3c661ffe6ad321328d8286a5fc4a02cb4bfb3fe4aa size 1720 diff --git a/assets/voxygen/voxel/sprite/food/meat/tough_cooked.vox b/assets/voxygen/voxel/sprite/food/meat/tough_cooked.vox index fd82a0f9f8..4860dde913 100644 --- a/assets/voxygen/voxel/sprite/food/meat/tough_cooked.vox +++ b/assets/voxygen/voxel/sprite/food/meat/tough_cooked.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:467440b1e8c93a24d4ab31262eedb5e40f070bf52bbddc2885c9177b836da96e -size 1816 +oid sha256:edf7416e28df9fc3eb4e7f6341d6b1841db0e4fc802ea72c92c31db4335d534a +size 1836 diff --git a/assets/voxygen/voxel/sprite/food/meat/tough_raw.vox b/assets/voxygen/voxel/sprite/food/meat/tough_raw.vox index fbf810c904..503d39e3c5 100644 --- a/assets/voxygen/voxel/sprite/food/meat/tough_raw.vox +++ b/assets/voxygen/voxel/sprite/food/meat/tough_raw.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b91604a31137cef5803bba645bdb12759fbde7ba5e91c270f11dbb705a5cf6a0 -size 1816 +oid sha256:6a83b8a9b35adcccf5d9ed694b7b9c8a198ca4c44c5d451b844bdce72500f192 +size 1836 diff --git a/assets/voxygen/voxel/sprite_manifest.ron b/assets/voxygen/voxel/sprite_manifest.ron index 7eb1a01dfc..7d8368ecc4 100644 --- a/assets/voxygen/voxel/sprite_manifest.ron +++ b/assets/voxygen/voxel/sprite_manifest.ron @@ -2940,8 +2940,28 @@ Cauldron: Some(( Forge: Some(( variations: [ ( - model: "voxygen.voxel.sprite.forge.forge-0", - offset: (-20.0, -20.0, 0.0), + model: "voxygen.voxel.object.forge", + offset: (-6.5, -6.0, 0.0), + lod_axes: (0.0, 0.0, 0.0), + ), + ], + wind_sway: 0.0, +)), +Loom: Some(( + variations: [ + ( + model: "voxygen.voxel.object.loom", + offset: (-6.0, -4.0, 0.0), + lod_axes: (0.0, 0.0, 0.0), + ), + ], + wind_sway: 0.0, +)), +SpinningWheel: Some(( + variations: [ + ( + model: "voxygen.voxel.object.spinning_wheel", + offset: (-7.5, -5.0, 0.0), lod_axes: (0.0, 0.0, 0.0), ), ], diff --git a/common/src/comp/body/object.rs b/common/src/comp/body/object.rs index 97f2d203a5..83a1763a0d 100644 --- a/common/src/comp/body/object.rs +++ b/common/src/comp/body/object.rs @@ -228,6 +228,9 @@ impl Body { Body::CarpetHumanSquircle => "carpet_human_squircle", Body::Pouch => "pouch", Body::CraftingBench => "crafting_bench", + Body::Forge => "forge", + Body::Loom => "loom", + Body::SpinningWheel => "spinning_wheel", Body::BoltFire => "bolt_fire", Body::BoltFireBig => "bolt_fire_big", Body::ArrowSnake => "arrow_snake", @@ -311,6 +314,9 @@ impl Body { | Body::ChestVines => 100.0, Body::Coins => 1.0, Body::CraftingBench => 100.0, + Body::Forge => 100.0, + Body::Loom => 100.0, + Body::SpinningWheel => 100.0, Body::Crate => 50.0, Body::Crossbow => 200.0, Body::DoorSpooky => 20.0, diff --git a/common/src/terrain/sprite.rs b/common/src/terrain/sprite.rs index 4f74e3a9d8..ad48705452 100644 --- a/common/src/terrain/sprite.rs +++ b/common/src/terrain/sprite.rs @@ -154,6 +154,8 @@ make_case_elim!( DungeonChest3 = 0x7F, DungeonChest4 = 0x80, DungeonChest5 = 0x81, + Loom = 0x82, + SpinningWheel = 0x83, } ); @@ -204,6 +206,8 @@ impl SpriteKind { SpriteKind::CraftingBench => 1.18, SpriteKind::Forge => 2.7, SpriteKind::Cauldron => 1.27, + SpriteKind::SpinningWheel => 1.6, + SpriteKind::Loom => 1.27, SpriteKind::Anvil => 1.1, SpriteKind::CookingPot => 1.36, // TODO: Find suitable heights. @@ -357,6 +361,8 @@ impl SpriteKind { | SpriteKind::Cauldron | SpriteKind::Anvil | SpriteKind::CookingPot + | SpriteKind::SpinningWheel + | SpriteKind::Loom ) } } diff --git a/voxygen/src/hud/crafting.rs b/voxygen/src/hud/crafting.rs index 761405f684..44947a5cde 100644 --- a/voxygen/src/hud/crafting.rs +++ b/voxygen/src/hud/crafting.rs @@ -688,6 +688,9 @@ impl<'a> Widget for Crafting<'a> { Some(SpriteKind::Cauldron) => "Cauldron", Some(SpriteKind::CookingPot) => "CookingPot", Some(SpriteKind::CraftingBench) => "CraftingBench", + Some(SpriteKind::Forge) => "Forge", + Some(SpriteKind::Loom) => "Loom", + Some(SpriteKind::SpinningWheel) => "SpinningWheel", None => "CraftsmanHammer", _ => "CraftsmanHammer", }; @@ -707,6 +710,9 @@ impl<'a> Widget for Crafting<'a> { Some(SpriteKind::Cauldron) => "hud.crafting.cauldron", Some(SpriteKind::CookingPot) => "hud.crafting.cooking_pot", Some(SpriteKind::CraftingBench) => "hud.crafting.crafting_bench", + Some(SpriteKind::Forge) => "hud.crafting.forge", + Some(SpriteKind::Loom) => "hud.crafting.loom", + Some(SpriteKind::SpinningWheel) => "hud.crafting.spinning_wheel", _ => "", }; Text::new(&self.localized_strings.get(station_name)) diff --git a/voxygen/src/scene/terrain/watcher.rs b/voxygen/src/scene/terrain/watcher.rs index 3b32b2f6a3..e880dc77bd 100644 --- a/voxygen/src/scene/terrain/watcher.rs +++ b/voxygen/src/scene/terrain/watcher.rs @@ -121,6 +121,12 @@ impl BlocksOfInterest { Some(SpriteKind::Forge) => { interactables.push((pos, Interaction::Craft(CraftingTab::Dismantle))) }, + Some(SpriteKind::SpinningWheel) => { + interactables.push((pos, Interaction::Craft(CraftingTab::All))) + }, + Some(SpriteKind::Loom) => { + interactables.push((pos, Interaction::Craft(CraftingTab::All))) + }, Some(SpriteKind::Cauldron) => { interactables.push((pos, Interaction::Craft(CraftingTab::Potion))) }, diff --git a/world/src/site/settlement/building/archetype/house.rs b/world/src/site/settlement/building/archetype/house.rs index 7aecd69def..3f4ef98141 100644 --- a/world/src/site/settlement/building/archetype/house.rs +++ b/world/src/site/settlement/building/archetype/house.rs @@ -530,7 +530,7 @@ impl Archetype for House { center_offset.x, center_offset.y, z + 100, - )) % 8 + )) % 11 { 0..=1 => SpriteKind::Crate, 2 => SpriteKind::Bench, @@ -539,7 +539,9 @@ impl Archetype for House { 5 => SpriteKind::CraftingBench, 6 => SpriteKind::FireBowlGround, 7 => SpriteKind::Cauldron, - //8 => SpriteKind::Forge, + 8 => SpriteKind::Forge, + 9 => SpriteKind::Loom, + 10 => SpriteKind::SpinningWheel, _ => unreachable!(), };