From 65ea69bef33b3dccf0d204704c712a08806ec7be Mon Sep 17 00:00:00 2001 From: Youssef Fahmy Date: Mon, 19 Jun 2023 01:16:42 +0000 Subject: [PATCH] Small balance changes --- assets/common/component_recipe_book.ron | 336 +++++++----------- .../entity/dungeon/sea_chapel/prisoner.ron | 2 +- assets/common/entity/village/alchemist.ron | 2 +- assets/common/entity/village/blacksmith.ron | 2 +- assets/common/entity/village/bowman.ron | 2 +- assets/common/entity/village/captain.ron | 2 +- assets/common/entity/village/chef.ron | 2 +- assets/common/entity/village/farmer.ron | 2 +- assets/common/entity/village/guard.ron | 2 +- assets/common/entity/village/herbalist.ron | 2 +- assets/common/entity/village/hunter.ron | 2 +- assets/common/entity/village/merchant.ron | 2 +- assets/common/entity/village/mountaineer.ron | 2 +- assets/common/entity/village/skinner.ron | 2 +- assets/common/entity/village/villager.ron | 2 +- .../wild/{aggressive => peaceful}/bushly.ron | 2 +- .../wild/{aggressive => peaceful}/driggle.ron | 2 +- .../{aggressive => peaceful}/emberfly.ron | 2 +- .../{aggressive => peaceful}/mossy_snail.ron | 2 +- .../treant_sapling.ron | 2 +- assets/common/entity/world/traveler0.ron | 2 +- assets/common/entity/world/traveler1.ron | 2 +- assets/common/entity/world/traveler2.ron | 2 +- assets/common/entity/world/traveler3.ron | 2 +- assets/common/items/armor/boreal/back.ron | 2 +- assets/common/items/armor/boreal/chest.ron | 2 +- assets/common/items/armor/boreal/foot.ron | 2 +- assets/common/items/armor/boreal/hand.ron | 2 +- assets/common/items/armor/boreal/pants.ron | 2 +- assets/common/items/armor/boreal/shoulder.ron | 4 +- assets/common/items/armor/brinestone/hand.ron | 2 +- .../items/armor/misc/head/boreal_warhelm.ron | 11 +- .../items/crafting_ing/cloth/cloth_strips.ron | 10 + .../items/crafting_ing/living_embers.ron | 2 +- .../items/crafting_ing/sentient_seed.ron | 10 + .../biped_small/boreal/chest/warrior.ron | 2 +- .../biped_small/boreal/foot/warrior.ron | 2 +- .../biped_small/boreal/hand/warrior.ron | 2 +- .../biped_small/boreal/pants/warrior.ron | 2 +- .../creature/biped_small/bushly.ron | 3 +- .../creature/biped_small/irrwurz.ron | 2 + .../creature/quad_low/maneater.ron | 1 + .../creature/quad_small/treant_sapling.ron | 1 + .../loot_tables/creature/theropod/axebeak.ron | 2 +- .../loot_tables/dungeon/tier-0/mandragora.ron | 1 + assets/common/loot_tables/world/traveler0.ron | 11 - assets/common/loot_tables/world/traveler1.ron | 16 - assets/common/loot_tables/world/traveler2.ron | 23 -- assets/common/loot_tables/world/traveler3.ron | 26 -- .../world/world_bosses/gigas_frost/boss.ron | 2 +- assets/common/material_stats_manifest.ron | 21 +- assets/common/recipe_book.ron | 76 ++-- assets/voxygen/item_image_manifest.ron | 10 +- .../voxygen/voxel/biped_weapon_manifest.ron | 4 +- assets/voxygen/voxel/item_drop_manifest.ron | 4 +- .../crafting_ing/cloth/cloth_strips.vox | 3 + .../sprite/crafting_ing/sentient_seed.vox | 3 + .../voxygen/voxel/weapon/hammer/craftsman.vox | 2 +- .../voxel/weapon/tool/pickaxe_stone.vox | 3 + .../wildlife/spawn/temperate/rainforest.ron | 8 +- .../world/wildlife/spawn/temperate/rare.ron | 6 +- .../world/wildlife/spawn/temperate/wood.ron | 8 +- 62 files changed, 279 insertions(+), 396 deletions(-) rename assets/common/entity/wild/{aggressive => peaceful}/bushly.ron (89%) rename assets/common/entity/wild/{aggressive => peaceful}/driggle.ron (86%) rename assets/common/entity/wild/{aggressive => peaceful}/emberfly.ron (86%) rename assets/common/entity/wild/{aggressive => peaceful}/mossy_snail.ron (87%) rename assets/common/entity/wild/{aggressive => peaceful}/treant_sapling.ron (87%) create mode 100644 assets/common/items/crafting_ing/cloth/cloth_strips.ron create mode 100644 assets/common/items/crafting_ing/sentient_seed.ron delete mode 100644 assets/common/loot_tables/world/traveler0.ron delete mode 100644 assets/common/loot_tables/world/traveler1.ron delete mode 100644 assets/common/loot_tables/world/traveler2.ron delete mode 100644 assets/common/loot_tables/world/traveler3.ron create mode 100644 assets/voxygen/voxel/sprite/crafting_ing/cloth/cloth_strips.vox create mode 100644 assets/voxygen/voxel/sprite/crafting_ing/sentient_seed.vox create mode 100644 assets/voxygen/voxel/weapon/tool/pickaxe_stone.vox diff --git a/assets/common/component_recipe_book.ron b/assets/common/component_recipe_book.ron index 0ef473e489..f485e9bdac 100644 --- a/assets/common/component_recipe_book.ron +++ b/assets/common/component_recipe_book.ron @@ -7,9 +7,7 @@ ), material: ("common.items.mineral.ingot.bronze", 5), modifier: None, - additional_inputs: [ - (Item("common.items.tool.craftsman_hammer"), 0), - ], + additional_inputs: [], craft_sprite: Some(Anvil), ), ( @@ -19,9 +17,7 @@ ), material: ("common.items.mineral.ingot.iron", 5), modifier: None, - additional_inputs: [ - (Item("common.items.tool.craftsman_hammer"), 0), - ], + additional_inputs: [], craft_sprite: Some(Anvil), ), ( @@ -79,9 +75,7 @@ ), material: ("common.items.mineral.ingot.bronze", 5), modifier: Some(("common.items.crafting_ing.animal_misc.sharp_fang", 1)), - additional_inputs: [ - (Item("common.items.tool.craftsman_hammer"), 0), - ], + additional_inputs: [], craft_sprite: Some(Anvil), ), ( @@ -91,9 +85,7 @@ ), material: ("common.items.mineral.ingot.iron", 5), modifier: Some(("common.items.crafting_ing.animal_misc.sharp_fang", 2)), - additional_inputs: [ - (Item("common.items.tool.craftsman_hammer"), 0), - ], + additional_inputs: [], craft_sprite: Some(Anvil), ), ( @@ -151,9 +143,7 @@ ), material: ("common.items.mineral.ingot.bronze", 5), modifier: Some(("common.items.crafting_ing.animal_misc.claw", 1)), - additional_inputs: [ - (Item("common.items.tool.craftsman_hammer"), 0), - ], + additional_inputs: [], craft_sprite: Some(Anvil), ), ( @@ -163,9 +153,7 @@ ), material: ("common.items.mineral.ingot.iron", 5), modifier: Some(("common.items.crafting_ing.animal_misc.claw", 2)), - additional_inputs: [ - (Item("common.items.tool.craftsman_hammer"), 0), - ], + additional_inputs: [], craft_sprite: Some(Anvil), ), ( @@ -223,9 +211,7 @@ ), material: ("common.items.mineral.ingot.bronze", 5), modifier: Some(("common.items.crafting_ing.animal_misc.long_tusk", 1)), - additional_inputs: [ - (Item("common.items.tool.craftsman_hammer"), 0), - ], + additional_inputs: [], craft_sprite: Some(Anvil), ), ( @@ -235,9 +221,7 @@ ), material: ("common.items.mineral.ingot.iron", 5), modifier: Some(("common.items.crafting_ing.animal_misc.long_tusk", 2)), - additional_inputs: [ - (Item("common.items.tool.craftsman_hammer"), 0), - ], + additional_inputs: [], craft_sprite: Some(Anvil), ), ( @@ -295,9 +279,7 @@ ), material: ("common.items.mineral.ingot.bronze", 5), modifier: Some(("common.items.crafting_ing.animal_misc.strong_pincer", 1)), - additional_inputs: [ - (Item("common.items.tool.craftsman_hammer"), 0), - ], + additional_inputs: [], craft_sprite: Some(Anvil), ), ( @@ -307,9 +289,7 @@ ), material: ("common.items.mineral.ingot.iron", 5), modifier: Some(("common.items.crafting_ing.animal_misc.strong_pincer", 2)), - additional_inputs: [ - (Item("common.items.tool.craftsman_hammer"), 0), - ], + additional_inputs: [], craft_sprite: Some(Anvil), ), ( @@ -367,9 +347,7 @@ ), material: ("common.items.mineral.ingot.bronze", 5), modifier: Some(("common.items.crafting_ing.animal_misc.large_horn", 1)), - additional_inputs: [ - (Item("common.items.tool.craftsman_hammer"), 0), - ], + additional_inputs: [], craft_sprite: Some(Anvil), ), ( @@ -379,9 +357,7 @@ ), material: ("common.items.mineral.ingot.iron", 5), modifier: Some(("common.items.crafting_ing.animal_misc.large_horn", 2)), - additional_inputs: [ - (Item("common.items.tool.craftsman_hammer"), 0), - ], + additional_inputs: [], craft_sprite: Some(Anvil), ), ( @@ -439,9 +415,7 @@ ), material: ("common.items.mineral.ingot.bronze", 5), modifier: Some(("common.items.crafting_ing.animal_misc.elegant_crest", 1)), - additional_inputs: [ - (Item("common.items.tool.craftsman_hammer"), 0), - ], + additional_inputs: [], craft_sprite: Some(Anvil), ), ( @@ -451,9 +425,7 @@ ), material: ("common.items.mineral.ingot.iron", 5), modifier: Some(("common.items.crafting_ing.animal_misc.elegant_crest", 2)), - additional_inputs: [ - (Item("common.items.tool.craftsman_hammer"), 0), - ], + additional_inputs: [], craft_sprite: Some(Anvil), ), ( @@ -512,9 +484,7 @@ ), material: ("common.items.mineral.ingot.bronze", 5), modifier: None, - additional_inputs: [ - (Item("common.items.tool.craftsman_hammer"), 0), - ], + additional_inputs: [], craft_sprite: Some(Anvil), ), ( @@ -524,9 +494,7 @@ ), material: ("common.items.mineral.ingot.iron", 5), modifier: None, - additional_inputs: [ - (Item("common.items.tool.craftsman_hammer"), 0), - ], + additional_inputs: [], craft_sprite: Some(Anvil), ), ( @@ -584,9 +552,7 @@ ), material: ("common.items.mineral.ingot.bronze", 5), modifier: Some(("common.items.crafting_ing.animal_misc.sharp_fang", 1)), - additional_inputs: [ - (Item("common.items.tool.craftsman_hammer"), 0), - ], + additional_inputs: [], craft_sprite: Some(Anvil), ), ( @@ -596,9 +562,7 @@ ), material: ("common.items.mineral.ingot.iron", 5), modifier: Some(("common.items.crafting_ing.animal_misc.sharp_fang", 2)), - additional_inputs: [ - (Item("common.items.tool.craftsman_hammer"), 0), - ], + additional_inputs: [], craft_sprite: Some(Anvil), ), ( @@ -656,9 +620,7 @@ ), material: ("common.items.mineral.ingot.bronze", 5), modifier: Some(("common.items.crafting_ing.animal_misc.claw", 1)), - additional_inputs: [ - (Item("common.items.tool.craftsman_hammer"), 0), - ], + additional_inputs: [], craft_sprite: Some(Anvil), ), ( @@ -668,9 +630,7 @@ ), material: ("common.items.mineral.ingot.iron", 5), modifier: Some(("common.items.crafting_ing.animal_misc.claw", 2)), - additional_inputs: [ - (Item("common.items.tool.craftsman_hammer"), 0), - ], + additional_inputs: [], craft_sprite: Some(Anvil), ), ( @@ -728,9 +688,7 @@ ), material: ("common.items.mineral.ingot.bronze", 5), modifier: Some(("common.items.crafting_ing.animal_misc.long_tusk", 1)), - additional_inputs: [ - (Item("common.items.tool.craftsman_hammer"), 0), - ], + additional_inputs: [], craft_sprite: Some(Anvil), ), ( @@ -740,9 +698,7 @@ ), material: ("common.items.mineral.ingot.iron", 5), modifier: Some(("common.items.crafting_ing.animal_misc.long_tusk", 2)), - additional_inputs: [ - (Item("common.items.tool.craftsman_hammer"), 0), - ], + additional_inputs: [], craft_sprite: Some(Anvil), ), ( @@ -800,9 +756,7 @@ ), material: ("common.items.mineral.ingot.bronze", 5), modifier: Some(("common.items.crafting_ing.animal_misc.strong_pincer", 1)), - additional_inputs: [ - (Item("common.items.tool.craftsman_hammer"), 0), - ], + additional_inputs: [], craft_sprite: Some(Anvil), ), ( @@ -812,9 +766,7 @@ ), material: ("common.items.mineral.ingot.iron", 5), modifier: Some(("common.items.crafting_ing.animal_misc.strong_pincer", 2)), - additional_inputs: [ - (Item("common.items.tool.craftsman_hammer"), 0), - ], + additional_inputs: [], craft_sprite: Some(Anvil), ), ( @@ -872,9 +824,7 @@ ), material: ("common.items.mineral.ingot.bronze", 5), modifier: Some(("common.items.crafting_ing.animal_misc.large_horn", 1)), - additional_inputs: [ - (Item("common.items.tool.craftsman_hammer"), 0), - ], + additional_inputs: [], craft_sprite: Some(Anvil), ), ( @@ -884,9 +834,7 @@ ), material: ("common.items.mineral.ingot.iron", 5), modifier: Some(("common.items.crafting_ing.animal_misc.large_horn", 2)), - additional_inputs: [ - (Item("common.items.tool.craftsman_hammer"), 0), - ], + additional_inputs: [], craft_sprite: Some(Anvil), ), ( @@ -944,9 +892,7 @@ ), material: ("common.items.mineral.ingot.bronze", 5), modifier: Some(("common.items.crafting_ing.animal_misc.elegant_crest", 1)), - additional_inputs: [ - (Item("common.items.tool.craftsman_hammer"), 0), - ], + additional_inputs: [], craft_sprite: Some(Anvil), ), ( @@ -956,9 +902,7 @@ ), material: ("common.items.mineral.ingot.iron", 5), modifier: Some(("common.items.crafting_ing.animal_misc.elegant_crest", 2)), - additional_inputs: [ - (Item("common.items.tool.craftsman_hammer"), 0), - ], + additional_inputs: [], craft_sprite: Some(Anvil), ), ( @@ -1017,9 +961,7 @@ ), material: ("common.items.mineral.ingot.bronze", 5), modifier: None, - additional_inputs: [ - (Item("common.items.tool.craftsman_hammer"), 0), - ], + additional_inputs: [], craft_sprite: Some(Anvil), ), ( @@ -1029,9 +971,7 @@ ), material: ("common.items.mineral.ingot.iron", 5), modifier: None, - additional_inputs: [ - (Item("common.items.tool.craftsman_hammer"), 0), - ], + additional_inputs: [], craft_sprite: Some(Anvil), ), ( @@ -1089,9 +1029,7 @@ ), material: ("common.items.mineral.ingot.bronze", 5), modifier: Some(("common.items.crafting_ing.animal_misc.sharp_fang", 1)), - additional_inputs: [ - (Item("common.items.tool.craftsman_hammer"), 0), - ], + additional_inputs: [], craft_sprite: Some(Anvil), ), ( @@ -1101,9 +1039,7 @@ ), material: ("common.items.mineral.ingot.iron", 5), modifier: Some(("common.items.crafting_ing.animal_misc.sharp_fang", 2)), - additional_inputs: [ - (Item("common.items.tool.craftsman_hammer"), 0), - ], + additional_inputs: [], craft_sprite: Some(Anvil), ), ( @@ -1161,9 +1097,7 @@ ), material: ("common.items.mineral.ingot.bronze", 5), modifier: Some(("common.items.crafting_ing.animal_misc.claw", 1)), - additional_inputs: [ - (Item("common.items.tool.craftsman_hammer"), 0), - ], + additional_inputs: [], craft_sprite: Some(Anvil), ), ( @@ -1173,9 +1107,7 @@ ), material: ("common.items.mineral.ingot.iron", 5), modifier: Some(("common.items.crafting_ing.animal_misc.claw", 2)), - additional_inputs: [ - (Item("common.items.tool.craftsman_hammer"), 0), - ], + additional_inputs: [], craft_sprite: Some(Anvil), ), ( @@ -1233,9 +1165,7 @@ ), material: ("common.items.mineral.ingot.bronze", 5), modifier: Some(("common.items.crafting_ing.animal_misc.long_tusk", 1)), - additional_inputs: [ - (Item("common.items.tool.craftsman_hammer"), 0), - ], + additional_inputs: [], craft_sprite: Some(Anvil), ), ( @@ -1245,9 +1175,7 @@ ), material: ("common.items.mineral.ingot.iron", 5), modifier: Some(("common.items.crafting_ing.animal_misc.long_tusk", 2)), - additional_inputs: [ - (Item("common.items.tool.craftsman_hammer"), 0), - ], + additional_inputs: [], craft_sprite: Some(Anvil), ), ( @@ -1305,9 +1233,7 @@ ), material: ("common.items.mineral.ingot.bronze", 5), modifier: Some(("common.items.crafting_ing.animal_misc.strong_pincer", 1)), - additional_inputs: [ - (Item("common.items.tool.craftsman_hammer"), 0), - ], + additional_inputs: [], craft_sprite: Some(Anvil), ), ( @@ -1317,9 +1243,7 @@ ), material: ("common.items.mineral.ingot.iron", 5), modifier: Some(("common.items.crafting_ing.animal_misc.strong_pincer", 2)), - additional_inputs: [ - (Item("common.items.tool.craftsman_hammer"), 0), - ], + additional_inputs: [], craft_sprite: Some(Anvil), ), ( @@ -1377,9 +1301,7 @@ ), material: ("common.items.mineral.ingot.bronze", 5), modifier: Some(("common.items.crafting_ing.animal_misc.large_horn", 1)), - additional_inputs: [ - (Item("common.items.tool.craftsman_hammer"), 0), - ], + additional_inputs: [], craft_sprite: Some(Anvil), ), ( @@ -1389,9 +1311,7 @@ ), material: ("common.items.mineral.ingot.iron", 5), modifier: Some(("common.items.crafting_ing.animal_misc.large_horn", 2)), - additional_inputs: [ - (Item("common.items.tool.craftsman_hammer"), 0), - ], + additional_inputs: [], craft_sprite: Some(Anvil), ), ( @@ -1449,9 +1369,7 @@ ), material: ("common.items.mineral.ingot.bronze", 5), modifier: Some(("common.items.crafting_ing.animal_misc.elegant_crest", 1)), - additional_inputs: [ - (Item("common.items.tool.craftsman_hammer"), 0), - ], + additional_inputs: [], craft_sprite: Some(Anvil), ), ( @@ -1461,9 +1379,7 @@ ), material: ("common.items.mineral.ingot.iron", 5), modifier: Some(("common.items.crafting_ing.animal_misc.elegant_crest", 2)), - additional_inputs: [ - (Item("common.items.tool.craftsman_hammer"), 0), - ], + additional_inputs: [], craft_sprite: Some(Anvil), ), ( @@ -1986,7 +1902,7 @@ material: ("common.items.log.wood", 5), modifier: Some(("common.items.crafting_ing.animal_misc.claw", 1)), additional_inputs: [ - (Item("common.items.crafting_ing.leather.leather_strips"), 2), + (Item("common.items.crafting_ing.cloth.cloth_strips"), 2), ], craft_sprite: Some(CraftingBench), ), @@ -1998,7 +1914,7 @@ material: ("common.items.log.bamboo", 5), modifier: Some(("common.items.crafting_ing.animal_misc.claw", 2)), additional_inputs: [ - (Item("common.items.crafting_ing.leather.leather_strips"), 2), + (Item("common.items.crafting_ing.cloth.cloth_strips"), 2), ], craft_sprite: Some(CraftingBench), ), @@ -2010,7 +1926,7 @@ material: ("common.items.log.hardwood", 5), modifier: Some(("common.items.crafting_ing.animal_misc.claw", 5)), additional_inputs: [ - (Item("common.items.crafting_ing.leather.leather_strips"), 2), + (Item("common.items.crafting_ing.cloth.cloth_strips"), 2), ], craft_sprite: Some(CraftingBench), ), @@ -2022,7 +1938,7 @@ material: ("common.items.log.ironwood", 5), modifier: Some(("common.items.crafting_ing.animal_misc.claw", 10)), additional_inputs: [ - (Item("common.items.crafting_ing.leather.leather_strips"), 2), + (Item("common.items.crafting_ing.cloth.cloth_strips"), 2), ], craft_sprite: Some(CraftingBench), ), @@ -2034,7 +1950,7 @@ material: ("common.items.log.frostwood", 5), modifier: Some(("common.items.crafting_ing.animal_misc.claw", 15)), additional_inputs: [ - (Item("common.items.crafting_ing.leather.leather_strips"), 2), + (Item("common.items.crafting_ing.cloth.cloth_strips"), 2), ], craft_sprite: Some(CraftingBench), ), @@ -2046,7 +1962,7 @@ material: ("common.items.log.eldwood", 5), modifier: Some(("common.items.crafting_ing.animal_misc.claw", 25)), additional_inputs: [ - (Item("common.items.crafting_ing.leather.leather_strips"), 2), + (Item("common.items.crafting_ing.cloth.cloth_strips"), 2), ], craft_sprite: Some(CraftingBench), ), @@ -2058,7 +1974,7 @@ material: ("common.items.log.wood", 5), modifier: Some(("common.items.crafting_ing.animal_misc.large_horn", 1)), additional_inputs: [ - (Item("common.items.crafting_ing.leather.leather_strips"), 2), + (Item("common.items.crafting_ing.cloth.cloth_strips"), 2), ], craft_sprite: Some(CraftingBench), ), @@ -2070,7 +1986,7 @@ material: ("common.items.log.bamboo", 5), modifier: Some(("common.items.crafting_ing.animal_misc.large_horn", 2)), additional_inputs: [ - (Item("common.items.crafting_ing.leather.leather_strips"), 2), + (Item("common.items.crafting_ing.cloth.cloth_strips"), 2), ], craft_sprite: Some(CraftingBench), ), @@ -2082,7 +1998,7 @@ material: ("common.items.log.hardwood", 5), modifier: Some(("common.items.crafting_ing.animal_misc.large_horn", 5)), additional_inputs: [ - (Item("common.items.crafting_ing.leather.leather_strips"), 2), + (Item("common.items.crafting_ing.cloth.cloth_strips"), 2), ], craft_sprite: Some(CraftingBench), ), @@ -2094,7 +2010,7 @@ material: ("common.items.log.ironwood", 5), modifier: Some(("common.items.crafting_ing.animal_misc.large_horn", 10)), additional_inputs: [ - (Item("common.items.crafting_ing.leather.leather_strips"), 2), + (Item("common.items.crafting_ing.cloth.cloth_strips"), 2), ], craft_sprite: Some(CraftingBench), ), @@ -2106,7 +2022,7 @@ material: ("common.items.log.frostwood", 5), modifier: Some(("common.items.crafting_ing.animal_misc.large_horn", 15)), additional_inputs: [ - (Item("common.items.crafting_ing.leather.leather_strips"), 2), + (Item("common.items.crafting_ing.cloth.cloth_strips"), 2), ], craft_sprite: Some(CraftingBench), ), @@ -2118,7 +2034,7 @@ material: ("common.items.log.eldwood", 5), modifier: Some(("common.items.crafting_ing.animal_misc.large_horn", 25)), additional_inputs: [ - (Item("common.items.crafting_ing.leather.leather_strips"), 2), + (Item("common.items.crafting_ing.cloth.cloth_strips"), 2), ], craft_sprite: Some(CraftingBench), ), @@ -2130,7 +2046,7 @@ material: ("common.items.log.wood", 5), modifier: Some(("common.items.crafting_ing.animal_misc.long_tusk", 1)), additional_inputs: [ - (Item("common.items.crafting_ing.leather.leather_strips"), 2), + (Item("common.items.crafting_ing.cloth.cloth_strips"), 2), ], craft_sprite: Some(CraftingBench), ), @@ -2142,7 +2058,7 @@ material: ("common.items.log.bamboo", 5), modifier: Some(("common.items.crafting_ing.animal_misc.long_tusk", 2)), additional_inputs: [ - (Item("common.items.crafting_ing.leather.leather_strips"), 2), + (Item("common.items.crafting_ing.cloth.cloth_strips"), 2), ], craft_sprite: Some(CraftingBench), ), @@ -2154,7 +2070,7 @@ material: ("common.items.log.hardwood", 5), modifier: Some(("common.items.crafting_ing.animal_misc.long_tusk", 5)), additional_inputs: [ - (Item("common.items.crafting_ing.leather.leather_strips"), 2), + (Item("common.items.crafting_ing.cloth.cloth_strips"), 2), ], craft_sprite: Some(CraftingBench), ), @@ -2166,7 +2082,7 @@ material: ("common.items.log.ironwood", 5), modifier: Some(("common.items.crafting_ing.animal_misc.long_tusk", 10)), additional_inputs: [ - (Item("common.items.crafting_ing.leather.leather_strips"), 2), + (Item("common.items.crafting_ing.cloth.cloth_strips"), 2), ], craft_sprite: Some(CraftingBench), ), @@ -2178,7 +2094,7 @@ material: ("common.items.log.frostwood", 5), modifier: Some(("common.items.crafting_ing.animal_misc.long_tusk", 15)), additional_inputs: [ - (Item("common.items.crafting_ing.leather.leather_strips"), 2), + (Item("common.items.crafting_ing.cloth.cloth_strips"), 2), ], craft_sprite: Some(CraftingBench), ), @@ -2190,7 +2106,7 @@ material: ("common.items.log.eldwood", 5), modifier: Some(("common.items.crafting_ing.animal_misc.long_tusk", 25)), additional_inputs: [ - (Item("common.items.crafting_ing.leather.leather_strips"), 2), + (Item("common.items.crafting_ing.cloth.cloth_strips"), 2), ], craft_sprite: Some(CraftingBench), ), @@ -2202,7 +2118,7 @@ material: ("common.items.log.wood", 5), modifier: Some(("common.items.crafting_ing.animal_misc.elegant_crest", 1)), additional_inputs: [ - (Item("common.items.crafting_ing.leather.leather_strips"), 2), + (Item("common.items.crafting_ing.cloth.cloth_strips"), 2), ], craft_sprite: Some(CraftingBench), ), @@ -2214,7 +2130,7 @@ material: ("common.items.log.bamboo", 5), modifier: Some(("common.items.crafting_ing.animal_misc.elegant_crest", 2)), additional_inputs: [ - (Item("common.items.crafting_ing.leather.leather_strips"), 2), + (Item("common.items.crafting_ing.cloth.cloth_strips"), 2), ], craft_sprite: Some(CraftingBench), ), @@ -2226,7 +2142,7 @@ material: ("common.items.log.hardwood", 5), modifier: Some(("common.items.crafting_ing.animal_misc.elegant_crest", 5)), additional_inputs: [ - (Item("common.items.crafting_ing.leather.leather_strips"), 2), + (Item("common.items.crafting_ing.cloth.cloth_strips"), 2), ], craft_sprite: Some(CraftingBench), ), @@ -2238,7 +2154,7 @@ material: ("common.items.log.ironwood", 5), modifier: Some(("common.items.crafting_ing.animal_misc.elegant_crest", 10)), additional_inputs: [ - (Item("common.items.crafting_ing.leather.leather_strips"), 2), + (Item("common.items.crafting_ing.cloth.cloth_strips"), 2), ], craft_sprite: Some(CraftingBench), ), @@ -2250,7 +2166,7 @@ material: ("common.items.log.frostwood", 5), modifier: Some(("common.items.crafting_ing.animal_misc.elegant_crest", 15)), additional_inputs: [ - (Item("common.items.crafting_ing.leather.leather_strips"), 2), + (Item("common.items.crafting_ing.cloth.cloth_strips"), 2), ], craft_sprite: Some(CraftingBench), ), @@ -2262,7 +2178,7 @@ material: ("common.items.log.eldwood", 5), modifier: Some(("common.items.crafting_ing.animal_misc.elegant_crest", 25)), additional_inputs: [ - (Item("common.items.crafting_ing.leather.leather_strips"), 2), + (Item("common.items.crafting_ing.cloth.cloth_strips"), 2), ], craft_sprite: Some(CraftingBench), ), @@ -2274,7 +2190,7 @@ material: ("common.items.log.wood", 5), modifier: Some(("common.items.crafting_ing.animal_misc.sharp_fang", 1)), additional_inputs: [ - (Item("common.items.crafting_ing.leather.leather_strips"), 2), + (Item("common.items.crafting_ing.cloth.cloth_strips"), 2), ], craft_sprite: Some(CraftingBench), ), @@ -2286,7 +2202,7 @@ material: ("common.items.log.bamboo", 5), modifier: Some(("common.items.crafting_ing.animal_misc.sharp_fang", 2)), additional_inputs: [ - (Item("common.items.crafting_ing.leather.leather_strips"), 2), + (Item("common.items.crafting_ing.cloth.cloth_strips"), 2), ], craft_sprite: Some(CraftingBench), ), @@ -2298,7 +2214,7 @@ material: ("common.items.log.hardwood", 5), modifier: Some(("common.items.crafting_ing.animal_misc.sharp_fang", 5)), additional_inputs: [ - (Item("common.items.crafting_ing.leather.leather_strips"), 2), + (Item("common.items.crafting_ing.cloth.cloth_strips"), 2), ], craft_sprite: Some(CraftingBench), ), @@ -2310,7 +2226,7 @@ material: ("common.items.log.ironwood", 5), modifier: Some(("common.items.crafting_ing.animal_misc.sharp_fang", 10)), additional_inputs: [ - (Item("common.items.crafting_ing.leather.leather_strips"), 2), + (Item("common.items.crafting_ing.cloth.cloth_strips"), 2), ], craft_sprite: Some(CraftingBench), ), @@ -2322,7 +2238,7 @@ material: ("common.items.log.frostwood", 5), modifier: Some(("common.items.crafting_ing.animal_misc.sharp_fang", 15)), additional_inputs: [ - (Item("common.items.crafting_ing.leather.leather_strips"), 2), + (Item("common.items.crafting_ing.cloth.cloth_strips"), 2), ], craft_sprite: Some(CraftingBench), ), @@ -2334,7 +2250,7 @@ material: ("common.items.log.eldwood", 5), modifier: Some(("common.items.crafting_ing.animal_misc.sharp_fang", 25)), additional_inputs: [ - (Item("common.items.crafting_ing.leather.leather_strips"), 2), + (Item("common.items.crafting_ing.cloth.cloth_strips"), 2), ], craft_sprite: Some(CraftingBench), ), @@ -2346,7 +2262,7 @@ material: ("common.items.log.wood", 5), modifier: Some(("common.items.crafting_ing.animal_misc.strong_pincer", 1)), additional_inputs: [ - (Item("common.items.crafting_ing.leather.leather_strips"), 2), + (Item("common.items.crafting_ing.cloth.cloth_strips"), 2), ], craft_sprite: Some(CraftingBench), ), @@ -2358,7 +2274,7 @@ material: ("common.items.log.bamboo", 5), modifier: Some(("common.items.crafting_ing.animal_misc.strong_pincer", 2)), additional_inputs: [ - (Item("common.items.crafting_ing.leather.leather_strips"), 2), + (Item("common.items.crafting_ing.cloth.cloth_strips"), 2), ], craft_sprite: Some(CraftingBench), ), @@ -2370,7 +2286,7 @@ material: ("common.items.log.hardwood", 5), modifier: Some(("common.items.crafting_ing.animal_misc.strong_pincer", 5)), additional_inputs: [ - (Item("common.items.crafting_ing.leather.leather_strips"), 2), + (Item("common.items.crafting_ing.cloth.cloth_strips"), 2), ], craft_sprite: Some(CraftingBench), ), @@ -2382,7 +2298,7 @@ material: ("common.items.log.ironwood", 5), modifier: Some(("common.items.crafting_ing.animal_misc.strong_pincer", 10)), additional_inputs: [ - (Item("common.items.crafting_ing.leather.leather_strips"), 2), + (Item("common.items.crafting_ing.cloth.cloth_strips"), 2), ], craft_sprite: Some(CraftingBench), ), @@ -2394,7 +2310,7 @@ material: ("common.items.log.frostwood", 5), modifier: Some(("common.items.crafting_ing.animal_misc.strong_pincer", 15)), additional_inputs: [ - (Item("common.items.crafting_ing.leather.leather_strips"), 2), + (Item("common.items.crafting_ing.cloth.cloth_strips"), 2), ], craft_sprite: Some(CraftingBench), ), @@ -2406,7 +2322,7 @@ material: ("common.items.log.eldwood", 5), modifier: Some(("common.items.crafting_ing.animal_misc.strong_pincer", 25)), additional_inputs: [ - (Item("common.items.crafting_ing.leather.leather_strips"), 2), + (Item("common.items.crafting_ing.cloth.cloth_strips"), 2), ], craft_sprite: Some(CraftingBench), ), @@ -2418,7 +2334,7 @@ material: ("common.items.log.wood", 5), modifier: None, additional_inputs: [ - (Item("common.items.crafting_ing.leather.leather_strips"), 2), + (Item("common.items.crafting_ing.cloth.cloth_strips"), 2), ], craft_sprite: Some(CraftingBench), ), @@ -2430,7 +2346,7 @@ material: ("common.items.log.bamboo", 5), modifier: None, additional_inputs: [ - (Item("common.items.crafting_ing.leather.leather_strips"), 2), + (Item("common.items.crafting_ing.cloth.cloth_strips"), 2), ], craft_sprite: Some(CraftingBench), ), @@ -2442,7 +2358,7 @@ material: ("common.items.log.hardwood", 5), modifier: None, additional_inputs: [ - (Item("common.items.crafting_ing.leather.leather_strips"), 2), + (Item("common.items.crafting_ing.cloth.cloth_strips"), 2), ], craft_sprite: Some(CraftingBench), ), @@ -2454,7 +2370,7 @@ material: ("common.items.log.ironwood", 5), modifier: None, additional_inputs: [ - (Item("common.items.crafting_ing.leather.leather_strips"), 2), + (Item("common.items.crafting_ing.cloth.cloth_strips"), 2), ], craft_sprite: Some(CraftingBench), ), @@ -2466,7 +2382,7 @@ material: ("common.items.log.frostwood", 5), modifier: None, additional_inputs: [ - (Item("common.items.crafting_ing.leather.leather_strips"), 2), + (Item("common.items.crafting_ing.cloth.cloth_strips"), 2), ], craft_sprite: Some(CraftingBench), ), @@ -2478,7 +2394,7 @@ material: ("common.items.log.eldwood", 5), modifier: None, additional_inputs: [ - (Item("common.items.crafting_ing.leather.leather_strips"), 2), + (Item("common.items.crafting_ing.cloth.cloth_strips"), 2), ], craft_sprite: Some(CraftingBench), ), @@ -2491,7 +2407,7 @@ material: ("common.items.log.wood", 5), modifier: Some(("common.items.crafting_ing.animal_misc.long_tusk", 1)), additional_inputs: [ - (Item("common.items.crafting_ing.leather.leather_strips"), 2), + (Item("common.items.crafting_ing.cloth.cloth_strips"), 2), ], craft_sprite: Some(CraftingBench), ), @@ -2503,7 +2419,7 @@ material: ("common.items.log.bamboo", 5), modifier: Some(("common.items.crafting_ing.animal_misc.long_tusk", 2)), additional_inputs: [ - (Item("common.items.crafting_ing.leather.leather_strips"), 2), + (Item("common.items.crafting_ing.cloth.cloth_strips"), 2), ], craft_sprite: Some(CraftingBench), ), @@ -2515,7 +2431,7 @@ material: ("common.items.log.hardwood", 5), modifier: Some(("common.items.crafting_ing.animal_misc.long_tusk", 5)), additional_inputs: [ - (Item("common.items.crafting_ing.leather.leather_strips"), 2), + (Item("common.items.crafting_ing.cloth.cloth_strips"), 2), ], craft_sprite: Some(CraftingBench), ), @@ -2527,7 +2443,7 @@ material: ("common.items.log.ironwood", 5), modifier: Some(("common.items.crafting_ing.animal_misc.long_tusk", 10)), additional_inputs: [ - (Item("common.items.crafting_ing.leather.leather_strips"), 2), + (Item("common.items.crafting_ing.cloth.cloth_strips"), 2), ], craft_sprite: Some(CraftingBench), ), @@ -2539,7 +2455,7 @@ material: ("common.items.log.frostwood", 5), modifier: Some(("common.items.crafting_ing.animal_misc.long_tusk", 15)), additional_inputs: [ - (Item("common.items.crafting_ing.leather.leather_strips"), 2), + (Item("common.items.crafting_ing.cloth.cloth_strips"), 2), ], craft_sprite: Some(CraftingBench), ), @@ -2551,7 +2467,7 @@ material: ("common.items.log.eldwood", 5), modifier: Some(("common.items.crafting_ing.animal_misc.long_tusk", 25)), additional_inputs: [ - (Item("common.items.crafting_ing.leather.leather_strips"), 2), + (Item("common.items.crafting_ing.cloth.cloth_strips"), 2), ], craft_sprite: Some(CraftingBench), ), @@ -2563,7 +2479,7 @@ material: ("common.items.log.wood", 5), modifier: Some(("common.items.crafting_ing.animal_misc.strong_pincer", 1)), additional_inputs: [ - (Item("common.items.crafting_ing.leather.leather_strips"), 2), + (Item("common.items.crafting_ing.cloth.cloth_strips"), 2), ], craft_sprite: Some(CraftingBench), ), @@ -2575,7 +2491,7 @@ material: ("common.items.log.bamboo", 5), modifier: Some(("common.items.crafting_ing.animal_misc.strong_pincer", 2)), additional_inputs: [ - (Item("common.items.crafting_ing.leather.leather_strips"), 2), + (Item("common.items.crafting_ing.cloth.cloth_strips"), 2), ], craft_sprite: Some(CraftingBench), ), @@ -2587,7 +2503,7 @@ material: ("common.items.log.hardwood", 5), modifier: Some(("common.items.crafting_ing.animal_misc.strong_pincer", 5)), additional_inputs: [ - (Item("common.items.crafting_ing.leather.leather_strips"), 2), + (Item("common.items.crafting_ing.cloth.cloth_strips"), 2), ], craft_sprite: Some(CraftingBench), ), @@ -2599,7 +2515,7 @@ material: ("common.items.log.ironwood", 5), modifier: Some(("common.items.crafting_ing.animal_misc.strong_pincer", 10)), additional_inputs: [ - (Item("common.items.crafting_ing.leather.leather_strips"), 2), + (Item("common.items.crafting_ing.cloth.cloth_strips"), 2), ], craft_sprite: Some(CraftingBench), ), @@ -2611,7 +2527,7 @@ material: ("common.items.log.frostwood", 5), modifier: Some(("common.items.crafting_ing.animal_misc.strong_pincer", 15)), additional_inputs: [ - (Item("common.items.crafting_ing.leather.leather_strips"), 2), + (Item("common.items.crafting_ing.cloth.cloth_strips"), 2), ], craft_sprite: Some(CraftingBench), ), @@ -2623,7 +2539,7 @@ material: ("common.items.log.eldwood", 5), modifier: Some(("common.items.crafting_ing.animal_misc.strong_pincer", 25)), additional_inputs: [ - (Item("common.items.crafting_ing.leather.leather_strips"), 2), + (Item("common.items.crafting_ing.cloth.cloth_strips"), 2), ], craft_sprite: Some(CraftingBench), ), @@ -2635,7 +2551,7 @@ material: ("common.items.log.wood", 5), modifier: Some(("common.items.crafting_ing.animal_misc.sharp_fang", 1)), additional_inputs: [ - (Item("common.items.crafting_ing.leather.leather_strips"), 2), + (Item("common.items.crafting_ing.cloth.cloth_strips"), 2), ], craft_sprite: Some(CraftingBench), ), @@ -2647,7 +2563,7 @@ material: ("common.items.log.bamboo", 5), modifier: Some(("common.items.crafting_ing.animal_misc.sharp_fang", 2)), additional_inputs: [ - (Item("common.items.crafting_ing.leather.leather_strips"), 2), + (Item("common.items.crafting_ing.cloth.cloth_strips"), 2), ], craft_sprite: Some(CraftingBench), ), @@ -2659,7 +2575,7 @@ material: ("common.items.log.hardwood", 5), modifier: Some(("common.items.crafting_ing.animal_misc.sharp_fang", 5)), additional_inputs: [ - (Item("common.items.crafting_ing.leather.leather_strips"), 2), + (Item("common.items.crafting_ing.cloth.cloth_strips"), 2), ], craft_sprite: Some(CraftingBench), ), @@ -2671,7 +2587,7 @@ material: ("common.items.log.ironwood", 5), modifier: Some(("common.items.crafting_ing.animal_misc.sharp_fang", 10)), additional_inputs: [ - (Item("common.items.crafting_ing.leather.leather_strips"), 2), + (Item("common.items.crafting_ing.cloth.cloth_strips"), 2), ], craft_sprite: Some(CraftingBench), ), @@ -2683,7 +2599,7 @@ material: ("common.items.log.frostwood", 5), modifier: Some(("common.items.crafting_ing.animal_misc.sharp_fang", 15)), additional_inputs: [ - (Item("common.items.crafting_ing.leather.leather_strips"), 2), + (Item("common.items.crafting_ing.cloth.cloth_strips"), 2), ], craft_sprite: Some(CraftingBench), ), @@ -2695,7 +2611,7 @@ material: ("common.items.log.eldwood", 5), modifier: Some(("common.items.crafting_ing.animal_misc.sharp_fang", 25)), additional_inputs: [ - (Item("common.items.crafting_ing.leather.leather_strips"), 2), + (Item("common.items.crafting_ing.cloth.cloth_strips"), 2), ], craft_sprite: Some(CraftingBench), ), @@ -2707,7 +2623,7 @@ material: ("common.items.log.wood", 5), modifier: Some(("common.items.crafting_ing.animal_misc.claw", 1)), additional_inputs: [ - (Item("common.items.crafting_ing.leather.leather_strips"), 2), + (Item("common.items.crafting_ing.cloth.cloth_strips"), 2), ], craft_sprite: Some(CraftingBench), ), @@ -2719,7 +2635,7 @@ material: ("common.items.log.bamboo", 5), modifier: Some(("common.items.crafting_ing.animal_misc.claw", 2)), additional_inputs: [ - (Item("common.items.crafting_ing.leather.leather_strips"), 2), + (Item("common.items.crafting_ing.cloth.cloth_strips"), 2), ], craft_sprite: Some(CraftingBench), ), @@ -2731,7 +2647,7 @@ material: ("common.items.log.hardwood", 5), modifier: Some(("common.items.crafting_ing.animal_misc.claw", 5)), additional_inputs: [ - (Item("common.items.crafting_ing.leather.leather_strips"), 2), + (Item("common.items.crafting_ing.cloth.cloth_strips"), 2), ], craft_sprite: Some(CraftingBench), ), @@ -2743,7 +2659,7 @@ material: ("common.items.log.ironwood", 5), modifier: Some(("common.items.crafting_ing.animal_misc.claw", 10)), additional_inputs: [ - (Item("common.items.crafting_ing.leather.leather_strips"), 2), + (Item("common.items.crafting_ing.cloth.cloth_strips"), 2), ], craft_sprite: Some(CraftingBench), ), @@ -2755,7 +2671,7 @@ material: ("common.items.log.frostwood", 5), modifier: Some(("common.items.crafting_ing.animal_misc.claw", 15)), additional_inputs: [ - (Item("common.items.crafting_ing.leather.leather_strips"), 2), + (Item("common.items.crafting_ing.cloth.cloth_strips"), 2), ], craft_sprite: Some(CraftingBench), ), @@ -2767,7 +2683,7 @@ material: ("common.items.log.eldwood", 5), modifier: Some(("common.items.crafting_ing.animal_misc.claw", 25)), additional_inputs: [ - (Item("common.items.crafting_ing.leather.leather_strips"), 2), + (Item("common.items.crafting_ing.cloth.cloth_strips"), 2), ], craft_sprite: Some(CraftingBench), ), @@ -2779,7 +2695,7 @@ material: ("common.items.log.wood", 5), modifier: Some(("common.items.crafting_ing.animal_misc.large_horn", 1)), additional_inputs: [ - (Item("common.items.crafting_ing.leather.leather_strips"), 2), + (Item("common.items.crafting_ing.cloth.cloth_strips"), 2), ], craft_sprite: Some(CraftingBench), ), @@ -2791,7 +2707,7 @@ material: ("common.items.log.bamboo", 5), modifier: Some(("common.items.crafting_ing.animal_misc.large_horn", 2)), additional_inputs: [ - (Item("common.items.crafting_ing.leather.leather_strips"), 2), + (Item("common.items.crafting_ing.cloth.cloth_strips"), 2), ], craft_sprite: Some(CraftingBench), ), @@ -2803,7 +2719,7 @@ material: ("common.items.log.hardwood", 5), modifier: Some(("common.items.crafting_ing.animal_misc.large_horn", 5)), additional_inputs: [ - (Item("common.items.crafting_ing.leather.leather_strips"), 2), + (Item("common.items.crafting_ing.cloth.cloth_strips"), 2), ], craft_sprite: Some(CraftingBench), ), @@ -2815,7 +2731,7 @@ material: ("common.items.log.ironwood", 5), modifier: Some(("common.items.crafting_ing.animal_misc.large_horn", 10)), additional_inputs: [ - (Item("common.items.crafting_ing.leather.leather_strips"), 2), + (Item("common.items.crafting_ing.cloth.cloth_strips"), 2), ], craft_sprite: Some(CraftingBench), ), @@ -2827,7 +2743,7 @@ material: ("common.items.log.frostwood", 5), modifier: Some(("common.items.crafting_ing.animal_misc.large_horn", 15)), additional_inputs: [ - (Item("common.items.crafting_ing.leather.leather_strips"), 2), + (Item("common.items.crafting_ing.cloth.cloth_strips"), 2), ], craft_sprite: Some(CraftingBench), ), @@ -2839,7 +2755,7 @@ material: ("common.items.log.eldwood", 5), modifier: Some(("common.items.crafting_ing.animal_misc.large_horn", 25)), additional_inputs: [ - (Item("common.items.crafting_ing.leather.leather_strips"), 2), + (Item("common.items.crafting_ing.cloth.cloth_strips"), 2), ], craft_sprite: Some(CraftingBench), ), @@ -2851,7 +2767,7 @@ material: ("common.items.log.wood", 5), modifier: Some(("common.items.crafting_ing.animal_misc.elegant_crest", 1)), additional_inputs: [ - (Item("common.items.crafting_ing.leather.leather_strips"), 2), + (Item("common.items.crafting_ing.cloth.cloth_strips"), 2), ], craft_sprite: Some(CraftingBench), ), @@ -2863,7 +2779,7 @@ material: ("common.items.log.bamboo", 5), modifier: Some(("common.items.crafting_ing.animal_misc.elegant_crest", 2)), additional_inputs: [ - (Item("common.items.crafting_ing.leather.leather_strips"), 2), + (Item("common.items.crafting_ing.cloth.cloth_strips"), 2), ], craft_sprite: Some(CraftingBench), ), @@ -2875,7 +2791,7 @@ material: ("common.items.log.hardwood", 5), modifier: Some(("common.items.crafting_ing.animal_misc.elegant_crest", 5)), additional_inputs: [ - (Item("common.items.crafting_ing.leather.leather_strips"), 2), + (Item("common.items.crafting_ing.cloth.cloth_strips"), 2), ], craft_sprite: Some(CraftingBench), ), @@ -2887,7 +2803,7 @@ material: ("common.items.log.ironwood", 5), modifier: Some(("common.items.crafting_ing.animal_misc.elegant_crest", 10)), additional_inputs: [ - (Item("common.items.crafting_ing.leather.leather_strips"), 2), + (Item("common.items.crafting_ing.cloth.cloth_strips"), 2), ], craft_sprite: Some(CraftingBench), ), @@ -2899,7 +2815,7 @@ material: ("common.items.log.frostwood", 5), modifier: Some(("common.items.crafting_ing.animal_misc.elegant_crest", 15)), additional_inputs: [ - (Item("common.items.crafting_ing.leather.leather_strips"), 2), + (Item("common.items.crafting_ing.cloth.cloth_strips"), 2), ], craft_sprite: Some(CraftingBench), ), @@ -2911,7 +2827,7 @@ material: ("common.items.log.eldwood", 5), modifier: Some(("common.items.crafting_ing.animal_misc.elegant_crest", 25)), additional_inputs: [ - (Item("common.items.crafting_ing.leather.leather_strips"), 2), + (Item("common.items.crafting_ing.cloth.cloth_strips"), 2), ], craft_sprite: Some(CraftingBench), ), @@ -2923,7 +2839,7 @@ material: ("common.items.log.wood", 5), modifier: None, additional_inputs: [ - (Item("common.items.crafting_ing.leather.leather_strips"), 2), + (Item("common.items.crafting_ing.cloth.cloth_strips"), 2), ], craft_sprite: Some(CraftingBench), ), @@ -2935,7 +2851,7 @@ material: ("common.items.log.bamboo", 5), modifier: None, additional_inputs: [ - (Item("common.items.crafting_ing.leather.leather_strips"), 2), + (Item("common.items.crafting_ing.cloth.cloth_strips"), 2), ], craft_sprite: Some(CraftingBench), ), @@ -2947,7 +2863,7 @@ material: ("common.items.log.hardwood", 5), modifier: None, additional_inputs: [ - (Item("common.items.crafting_ing.leather.leather_strips"), 2), + (Item("common.items.crafting_ing.cloth.cloth_strips"), 2), ], craft_sprite: Some(CraftingBench), ), @@ -2959,7 +2875,7 @@ material: ("common.items.log.ironwood", 5), modifier: None, additional_inputs: [ - (Item("common.items.crafting_ing.leather.leather_strips"), 2), + (Item("common.items.crafting_ing.cloth.cloth_strips"), 2), ], craft_sprite: Some(CraftingBench), ), @@ -2971,7 +2887,7 @@ material: ("common.items.log.frostwood", 5), modifier: None, additional_inputs: [ - (Item("common.items.crafting_ing.leather.leather_strips"), 2), + (Item("common.items.crafting_ing.cloth.cloth_strips"), 2), ], craft_sprite: Some(CraftingBench), ), @@ -2983,7 +2899,7 @@ material: ("common.items.log.eldwood", 5), modifier: None, additional_inputs: [ - (Item("common.items.crafting_ing.leather.leather_strips"), 2), + (Item("common.items.crafting_ing.cloth.cloth_strips"), 2), ], craft_sprite: Some(CraftingBench), ), diff --git a/assets/common/entity/dungeon/sea_chapel/prisoner.ron b/assets/common/entity/dungeon/sea_chapel/prisoner.ron index 1758103368..39363d23e8 100644 --- a/assets/common/entity/dungeon/sea_chapel/prisoner.ron +++ b/assets/common/entity/dungeon/sea_chapel/prisoner.ron @@ -3,7 +3,7 @@ name: Name("Prisoner"), body: RandomWith("humanoid"), alignment: Alignment(Npc), - loot: LootTable("common.loot_tables.creature.humanoid"), + loot: LootTable("common.loot_tables.nothing"), inventory: ( loadout: Inline(( inherit: Asset("common.loadout.village.villager"), diff --git a/assets/common/entity/village/alchemist.ron b/assets/common/entity/village/alchemist.ron index faa2aaeec6..d8c9c53eda 100644 --- a/assets/common/entity/village/alchemist.ron +++ b/assets/common/entity/village/alchemist.ron @@ -3,7 +3,7 @@ name: Name("Alchemist"), body: RandomWith("humanoid"), alignment: Alignment(Npc), - loot: LootTable("common.loot_tables.creature.humanoid"), + loot: LootTable("common.loot_tables.nothing"), inventory: ( loadout: Inline(( inherit: Asset("common.loadout.village.alchemist"), diff --git a/assets/common/entity/village/blacksmith.ron b/assets/common/entity/village/blacksmith.ron index d2c33be1c2..93fb72e5ec 100644 --- a/assets/common/entity/village/blacksmith.ron +++ b/assets/common/entity/village/blacksmith.ron @@ -3,7 +3,7 @@ name: Name("Blacksmith"), body: RandomWith("humanoid"), alignment: Alignment(Npc), - loot: LootTable("common.loot_tables.creature.humanoid"), + loot: LootTable("common.loot_tables.nothing"), inventory: ( loadout: Inline(( inherit: Asset("common.loadout.village.blacksmith"), diff --git a/assets/common/entity/village/bowman.ron b/assets/common/entity/village/bowman.ron index cf7e634f5d..c542685e80 100644 --- a/assets/common/entity/village/bowman.ron +++ b/assets/common/entity/village/bowman.ron @@ -3,7 +3,7 @@ name: Name("Bowman"), body: RandomWith("humanoid"), alignment: Alignment(Npc), - loot: LootTable("common.loot_tables.creature.humanoid"), + loot: LootTable("common.loot_tables.nothing"), inventory: ( loadout: Inline(( inherit: Choice([ diff --git a/assets/common/entity/village/captain.ron b/assets/common/entity/village/captain.ron index f6b247e641..5df6d45c81 100644 --- a/assets/common/entity/village/captain.ron +++ b/assets/common/entity/village/captain.ron @@ -3,7 +3,7 @@ name: Name("Captain"), body: RandomWith("humanoid"), alignment: Alignment(Npc), - loot: LootTable("common.loot_tables.creature.humanoid"), + loot: LootTable("common.loot_tables.nothing"), inventory: ( loadout: Inline(( inherit: Asset("common.loadout.village.captain"), diff --git a/assets/common/entity/village/chef.ron b/assets/common/entity/village/chef.ron index 8b06e1bdc6..a0e6bbbdae 100644 --- a/assets/common/entity/village/chef.ron +++ b/assets/common/entity/village/chef.ron @@ -3,7 +3,7 @@ name: Name("Chef"), body: RandomWith("humanoid"), alignment: Alignment(Npc), - loot: LootTable("common.loot_tables.creature.humanoid"), + loot: LootTable("common.loot_tables.nothing"), inventory: ( loadout: Inline(( inherit: Asset("common.loadout.village.chef"), diff --git a/assets/common/entity/village/farmer.ron b/assets/common/entity/village/farmer.ron index 77c8f1469c..f248d5611c 100644 --- a/assets/common/entity/village/farmer.ron +++ b/assets/common/entity/village/farmer.ron @@ -3,7 +3,7 @@ name: Name("Farmer"), body: RandomWith("humanoid"), alignment: Alignment(Npc), - loot: LootTable("common.loot_tables.creature.humanoid"), + loot: LootTable("common.loot_tables.nothing"), inventory: ( loadout: Inline(( inherit: Asset("common.loadout.village.farmer"), diff --git a/assets/common/entity/village/guard.ron b/assets/common/entity/village/guard.ron index 0f9981409c..328bdf6e85 100644 --- a/assets/common/entity/village/guard.ron +++ b/assets/common/entity/village/guard.ron @@ -3,7 +3,7 @@ name: Name("Guard"), body: RandomWith("humanoid"), alignment: Alignment(Npc), - loot: LootTable("common.loot_tables.creature.humanoid"), + loot: LootTable("common.loot_tables.nothing"), inventory: ( loadout: Inline(( inherit: Asset("common.loadout.village.guard"), diff --git a/assets/common/entity/village/herbalist.ron b/assets/common/entity/village/herbalist.ron index db8bea4a03..fbed25db5b 100644 --- a/assets/common/entity/village/herbalist.ron +++ b/assets/common/entity/village/herbalist.ron @@ -3,7 +3,7 @@ name: Name("Herbalist"), body: RandomWith("humanoid"), alignment: Alignment(Npc), - loot: LootTable("common.loot_tables.creature.humanoid"), + loot: LootTable("common.loot_tables.nothing"), inventory: ( loadout: Inline(( inherit: Asset("common.loadout.village.herbalist"), diff --git a/assets/common/entity/village/hunter.ron b/assets/common/entity/village/hunter.ron index d0304584c2..06cff77832 100644 --- a/assets/common/entity/village/hunter.ron +++ b/assets/common/entity/village/hunter.ron @@ -3,7 +3,7 @@ name: Name("Hunter"), body: RandomWith("humanoid"), alignment: Alignment(Npc), - loot: LootTable("common.loot_tables.creature.humanoid"), + loot: LootTable("common.loot_tables.nothing"), inventory: ( loadout: Inline(( inherit: Asset("common.loadout.village.hunter"), diff --git a/assets/common/entity/village/merchant.ron b/assets/common/entity/village/merchant.ron index 64ae86cb98..64123e4156 100644 --- a/assets/common/entity/village/merchant.ron +++ b/assets/common/entity/village/merchant.ron @@ -3,7 +3,7 @@ name: Name("Merchant"), body: RandomWith("humanoid"), alignment: Alignment(Npc), - loot: LootTable("common.loot_tables.creature.humanoid"), + loot: LootTable("common.loot_tables.nothing"), inventory: ( loadout: Inline(( inherit: Asset("common.loadout.village.merchant"), diff --git a/assets/common/entity/village/mountaineer.ron b/assets/common/entity/village/mountaineer.ron index e9f1788c73..93b77cad11 100644 --- a/assets/common/entity/village/mountaineer.ron +++ b/assets/common/entity/village/mountaineer.ron @@ -3,7 +3,7 @@ name: Name("Mountaineer"), body: RandomWith("orc"), alignment: Alignment(Npc), - loot: LootTable("common.loot_tables.creature.humanoid"), + loot: LootTable("common.loot_tables.nothing"), inventory: ( loadout: Inline(( inherit: Asset("common.loadout.village.mountaineer"), diff --git a/assets/common/entity/village/skinner.ron b/assets/common/entity/village/skinner.ron index c6f8c72112..ccc9615d70 100644 --- a/assets/common/entity/village/skinner.ron +++ b/assets/common/entity/village/skinner.ron @@ -3,7 +3,7 @@ name: Name("Skinner"), body: RandomWith("humanoid"), alignment: Alignment(Npc), - loot: LootTable("common.loot_tables.creature.humanoid"), + loot: LootTable("common.loot_tables.nothing"), inventory: ( loadout: Inline(( inherit: Choice([ diff --git a/assets/common/entity/village/villager.ron b/assets/common/entity/village/villager.ron index f6078c9fe2..e387627989 100644 --- a/assets/common/entity/village/villager.ron +++ b/assets/common/entity/village/villager.ron @@ -3,7 +3,7 @@ name: Name("Villager"), body: RandomWith("humanoid"), alignment: Alignment(Npc), - loot: LootTable("common.loot_tables.creature.humanoid"), + loot: LootTable("common.loot_tables.nothing"), inventory: ( loadout: Inline(( inherit: Asset("common.loadout.village.villager"), diff --git a/assets/common/entity/wild/aggressive/bushly.ron b/assets/common/entity/wild/peaceful/bushly.ron similarity index 89% rename from assets/common/entity/wild/aggressive/bushly.ron rename to assets/common/entity/wild/peaceful/bushly.ron index bb781c8a68..6aa51dbaea 100644 --- a/assets/common/entity/wild/aggressive/bushly.ron +++ b/assets/common/entity/wild/peaceful/bushly.ron @@ -2,7 +2,7 @@ ( name: Name("Bushly"), body: RandomWith("bushly"), - alignment: Alignment(Enemy), + alignment: Alignment(Wild), loot: LootTable("common.loot_tables.creature.biped_small.bushly"), inventory: ( loadout: Inline(( diff --git a/assets/common/entity/wild/aggressive/driggle.ron b/assets/common/entity/wild/peaceful/driggle.ron similarity index 86% rename from assets/common/entity/wild/aggressive/driggle.ron rename to assets/common/entity/wild/peaceful/driggle.ron index 94eb660ef0..9c6470c7ec 100644 --- a/assets/common/entity/wild/aggressive/driggle.ron +++ b/assets/common/entity/wild/peaceful/driggle.ron @@ -2,7 +2,7 @@ ( name: Name("Driggle"), body: RandomWith("driggle"), - alignment: Alignment(Enemy), + alignment: Alignment(Wild), loot: LootTable("common.loot_tables.creature.quad_low.driggle"), inventory: ( loadout: FromBody, diff --git a/assets/common/entity/wild/aggressive/emberfly.ron b/assets/common/entity/wild/peaceful/emberfly.ron similarity index 86% rename from assets/common/entity/wild/aggressive/emberfly.ron rename to assets/common/entity/wild/peaceful/emberfly.ron index 21206b9dbc..0f92bd7c96 100644 --- a/assets/common/entity/wild/aggressive/emberfly.ron +++ b/assets/common/entity/wild/peaceful/emberfly.ron @@ -2,7 +2,7 @@ ( name: Name("Emberfly"), body: RandomWith("emberfly"), - alignment: Alignment(Enemy), + alignment: Alignment(Wild), loot: LootTable("common.loot_tables.creature.arthropod.emberfly"), inventory: ( loadout: FromBody, diff --git a/assets/common/entity/wild/aggressive/mossy_snail.ron b/assets/common/entity/wild/peaceful/mossy_snail.ron similarity index 87% rename from assets/common/entity/wild/aggressive/mossy_snail.ron rename to assets/common/entity/wild/peaceful/mossy_snail.ron index bfd3b337b9..7a0073fce3 100644 --- a/assets/common/entity/wild/aggressive/mossy_snail.ron +++ b/assets/common/entity/wild/peaceful/mossy_snail.ron @@ -2,7 +2,7 @@ ( name: Name("Mossy Snail"), body: RandomWith("mossy_snail"), - alignment: Alignment(Enemy), + alignment: Alignment(Wild), loot: LootTable("common.loot_tables.creature.quad_small.mossy_snail"), inventory: ( loadout: FromBody, diff --git a/assets/common/entity/wild/aggressive/treant_sapling.ron b/assets/common/entity/wild/peaceful/treant_sapling.ron similarity index 87% rename from assets/common/entity/wild/aggressive/treant_sapling.ron rename to assets/common/entity/wild/peaceful/treant_sapling.ron index 9fed371fc5..ae73066e2b 100644 --- a/assets/common/entity/wild/aggressive/treant_sapling.ron +++ b/assets/common/entity/wild/peaceful/treant_sapling.ron @@ -2,7 +2,7 @@ ( name: Name("TreantSapling"), body: RandomWith("treant_sapling"), - alignment: Alignment(Enemy), + alignment: Alignment(Wild), loot: LootTable("common.loot_tables.creature.quad_small.treant_sapling"), inventory: ( loadout: FromBody, diff --git a/assets/common/entity/world/traveler0.ron b/assets/common/entity/world/traveler0.ron index 7a9985a9e0..8540b7ab17 100644 --- a/assets/common/entity/world/traveler0.ron +++ b/assets/common/entity/world/traveler0.ron @@ -3,7 +3,7 @@ name: Name("Greenhorn Traveler"), body: RandomWith("humanoid"), alignment: Alignment(Npc), - loot: LootTable("common.loot_tables.world.traveler0"), + loot: LootTable("common.loot_tables.nothing"), inventory: ( loadout: Inline(( inherit: Choice([ diff --git a/assets/common/entity/world/traveler1.ron b/assets/common/entity/world/traveler1.ron index d0cd24dea3..9f903b5c50 100644 --- a/assets/common/entity/world/traveler1.ron +++ b/assets/common/entity/world/traveler1.ron @@ -3,7 +3,7 @@ name: Name("Traveler"), body: RandomWith("humanoid"), alignment: Alignment(Npc), - loot: LootTable("common.loot_tables.world.traveler1"), + loot: LootTable("common.loot_tables.nothing"), inventory: ( loadout: Inline(( inherit: Choice([ diff --git a/assets/common/entity/world/traveler2.ron b/assets/common/entity/world/traveler2.ron index 7956a51a19..6c6d88a32c 100644 --- a/assets/common/entity/world/traveler2.ron +++ b/assets/common/entity/world/traveler2.ron @@ -5,7 +5,7 @@ name: Name("Well-versed Traveler"), body: RandomWith("humanoid"), alignment: Alignment(Npc), - loot: LootTable("common.loot_tables.world.traveler2"), + loot: LootTable("common.loot_tables.nothing"), inventory: ( loadout: Inline(( inherit: Choice([ diff --git a/assets/common/entity/world/traveler3.ron b/assets/common/entity/world/traveler3.ron index c2fb9d10b8..3f81160a5d 100644 --- a/assets/common/entity/world/traveler3.ron +++ b/assets/common/entity/world/traveler3.ron @@ -5,7 +5,7 @@ name: Name("Experienced Traveler"), body: RandomWith("humanoid"), alignment: Alignment(Npc), - loot: LootTable("common.loot_tables.world.traveler3"), + loot: LootTable("common.loot_tables.nothing"), inventory: ( loadout: Inline(( inherit: Choice([ diff --git a/assets/common/items/armor/boreal/back.ron b/assets/common/items/armor/boreal/back.ron index 803db9e94a..f503ca980c 100644 --- a/assets/common/items/armor/boreal/back.ron +++ b/assets/common/items/armor/boreal/back.ron @@ -1,5 +1,5 @@ ItemDef( - name: "Boreal's Cloak", + name: "Boreal Cloak", description: "Thick yet surprisingly cold.", kind: Armor(( kind: Back, diff --git a/assets/common/items/armor/boreal/chest.ron b/assets/common/items/armor/boreal/chest.ron index 3b57834eb3..65c6198d8e 100644 --- a/assets/common/items/armor/boreal/chest.ron +++ b/assets/common/items/armor/boreal/chest.ron @@ -1,5 +1,5 @@ ItemDef( - name: "Boreal's Chestplate", + name: "Boreal Chestplate", description: "So frigid that you can feel it in your heart.", kind: Armor(( kind: Chest, diff --git a/assets/common/items/armor/boreal/foot.ron b/assets/common/items/armor/boreal/foot.ron index 10886d34d5..bb8124e018 100644 --- a/assets/common/items/armor/boreal/foot.ron +++ b/assets/common/items/armor/boreal/foot.ron @@ -1,5 +1,5 @@ ItemDef( - name: "Boreal's Wrappings", + name: "Boreal Wrappings", description: "The blistering cold makes it hard to move.", kind: Armor(( kind: Foot, diff --git a/assets/common/items/armor/boreal/hand.ron b/assets/common/items/armor/boreal/hand.ron index ee347dc4cd..eaaa304030 100644 --- a/assets/common/items/armor/boreal/hand.ron +++ b/assets/common/items/armor/boreal/hand.ron @@ -1,5 +1,5 @@ ItemDef( - name: "Boreal's Guantlets", + name: "Boreal Gauntlets", description: "Colder than the touch of death.", kind: Armor(( kind: Hand, diff --git a/assets/common/items/armor/boreal/pants.ron b/assets/common/items/armor/boreal/pants.ron index f43ef0aed3..787b81ad2c 100644 --- a/assets/common/items/armor/boreal/pants.ron +++ b/assets/common/items/armor/boreal/pants.ron @@ -1,5 +1,5 @@ ItemDef( - name: "Boreal's Tunic", + name: "Boreal Tunic", description: "Colder than the climate it protects you from.", kind: Armor(( kind: Pants, diff --git a/assets/common/items/armor/boreal/shoulder.ron b/assets/common/items/armor/boreal/shoulder.ron index 07f8e449cc..be3beb6c15 100644 --- a/assets/common/items/armor/boreal/shoulder.ron +++ b/assets/common/items/armor/boreal/shoulder.ron @@ -1,6 +1,6 @@ ItemDef( - name: "Boreal's Spaulders", - description: "I should probbaly think of something before merging", + name: "Boreal Spaulders", + description: "As though the icy grip of death touches your shoulder.", kind: Armor(( kind: Shoulder, stats: FromSet("Boreal"), diff --git a/assets/common/items/armor/brinestone/hand.ron b/assets/common/items/armor/brinestone/hand.ron index f5c3558b19..d09400a216 100644 --- a/assets/common/items/armor/brinestone/hand.ron +++ b/assets/common/items/armor/brinestone/hand.ron @@ -1,5 +1,5 @@ ItemDef( - name: "Brinestone Guantlets", + name: "Brinestone Gauntlets", description: "Hits like a rock.", kind: Armor(( kind: Hand, diff --git a/assets/common/items/armor/misc/head/boreal_warhelm.ron b/assets/common/items/armor/misc/head/boreal_warhelm.ron index cd16a97a78..7f5fe5197a 100644 --- a/assets/common/items/armor/misc/head/boreal_warhelm.ron +++ b/assets/common/items/armor/misc/head/boreal_warhelm.ron @@ -4,12 +4,13 @@ ItemDef( kind: Armor(( kind: Head, stats: Direct(( - protection: Some(Normal(6.0)), - poise_resilience: Some(Normal(3.0)), - energy_max: Some(4.0), - energy_reward: Some(0.01), + protection: Some(Normal(9.82)), + poise_resilience: Some(Normal(5.5)), + energy_max: Some(-6.5), + crit_power: Some(0.065), + stealth: Some(0.05), )), )), - quality: High, + quality: Legendary, tags: [], ) diff --git a/assets/common/items/crafting_ing/cloth/cloth_strips.ron b/assets/common/items/crafting_ing/cloth/cloth_strips.ron new file mode 100644 index 0000000000..a2f3d38d29 --- /dev/null +++ b/assets/common/items/crafting_ing/cloth/cloth_strips.ron @@ -0,0 +1,10 @@ +ItemDef( + name: "Cloth Strips", + description: "Small and soft, yet useful", + kind: Ingredient( + // Descriptor not needed + descriptor: "", + ), + quality: Common, + tags: [BaseMaterial], +) diff --git a/assets/common/items/crafting_ing/living_embers.ron b/assets/common/items/crafting_ing/living_embers.ron index 77c64536e5..afa03cf702 100644 --- a/assets/common/items/crafting_ing/living_embers.ron +++ b/assets/common/items/crafting_ing/living_embers.ron @@ -1,6 +1,6 @@ ItemDef( name: "Living Embers", - description: "Forest creatures often carry them.", + description: "The smouldering remains of a fiery creature.", kind: Ingredient( // Descriptor not needed descriptor: "", diff --git a/assets/common/items/crafting_ing/sentient_seed.ron b/assets/common/items/crafting_ing/sentient_seed.ron new file mode 100644 index 0000000000..4fe45a8b9c --- /dev/null +++ b/assets/common/items/crafting_ing/sentient_seed.ron @@ -0,0 +1,10 @@ +ItemDef( + name: "Sentient Seed", + description: "The undeveloped spawn of a sentient plant.", + kind: Ingredient( + // Descriptor not needed + descriptor: "", + ), + quality: Common, + tags: [], +) diff --git a/assets/common/items/npc_armor/biped_small/boreal/chest/warrior.ron b/assets/common/items/npc_armor/biped_small/boreal/chest/warrior.ron index cd9e2b56a3..190e3b5175 100644 --- a/assets/common/items/npc_armor/biped_small/boreal/chest/warrior.ron +++ b/assets/common/items/npc_armor/biped_small/boreal/chest/warrior.ron @@ -1,5 +1,5 @@ ItemDef( - name: "Boreal's Chestplate", + name: "Boreal Chestplate", description: "So frigid that you can feel it in your heart.", kind: Armor(( kind: Chest, diff --git a/assets/common/items/npc_armor/biped_small/boreal/foot/warrior.ron b/assets/common/items/npc_armor/biped_small/boreal/foot/warrior.ron index 6c9738902e..97c6243054 100644 --- a/assets/common/items/npc_armor/biped_small/boreal/foot/warrior.ron +++ b/assets/common/items/npc_armor/biped_small/boreal/foot/warrior.ron @@ -1,5 +1,5 @@ ItemDef( - name: "Boreal's Wrappings", + name: "Boreal Wrappings", description: "The blistering cold makes it hard to move.", kind: Armor(( kind: Foot, diff --git a/assets/common/items/npc_armor/biped_small/boreal/hand/warrior.ron b/assets/common/items/npc_armor/biped_small/boreal/hand/warrior.ron index 03103e5bb5..272b0bd0cb 100644 --- a/assets/common/items/npc_armor/biped_small/boreal/hand/warrior.ron +++ b/assets/common/items/npc_armor/biped_small/boreal/hand/warrior.ron @@ -1,5 +1,5 @@ ItemDef( - name: "Boreal's Guantlets", + name: "Boreal Gauntlets", description: "Colder than the touch of death.", kind: Armor(( kind: Hand, diff --git a/assets/common/items/npc_armor/biped_small/boreal/pants/warrior.ron b/assets/common/items/npc_armor/biped_small/boreal/pants/warrior.ron index ef046d808f..baffe495f5 100644 --- a/assets/common/items/npc_armor/biped_small/boreal/pants/warrior.ron +++ b/assets/common/items/npc_armor/biped_small/boreal/pants/warrior.ron @@ -1,5 +1,5 @@ ItemDef( - name: "Boreal's Tunic", + name: "Boreal Tunic", description: "Colder than the climate it protects you from.", kind: Armor(( kind: Pants, diff --git a/assets/common/loot_tables/creature/biped_small/bushly.ron b/assets/common/loot_tables/creature/biped_small/bushly.ron index 9a891eee17..892d8aa0c2 100644 --- a/assets/common/loot_tables/creature/biped_small/bushly.ron +++ b/assets/common/loot_tables/creature/biped_small/bushly.ron @@ -1,3 +1,4 @@ [ - (1.0, Item("common.items.flowers.plant_fiber")), + (2.0, Item("common.items.flowers.plant_fiber")), + (1.0, Item("common.items.crafting_ing.sentient_seed")), ] diff --git a/assets/common/loot_tables/creature/biped_small/irrwurz.ron b/assets/common/loot_tables/creature/biped_small/irrwurz.ron index 909d63afa5..6fdcd04dc8 100644 --- a/assets/common/loot_tables/creature/biped_small/irrwurz.ron +++ b/assets/common/loot_tables/creature/biped_small/irrwurz.ron @@ -1,3 +1,5 @@ [ (1.0, MultiDrop(Item("common.items.flowers.plant_fiber"), 2, 4)), + (1.0, Item("common.items.crafting_ing.sentient_seed")), + ] diff --git a/assets/common/loot_tables/creature/quad_low/maneater.ron b/assets/common/loot_tables/creature/quad_low/maneater.ron index 3f505b186c..1b4a4db7d1 100644 --- a/assets/common/loot_tables/creature/quad_low/maneater.ron +++ b/assets/common/loot_tables/creature/quad_low/maneater.ron @@ -2,4 +2,5 @@ (9.0, Item("common.items.crafting_ing.animal_misc.lively_vine")), (9.0, LootTable("common.loot_tables.food.wild_ingredients")), (1.0, Item("common.items.armor.misc.head.bamboo_twig")), + (5.0, MultiDrop(Item("common.items.crafting_ing.sentient_seed"), 1, 3)), ] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/quad_small/treant_sapling.ron b/assets/common/loot_tables/creature/quad_small/treant_sapling.ron index caffef68e0..fadf82680e 100644 --- a/assets/common/loot_tables/creature/quad_small/treant_sapling.ron +++ b/assets/common/loot_tables/creature/quad_small/treant_sapling.ron @@ -2,4 +2,5 @@ (2.0, Item("common.items.log.wood")), (2.0, Item("common.items.flowers.plant_fiber")), (1.0, Item("common.items.crafting_ing.resin")), + (1.0, Item("common.items.crafting_ing.sentient_seed")), ] diff --git a/assets/common/loot_tables/creature/theropod/axebeak.ron b/assets/common/loot_tables/creature/theropod/axebeak.ron index 5489ab9e20..03979386ef 100644 --- a/assets/common/loot_tables/creature/theropod/axebeak.ron +++ b/assets/common/loot_tables/creature/theropod/axebeak.ron @@ -1,5 +1,5 @@ [ (4.0, MultiDrop(Item("common.items.crafting_ing.animal_misc.elegant_crest"), 3, 6)), (1.0, Item("common.items.crafting_ing.animal_misc.raptor_feather")), - (0.5, Item("common.items.weapons.hammer.burnt_drumstick")), + (0.5, Item("common.items.food.meat.bird_large_raw")), ] \ No newline at end of file diff --git a/assets/common/loot_tables/dungeon/tier-0/mandragora.ron b/assets/common/loot_tables/dungeon/tier-0/mandragora.ron index 2f2754925c..fedaa77860 100644 --- a/assets/common/loot_tables/dungeon/tier-0/mandragora.ron +++ b/assets/common/loot_tables/dungeon/tier-0/mandragora.ron @@ -1,4 +1,5 @@ [ (1.0, LootTable("common.loot_tables.dungeon.tier-0.enemy")), (1.0, MultiDrop(Item("common.items.flowers.plant_fiber"), 2, 4)), + (1.0, Item("common.items.crafting_ing.sentient_seed")), ] \ No newline at end of file diff --git a/assets/common/loot_tables/world/traveler0.ron b/assets/common/loot_tables/world/traveler0.ron deleted file mode 100644 index 16ef614570..0000000000 --- a/assets/common/loot_tables/world/traveler0.ron +++ /dev/null @@ -1,11 +0,0 @@ -[ - //Currency - (4.0, MultiDrop(Item("common.items.utility.coins"), 50, 200)), - //Food - (4.0, LootTable("common.loot_tables.food.prepared")), - //Flowers, pretty - (2.0, MultiDrop(Item("common.items.flowers.red"), 3, 6)), - //Weapon components - (2.0, LootTable("common.loot_tables.weapons.components.tier-0")), - (1.0, LootTable("common.loot_tables.weapons.components.tier-1")), -] diff --git a/assets/common/loot_tables/world/traveler1.ron b/assets/common/loot_tables/world/traveler1.ron deleted file mode 100644 index a2cee23e0f..0000000000 --- a/assets/common/loot_tables/world/traveler1.ron +++ /dev/null @@ -1,16 +0,0 @@ -[ - //Currency - (3.0, MultiDrop(Item("common.items.utility.coins"), 50, 200)), - (2.0, MultiDrop(Item("common.items.utility.coins"), 200, 500)), - //Food - (3.0, LootTable("common.loot_tables.food.prepared")), - //Ores - (2.0, MultiDrop(Item("common.items.mineral.ore.iron"), 2, 7)), - //Hides - (2.0, MultiDrop(Item("common.items.crafting_ing.hide.animal_hide"), 5, 15)), - //Flowers, pretty - (2.0, MultiDrop(Item("common.items.flowers.red"), 3, 6)), - //Weapon components - (1.0, LootTable("common.loot_tables.weapons.components.tier-2")), - (1.0, LootTable("common.loot_tables.weapons.components.tier-3")), -] diff --git a/assets/common/loot_tables/world/traveler2.ron b/assets/common/loot_tables/world/traveler2.ron deleted file mode 100644 index 87a0f842c0..0000000000 --- a/assets/common/loot_tables/world/traveler2.ron +++ /dev/null @@ -1,23 +0,0 @@ -[ - //Currency - (3.0, MultiDrop(Item("common.items.utility.coins"), 200, 500)), - (2.0, MultiDrop(Item("common.items.utility.coins"), 2000, 5000)), - //Food - (3.0, LootTable("common.loot_tables.food.prepared")), - //Ores - (2.0, MultiDrop(Item("common.items.mineral.ore.coal"), 5, 15)), - (2.0, MultiDrop(Item("common.items.mineral.ore.iron"), 2, 7)), - (1.0, MultiDrop(Item("common.items.mineral.ore.cobalt"), 2, 5)), - (0.1, MultiDrop(Item("common.items.mineral.gem.diamond"), 2, 5)), - //Hides - (2.0, MultiDrop(Item("common.items.crafting_ing.hide.animal_hide"), 5, 15)), - (2.0, MultiDrop(Item("common.items.crafting_ing.hide.scales"), 5, 15)), - (1.0, MultiDrop(Item("common.items.crafting_ing.hide.carapace"), 3, 10)), - (1.0, MultiDrop(Item("common.items.crafting_ing.hide.tough_hide"), 3, 10)), - //Flowers, very pretty - (2.0, MultiDrop(Item("common.items.flowers.red"), 5, 10)), - //Weapon components - (1.0, LootTable("common.loot_tables.weapons.components.tier-2")), - (1.0, LootTable("common.loot_tables.weapons.components.tier-3")), - (0.2, LootTable("common.loot_tables.weapons.components.tier-4")), -] diff --git a/assets/common/loot_tables/world/traveler3.ron b/assets/common/loot_tables/world/traveler3.ron deleted file mode 100644 index 0da21a3a25..0000000000 --- a/assets/common/loot_tables/world/traveler3.ron +++ /dev/null @@ -1,26 +0,0 @@ -[ - //Currency - (2.0, MultiDrop(Item("common.items.utility.coins"), 200, 500)), - (1.0, MultiDrop(Item("common.items.utility.coins"), 2000, 5000)), - //Food - (4.0, LootTable("common.loot_tables.food.prepared")), - //Ores - (2.0, MultiDrop(Item("common.items.mineral.ore.coal"), 10, 30)), - (2.0, MultiDrop(Item("common.items.mineral.ore.iron"), 4, 14)), - (1.0, MultiDrop(Item("common.items.mineral.ore.cobalt"), 4, 10)), - (0.1, MultiDrop(Item("common.items.mineral.gem.diamond"), 4, 10)), - //Hides - (2.0, MultiDrop(Item("common.items.crafting_ing.hide.animal_hide"), 10, 30)), - (2.0, MultiDrop(Item("common.items.crafting_ing.hide.scales"), 10, 30)), - (1.0, MultiDrop(Item("common.items.crafting_ing.hide.carapace"), 6, 20)), - (1.0, MultiDrop(Item("common.items.crafting_ing.hide.tough_hide"), 6, 20)), - (0.3, MultiDrop(Item("common.items.crafting_ing.hide.plate"), 1, 8)), - (0.1, MultiDrop(Item("common.items.crafting_ing.hide.rugged_hide"), 1, 6)), - //Flowers, very pretty - (3.0, MultiDrop(Item("common.items.flowers.red"), 10, 20)), - (2.0, MultiDrop(Item("common.items.flowers.moonbell"), 6, 12)), - (1.0, MultiDrop(Item("common.items.flowers.pyrebloom"), 3, 6)), - //Weapon components - (1.5, LootTable("common.loot_tables.weapons.components.tier-4")), - (0.2, LootTable("common.loot_tables.weapons.components.tier-5")), -] diff --git a/assets/common/loot_tables/world/world_bosses/gigas_frost/boss.ron b/assets/common/loot_tables/world/world_bosses/gigas_frost/boss.ron index 001dea25f2..01dd3a74e7 100644 --- a/assets/common/loot_tables/world/world_bosses/gigas_frost/boss.ron +++ b/assets/common/loot_tables/world/world_bosses/gigas_frost/boss.ron @@ -1,4 +1,4 @@ [ (1.0, LootTable("common.loot_tables.armor.boreal")), - (1.0, MultiDrop(Item("common.items.crafting_ing.glacial_crystal"), 5, 15)), + (1.0, Item("common.items.crafting_ing.glacial_crystal")), ] \ No newline at end of file diff --git a/assets/common/material_stats_manifest.ron b/assets/common/material_stats_manifest.ron index d5b19098dd..6527be2490 100644 --- a/assets/common/material_stats_manifest.ron +++ b/assets/common/material_stats_manifest.ron @@ -318,17 +318,18 @@ crit_power: Some(0.8), ), "Boreal": ( - protection: Some(Normal(98.0)), - poise_resilence: Some(Normal(34.0)), - energy_reward: Some(-0.35), - crit_power: Some(0.35), - stealth: Some(0.5), + protection: Some(Normal(88.0)), + poise_resilience: Some(Normal(49.5)), + energy_max: Some(-58.5), + crit_power: Some(0.585), + stealth: Some(0.45), ), "Brinestone": ( - protection: Some(Normal(120.0)), - poise_resilence: Some(Normal(28.0)), - energy_reward: Some(0.35), - crit_power: Some(0.25), - ) + protection: Some(Normal(122.0)), + poise_resilience: Some(Normal(29.5)), + energy_max: Some(63.0), + energy_reward: Some(0.63), + crit_power: Some(-0.21), + ), }, ) diff --git a/assets/common/recipe_book.ron b/assets/common/recipe_book.ron index a4bc06d350..512a443a91 100644 --- a/assets/common/recipe_book.ron +++ b/assets/common/recipe_book.ron @@ -2,8 +2,8 @@ "crafting_hammer": ( output: ("common.items.tool.craftsman_hammer", 1), inputs: [ - (Item("common.items.crafting_ing.twigs"), 3, false), - (Item("common.items.crafting_ing.stones"), 3, false), + (Item("common.items.log.wood"), 1, false), + (Item("common.items.mineral.ingot.iron"), 3, false), ], craft_sprite: None, ), @@ -12,7 +12,6 @@ inputs: [ (Item("common.items.crafting_ing.stones"), 6, false), (Item("common.items.crafting_ing.bowl"), 1, false), - (Item("common.items.tool.craftsman_hammer"), 0, false), ], craft_sprite: Some(CraftingBench), ), @@ -326,6 +325,13 @@ ], craft_sprite: Some(SpinningWheel), ), + "cloth_strips": ( + output: ("common.items.crafting_ing.cloth.cloth_strips", 3), + inputs: [ + (Item("common.items.crafting_ing.cloth.linen"), 1, false), + ], + craft_sprite: Some(SpinningWheel), + ), "silk": ( output: ("common.items.crafting_ing.cloth.silk", 1), inputs: [ @@ -404,7 +410,6 @@ (Item("common.items.crafting_ing.twigs"), 5, false), (Item("common.items.crafting_ing.leather.leather_strips"), 5, false), (Item("common.items.crafting_ing.cloth.linen"), 10, false), - (Item("common.items.tool.craftsman_hammer"), 0, false), (Item("common.items.crafting_tools.sewing_set"), 0, false), ], craft_sprite: Some(CraftingBench), @@ -415,7 +420,6 @@ (Item("common.items.crafting_ing.twigs"), 5, false), (Item("common.items.crafting_ing.cloth.linen_red"), 10, false), (Item("common.items.crafting_ing.leather.thick_leather"), 4, false), - (Item("common.items.tool.craftsman_hammer"), 0, false), (Item("common.items.crafting_tools.sewing_set"), 0, false), ], craft_sprite: Some(CraftingBench), @@ -427,7 +431,6 @@ (Item("common.items.crafting_ing.leather.thick_leather"), 4, false), (Item("common.items.crafting_ing.cloth.linen"), 5, false), (Item("common.items.mineral.gem.emerald"), 1, false), - (Item("common.items.tool.craftsman_hammer"), 0, false), (Item("common.items.crafting_tools.sewing_set"), 0, false), ], craft_sprite: Some(CraftingBench), @@ -500,7 +503,7 @@ "winter_wings": ( output: ("common.items.glider.winter_wings", 1), inputs: [ - (Item("common.items.crafting_ing.glacial_crystal"), 2, false), + (Item("common.items.crafting_ing.glacial_crystal"), 6, false), (Item("common.items.crafting_ing.animal_misc.icy_fang"), 32, false), (Item("common.items.mineral.gem.sapphire"), 18, false), (Item("common.items.tool.craftsman_hammer"), 0, false), @@ -527,56 +530,49 @@ "rawhide_back": ( output: ("common.items.armor.hide.rawhide.back", 1), inputs: [ - (Item("common.items.crafting_ing.leather.simple_leather"), 3, false), - (Item("common.items.crafting_ing.leather.leather_strips"), 2, false), + (Item("common.items.crafting_ing.leather.simple_leather"), 1, false), ], craft_sprite: Some(CraftingBench), ), "rawhide_belt": ( output: ("common.items.armor.hide.rawhide.belt", 1), inputs: [ - (Item("common.items.crafting_ing.leather.simple_leather"), 2, false), - (Item("common.items.crafting_ing.leather.leather_strips"), 2, false), + (Item("common.items.crafting_ing.leather.simple_leather"), 1, false), ], craft_sprite: Some(CraftingBench), ), "rawhide_chest": ( output: ("common.items.armor.hide.rawhide.chest", 1), inputs: [ - (Item("common.items.crafting_ing.leather.simple_leather"), 10, false), - (Item("common.items.crafting_ing.leather.leather_strips"), 4, false), + (Item("common.items.crafting_ing.leather.simple_leather"), 5, false), ], craft_sprite: Some(CraftingBench), ), "rawhide_feet": ( output: ("common.items.armor.hide.rawhide.foot", 1), inputs: [ - (Item("common.items.crafting_ing.leather.simple_leather"), 3, false), - (Item("common.items.crafting_ing.leather.leather_strips"), 2, false), + (Item("common.items.crafting_ing.leather.simple_leather"), 2, false), ], craft_sprite: Some(CraftingBench), ), "rawhide_hands": ( output: ("common.items.armor.hide.rawhide.hand", 1), inputs: [ - (Item("common.items.crafting_ing.leather.simple_leather"), 3, false), - (Item("common.items.crafting_ing.leather.leather_strips"), 2, false), + (Item("common.items.crafting_ing.leather.simple_leather"), 2, false), ], craft_sprite: Some(CraftingBench), ), "rawhide_pants": ( output: ("common.items.armor.hide.rawhide.pants", 1), inputs: [ - (Item("common.items.crafting_ing.leather.simple_leather"), 8, false), - (Item("common.items.crafting_ing.leather.leather_strips"), 4, false), + (Item("common.items.crafting_ing.leather.simple_leather"), 4, false), ], craft_sprite: Some(CraftingBench), ), "rawhide_shoulder": ( output: ("common.items.armor.hide.rawhide.shoulder", 1), inputs: [ - (Item("common.items.crafting_ing.leather.simple_leather"), 8, false), - (Item("common.items.crafting_ing.leather.leather_strips"), 6, false), + (Item("common.items.crafting_ing.leather.simple_leather"), 4, false), ], craft_sprite: Some(CraftingBench), ), @@ -898,49 +894,49 @@ "linen_back": ( output: ("common.items.armor.cloth.linen.back", 1), inputs: [ - (Item("common.items.crafting_ing.cloth.linen"), 3, false), + (Item("common.items.crafting_ing.cloth.linen"), 1, false), ], craft_sprite: Some(Loom), ), "linen_belt": ( output: ("common.items.armor.cloth.linen.belt", 1), inputs: [ - (Item("common.items.crafting_ing.cloth.linen"), 2, false), + (Item("common.items.crafting_ing.cloth.linen"), 1, false), ], craft_sprite: Some(Loom), ), "linen_chest": ( output: ("common.items.armor.cloth.linen.chest", 1), inputs: [ - (Item("common.items.crafting_ing.cloth.linen"), 10, false), + (Item("common.items.crafting_ing.cloth.linen"), 5, false), ], craft_sprite: Some(Loom), ), "linen_feet": ( output: ("common.items.armor.cloth.linen.foot", 1), inputs: [ - (Item("common.items.crafting_ing.cloth.linen"), 3, false), + (Item("common.items.crafting_ing.cloth.linen"), 2, false), ], craft_sprite: Some(Loom), ), "linen_hands": ( output: ("common.items.armor.cloth.linen.hand", 1), inputs: [ - (Item("common.items.crafting_ing.cloth.linen"), 3, false), + (Item("common.items.crafting_ing.cloth.linen"), 2, false), ], craft_sprite: Some(Loom), ), "linen_pants": ( output: ("common.items.armor.cloth.linen.pants", 1), inputs: [ - (Item("common.items.crafting_ing.cloth.linen"), 8, false), + (Item("common.items.crafting_ing.cloth.linen"), 4, false), ], craft_sprite: Some(Loom), ), "linen_shoulder": ( output: ("common.items.armor.cloth.linen.shoulder", 1), inputs: [ - (Item("common.items.crafting_ing.cloth.linen"), 8, false), + (Item("common.items.crafting_ing.cloth.linen"), 4, false), ], craft_sprite: Some(Loom), ), @@ -1745,7 +1741,7 @@ "tiny_leather_pouch": ( output: ("common.items.armor.misc.bag.tiny_leather_pouch", 1), inputs: [ - (Item("common.items.crafting_ing.leather.leather_strips"), 12, false), + (Item("common.items.crafting_ing.leather.simple_leather"), 3, false), ], craft_sprite: None, ), @@ -1773,7 +1769,7 @@ (Item("common.items.mineral.gem.diamond"), 2, false), (Item("common.items.crafting_ing.twigs"), 2, false), (Item("common.items.crafting_ing.cloth.silk"), 4, false), - (Item("common.items.crafting_ing.leather.leather_strips"), 3, false), + (Item("common.items.crafting_ing.leather.simple_leather"), 3, false), (Item("common.items.armor.misc.bag.tiny_leather_pouch"), 2, false), (Item("common.items.crafting_tools.sewing_set"), 0, false), ], @@ -1794,7 +1790,7 @@ output: ("common.items.armor.misc.bag.troll_hide_pack", 1), inputs: [ (Item("common.items.crafting_ing.hide.leather_troll"), 10, false), - (Item("common.items.crafting_ing.leather.leather_strips"), 10, false), + (Item("common.items.crafting_ing.leather.simple_leather"), 3, false), (Item("common.items.mineral.gem.diamond"), 1, false), (Item("common.items.crafting_tools.sewing_set"), 0, false), ], @@ -1823,18 +1819,17 @@ "tin_pickaxe": ( output: ("common.items.tool.pickaxe_stone", 1), inputs: [ - (Item("common.items.crafting_ing.leather.leather_strips"), 2, false), - (Item("common.items.crafting_ing.stones"), 3, false), - (Item("common.items.log.wood"), 1, false), - (Item("common.items.tool.craftsman_hammer"), 0, false), + (Item("common.items.crafting_ing.twigs"), 4, false), + (Item("common.items.crafting_ing.stones"), 5, false), ], craft_sprite: None, ), "steel_pickaxe": ( output: ("common.items.tool.pickaxe_steel", 1), inputs: [ + (Item("common.items.log.hardwood"), 1, false), (Item("common.items.crafting_ing.cloth.lifecloth"), 1, false), - (Item("common.items.mineral.ingot.steel"), 5, false), + (Item("common.items.mineral.ingot.steel"), 3, false), (Item("common.items.tool.craftsman_hammer"), 0, false), ], craft_sprite: Some(Anvil), @@ -1990,7 +1985,7 @@ "polaris": ( output: ("common.items.lantern.polaris", 1), inputs: [ - (Item("common.items.crafting_ing.glacial_crystal"), 1, false), + (Item("common.items.crafting_ing.glacial_crystal"), 3, false), (Item("common.items.crafting_ing.animal_misc.icy_fang"), 16, false), (Item("common.items.crafting_ing.pearl"), 1, false), (Item("common.items.tool.craftsman_hammer"), 0, false), @@ -2142,7 +2137,7 @@ "light_biocore": ( output: ("common.items.modular.weapon.secondary.sceptre.light", 1), inputs: [ - (Item("common.items.mineral.gem.emerald"), 1, false), + (Item("common.items.crafting_ing.sentient_seed"), 1, false), (Item("common.items.mineral.ore.veloritefrag"), 3, false), ], craft_sprite: Some(Cauldron), @@ -2151,7 +2146,7 @@ "medium_biocore": ( output: ("common.items.modular.weapon.secondary.sceptre.medium", 1), inputs: [ - (Item("common.items.mineral.gem.emerald"), 1, false), + (Item("common.items.crafting_ing.sentient_seed"), 1, false), (Item("common.items.mineral.ore.veloritefrag"), 3, false), ], craft_sprite: Some(Cauldron), @@ -2160,7 +2155,7 @@ "heavy_biocore": ( output: ("common.items.modular.weapon.secondary.sceptre.heavy", 1), inputs: [ - (Item("common.items.mineral.gem.emerald"), 1, false), + (Item("common.items.crafting_ing.sentient_seed"), 1, false), (Item("common.items.mineral.ore.veloritefrag"), 3, false), ], craft_sprite: Some(Cauldron), @@ -2278,7 +2273,6 @@ output: ("common.items.utility.lockpick_0", 2), inputs: [ (Item("common.items.mineral.ingot.copper"), 3, false), - (Item("common.items.tool.craftsman_hammer"), 0, false), ], craft_sprite: Some(CraftingBench), ), diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron index 97ad391275..67c055b774 100644 --- a/assets/voxygen/item_image_manifest.ron +++ b/assets/voxygen/item_image_manifest.ron @@ -1676,7 +1676,7 @@ ), // Picks Simple("common.items.tool.pickaxe_stone"): VoxTrans( - "voxel.weapon.tool.pickaxe_green-0", + "voxel.weapon.tool.pickaxe_stone", (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.0, ), Simple("common.items.tool.pickaxe_steel"): VoxTrans( @@ -3526,6 +3526,10 @@ "voxel.sprite.crafting_ing.cloth.linen", (0.0, 0.0, 0.0), (-65.0, 0.0, 20.0), 0.9, ), + Simple("common.items.crafting_ing.cloth.cloth_strips"): VoxTrans( + "voxel.sprite.crafting_ing.cloth.cloth_strips", + (1.0, 0.0, 0.0), (0.0, 0.0, 25.0), 0.9, + ), Simple("common.items.crafting_ing.cloth.wool"): VoxTrans( "voxel.sprite.crafting_ing.cloth.wool", (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9, @@ -3558,6 +3562,10 @@ "voxel.sprite.crafting_ing.living_embers", (0.0, 0.0, 0.0), (-65.0, 0.0, 20.0), 0.9, ), + Simple("common.items.crafting_ing.sentient_seed"): VoxTrans( + "voxel.sprite.crafting_ing.sentient_seed", + (0.0, 0.0, 0.0), (-75.0, 25.0, 10.0), 0.9, + ), Simple("common.items.crafting_ing.resin"): VoxTrans( "voxel.sprite.crafting_ing.resin", (0.0, 0.0, 0.0), (-65.0, 0.0, 20.0), 0.9, diff --git a/assets/voxygen/voxel/biped_weapon_manifest.ron b/assets/voxygen/voxel/biped_weapon_manifest.ron index d8f419e9c2..4c13a42637 100644 --- a/assets/voxygen/voxel/biped_weapon_manifest.ron +++ b/assets/voxygen/voxel/biped_weapon_manifest.ron @@ -760,7 +760,7 @@ color: None ), Tool("common.items.tool.craftsman_hammer"): ( - vox_spec: ("weapon.hammer.craftsman", (-2.5, -5.5, -4.5)), + vox_spec: ("weapon.hammer.craftsman", (-2.5, -4.5, -4.5)), color: None ), Tool("common.items.weapons.hammer.hammer_1"): ( @@ -1552,7 +1552,7 @@ ), // Picks Tool("common.items.tool.pickaxe_stone"): ( - vox_spec: ("weapon.tool.pickaxe_green-0", (-2.5, -7.5, -4.0)), + vox_spec: ("weapon.tool.pickaxe_stone", (-2.5, -7.5, -4.0)), color: None ), Tool("common.items.tool.pickaxe_steel"): ( diff --git a/assets/voxygen/voxel/item_drop_manifest.ron b/assets/voxygen/voxel/item_drop_manifest.ron index 69ff249fe0..ac2f8ae826 100644 --- a/assets/voxygen/voxel/item_drop_manifest.ron +++ b/assets/voxygen/voxel/item_drop_manifest.ron @@ -395,7 +395,7 @@ Simple("common.items.weapons.tool.shovel-0"): "voxel.weapon.tool.shovel_green", Simple("common.items.weapons.tool.shovel-1"): "voxel.weapon.tool.shovel_gold", // Picks - Simple("common.items.tool.pickaxe_stone"): "voxel.weapon.tool.pickaxe_green-0", + Simple("common.items.tool.pickaxe_stone"): "voxel.weapon.tool.pickaxe_stone", Simple("common.items.tool.pickaxe_steel"): "voxel.weapon.tool.pickaxe_green-1", // Instruments Simple("common.items.tool.instruments.double_bass"): "voxel.weapon.tool.wooden_bass", @@ -895,6 +895,7 @@ Simple("common.items.crafting_ing.cotton_boll"): "voxel.sprite.crafting_ing.cotton_boll", Simple("common.items.crafting_ing.cloth.cotton"): "voxel.sprite.crafting_ing.cloth.cotton", Simple("common.items.crafting_ing.cloth.linen"): "voxel.sprite.crafting_ing.cloth.linen", + Simple("common.items.crafting_ing.cloth.cloth_strips"): "voxel.sprite.crafting_ing.cloth.cloth_strips", Simple("common.items.crafting_ing.cloth.wool"): "voxel.sprite.crafting_ing.cloth.wool", Simple("common.items.crafting_ing.cloth.silk"): "voxel.sprite.crafting_ing.cloth.silk", Simple("common.items.crafting_ing.cloth.lifecloth"): "voxel.sprite.crafting_ing.cloth.lifecloth", @@ -903,6 +904,7 @@ Simple("common.items.crafting_ing.cloth.linen_red"): "voxel.sprite.crafting_ing.cloth.linen_red", Simple("common.items.crafting_ing.sticky_thread"): "voxel.sprite.crafting_ing.sticky_thread", Simple("common.items.crafting_ing.living_embers"): "voxel.sprite.crafting_ing.living_embers", + Simple("common.items.crafting_ing.sentient_seed"): "voxel.sprite.crafting_ing.sentient_seed", Simple("common.items.crafting_ing.resin"): "voxel.sprite.crafting_ing.resin", Simple("common.items.crafting_ing.glacial_crystal"): "voxel.object.glacial_crystal", Simple("common.items.mineral.ingot.silver"): "voxel.sprite.mineral.ingot.silver", diff --git a/assets/voxygen/voxel/sprite/crafting_ing/cloth/cloth_strips.vox b/assets/voxygen/voxel/sprite/crafting_ing/cloth/cloth_strips.vox new file mode 100644 index 0000000000..51dc1e85df --- /dev/null +++ b/assets/voxygen/voxel/sprite/crafting_ing/cloth/cloth_strips.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fe14dac8b058346599c86b14b65a6a4230e4cc6333475f5aca75475ae77e5b8b +size 1284 diff --git a/assets/voxygen/voxel/sprite/crafting_ing/sentient_seed.vox b/assets/voxygen/voxel/sprite/crafting_ing/sentient_seed.vox new file mode 100644 index 0000000000..248e70556b --- /dev/null +++ b/assets/voxygen/voxel/sprite/crafting_ing/sentient_seed.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0a165c0c28eaea7389718d82faad51e2f7455ffaf9b0b1202347309f071a0577 +size 1536 diff --git a/assets/voxygen/voxel/weapon/hammer/craftsman.vox b/assets/voxygen/voxel/weapon/hammer/craftsman.vox index a2adc3bd18..fc5d74cb7a 100644 --- a/assets/voxygen/voxel/weapon/hammer/craftsman.vox +++ b/assets/voxygen/voxel/weapon/hammer/craftsman.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ff5902aca1ec5ee83d24798920391cff003ad292f1a0fb0d815bc085532cc7e1 +oid sha256:c9c0c86f8820147113d93895028d5adb4de4fcb9a9bd568acc273108779bbbdf size 2240 diff --git a/assets/voxygen/voxel/weapon/tool/pickaxe_stone.vox b/assets/voxygen/voxel/weapon/tool/pickaxe_stone.vox new file mode 100644 index 0000000000..18412ba4ed --- /dev/null +++ b/assets/voxygen/voxel/weapon/tool/pickaxe_stone.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2a50522d694f6f8bc1264b4b151b2118e992e045ec4af858dc635b361470ff21 +size 1548 diff --git a/assets/world/wildlife/spawn/temperate/rainforest.ron b/assets/world/wildlife/spawn/temperate/rainforest.ron index d36f8327d7..41a5e7812d 100644 --- a/assets/world/wildlife/spawn/temperate/rainforest.ron +++ b/assets/world/wildlife/spawn/temperate/rainforest.ron @@ -20,6 +20,9 @@ SpawnEntry ( (1, (1, 7, "common.entity.wild.peaceful.alpaca")), (1, (1, 7, "common.entity.wild.peaceful.chicken")), (1, (1, 4, "common.entity.wild.peaceful.crow")), + (2, (1, 1, "common.entity.wild.peaceful.bushly")), + (2, (1, 1, "common.entity.wild.peaceful.mossy_snail")), + (2, (1, 1, "common.entity.wild.peaceful.treant_sapling")), // Solitary (2, (1, 1, "common.entity.wild.peaceful.forest_fox")), (2, (1, 1, "common.entity.wild.peaceful.donkey")), @@ -33,9 +36,6 @@ SpawnEntry ( (2, (1, 1, "common.entity.wild.peaceful.truffler")), (2, (1, 1, "common.entity.wild.peaceful.leaf_beetle")), (2, (1, 1, "common.entity.wild.aggressive.weevil")), - (2, (1, 1, "common.entity.wild.aggressive.bushly")), - (2, (1, 1, "common.entity.wild.aggressive.mossy_snail")), - (2, (1, 1, "common.entity.wild.aggressive.treant_sapling")), ], spawn_mode: Land, day_period: [Morning, Noon, Evening], @@ -50,7 +50,7 @@ SpawnEntry ( (5, (1, 3, "common.entity.wild.peaceful.rat")), (5, (1, 3, "common.entity.wild.peaceful.squirrel")), (3, (1, 3, "common.entity.wild.aggressive.bat")), - (5, (1, 3, "common.entity.wild.aggressive.emberfly")), + (5, (1, 3, "common.entity.wild.peaceful.emberfly")), ], spawn_mode: Land, day_period: [Night], diff --git a/assets/world/wildlife/spawn/temperate/rare.ron b/assets/world/wildlife/spawn/temperate/rare.ron index 2dac750d8b..c822a7d196 100644 --- a/assets/world/wildlife/spawn/temperate/rare.ron +++ b/assets/world/wildlife/spawn/temperate/rare.ron @@ -7,8 +7,8 @@ SpawnEntry ( (1, (1, 1, "common.entity.wild.aggressive.ogre")), (1, (1, 1, "common.entity.wild.aggressive.swamp_troll")), (1, (1, 1, "common.entity.wild.aggressive.dullahan")), - (2, (1, 1, "common.entity.wild.aggressive.bushly")), - (2, (1, 1, "common.entity.wild.aggressive.driggle")), + (2, (1, 1, "common.entity.wild.peaceful.bushly")), + (2, (1, 1, "common.entity.wild.peaceful.driggle")), ], spawn_mode: Land, day_period: [Morning, Noon, Evening], @@ -20,7 +20,7 @@ SpawnEntry ( (1, (1, 1, "common.entity.wild.aggressive.swamp_troll")), (1, (1, 1, "common.entity.wild.aggressive.dullahan")), // Pack - (1, (1, 3, "common.entity.wild.aggressive.emberfly")), + (1, (1, 3, "common.entity.wild.peaceful.emberfly")), ], spawn_mode: Land, day_period: [Night], diff --git a/assets/world/wildlife/spawn/temperate/wood.ron b/assets/world/wildlife/spawn/temperate/wood.ron index 2f23104675..b817bbaaa5 100644 --- a/assets/world/wildlife/spawn/temperate/wood.ron +++ b/assets/world/wildlife/spawn/temperate/wood.ron @@ -4,16 +4,18 @@ SpawnEntry ( rules: [ Pack( groups: [ + // Aggressive (1, (1, 1, "common.entity.wild.aggressive.bear")), (1, (1, 1, "common.entity.wild.aggressive.tarasque")), (1, (1, 1, "common.entity.wild.aggressive.wood_raptor")), (1, (1, 1, "common.entity.wild.aggressive.deadwood")), (1, (1, 1, "common.entity.wild.aggressive.saber")), (1, (1, 1, "common.entity.wild.aggressive.weevil")), + // Peaceful (1, (1, 1, "common.entity.wild.peaceful.leaf_beetle")), - (1, (1, 1, "common.entity.wild.aggressive.bushly")), - (1, (1, 1, "common.entity.wild.aggressive.mossy_snail")), - (1, (1, 1, "common.entity.wild.aggressive.treant_sapling")), + (1, (1, 1, "common.entity.wild.peaceful.bushly")), + (1, (1, 1, "common.entity.wild.peaceful.mossy_snail")), + (1, (1, 1, "common.entity.wild.peaceful.treant_sapling")), ], spawn_mode: Land, day_period: [Night, Morning, Noon, Evening],