Merge branch 'small_tweaks' into 'master'

Small balance changes

See merge request veloren/veloren!3989

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"),

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"),

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"),

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([                

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"),

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"),

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"),

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"),

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"),

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"),

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"),

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"),

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([                

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"),

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((

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,

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,

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,

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,

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([

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([

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([

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([

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,

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,

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,

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,

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,

assets/common/items/armor/boreal/shoulder.ron

@@ -1,6 +1,6 @@
 ItemDef(
-    name: "Boreal's Spaulders",
+    name: "Boreal Spaulders",
-    description: "I should probbaly think of something before merging",
+    description: "As though the icy grip of death touches your shoulder.",
     kind: Armor((
         kind: Shoulder,
         stats: FromSet("Boreal"),

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,

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)),
+            protection: Some(Normal(9.82)),
-            poise_resilience: Some(Normal(3.0)),
+            poise_resilience: Some(Normal(5.5)),
-            energy_max: Some(4.0),
+            energy_max: Some(-6.5),
-            energy_reward: Some(0.01),
+            crit_power: Some(0.065),
+            stealth: Some(0.05),
         )),
     )),
-    quality: High,
+    quality: Legendary,
     tags: [],
 )

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],
+)

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: "",

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: [],
+)

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,

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,

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,

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,

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")),
 ]

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")),
+
 ]

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)),
 ]

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")),
 ]

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")),
 ]

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")),
 ]

assets/common/loot_tables/world/traveler0.ron

@@ -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")),
-]

assets/common/loot_tables/world/traveler1.ron

@@ -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")),
-]

assets/common/loot_tables/world/traveler2.ron

@@ -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")),
-]

assets/common/loot_tables/world/traveler3.ron

@@ -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")),
-]

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")),
 ]

assets/common/material_stats_manifest.ron

@@ -318,17 +318,18 @@
             crit_power: Some(0.8),
         ),
         "Boreal": (
-            protection: Some(Normal(98.0)),
+            protection: Some(Normal(88.0)),
-            poise_resilence: Some(Normal(34.0)),
+            poise_resilience: Some(Normal(49.5)),
-            energy_reward: Some(-0.35),
+            energy_max: Some(-58.5),
-            crit_power: Some(0.35),
+            crit_power: Some(0.585),
-            stealth: Some(0.5),
+            stealth: Some(0.45),
         ),
         "Brinestone": (
-            protection: Some(Normal(120.0)),
+            protection: Some(Normal(122.0)),
-            poise_resilence: Some(Normal(28.0)),
+            poise_resilience: Some(Normal(29.5)),
-            energy_reward: Some(0.35),
+            energy_max: Some(63.0),
-            crit_power: Some(0.25),
+            energy_reward: Some(0.63),
-        )
+            crit_power: Some(-0.21),
+        ),
     },
 )

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.log.wood"), 1, false),
-            (Item("common.items.crafting_ing.stones"), 3, 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.simple_leather"), 1, false),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 2, 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.simple_leather"), 1, false),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 2, 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.simple_leather"), 5, false),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 4, 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.simple_leather"), 2, false),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 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.simple_leather"), 2, false),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 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.simple_leather"), 4, false),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 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.simple_leather"), 4, false),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 6, 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.twigs"), 4, false),
-            (Item("common.items.crafting_ing.stones"), 3, false),
+            (Item("common.items.crafting_ing.stones"), 5, false),
-            (Item("common.items.log.wood"), 1, false),
-            (Item("common.items.tool.craftsman_hammer"), 0, 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),
     ),

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,

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"): (

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",

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],

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.peaceful.bushly")),
-                (2, (1, 1, "common.entity.wild.aggressive.driggle")),
+                (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],

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.peaceful.bushly")),
-                (1, (1, 1, "common.entity.wild.aggressive.mossy_snail")),
+                (1, (1, 1, "common.entity.wild.peaceful.mossy_snail")),
-                (1, (1, 1, "common.entity.wild.aggressive.treant_sapling")),
+                (1, (1, 1, "common.entity.wild.peaceful.treant_sapling")),
             ],
             spawn_mode: Land,
             day_period: [Night, Morning, Noon, Evening],