Merge branch 'modular-weapons' into 'master'

Modular weapons Closes #1255 See merge request veloren/veloren!2708
2024-08-30 18:12:32 +00:00 · 2022-05-18 00:42:03 +00:00 · 2022-05-18 00:42:03 +00:00 · c3377547c3
commit c3377547c3
parent d69f76461f 94d05b4ddf
1619 changed files with 18689 additions and 11046 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -23,6 +23,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Implemented an LoD system for objects, making trees visible far beyond the view distance
 - Add stealth stat on Bag UI
 - Water caves
+- Modular weapons

 ### Changed

--- a/assets/common/abilities/sceptre/wardingaura.ron
+++ b/assets/common/abilities/sceptre/wardingaura.ron
@ -6,7 +6,7 @@ BasicAura(
    auras: [
        (
            kind: ProtectingWard,
-            strength: 0.20,
+            strength: 0.15,
            duration: Some(10.0),
            category: Magical,
        ),
--- a/assets/common/component_recipe_book.ron
+++ b/assets/common/component_recipe_book.ron
--- a/assets/common/crafting/metal_weapon_materials.ron
+++ b/assets/common/crafting/metal_weapon_materials.ron
@ -0,0 +1,9 @@
+// Potentially make more fine grained later if needed
+([
+    "common.items.mineral.ingot.bronze",
+    "common.items.mineral.ingot.iron",
+    "common.items.mineral.ingot.steel",
+    "common.items.mineral.ingot.cobalt",
+    "common.items.mineral.ingot.bloodsteel",
+    "common.items.mineral.ingot.orichalcum",
+])
--- a/assets/common/crafting/wood_weapon_materials.ron
+++ b/assets/common/crafting/wood_weapon_materials.ron
@ -0,0 +1,9 @@
+// Potentially make more fine grained later if needed
+([
+    "common.items.log.wood",
+    "common.items.log.bamboo",
+    "common.items.log.hardwood",
+    "common.items.log.ironwood",
+    "common.items.log.frostwood",
+    "common.items.log.eldwood",
+])
--- a/assets/common/entity/dungeon/fallback/enemy.ron
+++ b/assets/common/entity/dungeon/fallback/enemy.ron
@ -6,15 +6,15 @@
    loot: LootTable("common.loot_tables.fallback"),
    inventory: (
        loadout: Inline((
-            active_hands: ([
-                (1, "common.items.weapons.tool.broom"),
-                (1, "common.items.weapons.tool.hoe"),
-                (1, "common.items.weapons.tool.pickaxe"),
-                (1, "common.items.weapons.tool.rake"),
-                (1, "common.items.weapons.tool.shovel-0"),
-                (1, "common.items.weapons.tool.shovel-1"),
-                (1, "common.items.weapons.bow.bone-1"),
-            ], None),
+            active_hands: InHands((Choice([
+                (1, Item("common.items.weapons.tool.broom")),
+                (1, Item("common.items.weapons.tool.hoe")),
+                (1, Item("common.items.weapons.tool.pickaxe")),
+                (1, Item("common.items.weapons.tool.rake")),
+                (1, Item("common.items.weapons.tool.shovel-0")),
+                (1, Item("common.items.weapons.tool.shovel-1")),
+                (1, Item("common.items.weapons.bow.starter")),
+            ]), None)),
        )),
    ),
    meta: [],
--- a/assets/common/entity/dungeon/gnarling/chieftain.ron
+++ b/assets/common/entity/dungeon/gnarling/chieftain.ron
@ -8,7 +8,7 @@
    inventory: (
        loadout: Inline((
            inherit: Asset("common.loadout.dungeon.gnarling.chieftain"),
-            active_hands: ("common.items.npc_weapons.biped_small.gnarling.chieftain", None),
+            active_hands: InHands((Item("common.items.npc_weapons.biped_small.gnarling.chieftain"), None)),
        )),
    ),
    meta: [
--- a/assets/common/entity/dungeon/gnarling/logger.ron
+++ b/assets/common/entity/dungeon/gnarling/logger.ron
@ -7,7 +7,7 @@
    inventory: (
        loadout: Inline((
            inherit: Asset("common.loadout.dungeon.gnarling.logger"),
-            active_hands: ("common.items.npc_weapons.biped_small.gnarling.logger", None),
+            active_hands: InHands((Item("common.items.npc_weapons.biped_small.gnarling.logger"), None)),
        )),
    ),
    meta: [],
--- a/assets/common/entity/dungeon/gnarling/mandragora.ron
+++ b/assets/common/entity/dungeon/gnarling/mandragora.ron
@ -3,11 +3,11 @@
    name: Name("Mandragora"),
    body: RandomWith("mandragora"),
    alignment: Alignment(Enemy),
-    loot: LootTable("common.loot_tables.dungeon.tier-0.enemy"),
+    loot: LootTable("common.loot_tables.dungeon.tier-0.mandragora"),
    inventory: (
        loadout: Inline((
            inherit: Asset("common.loadout.dungeon.gnarling.mandragora"),
-            active_hands: ("common.items.npc_weapons.biped_small.mandragora", None),
+            active_hands: InHands((Item("common.items.npc_weapons.biped_small.mandragora"), None)),
        )),
    ),
    meta: [],
--- a/assets/common/entity/dungeon/gnarling/mugger.ron
+++ b/assets/common/entity/dungeon/gnarling/mugger.ron
@ -7,7 +7,7 @@
    inventory: (
        loadout: Inline((
            inherit: Asset("common.loadout.dungeon.gnarling.mugger"),
-            active_hands: ("common.items.npc_weapons.biped_small.gnarling.mugger", None),
+            active_hands: InHands((Item("common.items.npc_weapons.biped_small.gnarling.mugger"), None)),
        )),
    ),
    meta: [],
--- a/assets/common/entity/dungeon/gnarling/stalker.ron
+++ b/assets/common/entity/dungeon/gnarling/stalker.ron
@ -7,7 +7,7 @@
    inventory: (
        loadout: Inline((
            inherit: Asset("common.loadout.dungeon.gnarling.stalker"),
-            active_hands: ("common.items.npc_weapons.biped_small.gnarling.stalker", None),
+            active_hands: InHands((Item("common.items.npc_weapons.biped_small.gnarling.stalker"), None)),
        )),
    ),
    meta: [],
--- a/assets/common/entity/dungeon/gnarling/woodgolem.ron
+++ b/assets/common/entity/dungeon/gnarling/woodgolem.ron
@ -3,7 +3,7 @@
    name: Name("Wooden Golem"),
    body: RandomWith("woodgolem"),
    alignment: Alignment(Enemy),
-    loot: LootTable("common.loot_tables.dungeon.tier-0.miniboss"),
+    loot: LootTable("common.loot_tables.dungeon.tier-0.woodgolem"),
    inventory: (
        loadout: FromBody,
    ),
--- a/assets/common/entity/dungeon/tier-1/hunter.ron
+++ b/assets/common/entity/dungeon/tier-1/hunter.ron
@ -7,7 +7,7 @@
    inventory: (
        loadout: Inline((
            inherit: Asset("common.loadout.dungeon.tier-1.hunter"),
-            active_hands: ("common.items.npc_weapons.biped_small.adlet.hunter", None),
+            active_hands: InHands((Item("common.items.npc_weapons.biped_small.adlet.hunter"), None)),
        )),
    ),
    meta: [
--- a/assets/common/entity/dungeon/tier-1/icepicker.ron
+++ b/assets/common/entity/dungeon/tier-1/icepicker.ron
@ -7,7 +7,7 @@
    inventory: (
        loadout: Inline((
            inherit: Asset("common.loadout.dungeon.tier-1.icepicker"),
-            active_hands: ("common.items.npc_weapons.biped_small.adlet.icepicker", None),
+            active_hands: InHands((Item("common.items.npc_weapons.biped_small.adlet.icepicker"), None)),
        )),
    ),
    meta: [
--- a/assets/common/entity/dungeon/tier-1/tracker.ron
+++ b/assets/common/entity/dungeon/tier-1/tracker.ron
@ -7,7 +7,7 @@
    inventory: (
        loadout: Inline((
            inherit: Asset("common.loadout.dungeon.tier-1.tracker"),
-            active_hands: ("common.items.npc_weapons.biped_small.adlet.tracker", None),
+            active_hands: InHands((Item("common.items.npc_weapons.biped_small.adlet.tracker"), None)),
        )),
    ),
    meta: [
--- a/assets/common/entity/dungeon/tier-2/sniper.ron
+++ b/assets/common/entity/dungeon/tier-2/sniper.ron
@ -7,7 +7,7 @@
    inventory: (
        loadout: Inline((
            inherit: Asset("common.loadout.dungeon.tier-2.sniper"),
-            active_hands: ("common.items.npc_weapons.biped_small.sahagin.sniper", None),
+            active_hands: InHands((Item("common.items.npc_weapons.biped_small.sahagin.sniper"), None)),
        )),
    ),
    meta: [
--- a/assets/common/entity/dungeon/tier-2/sorcerer.ron
+++ b/assets/common/entity/dungeon/tier-2/sorcerer.ron
@ -7,7 +7,7 @@
    inventory: (
        loadout: Inline((
            inherit: Asset("common.loadout.dungeon.tier-2.sorcerer"),
-            active_hands: ("common.items.npc_weapons.biped_small.sahagin.sorcerer", None),
+            active_hands: InHands((Item("common.items.npc_weapons.biped_small.sahagin.sorcerer"), None)),
        )),
    ),
    meta: [
--- a/assets/common/entity/dungeon/tier-2/spearman.ron
+++ b/assets/common/entity/dungeon/tier-2/spearman.ron
@ -7,7 +7,7 @@
    inventory: (
        loadout: Inline((
            inherit: Asset("common.loadout.dungeon.tier-2.spearman"),
-            active_hands: ("common.items.npc_weapons.biped_small.sahagin.spearman", None),
+            active_hands: InHands((Item("common.items.npc_weapons.biped_small.sahagin.spearman"), None)),
        )),
    ),
    meta: [
--- a/assets/common/entity/dungeon/tier-3/archer.ron
+++ b/assets/common/entity/dungeon/tier-3/archer.ron
@ -7,7 +7,7 @@
    inventory: (
        loadout: Inline((
            inherit: Asset("common.loadout.dungeon.tier-3.archer"),
-            active_hands: ("common.items.npc_weapons.biped_small.haniwa.archer", None),
+            active_hands: InHands((Item("common.items.npc_weapons.biped_small.haniwa.archer"), None)),
        )),
    ),
    meta: [
--- a/assets/common/entity/dungeon/tier-3/guard.ron
+++ b/assets/common/entity/dungeon/tier-3/guard.ron
@ -7,7 +7,7 @@
    inventory: (
        loadout: Inline((
            inherit: Asset("common.loadout.dungeon.tier-3.guard"),
-            active_hands: ("common.items.npc_weapons.biped_small.haniwa.guard", None),
+            active_hands: InHands((Item("common.items.npc_weapons.biped_small.haniwa.guard"), None)),
        )),
    ),
    meta: [
--- a/assets/common/entity/dungeon/tier-3/soldier.ron
+++ b/assets/common/entity/dungeon/tier-3/soldier.ron
@ -7,7 +7,7 @@
    inventory: (
        loadout: Inline((
            inherit: Asset("common.loadout.dungeon.tier-3.soldier"),
-            active_hands: ("common.items.npc_weapons.biped_small.haniwa.soldier", None),
+            active_hands: InHands((Item("common.items.npc_weapons.biped_small.haniwa.soldier"), None)),
        )),
    ),
    meta: [
--- a/assets/common/entity/dungeon/tier-4/hoplite.ron
+++ b/assets/common/entity/dungeon/tier-4/hoplite.ron
@ -7,7 +7,7 @@
    inventory: (
        loadout: Inline((
            inherit: Asset("common.loadout.dungeon.tier-4.hoplite"),
-            active_hands: ("common.items.npc_weapons.biped_small.myrmidon.hoplite", None),
+            active_hands: InHands((Item("common.items.npc_weapons.biped_small.myrmidon.hoplite"), None)),
        )),
    ),
    meta: [
--- a/assets/common/entity/dungeon/tier-4/marksman.ron
+++ b/assets/common/entity/dungeon/tier-4/marksman.ron
@ -7,7 +7,7 @@
    inventory: (
        loadout: Inline((
            inherit: Asset("common.loadout.dungeon.tier-4.marksman"),
-            active_hands: ("common.items.npc_weapons.biped_small.myrmidon.marksman", None),
+            active_hands: InHands((Item("common.items.npc_weapons.biped_small.myrmidon.marksman"), None)),
        )),
    ),
    meta: [
--- a/assets/common/entity/dungeon/tier-4/strategian.ron
+++ b/assets/common/entity/dungeon/tier-4/strategian.ron
@ -7,7 +7,7 @@
    inventory: (
        loadout: Inline((
            inherit: Asset("common.loadout.dungeon.tier-4.strategian"),
-            active_hands: ("common.items.npc_weapons.biped_small.myrmidon.strategian", None),
+            active_hands: InHands((Item("common.items.npc_weapons.biped_small.myrmidon.strategian"), None)),
        )),
    ),
    meta: [
--- a/assets/common/entity/dungeon/tier-5/beastmaster.ron
+++ b/assets/common/entity/dungeon/tier-5/beastmaster.ron
@ -7,11 +7,11 @@
    inventory: (
        loadout: Inline((
            inherit: Asset("common.loadout.dungeon.tier-5.beastmaster"),
-            active_hands: ([
-                (1, "common.items.weapons.axe.malachite_axe-0"),
-                (1, "common.items.weapons.sword.bloodsteel-1"),
-                (1, "common.items.weapons.bow.velorite"),
-            ], None),
+            active_hands: InHands((Choice([
+                (1, Item("common.items.weapons.axe.malachite_axe-0")),
+                (1, ModularWeapon(tool: Sword, material: Bloodsteel, hands: Two)),
+                (1, Item("common.items.weapons.bow.velorite")),
+            ]), None)),
        )),
    ),
    meta: [
--- a/assets/common/entity/dungeon/tier-5/cultist.ron
+++ b/assets/common/entity/dungeon/tier-5/cultist.ron
@ -7,15 +7,15 @@
    inventory: (
        loadout: Inline((
            inherit: Asset("common.loadout.dungeon.tier-5.cultist"),
-            active_hands: ([
-                (2, "common.items.weapons.axe_1h.orichalcum-0"),
-                (4, "common.items.weapons.sword.cultist"),
-                (2, "common.items.weapons.staff.cultist_staff"),
-                (2, "common.items.weapons.hammer.cultist_purp_2h-0"),
-                (2, "common.items.weapons.hammer_1h.orichalcum-0"),
-                (2, "common.items.weapons.bow.velorite"),
-                (1, "common.items.weapons.sceptre.sceptre_velorite_0"),
-            ], None),
+            active_hands: InHands((Choice([
+                (2, ModularWeapon(tool: Axe, material: Orichalcum, hands: One)),
+                (4, Item("common.items.weapons.sword.cultist")),
+                (2, Item("common.items.weapons.staff.cultist_staff")),
+                (2, Item("common.items.weapons.hammer.cultist_purp_2h-0")),
+                (2, ModularWeapon(tool: Hammer, material: Orichalcum, hands: One)),
+                (2, Item("common.items.weapons.bow.velorite")),
+                (1, Item("common.items.weapons.sceptre.sceptre_velorite_0")),
+            ]), None)),
        )),
    ),
    meta: [
--- a/assets/common/entity/dungeon/tier-5/warlock.ron
+++ b/assets/common/entity/dungeon/tier-5/warlock.ron
@ -7,10 +7,10 @@
    inventory: (
        loadout: Inline((
            inherit: Asset("common.loadout.dungeon.tier-5.warlock"),
-            active_hands: ([
-                (1, "common.items.npc_weapons.staff.bipedlarge-cultist"),
-                (1, "common.items.npc_weapons.bow.bipedlarge-velorite"),
-            ], None),
+            active_hands: InHands((Choice([
+                (1, Item("common.items.npc_weapons.staff.bipedlarge-cultist")),
+                (1, Item("common.items.npc_weapons.bow.bipedlarge-velorite")),
+            ]), None)),
        )),
    ),
    meta: [],
--- a/assets/common/entity/dungeon/tier-5/warlord.ron
+++ b/assets/common/entity/dungeon/tier-5/warlord.ron
@ -7,10 +7,10 @@
    inventory: (
        loadout: Inline((
            inherit: Asset("common.loadout.dungeon.tier-5.warlord"),
-            active_hands: ([
-                (1, "common.items.npc_weapons.sword.bipedlarge-cultist"),
-                (1, "common.items.npc_weapons.hammer.bipedlarge-cultist"),
-            ], None),
+            active_hands: InHands((Choice([
+                (1, Item("common.items.npc_weapons.sword.bipedlarge-cultist")),
+                (1, Item("common.items.npc_weapons.hammer.bipedlarge-cultist")),
+            ]), None)),
        )),
    ),
    meta: [],
--- a/assets/common/entity/spot/dwarf_grave_robber.ron
+++ b/assets/common/entity/spot/dwarf_grave_robber.ron
@ -7,7 +7,10 @@
    inventory: (
        loadout: Inline((
            inherit: Asset("common.loadout.spots.dwarf_graverobber"),
-            active_hands: ("common.items.weapons.hammer.steel_hammer-3", None),
+            active_hands: InHands((
+                ModularWeapon(tool: Hammer, material: Steel, hands: Two),
+                None
+            )),
        )),
    ),
    meta: [
--- a/assets/common/entity/spot/gnome/spear.ron
+++ b/assets/common/entity/spot/gnome/spear.ron
@ -7,7 +7,7 @@
    inventory: (
        loadout: Inline((
            inherit: Asset("common.loadout.spots.gnome"),
-            active_hands: ("common.items.npc_weapons.biped_small.myrmidon.hoplite", None),
+            active_hands: InHands((Item("common.items.npc_weapons.biped_small.myrmidon.hoplite"), None)),
        )),
    ),
    meta: [],
--- a/assets/common/entity/spot/grim_salvager.ron
+++ b/assets/common/entity/spot/grim_salvager.ron
@ -7,7 +7,10 @@
    inventory: (
        loadout: Inline((
            inherit: Asset("common.loadout.spots.dwarf_graverobber"),
-            active_hands: ("common.items.weapons.hammer.steel_hammer-0", None),
+            active_hands: InHands((
+                ModularWeapon(tool: Hammer, material: Steel, hands: Two),
+                None
+            )),
        )),
    ),
    meta: [
--- a/assets/common/entity/spot/pirate.ron
+++ b/assets/common/entity/spot/pirate.ron
@ -7,7 +7,10 @@
    inventory: (
        loadout: Inline((
            inherit: Asset("common.loadout.spots.pirate"),
-            active_hands: ("common.items.weapons.sword_1h.iron-2", "common.items.weapons.sword_1h.iron-2"),
+            active_hands: InHands((
+                ModularWeapon(tool: Sword, material: Iron, hands: One),
+                ModularWeapon(tool: Sword, material: Iron, hands: One),
+            )),
        )),
    ),
    meta: [
--- a/assets/common/entity/spot/saurok.ron
+++ b/assets/common/entity/spot/saurok.ron
@ -6,7 +6,7 @@
    loot: LootTable("common.loot_tables.creature.biped_large.saurok"),
    inventory: (
        loadout: Inline((
-            active_hands: ("common.items.npc_weapons.bow.saurok_bow", None),
+            active_hands: InHands((Item("common.items.npc_weapons.bow.saurok_bow"), None)),
        )),
    ),
    meta: [],
--- a/assets/common/entity/spot/witch_dark.ron
+++ b/assets/common/entity/spot/witch_dark.ron
@ -7,7 +7,7 @@
    inventory: (
        loadout: Inline((
            inherit: Asset("common.loadout.spots.witch"),
-            active_hands: ("common.items.weapons.sceptre.belzeshrub", None),
+            active_hands: InHands((Item("common.items.weapons.sceptre.belzeshrub"), None)),
        )),
    ),
    meta: [
--- a/assets/common/entity/template.ron
+++ b/assets/common/entity/template.ron
@ -9,7 +9,7 @@
    inventory: (
        loadout: Inline((
            inherit: Asset("common.loadout.village.merchant"),
-            active_hands: ("common.items.weapons.sword.cultist", None),
+            active_hands: InHands((Item("common.items.weapons.sword.cultist"), None)),
        )),
    ),
    meta: [
--- a/assets/common/entity/village/alchemist.ron
+++ b/assets/common/entity/village/alchemist.ron
@ -7,14 +7,14 @@
    inventory: (
        loadout: Inline((
            inherit: Asset("common.loadout.village.alchemist"),
-            active_hands: ([
-                (1, "common.items.weapons.tool.broom"),
-                (1, "common.items.weapons.tool.hoe"),
-                (1, "common.items.weapons.tool.pickaxe"),
-                (1, "common.items.weapons.tool.rake"),
-                (1, "common.items.weapons.tool.shovel-0"),
-                (1, "common.items.weapons.tool.shovel-1"),
-            ], None),
+            active_hands: InHands((Choice([
+                (1, Item("common.items.weapons.tool.broom")),
+                (1, Item("common.items.weapons.tool.hoe")),
+                (1, Item("common.items.weapons.tool.pickaxe")),
+                (1, Item("common.items.weapons.tool.rake")),
+                (1, Item("common.items.weapons.tool.shovel-0")),
+                (1, Item("common.items.weapons.tool.shovel-1")),
+            ]), None)),
        )),
        items: [
            (10, "common.items.consumable.potion_big"),
--- a/assets/common/entity/village/blacksmith.ron
+++ b/assets/common/entity/village/blacksmith.ron
@ -7,14 +7,14 @@
    inventory: (
        loadout: Inline((
            inherit: Asset("common.loadout.village.blacksmith"),
-            active_hands: ([
-                (1, "common.items.weapons.tool.broom"),
-                (1, "common.items.weapons.tool.hoe"),
-                (1, "common.items.weapons.tool.pickaxe"),
-                (1, "common.items.weapons.tool.rake"),
-                (1, "common.items.weapons.tool.shovel-0"),
-                (1, "common.items.weapons.tool.shovel-1"),
-            ], None),
+            active_hands: InHands((Choice([
+                (1, Item("common.items.weapons.tool.broom")),
+                (1, Item("common.items.weapons.tool.hoe")),
+                (1, Item("common.items.weapons.tool.pickaxe")),
+                (1, Item("common.items.weapons.tool.rake")),
+                (1, Item("common.items.weapons.tool.shovel-0")),
+                (1, Item("common.items.weapons.tool.shovel-1")),
+            ]), None)),
        )),
        items: [
            (10, "common.items.consumable.potion_big"),
--- a/assets/common/entity/village/chef.ron
+++ b/assets/common/entity/village/chef.ron
@ -7,14 +7,14 @@
    inventory: (
        loadout: Inline((
            inherit: Asset("common.loadout.village.chef"),
-            active_hands: ([
-                (1, "common.items.weapons.tool.broom"),
-                (1, "common.items.weapons.tool.hoe"),
-                (1, "common.items.weapons.tool.pickaxe"),
-                (1, "common.items.weapons.tool.rake"),
-                (1, "common.items.weapons.tool.shovel-0"),
-                (1, "common.items.weapons.tool.shovel-1"),
-            ], None),
+            active_hands: InHands((Choice([
+                (1, Item("common.items.weapons.tool.broom")),
+                (1, Item("common.items.weapons.tool.hoe")),
+                (1, Item("common.items.weapons.tool.pickaxe")),
+                (1, Item("common.items.weapons.tool.rake")),
+                (1, Item("common.items.weapons.tool.shovel-0")),
+                (1, Item("common.items.weapons.tool.shovel-1")),
+            ]), None)),
        )),
        items: [
            (10, "common.items.consumable.potion_big"),
--- a/assets/common/entity/village/guard.ron
+++ b/assets/common/entity/village/guard.ron
@ -7,11 +7,11 @@
    inventory: (
        loadout: Inline((
            inherit: Asset("common.loadout.village.guard"),
-            active_hands: ([
-                (1, "common.items.weapons.sword.cobalt-0"),
-                (2, "common.items.weapons.bow.metal-2"),
-                (1, "common.items.weapons.axe.cobalt_axe-0"),
-            ], None),
+            active_hands: InHands((Choice([
+                (1, ModularWeapon(tool: Sword, material: Cobalt, hands: None)),
+                (2, ModularWeapon(tool: Bow, material: Ironwood, hands: None)),
+                (1, ModularWeapon(tool: Axe, material: Cobalt, hands: None)),
+            ]), None)),
        )),
        items: [
            (25, "common.items.consumable.potion_big"),
--- a/assets/common/entity/village/merchant.ron
+++ b/assets/common/entity/village/merchant.ron
@ -6,12 +6,12 @@
    loot: LootTable("common.loot_tables.creature.humanoid"),
    inventory: (
        loadout: Inline((
-            active_hands: ([
-                (2, "common.items.weapons.bow.eldwood-0"),
-                (1, "common.items.weapons.sword.steel-0"),
-                (1, "common.items.weapons.sword_1h.bloodsteel-0"),
-                (2, "common.items.weapons.staff.flamethrower_0"),
-            ], None),
+            active_hands: InHands((Choice([
+                (2, ModularWeapon(tool: Bow, material: Eldwood, hands: None)),
+                (1, ModularWeapon(tool: Sword, material: Steel, hands: None)),
+                (1, ModularWeapon(tool: Sword, material: Bloodsteel, hands: None)),
+                (2, ModularWeapon(tool: Staff, material: Ironwood, hands: None)),
+            ]), None)),
        )),
    ),
    meta: [
--- a/assets/common/entity/village/mountaineer.ron
+++ b/assets/common/entity/village/mountaineer.ron
@ -7,14 +7,14 @@
    inventory: (
        loadout: Inline((
            inherit: Asset("common.loadout.village.mountaineer"),
-            active_hands: ([
-                (1, "common.items.weapons.tool.broom"),
-                (1, "common.items.weapons.tool.hoe"),
-                (1, "common.items.weapons.tool.pickaxe"),
-                (1, "common.items.weapons.tool.rake"),
-                (1, "common.items.weapons.tool.shovel-0"),
-                (1, "common.items.weapons.tool.shovel-1"),
-            ], None),
+            active_hands: InHands((Choice([
+                (1, Item("common.items.weapons.tool.broom")),
+                (1, Item("common.items.weapons.tool.hoe")),
+                (1, Item("common.items.weapons.tool.pickaxe")),
+                (1, Item("common.items.weapons.tool.rake")),
+                (1, Item("common.items.weapons.tool.shovel-0")),
+                (1, Item("common.items.weapons.tool.shovel-1")),
+            ]), None)),
        )),
        items: [
            (10, "common.items.consumable.potion_big"),
--- a/assets/common/entity/village/villager.ron
+++ b/assets/common/entity/village/villager.ron
@ -7,14 +7,14 @@
    inventory: (
        loadout: Inline((
            inherit: Asset("common.loadout.village.villager"),
-            active_hands: ([
-                (1, "common.items.weapons.tool.broom"),
-                (1, "common.items.weapons.tool.hoe"),
-                (1, "common.items.weapons.tool.pickaxe"),
-                (1, "common.items.weapons.tool.rake"),
-                (1, "common.items.weapons.tool.shovel-0"),
-                (1, "common.items.weapons.tool.shovel-1"),
-            ], None),
+            active_hands: InHands((Choice([
+                (1, Item("common.items.weapons.tool.broom")),
+                (1, Item("common.items.weapons.tool.hoe")),
+                (1, Item("common.items.weapons.tool.pickaxe")),
+                (1, Item("common.items.weapons.tool.rake")),
+                (1, Item("common.items.weapons.tool.shovel-0")),
+                (1, Item("common.items.weapons.tool.shovel-1")),
+            ]), None)),
        )),
        items: [
            (10, "common.items.consumable.potion_big"),
--- a/assets/common/entity/wild/aggressive/black_widow.ron
+++ b/assets/common/entity/wild/aggressive/black_widow.ron
@ -3,7 +3,7 @@
    name: Automatic,
    body: RandomWith("black_widow"),
    alignment: Alignment(Enemy),
-    loot: LootTable("common.loot_tables.creature.arthropod.venom"),
+    loot: LootTable("common.loot_tables.creature.arthropod.black_widow"),
    inventory: (
        loadout: FromBody,
    ),
--- a/assets/common/entity/wild/aggressive/ngoubou.ron
+++ b/assets/common/entity/wild/aggressive/ngoubou.ron
@ -3,7 +3,7 @@
    name: Automatic,
    body: RandomWith("ngoubou"),
    alignment: Alignment(Enemy),
-    loot: LootTable("common.loot_tables.creature.quad_medium.horned"),
+    loot: LootTable("common.loot_tables.creature.quad_medium.ngoubou"),
    inventory: (
        loadout: FromBody,
    ),
--- a/assets/common/entity/wild/aggressive/odonto.ron
+++ b/assets/common/entity/wild/aggressive/odonto.ron
@ -3,7 +3,7 @@
    name: Automatic,
    body: RandomWith("odonto"),
    alignment: Alignment(Enemy),
-    loot: LootTable("common.loot_tables.creature.theropod.generic"),
+    loot: LootTable("common.loot_tables.creature.theropod.odonto"),
    inventory: (
        loadout: FromBody,
    ),
--- a/assets/common/entity/wild/aggressive/sunlizard.ron
+++ b/assets/common/entity/wild/aggressive/sunlizard.ron
@ -3,7 +3,7 @@
    name: Automatic,
    body: RandomWith("sunlizard"),
    alignment: Alignment(Enemy),
-    loot: LootTable("common.loot_tables.creature.theropod.raptor"),
+    loot: LootTable("common.loot_tables.creature.theropod.scale"),
    inventory: (
        loadout: FromBody,
    ),
--- a/assets/common/entity/wild/peaceful/leaf_beetle.ron
+++ b/assets/common/entity/wild/peaceful/leaf_beetle.ron
@ -3,7 +3,7 @@
    name: Automatic,
    body: RandomWith("leaf_beetle"),
    alignment: Alignment(Wild),
-    loot: LootTable("common.loot_tables.creature.arthropod.leaf"),
+    loot: LootTable("common.loot_tables.creature.arthropod.leaf_beetle"),
    inventory: (
        loadout: FromBody,
    ),
--- a/assets/common/entity/wild/peaceful/truffler.ron
+++ b/assets/common/entity/wild/peaceful/truffler.ron
@ -3,7 +3,7 @@
    name: Automatic,
    body: RandomWith("truffler"),
    alignment: Alignment(Wild),
-    loot: LootTable("common.loot_tables.creature.quad_small.mushroom"),
+    loot: LootTable("common.loot_tables.creature.quad_small.truffler"),
    inventory: (
        loadout: FromBody,
    ),
--- a/assets/common/entity/wild/peaceful/tuskram.ron
+++ b/assets/common/entity/wild/peaceful/tuskram.ron
@ -3,7 +3,7 @@
    name: Automatic,
    body: RandomWith("tuskram"),
    alignment: Alignment(Wild),
-    loot: LootTable("common.loot_tables.creature.quad_medium.fanged"),
+    loot: LootTable("common.loot_tables.creature.quad_medium.tuskram"),
    inventory: (
        loadout: FromBody,
    ),
--- a/assets/common/entity/world/traveler0.ron
+++ b/assets/common/entity/world/traveler0.ron
@ -11,14 +11,14 @@
                (1, Asset("common.loadout.world.traveler0.linen")),
                (1, Asset("common.loadout.world.traveler0.rawhide")),
            ]),
-            active_hands: ([
-                (1, "common.items.weapons.sword.bronze-0"),
-                (1, "common.items.weapons.axe.bronze_axe-0"),
-                (1, "common.items.weapons.hammer.bronze_hammer-0"),
-                (1, "common.items.weapons.bow.bone-0"),
-                (1, "common.items.weapons.staff.fiery_wishing_rod"),
-                (1, "common.items.weapons.sceptre.root_green0"),
-            ], None),
+            active_hands: InHands((Choice([
+                (1, ModularWeapon(tool: Sword, material: Bronze, hands: None)),
+                (1, ModularWeapon(tool: Axe, material: Bronze, hands: None)),
+                (1, ModularWeapon(tool: Hammer, material: Bronze, hands: None)),
+                (1, ModularWeapon(tool: Bow, material: Wood, hands: None)),
+                (1, ModularWeapon(tool: Staff, material: Wood, hands: None)),
+                (1, ModularWeapon(tool: Sceptre, material: Wood, hands: None)),
+            ]), None)),
        )),
        items: [
            (5, "common.items.consumable.potion_minor"),
--- a/assets/common/entity/world/traveler1.ron
+++ b/assets/common/entity/world/traveler1.ron
@ -11,14 +11,14 @@
                (1, Asset("common.loadout.world.traveler1.leather")),
                (1, Asset("common.loadout.world.traveler1.wool")),
            ]),
-            active_hands: ([
-                (1, "common.items.weapons.sword.iron-0"),
-                (1, "common.items.weapons.axe.iron_axe-0"),
-                (1, "common.items.weapons.hammer.iron_hammer-0"),
-                (1, "common.items.weapons.bow.hardwood-0"),
-                (1, "common.items.weapons.staff.heated_arm"),
-                (1, "common.items.weapons.sceptre.staff_nature"),
-            ], None),
+            active_hands: InHands((Choice([
+                (1, ModularWeapon(tool: Sword, material: Iron, hands: None)),
+                (1, ModularWeapon(tool: Axe, material: Iron, hands: None)),
+                (1, ModularWeapon(tool: Hammer, material: Iron, hands: None)),
+                (1, ModularWeapon(tool: Bow, material: Bamboo, hands: None)),
+                (1, ModularWeapon(tool: Staff, material: Bamboo, hands: None)),
+                (1, ModularWeapon(tool: Sceptre, material: Bamboo, hands: None)),
+            ]), None)),
        )),
        items: [
            (25, "common.items.consumable.potion_minor"),
--- a/assets/common/entity/world/traveler2.ron
+++ b/assets/common/entity/world/traveler2.ron
@ -16,20 +16,20 @@
                (1, Asset("common.loadout.world.traveler2.druid")),
                (1, Asset("common.loadout.world.traveler2.carapace")),
            ]),
-            active_hands: ([
-                (1, "common.items.weapons.sword.steel-0"),
-                (1, "common.items.weapons.axe.steel_axe-0"),
-                (1, "common.items.weapons.hammer.steel_hammer-0"),
-                (1, "common.items.weapons.bow.metal-0"),
-                (1, "common.items.weapons.staff.golden_khakkara"),
-                (1, "common.items.weapons.sceptre.totem_green"),
-                (1, "common.items.weapons.sword.cobalt-0"),
-                (1, "common.items.weapons.axe.cobalt_axe-0"),
-                (1, "common.items.weapons.hammer.cobalt_hammer-0"),
-                (1, "common.items.weapons.bow.frostwood-0"),
-                (1, "common.items.weapons.staff.aurora"),
-                (1, "common.items.weapons.sceptre.loops0"),
-            ], None),
+            active_hands: InHands((Choice([
+                (1, ModularWeapon(tool: Sword, material: Steel, hands: None)),
+                (1, ModularWeapon(tool: Axe, material: Steel, hands: None)),
+                (1, ModularWeapon(tool: Hammer, material: Steel, hands: None)),
+                (1, ModularWeapon(tool: Bow, material: Hardwood, hands: None)),
+                (1, ModularWeapon(tool: Staff, material: Hardwood, hands: None)),
+                (1, ModularWeapon(tool: Sceptre, material: Hardwood, hands: None)),
+                (1, ModularWeapon(tool: Sword, material: Cobalt, hands: None)),
+                (1, ModularWeapon(tool: Axe, material: Cobalt, hands: None)),
+                (1, ModularWeapon(tool: Hammer, material: Cobalt, hands: None)),
+                (1, ModularWeapon(tool: Bow, material: Ironwood, hands: None)),
+                (1, ModularWeapon(tool: Staff, material: Ironwood, hands: None)),
+                (1, ModularWeapon(tool: Sceptre, material: Ironwood, hands: None)),
+            ]), None)),
        )),
        items: [
            (50, "common.items.consumable.potion_med"),
--- a/assets/common/entity/world/traveler3.ron
+++ b/assets/common/entity/world/traveler3.ron
@ -16,22 +16,21 @@
                (1, Asset("common.loadout.world.traveler3.sunsilk")),
                (1, Asset("common.loadout.world.traveler3.dragonscale")),
            ]),
-            active_hands: ([
-                (2, "common.items.weapons.sword.bloodsteel-0"),
-                (2, "common.items.weapons.axe.bloodsteel_axe-0"),
-                (2, "common.items.weapons.hammer.runic_hammer"),
-                (2, "common.items.weapons.bow.eldwood-0"),
-                (2, "common.items.weapons.staff.ruby_rod"),
-                (2, "common.items.weapons.sceptre.emerald"),
-                (2, "common.items.weapons.sword.caladbolg"),
-                (2, "common.items.weapons.hammer.mjolnir"),
-                (2, "common.items.weapons.axe.parashu"),
-                (2, "common.items.weapons.bow.sagitta"),
-                (1, "common.items.weapons.staff.phoenix"),
-                (1, "common.items.weapons.staff.laevateinn"),
-                (1, "common.items.weapons.sceptre.root_evil"),
-                (1, "common.items.weapons.sceptre.caduceus"),
-            ], None),
+            active_hands: InHands((Choice([
+                (2, ModularWeapon(tool: Sword, material: Orichalcum, hands: None)),
+                (2, ModularWeapon(tool: Axe, material: Orichalcum, hands: None)),
+                (2, ModularWeapon(tool: Hammer, material: Orichalcum, hands: None)),
+                (2, ModularWeapon(tool: Bow, material: Eldwood, hands: None)),
+                (2, ModularWeapon(tool: Staff, material: Eldwood, hands: None)),
+                (2, ModularWeapon(tool: Sceptre, material: Eldwood, hands: None)),
+                (2, Item("common.items.weapons.sword.caladbolg")),
+                (2, Item("common.items.weapons.hammer.mjolnir")),
+                (2, Item("common.items.weapons.axe.parashu")),
+                (2, Item("common.items.weapons.bow.sagitta")),
+                (2, Item("common.items.weapons.staff.laevateinn")),
+                (1, Item("common.items.weapons.sceptre.root_evil")),
+                (1, Item("common.items.weapons.sceptre.caduceus")),
+            ]), None)),
        )),
        items: [
            (50, "common.items.consumable.potion_big"),
--- a/assets/common/items/armor/cultist/ring.ron
+++ b/assets/common/items/armor/cultist/ring.ron
@ -1,5 +1,5 @@
 ItemDef(
-    name: "Cultist Signet Ring ",
+    name: "Cultist Signet Ring",
    description: "Once belonged to a cultist.",
    kind: Armor((
        kind: Ring("Cultist"),
--- a/assets/common/items/armor/misc/neck/shell.ron
+++ b/assets/common/items/armor/misc/neck/shell.ron
@ -1,6 +1,6 @@
 ItemDef(
    name: "Seashell Necklace",
-    description: "Contains the guardian aura of the ocean.",
+    description: "Contains the guardian aura of the ocean",
    kind: Armor((
        kind: Neck("Shell"),
        stats: (
--- a/assets/common/items/boss_drops/exp_flask.ron
+++ b/assets/common/items/boss_drops/exp_flask.ron
@ -2,7 +2,9 @@ ItemDef(
    name: "Flask of Velorite Dust",
    description: "Take with plenty of water",
    kind: Ingredient(
-        kind: "PotionExp",        
+        kind: "PotionExp",
+        // Descriptor not needed
+        descriptor: "",
    ),
    quality: High,
    tags: [Potion],
--- a/assets/common/items/boss_drops/xp_potion.ron
+++ b/assets/common/items/boss_drops/xp_potion.ron
@ -2,7 +2,9 @@ ItemDef(
    name: "Potion of Skill",
    description: "It doesn't seem to be doing anything...",
    kind: Ingredient(
-        kind: "Potion",        
+        kind: "Potion",
+        // Descriptor not needed
+        descriptor: "",
    ),
    quality: High,
    tags: [Potion],
--- a/assets/common/items/crafting_ing/animal_misc/bone.ron
+++ b/assets/common/items/crafting_ing/animal_misc/bone.ron
@ -3,6 +3,8 @@ ItemDef(
    description: "A bone sturdy enough to craft with.",
    kind: Ingredient(
        kind: "Bone",
+        // Descriptor not needed
+        descriptor: "",
    ),
    quality: Common,
    tags: [],
--- a/assets/common/items/crafting_ing/animal_misc/claw.ron
+++ b/assets/common/items/crafting_ing/animal_misc/claw.ron
@ -1,8 +1,10 @@
 ItemDef(
    name: "Predator Claw",
-    description: "Incredibly sharp claw from a predatory animal.",
+    description: "Incredibly sharp claw from a predatory animal.\n\nThis can be used when crafting weapons.",
    kind: Ingredient(
        kind: "Claw",
+        // Descriptor not needed
+        descriptor: "",
    ),
    quality: Common,
    tags: [],
--- a/assets/common/items/crafting_ing/animal_misc/elegant_crest.ron
+++ b/assets/common/items/crafting_ing/animal_misc/elegant_crest.ron
@ -0,0 +1,11 @@
+ItemDef(
+    name: "Elegant Crest",
+    description: "A flawless crest from some majestic creature.\n\nThis can be used when crafting weapons.",
+    kind: Ingredient(
+        kind: "ElegantCrest",
+        // Descriptor not needed
+        descriptor: "",
+    ),
+    quality: Common,
+    tags: [],
+)
--- a/assets/common/items/crafting_ing/animal_misc/ember.ron
+++ b/assets/common/items/crafting_ing/animal_misc/ember.ron
@ -3,6 +3,8 @@ ItemDef(
    description: "A flicking ember left by a fiery creature.",
    kind: Ingredient(
        kind: "Ember",
+        // Descriptor not needed
+        descriptor: "",
    ),
    quality: Common,
    tags: [],
--- a/assets/common/items/crafting_ing/animal_misc/feather.ron
+++ b/assets/common/items/crafting_ing/animal_misc/feather.ron
@ -3,6 +3,8 @@ ItemDef(
    description: "Feather from a bird.",
    kind: Ingredient(
        kind: "Feather",
+        // Descriptor not needed
+        descriptor: "",
    ),
    quality: Common,
    tags: [],
--- a/assets/common/items/crafting_ing/animal_misc/fur.ron
+++ b/assets/common/items/crafting_ing/animal_misc/fur.ron
@ -3,6 +3,8 @@ ItemDef(
    description: "Soft fur from an animal.",
    kind: Ingredient(
        kind: "Fur",
+        // Descriptor not needed
+        descriptor: "",
    ),
    quality: Common,
    tags: [],
--- a/assets/common/items/crafting_ing/animal_misc/grim_eyeball.ron
+++ b/assets/common/items/crafting_ing/animal_misc/grim_eyeball.ron
@ -3,6 +3,8 @@ ItemDef(
    description: "Casts a petrifying gaze.",
    kind: Ingredient(
        kind: "GrimEyeball",
+        // Descriptor not needed
+        descriptor: "",
    ),
    quality: Common,
    tags: [],
--- a/assets/common/items/crafting_ing/animal_misc/icy_fang.ron
+++ b/assets/common/items/crafting_ing/animal_misc/icy_fang.ron
@ -3,6 +3,8 @@ ItemDef(
    description: "Looted from a frosty creature.",
    kind: Ingredient(
        kind: "IcyShard",
+        // Descriptor not needed
+        descriptor: "",
    ),
    quality: Common,
    tags: [],
--- a/assets/common/items/crafting_ing/animal_misc/large_horn.ron
+++ b/assets/common/items/crafting_ing/animal_misc/large_horn.ron
@ -1,8 +1,10 @@
 ItemDef(
    name: "Large Horn",
-    description: "A huge sharp horn from an animal.",
+    description: "A huge sharp horn from an animal.\n\nThis can be used when crafting weapons.",
    kind: Ingredient(
        kind: "LargeHorn",
+        // Descriptor not needed
+        descriptor: "",
    ),
    quality: Common,
    tags: [],
--- a/assets/common/items/crafting_ing/animal_misc/lively_vine.ron
+++ b/assets/common/items/crafting_ing/animal_misc/lively_vine.ron
@ -3,6 +3,8 @@ ItemDef(
    description: "I think it just moved.",
    kind: Ingredient(
        kind: "LivelyVine",
+        // Descriptor not needed
+        descriptor: "",
    ),
    quality: Common,
    tags: [],
--- a/assets/common/items/crafting_ing/animal_misc/long_tusk.ron
+++ b/assets/common/items/crafting_ing/animal_misc/long_tusk.ron
@ -0,0 +1,11 @@
+ItemDef(
+    name: "Long Tusk",
+    description: "A pointy tusk from some beast.\n\nThis can be used when crafting weapons.",
+    kind: Ingredient(
+        kind: "LongTusk",
+        // Descriptor not needed
+        descriptor: "",
+    ),
+    quality: Common,
+    tags: [],
+)
--- a/assets/common/items/crafting_ing/animal_misc/phoenix_feather.ron
+++ b/assets/common/items/crafting_ing/animal_misc/phoenix_feather.ron
@ -3,6 +3,8 @@ ItemDef(
    description: "Said to have magical properties.",
    kind: Ingredient(
        kind: "PhoenixFeather",
+        // Descriptor not needed
+        descriptor: "",
    ),
    quality: Legendary,
    tags: [],
--- a/assets/common/items/crafting_ing/animal_misc/raptor_feather.ron
+++ b/assets/common/items/crafting_ing/animal_misc/raptor_feather.ron
@ -3,6 +3,8 @@ ItemDef(
    description: "Large colorful feather from a raptor.",
    kind: Ingredient(
        kind: "RaptorFeather",
+        // Descriptor not needed
+        descriptor: "",
    ),
    quality: Common,
    tags: [],
--- a/assets/common/items/crafting_ing/animal_misc/sharp_fang.ron
+++ b/assets/common/items/crafting_ing/animal_misc/sharp_fang.ron
@ -1,8 +1,10 @@
 ItemDef(
    name: "Sharp Fang",
-    description: "Incredibly sharp tooth from a predatory animal.",
+    description: "Incredibly sharp tooth from a predatory animal.\n\nThis can be used when crafting weapons.",
    kind: Ingredient(
        kind: "SharpFang",
+        // Descriptor not needed
+        descriptor: "",
    ),
    quality: Common,
    tags: [],
--- a/assets/common/items/crafting_ing/animal_misc/strong_pincer.ron
+++ b/assets/common/items/crafting_ing/animal_misc/strong_pincer.ron
@ -0,0 +1,11 @@
+ItemDef(
+    name: "Strong Pincer",
+    description: "The pincer of some creature, it is very tough.\n\nThis can be used when crafting weapons.",
+    kind: Ingredient(
+        kind: "StrongPincer",
+        // Descriptor not needed
+        descriptor: "",
+    ),
+    quality: Common,
+    tags: [],
+)
--- a/assets/common/items/crafting_ing/animal_misc/venom_sac.ron
+++ b/assets/common/items/crafting_ing/animal_misc/venom_sac.ron
@ -3,6 +3,8 @@ ItemDef(
    description: "A venomous sac from a poisonous creature.",
    kind: Ingredient(
        kind: "VenomSac",
+        // Descriptor not needed
+        descriptor: "",
    ),
    quality: Common,
    tags: [],
--- a/assets/common/items/crafting_ing/animal_misc/viscous_ooze.ron
+++ b/assets/common/items/crafting_ing/animal_misc/viscous_ooze.ron
@ -3,6 +3,8 @@ ItemDef(
    description: "A measure of viscous ooze from a slimy creature.",
    kind: Ingredient(
        kind: "ViscousOoze",
+        // Descriptor not needed
+        descriptor: "",
    ),
    quality: Common,
    tags: [],
--- a/assets/common/items/crafting_ing/bowl.ron
+++ b/assets/common/items/crafting_ing/bowl.ron
@ -3,6 +3,8 @@ ItemDef(
    description: "A simple bowl for preparing meals.",
    kind: Ingredient(
        kind: "Bowl",
+        // Descriptor not needed
+        descriptor: "",
    ),
    quality: Common,
    tags: [],
--- a/assets/common/items/crafting_ing/cactus.ron
+++ b/assets/common/items/crafting_ing/cactus.ron
@ -3,6 +3,8 @@ ItemDef(
    description: "Grows in warm and dry places.",
    kind: Ingredient(
        kind: "Cactus",
+        // Descriptor not needed
+        descriptor: "",
    ),
    quality: Common,
    tags: [],
--- a/assets/common/items/crafting_ing/cloth/cotton.ron
+++ b/assets/common/items/crafting_ing/cloth/cotton.ron
@ -3,7 +3,8 @@ ItemDef(
    description: "Easy to work with and multi-functional.",
    kind: Ingredient(
        kind: "Cotton",
+        descriptor: "Cotton",
    ),
    quality: Low,
-    tags: [Textile],
+    tags: [MaterialKind(Cloth)],
 )
--- a/assets/common/items/crafting_ing/cloth/lifecloth.ron
+++ b/assets/common/items/crafting_ing/cloth/lifecloth.ron
@ -3,7 +3,8 @@ ItemDef(
    description: "A fabric imbued with special properties.",
    kind: Ingredient(
        kind: "Lifecloth",
+        descriptor: "Lifecloth",
    ),
    quality: High,
-    tags: [Textile],
+    tags: [MaterialKind(Cloth), Material(Lifecloth)],
 )
--- a/assets/common/items/crafting_ing/cloth/linen.ron
+++ b/assets/common/items/crafting_ing/cloth/linen.ron
@ -3,7 +3,8 @@ ItemDef(
    description: "A textile made from flax fibers.",
    kind: Ingredient(
        kind: "Linen",
+        descriptor: "Linen",
    ),
    quality: Low,
-    tags: [Textile],
+    tags: [MaterialKind(Cloth), Material(Linen)],
 )
--- a/assets/common/items/crafting_ing/cloth/linen_red.ron
+++ b/assets/common/items/crafting_ing/cloth/linen_red.ron
@ -3,7 +3,9 @@ ItemDef(
    description: "A flax fiber textile, dyed to stand out.",
    kind: Ingredient(
        kind: "LinenRed",
+        // Descriptor not needed
+        descriptor: "",
    ),
    quality: Low,
-    tags: [Textile],
+    tags: [MaterialKind(Cloth)],
 )
--- a/assets/common/items/crafting_ing/cloth/moonweave.ron
+++ b/assets/common/items/crafting_ing/cloth/moonweave.ron
@ -3,7 +3,8 @@ ItemDef(
    description: "A light yet very sturdy textile.",
    kind: Ingredient(
        kind: "Moonweave",
+        descriptor: "Moonwoven",
    ),
    quality: Epic,
-    tags: [Textile],
+    tags: [MaterialKind(Cloth), Material(Moonweave)],
 )
--- a/assets/common/items/crafting_ing/cloth/silk.ron
+++ b/assets/common/items/crafting_ing/cloth/silk.ron
@ -3,7 +3,8 @@ ItemDef(
    description: "A fine and strong fibre produced by spiders.",
    kind: Ingredient(
        kind: "Silk",
+        descriptor: "Silken",
    ),
    quality: Moderate,
-    tags: [Textile],
+    tags: [MaterialKind(Cloth), Material(Silk)],
 )
--- a/assets/common/items/crafting_ing/cloth/sunsilk.ron
+++ b/assets/common/items/crafting_ing/cloth/sunsilk.ron
@ -3,7 +3,8 @@ ItemDef(
    description: "A supernaturally strong textile.",
    kind: Ingredient(
        kind: "Sunsilk",
+        descriptor: "Sunsilken",
    ),
    quality: Legendary,
-    tags: [Textile],
+    tags: [MaterialKind(Cloth), Material(Sunsilk)],
 )
--- a/assets/common/items/crafting_ing/cloth/wool.ron
+++ b/assets/common/items/crafting_ing/cloth/wool.ron
@ -3,7 +3,8 @@ ItemDef(
    description: "Soft wool from an animal.",
    kind: Ingredient(
        kind: "Wool",
+        descriptor: "Woolen",
    ),
    quality: Common,
-    tags: [Textile],
+    tags: [MaterialKind(Cloth), Material(Wool)],
 )
--- a/assets/common/items/crafting_ing/cotton_boll.ron
+++ b/assets/common/items/crafting_ing/cotton_boll.ron
@ -3,6 +3,8 @@ ItemDef(
    description: "Plucked from a common cotton plant.",
    kind: Ingredient(
        kind: "CottonBoll",
+        // Descriptor not needed
+        descriptor: "",
    ),
    quality: Common,
    tags: [],
--- a/assets/common/items/crafting_ing/empty_vial.ron
+++ b/assets/common/items/crafting_ing/empty_vial.ron
@ -3,6 +3,8 @@ ItemDef(
    description: "Can be filled with fluids.",
    kind: Ingredient(
        kind: "EmptyVial",
+        // Descriptor not needed
+        descriptor: "",
    ),
    quality: Common,
    tags: [],
--- a/assets/common/items/crafting_ing/hide/animal_hide.ron
+++ b/assets/common/items/crafting_ing/hide/animal_hide.ron
@ -3,6 +3,8 @@ ItemDef(
    description: "A pelt from an animal. Becomes leather.",
    kind: Ingredient(
        kind: "AnimalHide",
+        // Descriptor not needed
+        descriptor: "",
    ),
    quality: Low,
    tags: [
--- a/assets/common/items/crafting_ing/hide/carapace.ron
+++ b/assets/common/items/crafting_ing/hide/carapace.ron
@ -3,7 +3,8 @@ ItemDef(
    description: "Tough, hard carapace.",
    kind: Ingredient(
        kind: "Carapace",
+        descriptor: "Carapace",
    ),
    quality: High,
-    tags: [],
+    tags: [MaterialKind(Hide), Material(Carapace)],
 )
--- a/assets/common/items/crafting_ing/hide/dragon_scale.ron
+++ b/assets/common/items/crafting_ing/hide/dragon_scale.ron
@ -3,7 +3,8 @@ ItemDef(
    description: "Tough scale from a legendary beast.",
    kind: Ingredient(
        kind: "DragonScale",
+        descriptor: "Dragonscale",
    ),
    quality: Legendary,
-    tags: [],
+    tags: [MaterialKind(Hide), Material(Dragonscale)],
 )
--- a/assets/common/items/crafting_ing/hide/leather_troll.ron
+++ b/assets/common/items/crafting_ing/hide/leather_troll.ron
@ -3,6 +3,8 @@ ItemDef(
    description: "Looted from cave trolls.",
    kind: Ingredient(
        kind: "TrollLeather",
+        // Descriptor not needed
+        descriptor: "",
    ),
    quality: High,
    tags: [BaseMaterial],
--- a/assets/common/items/crafting_ing/hide/plate.ron
+++ b/assets/common/items/crafting_ing/hide/plate.ron
@ -3,7 +3,8 @@ ItemDef(
    description: "Durable plate from an armored animal.",
    kind: Ingredient(
        kind: "Plate",
+        descriptor: "Plate",
    ),
    quality: Epic,
-    tags: [],
+    tags: [MaterialKind(Hide), Material(Plate)],
 )
--- a/assets/common/items/crafting_ing/hide/rugged_hide.ron
+++ b/assets/common/items/crafting_ing/hide/rugged_hide.ron
@ -3,6 +3,8 @@ ItemDef(
    description: "A durable pelt, favored by leatherworkers.",
    kind: Ingredient(
        kind: "RuggedHide",
+        // Descriptor not needed
+        descriptor: "",
    ),
    quality: Epic,
    tags: [
--- a/assets/common/items/crafting_ing/hide/scales.ron
+++ b/assets/common/items/crafting_ing/hide/scales.ron
@ -3,7 +3,8 @@ ItemDef(
    description: "Shiny scale from an animal.",
    kind: Ingredient(
        kind: "Scale",
+        descriptor: "Scale",
    ),
    quality: Moderate,
-    tags: [],
+    tags: [MaterialKind(Hide), Material(Scale)],
 )
--- a/assets/common/items/crafting_ing/hide/tough_hide.ron
+++ b/assets/common/items/crafting_ing/hide/tough_hide.ron
@ -3,6 +3,8 @@ ItemDef(
    description: "A pelt from something fierce. Becomes leather.",
    kind: Ingredient(
        kind: "ToughHide",
+        // Descriptor not needed
+        descriptor: "",
    ),
    quality: Common,
    tags: [
--- a/assets/common/items/crafting_ing/honey.ron
+++ b/assets/common/items/crafting_ing/honey.ron
@ -3,6 +3,8 @@ ItemDef(
    description: "From a beehive.",
    kind: Ingredient(
        kind: "Honey",
+        // Descriptor not needed
+        descriptor: "",
    ),
    quality: Common,
    tags: [],
--- a/assets/common/items/crafting_ing/leather/leather_strips.ron
+++ b/assets/common/items/crafting_ing/leather/leather_strips.ron
@ -3,6 +3,8 @@ ItemDef(
    description: "Simple and versatile.",
    kind: Ingredient(
        kind: "LeatherStrips",
+        // Descriptor not needed
+        descriptor: "",
    ),
    quality: Common,
    tags: [BaseMaterial],
--- a/assets/common/items/crafting_ing/leather/rigid_leather.ron
+++ b/assets/common/items/crafting_ing/leather/rigid_leather.ron
@ -3,7 +3,9 @@ ItemDef(
    description: "Light but layered, perfect for protection.",
    kind: Ingredient(
        kind: "RigidLeather",
+        // Descriptor not needed
+        descriptor: "",
    ),
    quality: Epic,
-    tags: [BaseMaterial, Leather],
+    tags: [BaseMaterial],
 )
--- a/assets/common/items/crafting_ing/leather/simple_leather.ron
+++ b/assets/common/items/crafting_ing/leather/simple_leather.ron
@ -3,7 +3,8 @@ ItemDef(
    description: "Light and flexible.",
    kind: Ingredient(
        kind: "SimpleLeather",
+        descriptor: "Raw Hide",
    ),
    quality: Low,
-    tags: [BaseMaterial, Leather],
+    tags: [BaseMaterial, MaterialKind(Hide), Material(Rawhide)],
 )
--- a/assets/common/items/crafting_ing/leather/thick_leather.ron
+++ b/assets/common/items/crafting_ing/leather/thick_leather.ron
@ -3,7 +3,8 @@ ItemDef(
    description: "Strong and durable.",
    kind: Ingredient(
        kind: "ThickLeather",
+        descriptor: "Leather",
    ),
    quality: Common,
-    tags: [BaseMaterial, Leather],
+    tags: [BaseMaterial, MaterialKind(Hide), Material(Leather)],
 )
--- a/assets/common/items/crafting_ing/mindflayer_bag_damaged.ron
+++ b/assets/common/items/crafting_ing/mindflayer_bag_damaged.ron
@ -3,6 +3,8 @@ ItemDef(
    description: "Looted from an evil being.\n\nWith some additional work it can surely be\nbrought back to its former glory...",
    kind: Ingredient(
        kind: "FlayerBagDamaged",
+        // Descriptor not needed
+        descriptor: "",
    ),
    quality: Epic,
    tags: [],
--- a/Show More
+++ b/Show More