From 079f1e7dc074c2152d7e75ef3f6ba09582cc19f1 Mon Sep 17 00:00:00 2001
From: jshipsey <jshipsey18@gmail.com>
Date: Sat, 27 Feb 2021 22:00:30 -0500
Subject: [PATCH 01/16] re-org armor, common

---
 .../common/items/armor/{belt/assassin.ron => assassin/belt.ron}   | 0
 .../common/items/armor/{chest/assassin.ron => assassin/chest.ron} | 0
 .../common/items/armor/{foot/assassin.ron => assassin/foot.ron}   | 0
 .../common/items/armor/{hand/assassin.ron => assassin/hand.ron}   | 0
 .../items/armor/{head/assa_mask_0.ron => assassin/head.ron}       | 0
 .../common/items/armor/{pants/assassin.ron => assassin/pants.ron} | 0
 .../items/armor/{shoulder/assassin.ron => assassin/shoulder.ron}  | 0
 .../items/armor/{belt/bonerattler.ron => bonerattler/belt.ron}    | 0
 .../items/armor/{chest/bonerattler.ron => bonerattler/chest.ron}  | 0
 .../items/armor/{foot/bonerattler.ron => bonerattler/foot.ron}    | 0
 .../items/armor/{hand/bonerattler.ron => bonerattler/hand.ron}    | 0
 .../items/armor/{pants/bonerattler.ron => bonerattler/pants.ron}  | 0
 .../armor/{shoulder/bonerattler.ron => bonerattler/shoulder.ron}  | 0
 .../items/armor/{belt/cloth_blue_0.ron => cloth_blue/belt.ron}    | 0
 .../items/armor/{chest/cloth_blue_0.ron => cloth_blue/chest.ron}  | 0
 .../items/armor/{foot/cloth_blue_0.ron => cloth_blue/foot.ron}    | 0
 .../items/armor/{hand/cloth_blue_0.ron => cloth_blue/hand.ron}    | 0
 .../items/armor/{pants/cloth_blue_0.ron => cloth_blue/pants.ron}  | 0
 .../{shoulder/cloth_blue_0.ron => cloth_blue/shoulder_0.ron}      | 0
 .../{shoulder/cloth_blue_1.ron => cloth_blue/shoulder_1.ron}      | 0
 .../items/armor/{belt/cloth_green_0.ron => cloth_green/belt.ron}  | 0
 .../armor/{chest/cloth_green_0.ron => cloth_green/chest.ron}      | 0
 .../items/armor/{foot/cloth_green_0.ron => cloth_green/foot.ron}  | 0
 .../items/armor/{hand/cloth_green_0.ron => cloth_green/hand.ron}  | 0
 .../armor/{pants/cloth_green_0.ron => cloth_green/pants.ron}      | 0
 .../{shoulder/cloth_green_0.ron => cloth_green/shoulder.ron}      | 0
 .../armor/{belt/cloth_purple_0.ron => cloth_purple/belt.ron}      | 0
 .../armor/{chest/cloth_purple_0.ron => cloth_purple/chest.ron}    | 0
 .../armor/{foot/cloth_purple_0.ron => cloth_purple/foot.ron}      | 0
 .../armor/{hand/cloth_purple_0.ron => cloth_purple/hand.ron}      | 0
 .../armor/{pants/cloth_purple_0.ron => cloth_purple/pants.ron}    | 0
 .../{shoulder/cloth_purple_0.ron => cloth_purple/shoulder.ron}    | 0
 .../items/armor/{belt/cultist_belt.ron => cultist/belt.ron}       | 0
 .../{chest/cultist_chest_blue.ron => cultist/chest_blue.ron}      | 0
 .../{chest/cultist_chest_purple.ron => cultist/chest_purple.ron}  | 0
 .../items/armor/{foot/cultist_boots.ron => cultist/foot.ron}      | 0
 .../armor/{hand/cultist_hands_blue.ron => cultist/hand_blue.ron}  | 0
 .../{hand/cultist_hands_purple.ron => cultist/hand_purple.ron}    | 0
 .../armor/{pants/cultist_legs_blue.ron => cultist/pants_blue.ron} | 0
 .../{pants/cultist_legs_purple.ron => cultist/pants_purple.ron}   | 0
 .../cultist_shoulder_blue.ron => cultist/shoulder_blue.ron}       | 0
 .../cultist_shoulder_purple.ron => cultist/shoulder_purple.ron}   | 0
 assets/common/items/armor/{belt/druid.ron => druid/belt.ron}      | 0
 assets/common/items/armor/{chest/druid.ron => druid/chest.ron}    | 0
 assets/common/items/armor/{pants => druid}/druid.ron              | 0
 assets/common/items/armor/{foot/druid.ron => druid/foot.ron}      | 0
 assets/common/items/armor/{hand/druid.ron => druid/hand.ron}      | 0
 .../armor/{shoulder/druidshoulder.ron => druid/shoulder.ron}      | 0
 .../common/items/armor/{belt/leather_0.ron => leather_0/belt.ron} | 0
 .../items/armor/{chest/leather_0.ron => leather_0/chest.ron}      | 0
 .../common/items/armor/{foot/leather_0.ron => leather_0/foot.ron} | 0
 .../common/items/armor/{hand/leather_0.ron => leather_0/hand.ron} | 0
 .../common/items/armor/{head/leather_0.ron => leather_0/head.ron} | 0
 .../items/armor/{pants/leather_0.ron => leather_0/pants.ron}      | 0
 .../armor/{shoulder/leather_1.ron => leather_0/shoulder.ron}      | 0
 .../common/items/armor/{belt/leather_2.ron => leather_1/belt.ron} | 0
 .../items/armor/{chest/leather_2.ron => leather_1/chest.ron}      | 0
 .../common/items/armor/{foot/leather_2.ron => leather_1/foot.ron} | 0
 .../common/items/armor/{hand/leather_2.ron => leather_1/hand.ron} | 0
 .../items/armor/{pants/leather_2.ron => leather_1/pants.ron}      | 0
 .../armor/{shoulder/leather_2.ron => leather_1/shoulder.ron}      | 0
 .../{back/leather_adventurer.ron => leather_adventurer/back.ron}  | 0
 .../{belt/leather_adventurer.ron => leather_adventurer/belt.ron}  | 0
 .../leather_adventurer.ron => leather_adventurer/chest.ron}       | 0
 .../{foot/leather_adventurer.ron => leather_adventurer/foot.ron}  | 0
 .../{hand/leather_adventurer.ron => leather_adventurer/hand.ron}  | 0
 .../leather_adventurer.ron => leather_adventurer/pants.ron}       | 0
 .../leather_adventurer.ron => leather_adventurer/shoulder.ron}    | 0
 .../armor/{belt/plate_leather_0.ron => leather_plate/belt.ron}    | 0
 .../armor/{chest/plate_leather_0.ron => leather_plate/chest.ron}  | 0
 .../armor/{foot/plate_leather_0.ron => leather_plate/foot.ron}    | 0
 .../armor/{hand/plate_leather_0.ron => leather_plate/hand.ron}    | 0
 .../armor/{pants/plate_leather_0.ron => leather_plate/pants.ron}  | 0
 .../{shoulder/plate_leather_0.ron => leather_plate/shoulder.ron}  | 0
 assets/common/items/armor/{ => misc}/back/admin.ron               | 0
 assets/common/items/armor/{ => misc}/back/backpack_0.ron          | 0
 assets/common/items/armor/{ => misc}/back/dungeon_purple-0.ron    | 0
 assets/common/items/armor/{ => misc}/back/short_0.ron             | 0
 assets/common/items/armor/{ => misc}/back/short_1.ron             | 0
 assets/common/items/armor/{ => misc}/bag/heavy_seabag.ron         | 0
 assets/common/items/armor/{ => misc}/bag/knitted_red_pouch.ron    | 0
 assets/common/items/armor/{ => misc}/bag/liana_kit.ron            | 0
 assets/common/items/armor/{ => misc}/bag/mindflayer_spellbag.ron  | 0
 assets/common/items/armor/{ => misc}/bag/reliable_backpack.ron    | 0
 assets/common/items/armor/{ => misc}/bag/soulkeeper_cursed.ron    | 0
 assets/common/items/armor/{ => misc}/bag/soulkeeper_pure.ron      | 0
 assets/common/items/armor/{ => misc}/bag/sturdy_red_backpack.ron  | 0
 assets/common/items/armor/{ => misc}/bag/tiny_leather_pouch.ron   | 0
 assets/common/items/armor/{ => misc}/bag/tiny_red_pouch.ron       | 0
 assets/common/items/armor/{ => misc}/bag/troll_hide_pack.ron      | 0
 assets/common/items/armor/{ => misc}/bag/woven_red_bag.ron        | 0
 assets/common/items/armor/{ => misc}/chest/worker_green_0.ron     | 0
 assets/common/items/armor/{ => misc}/chest/worker_green_1.ron     | 0
 assets/common/items/armor/{ => misc}/chest/worker_orange_0.ron    | 0
 assets/common/items/armor/{ => misc}/chest/worker_orange_1.ron    | 0
 assets/common/items/armor/{ => misc}/chest/worker_purple_0.ron    | 0
 assets/common/items/armor/{ => misc}/chest/worker_purple_1.ron    | 0
 assets/common/items/armor/{ => misc}/chest/worker_red_0.ron       | 0
 assets/common/items/armor/{ => misc}/chest/worker_red_1.ron       | 0
 assets/common/items/armor/{ => misc}/chest/worker_yellow_0.ron    | 0
 assets/common/items/armor/{ => misc}/chest/worker_yellow_1.ron    | 0
 assets/common/items/armor/{ => misc}/foot/jackalope_slippers.ron  | 0
 .../items/armor/{foot/sandals_0.ron => misc/foot/sandals.ron}     | 0
 assets/common/items/armor/{ => misc}/neck/neck_0.ron              | 0
 assets/common/items/armor/{ => misc}/neck/neck_1.ron              | 0
 assets/common/items/armor/{ => misc}/neck/neck_2.ron              | 0
 assets/common/items/armor/{ => misc}/pants/hunting.ron            | 0
 .../armor/{pants/worker_blue_0.ron => misc/pants/worker_blue.ron} | 0
 assets/common/items/armor/{ => misc}/shoulder/iron_spikes.ron     | 0
 .../armor/{shoulder/leather_0.ron => misc/shoulder/leather_2.ron} | 0
 assets/common/items/armor/{ => misc}/shoulder/leather_iron_0.ron  | 0
 assets/common/items/armor/{ => misc}/shoulder/leather_iron_1.ron  | 0
 assets/common/items/armor/{ => misc}/shoulder/leather_iron_2.ron  | 0
 assets/common/items/armor/{ => misc}/shoulder/leather_iron_3.ron  | 0
 .../leather_strips.ron => misc/shoulder/leather_strip.ron}        | 0
 .../common/items/armor/{belt/plate_0.ron => plate_green/belt.ron} | 0
 .../armor/{chest/plate_green_0.ron => plate_green/chest.ron}      | 0
 .../common/items/armor/{foot/plate_0.ron => plate_green/foot.ron} | 0
 .../common/items/armor/{hand/plate_0.ron => plate_green/hand.ron} | 0
 .../armor/{pants/plate_green_0.ron => plate_green/pants.ron}      | 0
 .../armor/{shoulder/plate_0.ron => plate_green/shoulder.ron}      | 0
 assets/common/items/armor/{chest/rugged.ron => rugged/chest.ron}  | 0
 assets/common/items/armor/{pants/rugged.ron => rugged/pants.ron}  | 0
 assets/common/items/armor/{belt/steel_0.ron => steel/belt.ron}    | 0
 assets/common/items/armor/{chest/steel_0.ron => steel/chest.ron}  | 0
 assets/common/items/armor/{foot/steel_0.ron => steel/foot.ron}    | 0
 assets/common/items/armor/{hand/steel_0.ron => steel/hand.ron}    | 0
 assets/common/items/armor/{pants/steel_0.ron => steel/pants.ron}  | 0
 .../items/armor/{shoulder/steel_0.ron => steel/shoulder.ron}      | 0
 .../common/items/armor/{belt/tarasque.ron => tarasque/belt.ron}   | 0
 .../common/items/armor/{chest/tarasque.ron => tarasque/chest.ron} | 0
 .../common/items/armor/{foot/tarasque.ron => tarasque/foot.ron}   | 0
 .../common/items/armor/{hand/tarasque.ron => tarasque/hand.ron}   | 0
 .../common/items/armor/{pants/tarasque.ron => tarasque/pants.ron} | 0
 .../items/armor/{shoulder/tarasque.ron => tarasque/shoulder.ron}  | 0
 .../items/armor/{belt/twigsflowers.ron => twigflowers/belt.ron}   | 0
 .../items/armor/{chest/twigsflowers.ron => twigflowers/chest.ron} | 0
 .../items/armor/{foot/twigsflowers.ron => twigflowers/foot.ron}   | 0
 .../items/armor/{hand/twigsflowers.ron => twigflowers/hand.ron}   | 0
 .../items/armor/{pants/twigsflowers.ron => twigflowers/pants.ron} | 0
 .../armor/{shoulder/twigsflowers.ron => twigflowers/shoulder.ron} | 0
 assets/common/items/armor/{belt/twig.ron => twigs/belt.ron}       | 0
 assets/common/items/armor/{chest/twig.ron => twigs/chest.ron}     | 0
 assets/common/items/armor/{foot/twig.ron => twigs/foot.ron}       | 0
 assets/common/items/armor/{hand/twig.ron => twigs/hand.ron}       | 0
 assets/common/items/armor/{pants/twig.ron => twigs/pants.ron}     | 0
 .../common/items/armor/{shoulder/twigs.ron => twigs/shoulder.ron} | 0
 .../items/armor/{belt/twigsleaves.ron => twigsleaves/belt.ron}    | 0
 .../items/armor/{chest/twigsleaves.ron => twigsleaves/chest.ron}  | 0
 .../items/armor/{foot/twigsleaves.ron => twigsleaves/foot.ron}    | 0
 .../items/armor/{hand/twigsleaves.ron => twigsleaves/hand.ron}    | 0
 .../items/armor/{pants/twigsleaves.ron => twigsleaves/pants.ron}  | 0
 .../armor/{shoulder/twigsleaves.ron => twigsleaves/shoulder.ron}  | 0
 .../armor/{back/velorite_mage_0.ron => velorite_mage/back.ron}    | 0
 .../armor/{belt/velorite_mage_0.ron => velorite_mage/belt.ron}    | 0
 .../armor/{chest/velorite_mage_0.ron => velorite_mage/chest.ron}  | 0
 .../armor/{foot/velorite_mage_0.ron => velorite_mage/foot.ron}    | 0
 .../armor/{hand/velorite_mage_0.ron => velorite_mage/hand.ron}    | 0
 .../armor/{pants/velorite_mage_0.ron => velorite_mage/pants.ron}  | 0
 .../{shoulder/velorite_mage_0.ron => velorite_mage/shoulder.ron}  | 0
 assets/common/items/armor/{back/warlock.ron => warlock/back.ron}  | 0
 assets/common/items/armor/{belt/warlock.ron => warlock/belt.ron}  | 0
 .../common/items/armor/{chest/warlock.ron => warlock/chest.ron}   | 0
 assets/common/items/armor/{foot/warlock.ron => warlock/foot.ron}  | 0
 assets/common/items/armor/{hand/warlock.ron => warlock/hand.ron}  | 0
 assets/common/items/armor/{head/warlock.ron => warlock/head.ron}  | 0
 .../common/items/armor/{pants/warlock.ron => warlock/pants.ron}   | 0
 .../items/armor/{shoulder/warlock.ron => warlock/shoulder.ron}    | 0
 assets/common/items/armor/{back/warlord.ron => warlord/back.ron}  | 0
 assets/common/items/armor/{belt/warlord.ron => warlord/belt.ron}  | 0
 .../common/items/armor/{chest/warlord.ron => warlord/chest.ron}   | 0
 assets/common/items/armor/{foot/warlord.ron => warlord/foot.ron}  | 0
 assets/common/items/armor/{hand/warlord.ron => warlord/hand.ron}  | 0
 assets/common/items/armor/{head/warlord.ron => warlord/head.ron}  | 0
 .../common/items/armor/{pants/warlord.ron => warlord/pants.ron}   | 0
 .../items/armor/{shoulder/warlord.ron => warlord/shoulder.ron}    | 0
 176 files changed, 0 insertions(+), 0 deletions(-)
 rename assets/common/items/armor/{belt/assassin.ron => assassin/belt.ron} (100%)
 rename assets/common/items/armor/{chest/assassin.ron => assassin/chest.ron} (100%)
 rename assets/common/items/armor/{foot/assassin.ron => assassin/foot.ron} (100%)
 rename assets/common/items/armor/{hand/assassin.ron => assassin/hand.ron} (100%)
 rename assets/common/items/armor/{head/assa_mask_0.ron => assassin/head.ron} (100%)
 rename assets/common/items/armor/{pants/assassin.ron => assassin/pants.ron} (100%)
 rename assets/common/items/armor/{shoulder/assassin.ron => assassin/shoulder.ron} (100%)
 rename assets/common/items/armor/{belt/bonerattler.ron => bonerattler/belt.ron} (100%)
 rename assets/common/items/armor/{chest/bonerattler.ron => bonerattler/chest.ron} (100%)
 rename assets/common/items/armor/{foot/bonerattler.ron => bonerattler/foot.ron} (100%)
 rename assets/common/items/armor/{hand/bonerattler.ron => bonerattler/hand.ron} (100%)
 rename assets/common/items/armor/{pants/bonerattler.ron => bonerattler/pants.ron} (100%)
 rename assets/common/items/armor/{shoulder/bonerattler.ron => bonerattler/shoulder.ron} (100%)
 rename assets/common/items/armor/{belt/cloth_blue_0.ron => cloth_blue/belt.ron} (100%)
 rename assets/common/items/armor/{chest/cloth_blue_0.ron => cloth_blue/chest.ron} (100%)
 rename assets/common/items/armor/{foot/cloth_blue_0.ron => cloth_blue/foot.ron} (100%)
 rename assets/common/items/armor/{hand/cloth_blue_0.ron => cloth_blue/hand.ron} (100%)
 rename assets/common/items/armor/{pants/cloth_blue_0.ron => cloth_blue/pants.ron} (100%)
 rename assets/common/items/armor/{shoulder/cloth_blue_0.ron => cloth_blue/shoulder_0.ron} (100%)
 rename assets/common/items/armor/{shoulder/cloth_blue_1.ron => cloth_blue/shoulder_1.ron} (100%)
 rename assets/common/items/armor/{belt/cloth_green_0.ron => cloth_green/belt.ron} (100%)
 rename assets/common/items/armor/{chest/cloth_green_0.ron => cloth_green/chest.ron} (100%)
 rename assets/common/items/armor/{foot/cloth_green_0.ron => cloth_green/foot.ron} (100%)
 rename assets/common/items/armor/{hand/cloth_green_0.ron => cloth_green/hand.ron} (100%)
 rename assets/common/items/armor/{pants/cloth_green_0.ron => cloth_green/pants.ron} (100%)
 rename assets/common/items/armor/{shoulder/cloth_green_0.ron => cloth_green/shoulder.ron} (100%)
 rename assets/common/items/armor/{belt/cloth_purple_0.ron => cloth_purple/belt.ron} (100%)
 rename assets/common/items/armor/{chest/cloth_purple_0.ron => cloth_purple/chest.ron} (100%)
 rename assets/common/items/armor/{foot/cloth_purple_0.ron => cloth_purple/foot.ron} (100%)
 rename assets/common/items/armor/{hand/cloth_purple_0.ron => cloth_purple/hand.ron} (100%)
 rename assets/common/items/armor/{pants/cloth_purple_0.ron => cloth_purple/pants.ron} (100%)
 rename assets/common/items/armor/{shoulder/cloth_purple_0.ron => cloth_purple/shoulder.ron} (100%)
 rename assets/common/items/armor/{belt/cultist_belt.ron => cultist/belt.ron} (100%)
 rename assets/common/items/armor/{chest/cultist_chest_blue.ron => cultist/chest_blue.ron} (100%)
 rename assets/common/items/armor/{chest/cultist_chest_purple.ron => cultist/chest_purple.ron} (100%)
 rename assets/common/items/armor/{foot/cultist_boots.ron => cultist/foot.ron} (100%)
 rename assets/common/items/armor/{hand/cultist_hands_blue.ron => cultist/hand_blue.ron} (100%)
 rename assets/common/items/armor/{hand/cultist_hands_purple.ron => cultist/hand_purple.ron} (100%)
 rename assets/common/items/armor/{pants/cultist_legs_blue.ron => cultist/pants_blue.ron} (100%)
 rename assets/common/items/armor/{pants/cultist_legs_purple.ron => cultist/pants_purple.ron} (100%)
 rename assets/common/items/armor/{shoulder/cultist_shoulder_blue.ron => cultist/shoulder_blue.ron} (100%)
 rename assets/common/items/armor/{shoulder/cultist_shoulder_purple.ron => cultist/shoulder_purple.ron} (100%)
 rename assets/common/items/armor/{belt/druid.ron => druid/belt.ron} (100%)
 rename assets/common/items/armor/{chest/druid.ron => druid/chest.ron} (100%)
 rename assets/common/items/armor/{pants => druid}/druid.ron (100%)
 rename assets/common/items/armor/{foot/druid.ron => druid/foot.ron} (100%)
 rename assets/common/items/armor/{hand/druid.ron => druid/hand.ron} (100%)
 rename assets/common/items/armor/{shoulder/druidshoulder.ron => druid/shoulder.ron} (100%)
 rename assets/common/items/armor/{belt/leather_0.ron => leather_0/belt.ron} (100%)
 rename assets/common/items/armor/{chest/leather_0.ron => leather_0/chest.ron} (100%)
 rename assets/common/items/armor/{foot/leather_0.ron => leather_0/foot.ron} (100%)
 rename assets/common/items/armor/{hand/leather_0.ron => leather_0/hand.ron} (100%)
 rename assets/common/items/armor/{head/leather_0.ron => leather_0/head.ron} (100%)
 rename assets/common/items/armor/{pants/leather_0.ron => leather_0/pants.ron} (100%)
 rename assets/common/items/armor/{shoulder/leather_1.ron => leather_0/shoulder.ron} (100%)
 rename assets/common/items/armor/{belt/leather_2.ron => leather_1/belt.ron} (100%)
 rename assets/common/items/armor/{chest/leather_2.ron => leather_1/chest.ron} (100%)
 rename assets/common/items/armor/{foot/leather_2.ron => leather_1/foot.ron} (100%)
 rename assets/common/items/armor/{hand/leather_2.ron => leather_1/hand.ron} (100%)
 rename assets/common/items/armor/{pants/leather_2.ron => leather_1/pants.ron} (100%)
 rename assets/common/items/armor/{shoulder/leather_2.ron => leather_1/shoulder.ron} (100%)
 rename assets/common/items/armor/{back/leather_adventurer.ron => leather_adventurer/back.ron} (100%)
 rename assets/common/items/armor/{belt/leather_adventurer.ron => leather_adventurer/belt.ron} (100%)
 rename assets/common/items/armor/{chest/leather_adventurer.ron => leather_adventurer/chest.ron} (100%)
 rename assets/common/items/armor/{foot/leather_adventurer.ron => leather_adventurer/foot.ron} (100%)
 rename assets/common/items/armor/{hand/leather_adventurer.ron => leather_adventurer/hand.ron} (100%)
 rename assets/common/items/armor/{pants/leather_adventurer.ron => leather_adventurer/pants.ron} (100%)
 rename assets/common/items/armor/{shoulder/leather_adventurer.ron => leather_adventurer/shoulder.ron} (100%)
 rename assets/common/items/armor/{belt/plate_leather_0.ron => leather_plate/belt.ron} (100%)
 rename assets/common/items/armor/{chest/plate_leather_0.ron => leather_plate/chest.ron} (100%)
 rename assets/common/items/armor/{foot/plate_leather_0.ron => leather_plate/foot.ron} (100%)
 rename assets/common/items/armor/{hand/plate_leather_0.ron => leather_plate/hand.ron} (100%)
 rename assets/common/items/armor/{pants/plate_leather_0.ron => leather_plate/pants.ron} (100%)
 rename assets/common/items/armor/{shoulder/plate_leather_0.ron => leather_plate/shoulder.ron} (100%)
 rename assets/common/items/armor/{ => misc}/back/admin.ron (100%)
 rename assets/common/items/armor/{ => misc}/back/backpack_0.ron (100%)
 rename assets/common/items/armor/{ => misc}/back/dungeon_purple-0.ron (100%)
 rename assets/common/items/armor/{ => misc}/back/short_0.ron (100%)
 rename assets/common/items/armor/{ => misc}/back/short_1.ron (100%)
 rename assets/common/items/armor/{ => misc}/bag/heavy_seabag.ron (100%)
 rename assets/common/items/armor/{ => misc}/bag/knitted_red_pouch.ron (100%)
 rename assets/common/items/armor/{ => misc}/bag/liana_kit.ron (100%)
 rename assets/common/items/armor/{ => misc}/bag/mindflayer_spellbag.ron (100%)
 rename assets/common/items/armor/{ => misc}/bag/reliable_backpack.ron (100%)
 rename assets/common/items/armor/{ => misc}/bag/soulkeeper_cursed.ron (100%)
 rename assets/common/items/armor/{ => misc}/bag/soulkeeper_pure.ron (100%)
 rename assets/common/items/armor/{ => misc}/bag/sturdy_red_backpack.ron (100%)
 rename assets/common/items/armor/{ => misc}/bag/tiny_leather_pouch.ron (100%)
 rename assets/common/items/armor/{ => misc}/bag/tiny_red_pouch.ron (100%)
 rename assets/common/items/armor/{ => misc}/bag/troll_hide_pack.ron (100%)
 rename assets/common/items/armor/{ => misc}/bag/woven_red_bag.ron (100%)
 rename assets/common/items/armor/{ => misc}/chest/worker_green_0.ron (100%)
 rename assets/common/items/armor/{ => misc}/chest/worker_green_1.ron (100%)
 rename assets/common/items/armor/{ => misc}/chest/worker_orange_0.ron (100%)
 rename assets/common/items/armor/{ => misc}/chest/worker_orange_1.ron (100%)
 rename assets/common/items/armor/{ => misc}/chest/worker_purple_0.ron (100%)
 rename assets/common/items/armor/{ => misc}/chest/worker_purple_1.ron (100%)
 rename assets/common/items/armor/{ => misc}/chest/worker_red_0.ron (100%)
 rename assets/common/items/armor/{ => misc}/chest/worker_red_1.ron (100%)
 rename assets/common/items/armor/{ => misc}/chest/worker_yellow_0.ron (100%)
 rename assets/common/items/armor/{ => misc}/chest/worker_yellow_1.ron (100%)
 rename assets/common/items/armor/{ => misc}/foot/jackalope_slippers.ron (100%)
 rename assets/common/items/armor/{foot/sandals_0.ron => misc/foot/sandals.ron} (100%)
 rename assets/common/items/armor/{ => misc}/neck/neck_0.ron (100%)
 rename assets/common/items/armor/{ => misc}/neck/neck_1.ron (100%)
 rename assets/common/items/armor/{ => misc}/neck/neck_2.ron (100%)
 rename assets/common/items/armor/{ => misc}/pants/hunting.ron (100%)
 rename assets/common/items/armor/{pants/worker_blue_0.ron => misc/pants/worker_blue.ron} (100%)
 rename assets/common/items/armor/{ => misc}/shoulder/iron_spikes.ron (100%)
 rename assets/common/items/armor/{shoulder/leather_0.ron => misc/shoulder/leather_2.ron} (100%)
 rename assets/common/items/armor/{ => misc}/shoulder/leather_iron_0.ron (100%)
 rename assets/common/items/armor/{ => misc}/shoulder/leather_iron_1.ron (100%)
 rename assets/common/items/armor/{ => misc}/shoulder/leather_iron_2.ron (100%)
 rename assets/common/items/armor/{ => misc}/shoulder/leather_iron_3.ron (100%)
 rename assets/common/items/armor/{shoulder/leather_strips.ron => misc/shoulder/leather_strip.ron} (100%)
 rename assets/common/items/armor/{belt/plate_0.ron => plate_green/belt.ron} (100%)
 rename assets/common/items/armor/{chest/plate_green_0.ron => plate_green/chest.ron} (100%)
 rename assets/common/items/armor/{foot/plate_0.ron => plate_green/foot.ron} (100%)
 rename assets/common/items/armor/{hand/plate_0.ron => plate_green/hand.ron} (100%)
 rename assets/common/items/armor/{pants/plate_green_0.ron => plate_green/pants.ron} (100%)
 rename assets/common/items/armor/{shoulder/plate_0.ron => plate_green/shoulder.ron} (100%)
 rename assets/common/items/armor/{chest/rugged.ron => rugged/chest.ron} (100%)
 rename assets/common/items/armor/{pants/rugged.ron => rugged/pants.ron} (100%)
 rename assets/common/items/armor/{belt/steel_0.ron => steel/belt.ron} (100%)
 rename assets/common/items/armor/{chest/steel_0.ron => steel/chest.ron} (100%)
 rename assets/common/items/armor/{foot/steel_0.ron => steel/foot.ron} (100%)
 rename assets/common/items/armor/{hand/steel_0.ron => steel/hand.ron} (100%)
 rename assets/common/items/armor/{pants/steel_0.ron => steel/pants.ron} (100%)
 rename assets/common/items/armor/{shoulder/steel_0.ron => steel/shoulder.ron} (100%)
 rename assets/common/items/armor/{belt/tarasque.ron => tarasque/belt.ron} (100%)
 rename assets/common/items/armor/{chest/tarasque.ron => tarasque/chest.ron} (100%)
 rename assets/common/items/armor/{foot/tarasque.ron => tarasque/foot.ron} (100%)
 rename assets/common/items/armor/{hand/tarasque.ron => tarasque/hand.ron} (100%)
 rename assets/common/items/armor/{pants/tarasque.ron => tarasque/pants.ron} (100%)
 rename assets/common/items/armor/{shoulder/tarasque.ron => tarasque/shoulder.ron} (100%)
 rename assets/common/items/armor/{belt/twigsflowers.ron => twigflowers/belt.ron} (100%)
 rename assets/common/items/armor/{chest/twigsflowers.ron => twigflowers/chest.ron} (100%)
 rename assets/common/items/armor/{foot/twigsflowers.ron => twigflowers/foot.ron} (100%)
 rename assets/common/items/armor/{hand/twigsflowers.ron => twigflowers/hand.ron} (100%)
 rename assets/common/items/armor/{pants/twigsflowers.ron => twigflowers/pants.ron} (100%)
 rename assets/common/items/armor/{shoulder/twigsflowers.ron => twigflowers/shoulder.ron} (100%)
 rename assets/common/items/armor/{belt/twig.ron => twigs/belt.ron} (100%)
 rename assets/common/items/armor/{chest/twig.ron => twigs/chest.ron} (100%)
 rename assets/common/items/armor/{foot/twig.ron => twigs/foot.ron} (100%)
 rename assets/common/items/armor/{hand/twig.ron => twigs/hand.ron} (100%)
 rename assets/common/items/armor/{pants/twig.ron => twigs/pants.ron} (100%)
 rename assets/common/items/armor/{shoulder/twigs.ron => twigs/shoulder.ron} (100%)
 rename assets/common/items/armor/{belt/twigsleaves.ron => twigsleaves/belt.ron} (100%)
 rename assets/common/items/armor/{chest/twigsleaves.ron => twigsleaves/chest.ron} (100%)
 rename assets/common/items/armor/{foot/twigsleaves.ron => twigsleaves/foot.ron} (100%)
 rename assets/common/items/armor/{hand/twigsleaves.ron => twigsleaves/hand.ron} (100%)
 rename assets/common/items/armor/{pants/twigsleaves.ron => twigsleaves/pants.ron} (100%)
 rename assets/common/items/armor/{shoulder/twigsleaves.ron => twigsleaves/shoulder.ron} (100%)
 rename assets/common/items/armor/{back/velorite_mage_0.ron => velorite_mage/back.ron} (100%)
 rename assets/common/items/armor/{belt/velorite_mage_0.ron => velorite_mage/belt.ron} (100%)
 rename assets/common/items/armor/{chest/velorite_mage_0.ron => velorite_mage/chest.ron} (100%)
 rename assets/common/items/armor/{foot/velorite_mage_0.ron => velorite_mage/foot.ron} (100%)
 rename assets/common/items/armor/{hand/velorite_mage_0.ron => velorite_mage/hand.ron} (100%)
 rename assets/common/items/armor/{pants/velorite_mage_0.ron => velorite_mage/pants.ron} (100%)
 rename assets/common/items/armor/{shoulder/velorite_mage_0.ron => velorite_mage/shoulder.ron} (100%)
 rename assets/common/items/armor/{back/warlock.ron => warlock/back.ron} (100%)
 rename assets/common/items/armor/{belt/warlock.ron => warlock/belt.ron} (100%)
 rename assets/common/items/armor/{chest/warlock.ron => warlock/chest.ron} (100%)
 rename assets/common/items/armor/{foot/warlock.ron => warlock/foot.ron} (100%)
 rename assets/common/items/armor/{hand/warlock.ron => warlock/hand.ron} (100%)
 rename assets/common/items/armor/{head/warlock.ron => warlock/head.ron} (100%)
 rename assets/common/items/armor/{pants/warlock.ron => warlock/pants.ron} (100%)
 rename assets/common/items/armor/{shoulder/warlock.ron => warlock/shoulder.ron} (100%)
 rename assets/common/items/armor/{back/warlord.ron => warlord/back.ron} (100%)
 rename assets/common/items/armor/{belt/warlord.ron => warlord/belt.ron} (100%)
 rename assets/common/items/armor/{chest/warlord.ron => warlord/chest.ron} (100%)
 rename assets/common/items/armor/{foot/warlord.ron => warlord/foot.ron} (100%)
 rename assets/common/items/armor/{hand/warlord.ron => warlord/hand.ron} (100%)
 rename assets/common/items/armor/{head/warlord.ron => warlord/head.ron} (100%)
 rename assets/common/items/armor/{pants/warlord.ron => warlord/pants.ron} (100%)
 rename assets/common/items/armor/{shoulder/warlord.ron => warlord/shoulder.ron} (100%)

diff --git a/assets/common/items/armor/belt/assassin.ron b/assets/common/items/armor/assassin/belt.ron
similarity index 100%
rename from assets/common/items/armor/belt/assassin.ron
rename to assets/common/items/armor/assassin/belt.ron
diff --git a/assets/common/items/armor/chest/assassin.ron b/assets/common/items/armor/assassin/chest.ron
similarity index 100%
rename from assets/common/items/armor/chest/assassin.ron
rename to assets/common/items/armor/assassin/chest.ron
diff --git a/assets/common/items/armor/foot/assassin.ron b/assets/common/items/armor/assassin/foot.ron
similarity index 100%
rename from assets/common/items/armor/foot/assassin.ron
rename to assets/common/items/armor/assassin/foot.ron
diff --git a/assets/common/items/armor/hand/assassin.ron b/assets/common/items/armor/assassin/hand.ron
similarity index 100%
rename from assets/common/items/armor/hand/assassin.ron
rename to assets/common/items/armor/assassin/hand.ron
diff --git a/assets/common/items/armor/head/assa_mask_0.ron b/assets/common/items/armor/assassin/head.ron
similarity index 100%
rename from assets/common/items/armor/head/assa_mask_0.ron
rename to assets/common/items/armor/assassin/head.ron
diff --git a/assets/common/items/armor/pants/assassin.ron b/assets/common/items/armor/assassin/pants.ron
similarity index 100%
rename from assets/common/items/armor/pants/assassin.ron
rename to assets/common/items/armor/assassin/pants.ron
diff --git a/assets/common/items/armor/shoulder/assassin.ron b/assets/common/items/armor/assassin/shoulder.ron
similarity index 100%
rename from assets/common/items/armor/shoulder/assassin.ron
rename to assets/common/items/armor/assassin/shoulder.ron
diff --git a/assets/common/items/armor/belt/bonerattler.ron b/assets/common/items/armor/bonerattler/belt.ron
similarity index 100%
rename from assets/common/items/armor/belt/bonerattler.ron
rename to assets/common/items/armor/bonerattler/belt.ron
diff --git a/assets/common/items/armor/chest/bonerattler.ron b/assets/common/items/armor/bonerattler/chest.ron
similarity index 100%
rename from assets/common/items/armor/chest/bonerattler.ron
rename to assets/common/items/armor/bonerattler/chest.ron
diff --git a/assets/common/items/armor/foot/bonerattler.ron b/assets/common/items/armor/bonerattler/foot.ron
similarity index 100%
rename from assets/common/items/armor/foot/bonerattler.ron
rename to assets/common/items/armor/bonerattler/foot.ron
diff --git a/assets/common/items/armor/hand/bonerattler.ron b/assets/common/items/armor/bonerattler/hand.ron
similarity index 100%
rename from assets/common/items/armor/hand/bonerattler.ron
rename to assets/common/items/armor/bonerattler/hand.ron
diff --git a/assets/common/items/armor/pants/bonerattler.ron b/assets/common/items/armor/bonerattler/pants.ron
similarity index 100%
rename from assets/common/items/armor/pants/bonerattler.ron
rename to assets/common/items/armor/bonerattler/pants.ron
diff --git a/assets/common/items/armor/shoulder/bonerattler.ron b/assets/common/items/armor/bonerattler/shoulder.ron
similarity index 100%
rename from assets/common/items/armor/shoulder/bonerattler.ron
rename to assets/common/items/armor/bonerattler/shoulder.ron
diff --git a/assets/common/items/armor/belt/cloth_blue_0.ron b/assets/common/items/armor/cloth_blue/belt.ron
similarity index 100%
rename from assets/common/items/armor/belt/cloth_blue_0.ron
rename to assets/common/items/armor/cloth_blue/belt.ron
diff --git a/assets/common/items/armor/chest/cloth_blue_0.ron b/assets/common/items/armor/cloth_blue/chest.ron
similarity index 100%
rename from assets/common/items/armor/chest/cloth_blue_0.ron
rename to assets/common/items/armor/cloth_blue/chest.ron
diff --git a/assets/common/items/armor/foot/cloth_blue_0.ron b/assets/common/items/armor/cloth_blue/foot.ron
similarity index 100%
rename from assets/common/items/armor/foot/cloth_blue_0.ron
rename to assets/common/items/armor/cloth_blue/foot.ron
diff --git a/assets/common/items/armor/hand/cloth_blue_0.ron b/assets/common/items/armor/cloth_blue/hand.ron
similarity index 100%
rename from assets/common/items/armor/hand/cloth_blue_0.ron
rename to assets/common/items/armor/cloth_blue/hand.ron
diff --git a/assets/common/items/armor/pants/cloth_blue_0.ron b/assets/common/items/armor/cloth_blue/pants.ron
similarity index 100%
rename from assets/common/items/armor/pants/cloth_blue_0.ron
rename to assets/common/items/armor/cloth_blue/pants.ron
diff --git a/assets/common/items/armor/shoulder/cloth_blue_0.ron b/assets/common/items/armor/cloth_blue/shoulder_0.ron
similarity index 100%
rename from assets/common/items/armor/shoulder/cloth_blue_0.ron
rename to assets/common/items/armor/cloth_blue/shoulder_0.ron
diff --git a/assets/common/items/armor/shoulder/cloth_blue_1.ron b/assets/common/items/armor/cloth_blue/shoulder_1.ron
similarity index 100%
rename from assets/common/items/armor/shoulder/cloth_blue_1.ron
rename to assets/common/items/armor/cloth_blue/shoulder_1.ron
diff --git a/assets/common/items/armor/belt/cloth_green_0.ron b/assets/common/items/armor/cloth_green/belt.ron
similarity index 100%
rename from assets/common/items/armor/belt/cloth_green_0.ron
rename to assets/common/items/armor/cloth_green/belt.ron
diff --git a/assets/common/items/armor/chest/cloth_green_0.ron b/assets/common/items/armor/cloth_green/chest.ron
similarity index 100%
rename from assets/common/items/armor/chest/cloth_green_0.ron
rename to assets/common/items/armor/cloth_green/chest.ron
diff --git a/assets/common/items/armor/foot/cloth_green_0.ron b/assets/common/items/armor/cloth_green/foot.ron
similarity index 100%
rename from assets/common/items/armor/foot/cloth_green_0.ron
rename to assets/common/items/armor/cloth_green/foot.ron
diff --git a/assets/common/items/armor/hand/cloth_green_0.ron b/assets/common/items/armor/cloth_green/hand.ron
similarity index 100%
rename from assets/common/items/armor/hand/cloth_green_0.ron
rename to assets/common/items/armor/cloth_green/hand.ron
diff --git a/assets/common/items/armor/pants/cloth_green_0.ron b/assets/common/items/armor/cloth_green/pants.ron
similarity index 100%
rename from assets/common/items/armor/pants/cloth_green_0.ron
rename to assets/common/items/armor/cloth_green/pants.ron
diff --git a/assets/common/items/armor/shoulder/cloth_green_0.ron b/assets/common/items/armor/cloth_green/shoulder.ron
similarity index 100%
rename from assets/common/items/armor/shoulder/cloth_green_0.ron
rename to assets/common/items/armor/cloth_green/shoulder.ron
diff --git a/assets/common/items/armor/belt/cloth_purple_0.ron b/assets/common/items/armor/cloth_purple/belt.ron
similarity index 100%
rename from assets/common/items/armor/belt/cloth_purple_0.ron
rename to assets/common/items/armor/cloth_purple/belt.ron
diff --git a/assets/common/items/armor/chest/cloth_purple_0.ron b/assets/common/items/armor/cloth_purple/chest.ron
similarity index 100%
rename from assets/common/items/armor/chest/cloth_purple_0.ron
rename to assets/common/items/armor/cloth_purple/chest.ron
diff --git a/assets/common/items/armor/foot/cloth_purple_0.ron b/assets/common/items/armor/cloth_purple/foot.ron
similarity index 100%
rename from assets/common/items/armor/foot/cloth_purple_0.ron
rename to assets/common/items/armor/cloth_purple/foot.ron
diff --git a/assets/common/items/armor/hand/cloth_purple_0.ron b/assets/common/items/armor/cloth_purple/hand.ron
similarity index 100%
rename from assets/common/items/armor/hand/cloth_purple_0.ron
rename to assets/common/items/armor/cloth_purple/hand.ron
diff --git a/assets/common/items/armor/pants/cloth_purple_0.ron b/assets/common/items/armor/cloth_purple/pants.ron
similarity index 100%
rename from assets/common/items/armor/pants/cloth_purple_0.ron
rename to assets/common/items/armor/cloth_purple/pants.ron
diff --git a/assets/common/items/armor/shoulder/cloth_purple_0.ron b/assets/common/items/armor/cloth_purple/shoulder.ron
similarity index 100%
rename from assets/common/items/armor/shoulder/cloth_purple_0.ron
rename to assets/common/items/armor/cloth_purple/shoulder.ron
diff --git a/assets/common/items/armor/belt/cultist_belt.ron b/assets/common/items/armor/cultist/belt.ron
similarity index 100%
rename from assets/common/items/armor/belt/cultist_belt.ron
rename to assets/common/items/armor/cultist/belt.ron
diff --git a/assets/common/items/armor/chest/cultist_chest_blue.ron b/assets/common/items/armor/cultist/chest_blue.ron
similarity index 100%
rename from assets/common/items/armor/chest/cultist_chest_blue.ron
rename to assets/common/items/armor/cultist/chest_blue.ron
diff --git a/assets/common/items/armor/chest/cultist_chest_purple.ron b/assets/common/items/armor/cultist/chest_purple.ron
similarity index 100%
rename from assets/common/items/armor/chest/cultist_chest_purple.ron
rename to assets/common/items/armor/cultist/chest_purple.ron
diff --git a/assets/common/items/armor/foot/cultist_boots.ron b/assets/common/items/armor/cultist/foot.ron
similarity index 100%
rename from assets/common/items/armor/foot/cultist_boots.ron
rename to assets/common/items/armor/cultist/foot.ron
diff --git a/assets/common/items/armor/hand/cultist_hands_blue.ron b/assets/common/items/armor/cultist/hand_blue.ron
similarity index 100%
rename from assets/common/items/armor/hand/cultist_hands_blue.ron
rename to assets/common/items/armor/cultist/hand_blue.ron
diff --git a/assets/common/items/armor/hand/cultist_hands_purple.ron b/assets/common/items/armor/cultist/hand_purple.ron
similarity index 100%
rename from assets/common/items/armor/hand/cultist_hands_purple.ron
rename to assets/common/items/armor/cultist/hand_purple.ron
diff --git a/assets/common/items/armor/pants/cultist_legs_blue.ron b/assets/common/items/armor/cultist/pants_blue.ron
similarity index 100%
rename from assets/common/items/armor/pants/cultist_legs_blue.ron
rename to assets/common/items/armor/cultist/pants_blue.ron
diff --git a/assets/common/items/armor/pants/cultist_legs_purple.ron b/assets/common/items/armor/cultist/pants_purple.ron
similarity index 100%
rename from assets/common/items/armor/pants/cultist_legs_purple.ron
rename to assets/common/items/armor/cultist/pants_purple.ron
diff --git a/assets/common/items/armor/shoulder/cultist_shoulder_blue.ron b/assets/common/items/armor/cultist/shoulder_blue.ron
similarity index 100%
rename from assets/common/items/armor/shoulder/cultist_shoulder_blue.ron
rename to assets/common/items/armor/cultist/shoulder_blue.ron
diff --git a/assets/common/items/armor/shoulder/cultist_shoulder_purple.ron b/assets/common/items/armor/cultist/shoulder_purple.ron
similarity index 100%
rename from assets/common/items/armor/shoulder/cultist_shoulder_purple.ron
rename to assets/common/items/armor/cultist/shoulder_purple.ron
diff --git a/assets/common/items/armor/belt/druid.ron b/assets/common/items/armor/druid/belt.ron
similarity index 100%
rename from assets/common/items/armor/belt/druid.ron
rename to assets/common/items/armor/druid/belt.ron
diff --git a/assets/common/items/armor/chest/druid.ron b/assets/common/items/armor/druid/chest.ron
similarity index 100%
rename from assets/common/items/armor/chest/druid.ron
rename to assets/common/items/armor/druid/chest.ron
diff --git a/assets/common/items/armor/pants/druid.ron b/assets/common/items/armor/druid/druid.ron
similarity index 100%
rename from assets/common/items/armor/pants/druid.ron
rename to assets/common/items/armor/druid/druid.ron
diff --git a/assets/common/items/armor/foot/druid.ron b/assets/common/items/armor/druid/foot.ron
similarity index 100%
rename from assets/common/items/armor/foot/druid.ron
rename to assets/common/items/armor/druid/foot.ron
diff --git a/assets/common/items/armor/hand/druid.ron b/assets/common/items/armor/druid/hand.ron
similarity index 100%
rename from assets/common/items/armor/hand/druid.ron
rename to assets/common/items/armor/druid/hand.ron
diff --git a/assets/common/items/armor/shoulder/druidshoulder.ron b/assets/common/items/armor/druid/shoulder.ron
similarity index 100%
rename from assets/common/items/armor/shoulder/druidshoulder.ron
rename to assets/common/items/armor/druid/shoulder.ron
diff --git a/assets/common/items/armor/belt/leather_0.ron b/assets/common/items/armor/leather_0/belt.ron
similarity index 100%
rename from assets/common/items/armor/belt/leather_0.ron
rename to assets/common/items/armor/leather_0/belt.ron
diff --git a/assets/common/items/armor/chest/leather_0.ron b/assets/common/items/armor/leather_0/chest.ron
similarity index 100%
rename from assets/common/items/armor/chest/leather_0.ron
rename to assets/common/items/armor/leather_0/chest.ron
diff --git a/assets/common/items/armor/foot/leather_0.ron b/assets/common/items/armor/leather_0/foot.ron
similarity index 100%
rename from assets/common/items/armor/foot/leather_0.ron
rename to assets/common/items/armor/leather_0/foot.ron
diff --git a/assets/common/items/armor/hand/leather_0.ron b/assets/common/items/armor/leather_0/hand.ron
similarity index 100%
rename from assets/common/items/armor/hand/leather_0.ron
rename to assets/common/items/armor/leather_0/hand.ron
diff --git a/assets/common/items/armor/head/leather_0.ron b/assets/common/items/armor/leather_0/head.ron
similarity index 100%
rename from assets/common/items/armor/head/leather_0.ron
rename to assets/common/items/armor/leather_0/head.ron
diff --git a/assets/common/items/armor/pants/leather_0.ron b/assets/common/items/armor/leather_0/pants.ron
similarity index 100%
rename from assets/common/items/armor/pants/leather_0.ron
rename to assets/common/items/armor/leather_0/pants.ron
diff --git a/assets/common/items/armor/shoulder/leather_1.ron b/assets/common/items/armor/leather_0/shoulder.ron
similarity index 100%
rename from assets/common/items/armor/shoulder/leather_1.ron
rename to assets/common/items/armor/leather_0/shoulder.ron
diff --git a/assets/common/items/armor/belt/leather_2.ron b/assets/common/items/armor/leather_1/belt.ron
similarity index 100%
rename from assets/common/items/armor/belt/leather_2.ron
rename to assets/common/items/armor/leather_1/belt.ron
diff --git a/assets/common/items/armor/chest/leather_2.ron b/assets/common/items/armor/leather_1/chest.ron
similarity index 100%
rename from assets/common/items/armor/chest/leather_2.ron
rename to assets/common/items/armor/leather_1/chest.ron
diff --git a/assets/common/items/armor/foot/leather_2.ron b/assets/common/items/armor/leather_1/foot.ron
similarity index 100%
rename from assets/common/items/armor/foot/leather_2.ron
rename to assets/common/items/armor/leather_1/foot.ron
diff --git a/assets/common/items/armor/hand/leather_2.ron b/assets/common/items/armor/leather_1/hand.ron
similarity index 100%
rename from assets/common/items/armor/hand/leather_2.ron
rename to assets/common/items/armor/leather_1/hand.ron
diff --git a/assets/common/items/armor/pants/leather_2.ron b/assets/common/items/armor/leather_1/pants.ron
similarity index 100%
rename from assets/common/items/armor/pants/leather_2.ron
rename to assets/common/items/armor/leather_1/pants.ron
diff --git a/assets/common/items/armor/shoulder/leather_2.ron b/assets/common/items/armor/leather_1/shoulder.ron
similarity index 100%
rename from assets/common/items/armor/shoulder/leather_2.ron
rename to assets/common/items/armor/leather_1/shoulder.ron
diff --git a/assets/common/items/armor/back/leather_adventurer.ron b/assets/common/items/armor/leather_adventurer/back.ron
similarity index 100%
rename from assets/common/items/armor/back/leather_adventurer.ron
rename to assets/common/items/armor/leather_adventurer/back.ron
diff --git a/assets/common/items/armor/belt/leather_adventurer.ron b/assets/common/items/armor/leather_adventurer/belt.ron
similarity index 100%
rename from assets/common/items/armor/belt/leather_adventurer.ron
rename to assets/common/items/armor/leather_adventurer/belt.ron
diff --git a/assets/common/items/armor/chest/leather_adventurer.ron b/assets/common/items/armor/leather_adventurer/chest.ron
similarity index 100%
rename from assets/common/items/armor/chest/leather_adventurer.ron
rename to assets/common/items/armor/leather_adventurer/chest.ron
diff --git a/assets/common/items/armor/foot/leather_adventurer.ron b/assets/common/items/armor/leather_adventurer/foot.ron
similarity index 100%
rename from assets/common/items/armor/foot/leather_adventurer.ron
rename to assets/common/items/armor/leather_adventurer/foot.ron
diff --git a/assets/common/items/armor/hand/leather_adventurer.ron b/assets/common/items/armor/leather_adventurer/hand.ron
similarity index 100%
rename from assets/common/items/armor/hand/leather_adventurer.ron
rename to assets/common/items/armor/leather_adventurer/hand.ron
diff --git a/assets/common/items/armor/pants/leather_adventurer.ron b/assets/common/items/armor/leather_adventurer/pants.ron
similarity index 100%
rename from assets/common/items/armor/pants/leather_adventurer.ron
rename to assets/common/items/armor/leather_adventurer/pants.ron
diff --git a/assets/common/items/armor/shoulder/leather_adventurer.ron b/assets/common/items/armor/leather_adventurer/shoulder.ron
similarity index 100%
rename from assets/common/items/armor/shoulder/leather_adventurer.ron
rename to assets/common/items/armor/leather_adventurer/shoulder.ron
diff --git a/assets/common/items/armor/belt/plate_leather_0.ron b/assets/common/items/armor/leather_plate/belt.ron
similarity index 100%
rename from assets/common/items/armor/belt/plate_leather_0.ron
rename to assets/common/items/armor/leather_plate/belt.ron
diff --git a/assets/common/items/armor/chest/plate_leather_0.ron b/assets/common/items/armor/leather_plate/chest.ron
similarity index 100%
rename from assets/common/items/armor/chest/plate_leather_0.ron
rename to assets/common/items/armor/leather_plate/chest.ron
diff --git a/assets/common/items/armor/foot/plate_leather_0.ron b/assets/common/items/armor/leather_plate/foot.ron
similarity index 100%
rename from assets/common/items/armor/foot/plate_leather_0.ron
rename to assets/common/items/armor/leather_plate/foot.ron
diff --git a/assets/common/items/armor/hand/plate_leather_0.ron b/assets/common/items/armor/leather_plate/hand.ron
similarity index 100%
rename from assets/common/items/armor/hand/plate_leather_0.ron
rename to assets/common/items/armor/leather_plate/hand.ron
diff --git a/assets/common/items/armor/pants/plate_leather_0.ron b/assets/common/items/armor/leather_plate/pants.ron
similarity index 100%
rename from assets/common/items/armor/pants/plate_leather_0.ron
rename to assets/common/items/armor/leather_plate/pants.ron
diff --git a/assets/common/items/armor/shoulder/plate_leather_0.ron b/assets/common/items/armor/leather_plate/shoulder.ron
similarity index 100%
rename from assets/common/items/armor/shoulder/plate_leather_0.ron
rename to assets/common/items/armor/leather_plate/shoulder.ron
diff --git a/assets/common/items/armor/back/admin.ron b/assets/common/items/armor/misc/back/admin.ron
similarity index 100%
rename from assets/common/items/armor/back/admin.ron
rename to assets/common/items/armor/misc/back/admin.ron
diff --git a/assets/common/items/armor/back/backpack_0.ron b/assets/common/items/armor/misc/back/backpack_0.ron
similarity index 100%
rename from assets/common/items/armor/back/backpack_0.ron
rename to assets/common/items/armor/misc/back/backpack_0.ron
diff --git a/assets/common/items/armor/back/dungeon_purple-0.ron b/assets/common/items/armor/misc/back/dungeon_purple-0.ron
similarity index 100%
rename from assets/common/items/armor/back/dungeon_purple-0.ron
rename to assets/common/items/armor/misc/back/dungeon_purple-0.ron
diff --git a/assets/common/items/armor/back/short_0.ron b/assets/common/items/armor/misc/back/short_0.ron
similarity index 100%
rename from assets/common/items/armor/back/short_0.ron
rename to assets/common/items/armor/misc/back/short_0.ron
diff --git a/assets/common/items/armor/back/short_1.ron b/assets/common/items/armor/misc/back/short_1.ron
similarity index 100%
rename from assets/common/items/armor/back/short_1.ron
rename to assets/common/items/armor/misc/back/short_1.ron
diff --git a/assets/common/items/armor/bag/heavy_seabag.ron b/assets/common/items/armor/misc/bag/heavy_seabag.ron
similarity index 100%
rename from assets/common/items/armor/bag/heavy_seabag.ron
rename to assets/common/items/armor/misc/bag/heavy_seabag.ron
diff --git a/assets/common/items/armor/bag/knitted_red_pouch.ron b/assets/common/items/armor/misc/bag/knitted_red_pouch.ron
similarity index 100%
rename from assets/common/items/armor/bag/knitted_red_pouch.ron
rename to assets/common/items/armor/misc/bag/knitted_red_pouch.ron
diff --git a/assets/common/items/armor/bag/liana_kit.ron b/assets/common/items/armor/misc/bag/liana_kit.ron
similarity index 100%
rename from assets/common/items/armor/bag/liana_kit.ron
rename to assets/common/items/armor/misc/bag/liana_kit.ron
diff --git a/assets/common/items/armor/bag/mindflayer_spellbag.ron b/assets/common/items/armor/misc/bag/mindflayer_spellbag.ron
similarity index 100%
rename from assets/common/items/armor/bag/mindflayer_spellbag.ron
rename to assets/common/items/armor/misc/bag/mindflayer_spellbag.ron
diff --git a/assets/common/items/armor/bag/reliable_backpack.ron b/assets/common/items/armor/misc/bag/reliable_backpack.ron
similarity index 100%
rename from assets/common/items/armor/bag/reliable_backpack.ron
rename to assets/common/items/armor/misc/bag/reliable_backpack.ron
diff --git a/assets/common/items/armor/bag/soulkeeper_cursed.ron b/assets/common/items/armor/misc/bag/soulkeeper_cursed.ron
similarity index 100%
rename from assets/common/items/armor/bag/soulkeeper_cursed.ron
rename to assets/common/items/armor/misc/bag/soulkeeper_cursed.ron
diff --git a/assets/common/items/armor/bag/soulkeeper_pure.ron b/assets/common/items/armor/misc/bag/soulkeeper_pure.ron
similarity index 100%
rename from assets/common/items/armor/bag/soulkeeper_pure.ron
rename to assets/common/items/armor/misc/bag/soulkeeper_pure.ron
diff --git a/assets/common/items/armor/bag/sturdy_red_backpack.ron b/assets/common/items/armor/misc/bag/sturdy_red_backpack.ron
similarity index 100%
rename from assets/common/items/armor/bag/sturdy_red_backpack.ron
rename to assets/common/items/armor/misc/bag/sturdy_red_backpack.ron
diff --git a/assets/common/items/armor/bag/tiny_leather_pouch.ron b/assets/common/items/armor/misc/bag/tiny_leather_pouch.ron
similarity index 100%
rename from assets/common/items/armor/bag/tiny_leather_pouch.ron
rename to assets/common/items/armor/misc/bag/tiny_leather_pouch.ron
diff --git a/assets/common/items/armor/bag/tiny_red_pouch.ron b/assets/common/items/armor/misc/bag/tiny_red_pouch.ron
similarity index 100%
rename from assets/common/items/armor/bag/tiny_red_pouch.ron
rename to assets/common/items/armor/misc/bag/tiny_red_pouch.ron
diff --git a/assets/common/items/armor/bag/troll_hide_pack.ron b/assets/common/items/armor/misc/bag/troll_hide_pack.ron
similarity index 100%
rename from assets/common/items/armor/bag/troll_hide_pack.ron
rename to assets/common/items/armor/misc/bag/troll_hide_pack.ron
diff --git a/assets/common/items/armor/bag/woven_red_bag.ron b/assets/common/items/armor/misc/bag/woven_red_bag.ron
similarity index 100%
rename from assets/common/items/armor/bag/woven_red_bag.ron
rename to assets/common/items/armor/misc/bag/woven_red_bag.ron
diff --git a/assets/common/items/armor/chest/worker_green_0.ron b/assets/common/items/armor/misc/chest/worker_green_0.ron
similarity index 100%
rename from assets/common/items/armor/chest/worker_green_0.ron
rename to assets/common/items/armor/misc/chest/worker_green_0.ron
diff --git a/assets/common/items/armor/chest/worker_green_1.ron b/assets/common/items/armor/misc/chest/worker_green_1.ron
similarity index 100%
rename from assets/common/items/armor/chest/worker_green_1.ron
rename to assets/common/items/armor/misc/chest/worker_green_1.ron
diff --git a/assets/common/items/armor/chest/worker_orange_0.ron b/assets/common/items/armor/misc/chest/worker_orange_0.ron
similarity index 100%
rename from assets/common/items/armor/chest/worker_orange_0.ron
rename to assets/common/items/armor/misc/chest/worker_orange_0.ron
diff --git a/assets/common/items/armor/chest/worker_orange_1.ron b/assets/common/items/armor/misc/chest/worker_orange_1.ron
similarity index 100%
rename from assets/common/items/armor/chest/worker_orange_1.ron
rename to assets/common/items/armor/misc/chest/worker_orange_1.ron
diff --git a/assets/common/items/armor/chest/worker_purple_0.ron b/assets/common/items/armor/misc/chest/worker_purple_0.ron
similarity index 100%
rename from assets/common/items/armor/chest/worker_purple_0.ron
rename to assets/common/items/armor/misc/chest/worker_purple_0.ron
diff --git a/assets/common/items/armor/chest/worker_purple_1.ron b/assets/common/items/armor/misc/chest/worker_purple_1.ron
similarity index 100%
rename from assets/common/items/armor/chest/worker_purple_1.ron
rename to assets/common/items/armor/misc/chest/worker_purple_1.ron
diff --git a/assets/common/items/armor/chest/worker_red_0.ron b/assets/common/items/armor/misc/chest/worker_red_0.ron
similarity index 100%
rename from assets/common/items/armor/chest/worker_red_0.ron
rename to assets/common/items/armor/misc/chest/worker_red_0.ron
diff --git a/assets/common/items/armor/chest/worker_red_1.ron b/assets/common/items/armor/misc/chest/worker_red_1.ron
similarity index 100%
rename from assets/common/items/armor/chest/worker_red_1.ron
rename to assets/common/items/armor/misc/chest/worker_red_1.ron
diff --git a/assets/common/items/armor/chest/worker_yellow_0.ron b/assets/common/items/armor/misc/chest/worker_yellow_0.ron
similarity index 100%
rename from assets/common/items/armor/chest/worker_yellow_0.ron
rename to assets/common/items/armor/misc/chest/worker_yellow_0.ron
diff --git a/assets/common/items/armor/chest/worker_yellow_1.ron b/assets/common/items/armor/misc/chest/worker_yellow_1.ron
similarity index 100%
rename from assets/common/items/armor/chest/worker_yellow_1.ron
rename to assets/common/items/armor/misc/chest/worker_yellow_1.ron
diff --git a/assets/common/items/armor/foot/jackalope_slippers.ron b/assets/common/items/armor/misc/foot/jackalope_slippers.ron
similarity index 100%
rename from assets/common/items/armor/foot/jackalope_slippers.ron
rename to assets/common/items/armor/misc/foot/jackalope_slippers.ron
diff --git a/assets/common/items/armor/foot/sandals_0.ron b/assets/common/items/armor/misc/foot/sandals.ron
similarity index 100%
rename from assets/common/items/armor/foot/sandals_0.ron
rename to assets/common/items/armor/misc/foot/sandals.ron
diff --git a/assets/common/items/armor/neck/neck_0.ron b/assets/common/items/armor/misc/neck/neck_0.ron
similarity index 100%
rename from assets/common/items/armor/neck/neck_0.ron
rename to assets/common/items/armor/misc/neck/neck_0.ron
diff --git a/assets/common/items/armor/neck/neck_1.ron b/assets/common/items/armor/misc/neck/neck_1.ron
similarity index 100%
rename from assets/common/items/armor/neck/neck_1.ron
rename to assets/common/items/armor/misc/neck/neck_1.ron
diff --git a/assets/common/items/armor/neck/neck_2.ron b/assets/common/items/armor/misc/neck/neck_2.ron
similarity index 100%
rename from assets/common/items/armor/neck/neck_2.ron
rename to assets/common/items/armor/misc/neck/neck_2.ron
diff --git a/assets/common/items/armor/pants/hunting.ron b/assets/common/items/armor/misc/pants/hunting.ron
similarity index 100%
rename from assets/common/items/armor/pants/hunting.ron
rename to assets/common/items/armor/misc/pants/hunting.ron
diff --git a/assets/common/items/armor/pants/worker_blue_0.ron b/assets/common/items/armor/misc/pants/worker_blue.ron
similarity index 100%
rename from assets/common/items/armor/pants/worker_blue_0.ron
rename to assets/common/items/armor/misc/pants/worker_blue.ron
diff --git a/assets/common/items/armor/shoulder/iron_spikes.ron b/assets/common/items/armor/misc/shoulder/iron_spikes.ron
similarity index 100%
rename from assets/common/items/armor/shoulder/iron_spikes.ron
rename to assets/common/items/armor/misc/shoulder/iron_spikes.ron
diff --git a/assets/common/items/armor/shoulder/leather_0.ron b/assets/common/items/armor/misc/shoulder/leather_2.ron
similarity index 100%
rename from assets/common/items/armor/shoulder/leather_0.ron
rename to assets/common/items/armor/misc/shoulder/leather_2.ron
diff --git a/assets/common/items/armor/shoulder/leather_iron_0.ron b/assets/common/items/armor/misc/shoulder/leather_iron_0.ron
similarity index 100%
rename from assets/common/items/armor/shoulder/leather_iron_0.ron
rename to assets/common/items/armor/misc/shoulder/leather_iron_0.ron
diff --git a/assets/common/items/armor/shoulder/leather_iron_1.ron b/assets/common/items/armor/misc/shoulder/leather_iron_1.ron
similarity index 100%
rename from assets/common/items/armor/shoulder/leather_iron_1.ron
rename to assets/common/items/armor/misc/shoulder/leather_iron_1.ron
diff --git a/assets/common/items/armor/shoulder/leather_iron_2.ron b/assets/common/items/armor/misc/shoulder/leather_iron_2.ron
similarity index 100%
rename from assets/common/items/armor/shoulder/leather_iron_2.ron
rename to assets/common/items/armor/misc/shoulder/leather_iron_2.ron
diff --git a/assets/common/items/armor/shoulder/leather_iron_3.ron b/assets/common/items/armor/misc/shoulder/leather_iron_3.ron
similarity index 100%
rename from assets/common/items/armor/shoulder/leather_iron_3.ron
rename to assets/common/items/armor/misc/shoulder/leather_iron_3.ron
diff --git a/assets/common/items/armor/shoulder/leather_strips.ron b/assets/common/items/armor/misc/shoulder/leather_strip.ron
similarity index 100%
rename from assets/common/items/armor/shoulder/leather_strips.ron
rename to assets/common/items/armor/misc/shoulder/leather_strip.ron
diff --git a/assets/common/items/armor/belt/plate_0.ron b/assets/common/items/armor/plate_green/belt.ron
similarity index 100%
rename from assets/common/items/armor/belt/plate_0.ron
rename to assets/common/items/armor/plate_green/belt.ron
diff --git a/assets/common/items/armor/chest/plate_green_0.ron b/assets/common/items/armor/plate_green/chest.ron
similarity index 100%
rename from assets/common/items/armor/chest/plate_green_0.ron
rename to assets/common/items/armor/plate_green/chest.ron
diff --git a/assets/common/items/armor/foot/plate_0.ron b/assets/common/items/armor/plate_green/foot.ron
similarity index 100%
rename from assets/common/items/armor/foot/plate_0.ron
rename to assets/common/items/armor/plate_green/foot.ron
diff --git a/assets/common/items/armor/hand/plate_0.ron b/assets/common/items/armor/plate_green/hand.ron
similarity index 100%
rename from assets/common/items/armor/hand/plate_0.ron
rename to assets/common/items/armor/plate_green/hand.ron
diff --git a/assets/common/items/armor/pants/plate_green_0.ron b/assets/common/items/armor/plate_green/pants.ron
similarity index 100%
rename from assets/common/items/armor/pants/plate_green_0.ron
rename to assets/common/items/armor/plate_green/pants.ron
diff --git a/assets/common/items/armor/shoulder/plate_0.ron b/assets/common/items/armor/plate_green/shoulder.ron
similarity index 100%
rename from assets/common/items/armor/shoulder/plate_0.ron
rename to assets/common/items/armor/plate_green/shoulder.ron
diff --git a/assets/common/items/armor/chest/rugged.ron b/assets/common/items/armor/rugged/chest.ron
similarity index 100%
rename from assets/common/items/armor/chest/rugged.ron
rename to assets/common/items/armor/rugged/chest.ron
diff --git a/assets/common/items/armor/pants/rugged.ron b/assets/common/items/armor/rugged/pants.ron
similarity index 100%
rename from assets/common/items/armor/pants/rugged.ron
rename to assets/common/items/armor/rugged/pants.ron
diff --git a/assets/common/items/armor/belt/steel_0.ron b/assets/common/items/armor/steel/belt.ron
similarity index 100%
rename from assets/common/items/armor/belt/steel_0.ron
rename to assets/common/items/armor/steel/belt.ron
diff --git a/assets/common/items/armor/chest/steel_0.ron b/assets/common/items/armor/steel/chest.ron
similarity index 100%
rename from assets/common/items/armor/chest/steel_0.ron
rename to assets/common/items/armor/steel/chest.ron
diff --git a/assets/common/items/armor/foot/steel_0.ron b/assets/common/items/armor/steel/foot.ron
similarity index 100%
rename from assets/common/items/armor/foot/steel_0.ron
rename to assets/common/items/armor/steel/foot.ron
diff --git a/assets/common/items/armor/hand/steel_0.ron b/assets/common/items/armor/steel/hand.ron
similarity index 100%
rename from assets/common/items/armor/hand/steel_0.ron
rename to assets/common/items/armor/steel/hand.ron
diff --git a/assets/common/items/armor/pants/steel_0.ron b/assets/common/items/armor/steel/pants.ron
similarity index 100%
rename from assets/common/items/armor/pants/steel_0.ron
rename to assets/common/items/armor/steel/pants.ron
diff --git a/assets/common/items/armor/shoulder/steel_0.ron b/assets/common/items/armor/steel/shoulder.ron
similarity index 100%
rename from assets/common/items/armor/shoulder/steel_0.ron
rename to assets/common/items/armor/steel/shoulder.ron
diff --git a/assets/common/items/armor/belt/tarasque.ron b/assets/common/items/armor/tarasque/belt.ron
similarity index 100%
rename from assets/common/items/armor/belt/tarasque.ron
rename to assets/common/items/armor/tarasque/belt.ron
diff --git a/assets/common/items/armor/chest/tarasque.ron b/assets/common/items/armor/tarasque/chest.ron
similarity index 100%
rename from assets/common/items/armor/chest/tarasque.ron
rename to assets/common/items/armor/tarasque/chest.ron
diff --git a/assets/common/items/armor/foot/tarasque.ron b/assets/common/items/armor/tarasque/foot.ron
similarity index 100%
rename from assets/common/items/armor/foot/tarasque.ron
rename to assets/common/items/armor/tarasque/foot.ron
diff --git a/assets/common/items/armor/hand/tarasque.ron b/assets/common/items/armor/tarasque/hand.ron
similarity index 100%
rename from assets/common/items/armor/hand/tarasque.ron
rename to assets/common/items/armor/tarasque/hand.ron
diff --git a/assets/common/items/armor/pants/tarasque.ron b/assets/common/items/armor/tarasque/pants.ron
similarity index 100%
rename from assets/common/items/armor/pants/tarasque.ron
rename to assets/common/items/armor/tarasque/pants.ron
diff --git a/assets/common/items/armor/shoulder/tarasque.ron b/assets/common/items/armor/tarasque/shoulder.ron
similarity index 100%
rename from assets/common/items/armor/shoulder/tarasque.ron
rename to assets/common/items/armor/tarasque/shoulder.ron
diff --git a/assets/common/items/armor/belt/twigsflowers.ron b/assets/common/items/armor/twigflowers/belt.ron
similarity index 100%
rename from assets/common/items/armor/belt/twigsflowers.ron
rename to assets/common/items/armor/twigflowers/belt.ron
diff --git a/assets/common/items/armor/chest/twigsflowers.ron b/assets/common/items/armor/twigflowers/chest.ron
similarity index 100%
rename from assets/common/items/armor/chest/twigsflowers.ron
rename to assets/common/items/armor/twigflowers/chest.ron
diff --git a/assets/common/items/armor/foot/twigsflowers.ron b/assets/common/items/armor/twigflowers/foot.ron
similarity index 100%
rename from assets/common/items/armor/foot/twigsflowers.ron
rename to assets/common/items/armor/twigflowers/foot.ron
diff --git a/assets/common/items/armor/hand/twigsflowers.ron b/assets/common/items/armor/twigflowers/hand.ron
similarity index 100%
rename from assets/common/items/armor/hand/twigsflowers.ron
rename to assets/common/items/armor/twigflowers/hand.ron
diff --git a/assets/common/items/armor/pants/twigsflowers.ron b/assets/common/items/armor/twigflowers/pants.ron
similarity index 100%
rename from assets/common/items/armor/pants/twigsflowers.ron
rename to assets/common/items/armor/twigflowers/pants.ron
diff --git a/assets/common/items/armor/shoulder/twigsflowers.ron b/assets/common/items/armor/twigflowers/shoulder.ron
similarity index 100%
rename from assets/common/items/armor/shoulder/twigsflowers.ron
rename to assets/common/items/armor/twigflowers/shoulder.ron
diff --git a/assets/common/items/armor/belt/twig.ron b/assets/common/items/armor/twigs/belt.ron
similarity index 100%
rename from assets/common/items/armor/belt/twig.ron
rename to assets/common/items/armor/twigs/belt.ron
diff --git a/assets/common/items/armor/chest/twig.ron b/assets/common/items/armor/twigs/chest.ron
similarity index 100%
rename from assets/common/items/armor/chest/twig.ron
rename to assets/common/items/armor/twigs/chest.ron
diff --git a/assets/common/items/armor/foot/twig.ron b/assets/common/items/armor/twigs/foot.ron
similarity index 100%
rename from assets/common/items/armor/foot/twig.ron
rename to assets/common/items/armor/twigs/foot.ron
diff --git a/assets/common/items/armor/hand/twig.ron b/assets/common/items/armor/twigs/hand.ron
similarity index 100%
rename from assets/common/items/armor/hand/twig.ron
rename to assets/common/items/armor/twigs/hand.ron
diff --git a/assets/common/items/armor/pants/twig.ron b/assets/common/items/armor/twigs/pants.ron
similarity index 100%
rename from assets/common/items/armor/pants/twig.ron
rename to assets/common/items/armor/twigs/pants.ron
diff --git a/assets/common/items/armor/shoulder/twigs.ron b/assets/common/items/armor/twigs/shoulder.ron
similarity index 100%
rename from assets/common/items/armor/shoulder/twigs.ron
rename to assets/common/items/armor/twigs/shoulder.ron
diff --git a/assets/common/items/armor/belt/twigsleaves.ron b/assets/common/items/armor/twigsleaves/belt.ron
similarity index 100%
rename from assets/common/items/armor/belt/twigsleaves.ron
rename to assets/common/items/armor/twigsleaves/belt.ron
diff --git a/assets/common/items/armor/chest/twigsleaves.ron b/assets/common/items/armor/twigsleaves/chest.ron
similarity index 100%
rename from assets/common/items/armor/chest/twigsleaves.ron
rename to assets/common/items/armor/twigsleaves/chest.ron
diff --git a/assets/common/items/armor/foot/twigsleaves.ron b/assets/common/items/armor/twigsleaves/foot.ron
similarity index 100%
rename from assets/common/items/armor/foot/twigsleaves.ron
rename to assets/common/items/armor/twigsleaves/foot.ron
diff --git a/assets/common/items/armor/hand/twigsleaves.ron b/assets/common/items/armor/twigsleaves/hand.ron
similarity index 100%
rename from assets/common/items/armor/hand/twigsleaves.ron
rename to assets/common/items/armor/twigsleaves/hand.ron
diff --git a/assets/common/items/armor/pants/twigsleaves.ron b/assets/common/items/armor/twigsleaves/pants.ron
similarity index 100%
rename from assets/common/items/armor/pants/twigsleaves.ron
rename to assets/common/items/armor/twigsleaves/pants.ron
diff --git a/assets/common/items/armor/shoulder/twigsleaves.ron b/assets/common/items/armor/twigsleaves/shoulder.ron
similarity index 100%
rename from assets/common/items/armor/shoulder/twigsleaves.ron
rename to assets/common/items/armor/twigsleaves/shoulder.ron
diff --git a/assets/common/items/armor/back/velorite_mage_0.ron b/assets/common/items/armor/velorite_mage/back.ron
similarity index 100%
rename from assets/common/items/armor/back/velorite_mage_0.ron
rename to assets/common/items/armor/velorite_mage/back.ron
diff --git a/assets/common/items/armor/belt/velorite_mage_0.ron b/assets/common/items/armor/velorite_mage/belt.ron
similarity index 100%
rename from assets/common/items/armor/belt/velorite_mage_0.ron
rename to assets/common/items/armor/velorite_mage/belt.ron
diff --git a/assets/common/items/armor/chest/velorite_mage_0.ron b/assets/common/items/armor/velorite_mage/chest.ron
similarity index 100%
rename from assets/common/items/armor/chest/velorite_mage_0.ron
rename to assets/common/items/armor/velorite_mage/chest.ron
diff --git a/assets/common/items/armor/foot/velorite_mage_0.ron b/assets/common/items/armor/velorite_mage/foot.ron
similarity index 100%
rename from assets/common/items/armor/foot/velorite_mage_0.ron
rename to assets/common/items/armor/velorite_mage/foot.ron
diff --git a/assets/common/items/armor/hand/velorite_mage_0.ron b/assets/common/items/armor/velorite_mage/hand.ron
similarity index 100%
rename from assets/common/items/armor/hand/velorite_mage_0.ron
rename to assets/common/items/armor/velorite_mage/hand.ron
diff --git a/assets/common/items/armor/pants/velorite_mage_0.ron b/assets/common/items/armor/velorite_mage/pants.ron
similarity index 100%
rename from assets/common/items/armor/pants/velorite_mage_0.ron
rename to assets/common/items/armor/velorite_mage/pants.ron
diff --git a/assets/common/items/armor/shoulder/velorite_mage_0.ron b/assets/common/items/armor/velorite_mage/shoulder.ron
similarity index 100%
rename from assets/common/items/armor/shoulder/velorite_mage_0.ron
rename to assets/common/items/armor/velorite_mage/shoulder.ron
diff --git a/assets/common/items/armor/back/warlock.ron b/assets/common/items/armor/warlock/back.ron
similarity index 100%
rename from assets/common/items/armor/back/warlock.ron
rename to assets/common/items/armor/warlock/back.ron
diff --git a/assets/common/items/armor/belt/warlock.ron b/assets/common/items/armor/warlock/belt.ron
similarity index 100%
rename from assets/common/items/armor/belt/warlock.ron
rename to assets/common/items/armor/warlock/belt.ron
diff --git a/assets/common/items/armor/chest/warlock.ron b/assets/common/items/armor/warlock/chest.ron
similarity index 100%
rename from assets/common/items/armor/chest/warlock.ron
rename to assets/common/items/armor/warlock/chest.ron
diff --git a/assets/common/items/armor/foot/warlock.ron b/assets/common/items/armor/warlock/foot.ron
similarity index 100%
rename from assets/common/items/armor/foot/warlock.ron
rename to assets/common/items/armor/warlock/foot.ron
diff --git a/assets/common/items/armor/hand/warlock.ron b/assets/common/items/armor/warlock/hand.ron
similarity index 100%
rename from assets/common/items/armor/hand/warlock.ron
rename to assets/common/items/armor/warlock/hand.ron
diff --git a/assets/common/items/armor/head/warlock.ron b/assets/common/items/armor/warlock/head.ron
similarity index 100%
rename from assets/common/items/armor/head/warlock.ron
rename to assets/common/items/armor/warlock/head.ron
diff --git a/assets/common/items/armor/pants/warlock.ron b/assets/common/items/armor/warlock/pants.ron
similarity index 100%
rename from assets/common/items/armor/pants/warlock.ron
rename to assets/common/items/armor/warlock/pants.ron
diff --git a/assets/common/items/armor/shoulder/warlock.ron b/assets/common/items/armor/warlock/shoulder.ron
similarity index 100%
rename from assets/common/items/armor/shoulder/warlock.ron
rename to assets/common/items/armor/warlock/shoulder.ron
diff --git a/assets/common/items/armor/back/warlord.ron b/assets/common/items/armor/warlord/back.ron
similarity index 100%
rename from assets/common/items/armor/back/warlord.ron
rename to assets/common/items/armor/warlord/back.ron
diff --git a/assets/common/items/armor/belt/warlord.ron b/assets/common/items/armor/warlord/belt.ron
similarity index 100%
rename from assets/common/items/armor/belt/warlord.ron
rename to assets/common/items/armor/warlord/belt.ron
diff --git a/assets/common/items/armor/chest/warlord.ron b/assets/common/items/armor/warlord/chest.ron
similarity index 100%
rename from assets/common/items/armor/chest/warlord.ron
rename to assets/common/items/armor/warlord/chest.ron
diff --git a/assets/common/items/armor/foot/warlord.ron b/assets/common/items/armor/warlord/foot.ron
similarity index 100%
rename from assets/common/items/armor/foot/warlord.ron
rename to assets/common/items/armor/warlord/foot.ron
diff --git a/assets/common/items/armor/hand/warlord.ron b/assets/common/items/armor/warlord/hand.ron
similarity index 100%
rename from assets/common/items/armor/hand/warlord.ron
rename to assets/common/items/armor/warlord/hand.ron
diff --git a/assets/common/items/armor/head/warlord.ron b/assets/common/items/armor/warlord/head.ron
similarity index 100%
rename from assets/common/items/armor/head/warlord.ron
rename to assets/common/items/armor/warlord/head.ron
diff --git a/assets/common/items/armor/pants/warlord.ron b/assets/common/items/armor/warlord/pants.ron
similarity index 100%
rename from assets/common/items/armor/pants/warlord.ron
rename to assets/common/items/armor/warlord/pants.ron
diff --git a/assets/common/items/armor/shoulder/warlord.ron b/assets/common/items/armor/warlord/shoulder.ron
similarity index 100%
rename from assets/common/items/armor/shoulder/warlord.ron
rename to assets/common/items/armor/warlord/shoulder.ron

From 1831efd8e4bb5c9d39935aa22e55691e6f114905 Mon Sep 17 00:00:00 2001
From: Avi Weinstock <aweinstock314@gmail.com>
Date: Sat, 27 Feb 2021 21:44:57 -0500
Subject: [PATCH 02/16] During a trade, allow requesting items from the
 counterparty's inventory (prequisite for NPC trading).

---
 CHANGELOG.md                         |   1 +
 assets/voxygen/i18n/en/hud/trade.ron |   2 +-
 common/src/trade.rs                  |  33 +-
 server/src/events/trade.rs           |  18 +-
 voxygen/src/hud/bag.rs               | 634 +++++++++++++++++----------
 voxygen/src/hud/mod.rs               |  62 ++-
 voxygen/src/hud/slots.rs             |  29 +-
 voxygen/src/hud/trade.rs             |  48 +-
 8 files changed, 548 insertions(+), 279 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ae521df40a..e929be2ddb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -58,6 +58,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Improved network efficiency by ≈ factor 10 by using tokio.
 - Added item tooltips to trade window.
 - "Quest" given to new players converted to being a short tutorial
+- Items can be requested from the counterparty's inventory during trade.
 
 ### Removed
 
diff --git a/assets/voxygen/i18n/en/hud/trade.ron b/assets/voxygen/i18n/en/hud/trade.ron
index cb2c0364f7..7d4ecd2ad9 100644
--- a/assets/voxygen/i18n/en/hud/trade.ron
+++ b/assets/voxygen/i18n/en/hud/trade.ron
@@ -4,7 +4,7 @@
 (
     string_map: {
         "hud.trade.trade_window": "Trade window",
-	"hud.trade.phase1_description": "Drag the items you want to trade\n into your area.",
+	"hud.trade.phase1_description": "Drag the items you want to trade\n into the corresponding area.",
 	"hud.trade.phase2_description": "The trade is now locked to give you\n time to review it.",
 	/// Phase3 should only be visible for a few milliseconds if everything is working properly, but is included for completeness
 	"hud.trade.phase3_description": "Trade is being processed.",
diff --git a/common/src/trade.rs b/common/src/trade.rs
index aa40506a01..d82b085bde 100644
--- a/common/src/trade.rs
+++ b/common/src/trade.rs
@@ -21,10 +21,12 @@ pub enum TradeAction {
     AddItem {
         item: InvSlotId,
         quantity: u32,
+        ours: bool,
     },
     RemoveItem {
         item: InvSlotId,
         quantity: u32,
+        ours: bool,
     },
     /// Accept needs the phase indicator to avoid progressing too far in the
     /// trade if there's latency and a player presses the accept button
@@ -118,16 +120,26 @@ impl PendingTrade {
     /// - Modifications can only happen in phase 1
     /// - Whenever a trade is modified, both accept flags get reset
     /// - Accept flags only get set for the current phase
-    pub fn process_trade_action(&mut self, who: usize, action: TradeAction, inventory: &Inventory) {
+    pub fn process_trade_action(
+        &mut self,
+        mut who: usize,
+        action: TradeAction,
+        inventories: &[&Inventory],
+    ) {
         use TradeAction::*;
         match action {
             AddItem {
                 item,
                 quantity: delta,
+                ours,
             } => {
                 if self.phase() == TradePhase::Mutate && delta > 0 {
+                    if !ours {
+                        who = 1 - who;
+                    }
                     let total = self.offers[who].entry(item).or_insert(0);
-                    let owned_quantity = inventory.get(item).map(|i| i.amount()).unwrap_or(0);
+                    let owned_quantity =
+                        inventories[who].get(item).map(|i| i.amount()).unwrap_or(0);
                     *total = total.saturating_add(delta).min(owned_quantity);
                     self.accept_flags = [false, false];
                 }
@@ -135,8 +147,12 @@ impl PendingTrade {
             RemoveItem {
                 item,
                 quantity: delta,
+                ours,
             } => {
                 if self.phase() == TradePhase::Mutate {
+                    if !ours {
+                        who = 1 - who;
+                    }
                     self.offers[who]
                         .entry(item)
                         .and_replace_entry_with(|_, mut total| {
@@ -180,17 +196,24 @@ impl Trades {
         id
     }
 
-    pub fn process_trade_action(
+    pub fn process_trade_action<'a, F: Fn(Uid) -> Option<&'a Inventory>>(
         &mut self,
         id: TradeId,
         who: Uid,
         action: TradeAction,
-        inventory: &Inventory,
+        get_inventory: F,
     ) {
         trace!("for trade id {:?}, message {:?}", id, action);
         if let Some(trade) = self.trades.get_mut(&id) {
             if let Some(party) = trade.which_party(who) {
-                trade.process_trade_action(party, action, inventory);
+                let mut inventories = Vec::new();
+                for party in trade.parties.iter() {
+                    match get_inventory(*party) {
+                        Some(inventory) => inventories.push(inventory),
+                        None => return,
+                    }
+                }
+                trade.process_trade_action(party, action, &*inventories);
             } else {
                 warn!(
                     "An entity who is not a party to trade {:?} tried to modify it",
diff --git a/server/src/events/trade.rs b/server/src/events/trade.rs
index f1ba619e6d..12190921ed 100644
--- a/server/src/events/trade.rs
+++ b/server/src/events/trade.rs
@@ -3,7 +3,10 @@ use common::{
     comp::inventory::{item::MaterialStatManifest, Inventory},
     trade::{PendingTrade, TradeAction, TradeId, TradeResult, Trades},
 };
-use common_net::{msg::ServerGeneral, sync::WorldSyncExt};
+use common_net::{
+    msg::ServerGeneral,
+    sync::{Uid, WorldSyncExt},
+};
 use hashbrown::hash_map::Entry;
 use specs::{world::WorldExt, Entity as EcsEntity};
 use std::cmp::Ordering;
@@ -26,8 +29,17 @@ pub fn handle_process_trade_action(
                     server.notify_client(e, ServerGeneral::FinishedTrade(TradeResult::Declined))
                 });
         } else {
-            if let Some(inv) = server.state.ecs().read_component::<Inventory>().get(entity) {
-                trades.process_trade_action(trade_id, uid, action, inv);
+            {
+                let ecs = server.state.ecs();
+                let inventories = ecs.read_component::<Inventory>();
+                let get_inventory = |uid: Uid| {
+                    if let Some(entity) = ecs.entity_from_uid(uid.0) {
+                        inventories.get(entity)
+                    } else {
+                        None
+                    }
+                };
+                trades.process_trade_action(trade_id, uid, action, get_inventory);
             }
             if let Entry::Occupied(entry) = trades.trades.entry(trade_id) {
                 let parties = entry.get().parties;
diff --git a/voxygen/src/hud/bag.rs b/voxygen/src/hud/bag.rs
index f5a5db77ba..8fcbe9dd45 100644
--- a/voxygen/src/hud/bag.rs
+++ b/voxygen/src/hud/bag.rs
@@ -17,23 +17,25 @@ use crate::{
 };
 use client::Client;
 use common::{
+    assets::AssetExt,
     combat::{combat_rating, Damage},
     comp::{
-        item::{MaterialStatManifest, Quality},
-        Body, Energy, Health, Stats,
+        item::{ItemDef, MaterialStatManifest, Quality},
+        Body, Energy, Health, Inventory, Stats,
     },
 };
 use conrod_core::{
     color,
-    widget::{self, Button, Image, Rectangle, Scrollbar, Text},
-    widget_ids, Color, Colorable, Positionable, Sizeable, Widget, WidgetCommon,
+    widget::{self, Button, Image, Rectangle, Scrollbar, State as ConrodState, Text},
+    widget_ids, Color, Colorable, Positionable, Sizeable, UiCell, Widget, WidgetCommon,
 };
 
 use crate::hud::slots::SlotKind;
+use std::sync::Arc;
 use vek::Vec2;
 
 widget_ids! {
-    pub struct Ids {
+    pub struct InventoryScrollerIds {
         test,
         bag_close,
         inv_alignment,
@@ -53,6 +55,351 @@ widget_ids! {
         inventory_title_bg,
         scrollbar_bg,
         scrollbar_slots,
+    }
+}
+
+pub struct InventoryScrollerState {
+    ids: InventoryScrollerIds,
+}
+
+#[derive(WidgetCommon)]
+pub struct InventoryScroller<'a> {
+    imgs: &'a Imgs,
+    item_imgs: &'a ItemImgs,
+    fonts: &'a Fonts,
+    #[conrod(common_builder)]
+    common: widget::CommonBuilder,
+    tooltip_manager: &'a mut TooltipManager,
+    slot_manager: &'a mut SlotManager,
+    pulse: f32,
+    localized_strings: &'a Localization,
+    show_stats: bool,
+    show_bag_inv: bool,
+    msm: &'a MaterialStatManifest,
+    on_right: bool,
+    item_tooltip: &'a Tooltip<'a>,
+    playername: String,
+    is_us: bool,
+    inventory: &'a Inventory,
+    bg_ids: &'a BackgroundIds,
+}
+
+impl<'a> InventoryScroller<'a> {
+    #[allow(clippy::too_many_arguments)]
+    pub fn new(
+        imgs: &'a Imgs,
+        item_imgs: &'a ItemImgs,
+        fonts: &'a Fonts,
+        tooltip_manager: &'a mut TooltipManager,
+        slot_manager: &'a mut SlotManager,
+        pulse: f32,
+        localized_strings: &'a Localization,
+        show_stats: bool,
+        show_bag_inv: bool,
+        msm: &'a MaterialStatManifest,
+        on_right: bool,
+        item_tooltip: &'a Tooltip<'a>,
+        playername: String,
+        is_us: bool,
+        inventory: &'a Inventory,
+        bg_ids: &'a BackgroundIds,
+    ) -> Self {
+        InventoryScroller {
+            imgs,
+            item_imgs,
+            fonts,
+            common: widget::CommonBuilder::default(),
+            tooltip_manager,
+            slot_manager,
+            pulse,
+            localized_strings,
+            show_stats,
+            show_bag_inv,
+            msm,
+            on_right,
+            item_tooltip,
+            playername,
+            is_us,
+            inventory,
+            bg_ids,
+        }
+    }
+
+    fn background(&mut self, ui: &mut UiCell<'_>) {
+        let mut bg = Image::new(if self.show_stats {
+            self.imgs.inv_bg_stats
+        } else if self.show_bag_inv {
+            self.imgs.inv_bg_bag
+        } else {
+            self.imgs.inv_bg_armor
+        })
+        .w_h(424.0, 708.0);
+        if self.on_right {
+            bg = bg.bottom_right_with_margins_on(ui.window, 60.0, 5.0);
+        } else {
+            bg = bg.bottom_left_with_margins_on(ui.window, 60.0, 5.0);
+        }
+        bg.color(Some(UI_MAIN)).set(self.bg_ids.bg, ui);
+        Image::new(if self.show_bag_inv {
+            self.imgs.inv_frame_bag
+        } else {
+            self.imgs.inv_frame
+        })
+        .w_h(424.0, 708.0)
+        .middle_of(self.bg_ids.bg)
+        .color(Some(UI_HIGHLIGHT_0))
+        .set(self.bg_ids.bg_frame, ui);
+    }
+
+    fn title(&mut self, state: &mut ConrodState<'_, InventoryScrollerState>, ui: &mut UiCell<'_>) {
+        Text::new(
+            &self
+                .localized_strings
+                .get("hud.bag.inventory")
+                .replace("{playername}", &*self.playername),
+        )
+        .mid_top_with_margin_on(self.bg_ids.bg_frame, 9.0)
+        .font_id(self.fonts.cyri.conrod_id)
+        .font_size(self.fonts.cyri.scale(22))
+        .color(Color::Rgba(0.0, 0.0, 0.0, 1.0))
+        .set(state.ids.inventory_title_bg, ui);
+        Text::new(
+            &self
+                .localized_strings
+                .get("hud.bag.inventory")
+                .replace("{playername}", &*self.playername),
+        )
+        .top_left_with_margins_on(state.ids.inventory_title_bg, 2.0, 2.0)
+        .font_id(self.fonts.cyri.conrod_id)
+        .font_size(self.fonts.cyri.scale(22))
+        .color(TEXT_COLOR)
+        .set(state.ids.inventory_title, ui);
+    }
+
+    fn scrollbar_and_slots(
+        &mut self,
+        state: &mut ConrodState<'_, InventoryScrollerState>,
+        ui: &mut UiCell<'_>,
+    ) {
+        let space_max = self.inventory.slots().count();
+        // Slots Scrollbar
+        if space_max > 45 && !self.show_bag_inv {
+            // Scrollbar-BG
+            Image::new(self.imgs.scrollbar_bg)
+                .w_h(9.0, 173.0)
+                .bottom_right_with_margins_on(self.bg_ids.bg_frame, 42.0, 3.0)
+                .color(Some(UI_HIGHLIGHT_0))
+                .set(state.ids.scrollbar_bg, ui);
+            // Scrollbar
+            Scrollbar::y_axis(state.ids.inv_alignment)
+                .thickness(5.0)
+                .h(123.0)
+                .color(UI_MAIN)
+                .middle_of(state.ids.scrollbar_bg)
+                .set(state.ids.scrollbar_slots, ui);
+        } else if space_max > 135 {
+            // Scrollbar-BG
+            Image::new(self.imgs.scrollbar_bg_big)
+                .w_h(9.0, 592.0)
+                .bottom_right_with_margins_on(self.bg_ids.bg_frame, 42.0, 3.0)
+                .color(Some(UI_HIGHLIGHT_0))
+                .set(state.ids.scrollbar_bg, ui);
+            // Scrollbar
+            Scrollbar::y_axis(state.ids.inv_alignment)
+                .thickness(5.0)
+                .h(542.0)
+                .color(UI_MAIN)
+                .middle_of(state.ids.scrollbar_bg)
+                .set(state.ids.scrollbar_slots, ui);
+        };
+        // Alignment for Grid
+        Rectangle::fill_with(
+            [362.0, if self.show_bag_inv { 600.0 } else { 200.0 }],
+            color::TRANSPARENT,
+        )
+        .bottom_left_with_margins_on(self.bg_ids.bg_frame, 29.0, 46.5)
+        .scroll_kids_vertically()
+        .set(state.ids.inv_alignment, ui);
+
+        // Bag Slots
+        // Create available inventory slot widgets
+        if state.ids.inv_slots.len() < self.inventory.capacity() {
+            state.update(|s| {
+                s.ids
+                    .inv_slots
+                    .resize(self.inventory.capacity(), &mut ui.widget_id_generator());
+            });
+        }
+        // Determine the range of inventory slots that are provided by the loadout item
+        // that the mouse is over
+        let mouseover_loadout_slots = self
+            .slot_manager
+            .mouse_over_slot
+            .and_then(|x| {
+                if let SlotKind::Equip(e) = x {
+                    self.inventory.get_slot_range_for_equip_slot(e)
+                } else {
+                    None
+                }
+            })
+            .unwrap_or(0usize..0usize);
+
+        // Display inventory contents
+        let mut slot_maker = SlotMaker {
+            empty_slot: self.imgs.inv_slot,
+            filled_slot: self.imgs.inv_slot,
+            selected_slot: self.imgs.inv_slot_sel,
+            background_color: Some(UI_MAIN),
+            content_size: ContentSize {
+                width_height_ratio: 1.0,
+                max_fraction: 0.75,
+            },
+            selected_content_scale: 1.067,
+            amount_font: self.fonts.cyri.conrod_id,
+            amount_margins: Vec2::new(-4.0, 0.0),
+            amount_font_size: self.fonts.cyri.scale(12),
+            amount_text_color: TEXT_COLOR,
+            content_source: self.inventory,
+            image_source: self.item_imgs,
+            slot_manager: Some(self.slot_manager),
+            pulse: self.pulse,
+        };
+
+        for (i, (pos, item)) in self.inventory.slots_with_id().enumerate() {
+            let x = i % 9;
+            let y = i / 9;
+
+            // Slot
+            let mut slot_widget = slot_maker
+                .fabricate(
+                    InventorySlot {
+                        slot: pos,
+                        ours: self.is_us,
+                    },
+                    [40.0; 2],
+                )
+                .top_left_with_margins_on(
+                    state.ids.inv_alignment,
+                    0.0 + y as f64 * (40.0),
+                    0.0 + x as f64 * (40.0),
+                );
+
+            // Highlight slots are provided by the loadout item that the mouse is over
+            if mouseover_loadout_slots.contains(&i) {
+                slot_widget = slot_widget.with_background_color(Color::Rgba(1.0, 1.0, 1.0, 1.0));
+            }
+
+            if let Some(item) = item {
+                let (title, desc) = super::util::item_text(item, &self.msm);
+                let quality_col = get_quality_col(item);
+                let quality_col_img = match item.quality() {
+                    Quality::Low => self.imgs.inv_slot_grey,
+                    Quality::Common => self.imgs.inv_slot,
+                    Quality::Moderate => self.imgs.inv_slot_green,
+                    Quality::High => self.imgs.inv_slot_blue,
+                    Quality::Epic => self.imgs.inv_slot_purple,
+                    Quality::Legendary => self.imgs.inv_slot_gold,
+                    Quality::Artifact => self.imgs.inv_slot_orange,
+                    _ => self.imgs.inv_slot_red,
+                };
+                slot_widget
+                    .filled_slot(quality_col_img)
+                    .with_tooltip(
+                        self.tooltip_manager,
+                        title,
+                        &*desc,
+                        self.item_tooltip,
+                        quality_col,
+                    )
+                    .set(state.ids.inv_slots[i], ui);
+            } else {
+                slot_widget.set(state.ids.inv_slots[i], ui);
+            }
+        }
+    }
+
+    fn footer_metrics(
+        &mut self,
+        state: &mut ConrodState<'_, InventoryScrollerState>,
+        ui: &mut UiCell<'_>,
+    ) {
+        let space_used = self.inventory.populated_slots();
+        let space_max = self.inventory.slots().count();
+        let bag_space = format!("{}/{}", space_used, space_max);
+        let bag_space_percentage = space_used as f32 / space_max as f32;
+        let coin_itemdef = Arc::<ItemDef>::load_expect_cloned("common.items.utility.coins");
+        let currency = self.inventory.item_count(&coin_itemdef);
+
+        // Coin Icon and Currency Text
+        Image::new(self.imgs.coin_ico)
+            .w_h(16.0, 17.0)
+            .bottom_left_with_margins_on(self.bg_ids.bg_frame, 2.0, 43.0)
+            .set(state.ids.coin_ico, ui);
+        Text::new(&format!("{}", currency))
+            .bottom_left_with_margins_on(self.bg_ids.bg_frame, 6.0, 64.0)
+            .font_id(self.fonts.cyri.conrod_id)
+            .font_size(self.fonts.cyri.scale(14))
+            .color(Color::Rgba(0.871, 0.863, 0.05, 1.0))
+            .set(state.ids.currency_txt, ui);
+        //Free Bag-Space
+        Text::new(&bag_space)
+            .bottom_right_with_margins_on(self.bg_ids.bg_frame, 6.0, 43.0)
+            .font_id(self.fonts.cyri.conrod_id)
+            .font_size(self.fonts.cyri.scale(14))
+            .color(if bag_space_percentage < 0.8 {
+                TEXT_COLOR
+            } else if bag_space_percentage < 1.0 {
+                LOW_HP_COLOR
+            } else {
+                CRITICAL_HP_COLOR
+            })
+            .set(state.ids.space_txt, ui);
+    }
+}
+
+impl<'a> Widget for InventoryScroller<'a> {
+    type Event = ();
+    type State = InventoryScrollerState;
+    type Style = ();
+
+    fn init_state(&self, id_gen: widget::id::Generator) -> Self::State {
+        InventoryScrollerState {
+            ids: InventoryScrollerIds::new(id_gen),
+        }
+    }
+
+    fn style(&self) -> Self::Style {}
+
+    fn update(mut self, args: widget::UpdateArgs<Self>) -> Self::Event {
+        let widget::UpdateArgs { state, ui, .. } = args;
+        self.background(ui);
+        self.title(state, ui);
+        self.scrollbar_and_slots(state, ui);
+        self.footer_metrics(state, ui);
+    }
+}
+
+widget_ids! {
+    pub struct BackgroundIds {
+        bg,
+        bg_frame,
+    }
+}
+
+widget_ids! {
+    pub struct BagIds {
+        test,
+        inventory_scroller,
+        bag_close,
+        //tooltip[],
+        char_ico,
+        coin_ico,
+        space_txt,
+        currency_txt,
+        inventory_title,
+        inventory_title_bg,
+        scrollbar_bg,
+        scrollbar_slots,
         tab_1,
         tab_2,
         tab_3,
@@ -148,8 +495,9 @@ impl<'a> Bag<'a> {
 }
 const STATS: [&str; 4] = ["Health", "Stamina", "Protection", "Combat Rating"];
 
-pub struct State {
-    ids: Ids,
+pub struct BagState {
+    ids: BagIds,
+    bg_ids: BackgroundIds,
 }
 
 pub enum Event {
@@ -159,12 +507,16 @@ pub enum Event {
 
 impl<'a> Widget for Bag<'a> {
     type Event = Option<Event>;
-    type State = State;
+    type State = BagState;
     type Style = ();
 
-    fn init_state(&self, id_gen: widget::id::Generator) -> Self::State {
-        State {
-            ids: Ids::new(id_gen),
+    fn init_state(&self, mut id_gen: widget::id::Generator) -> Self::State {
+        BagState {
+            bg_ids: BackgroundIds {
+                bg: id_gen.next(),
+                bg_frame: id_gen.next(),
+            },
+            ids: BagIds::new(id_gen),
         }
     }
 
@@ -199,12 +551,6 @@ impl<'a> Widget for Bag<'a> {
             None => return None,
         };
 
-        let space_used = inventory.populated_slots();
-        let space_max = inventory.slots().count();
-        let bag_space = format!("{}/{}", space_used, space_max);
-        let bag_space_percentage = space_used as f32 / space_max as f32;
-        let currency = 0; // TODO: Add as a Stat
-
         // Tooltips
         let item_tooltip = Tooltip::new({
             // Edge images [t, b, r, l]
@@ -223,117 +569,32 @@ impl<'a> Widget for Bag<'a> {
         .desc_font_size(self.fonts.cyri.scale(12))
         .font_id(self.fonts.cyri.conrod_id)
         .desc_text_color(TEXT_COLOR);
-        // BG
-        Image::new(if self.show.stats {
-            self.imgs.inv_bg_stats
-        } else if self.show.bag_inv {
-            self.imgs.inv_bg_bag
-        } else {
-            self.imgs.inv_bg_armor
-        })
-        .w_h(424.0, 708.0)
-        .bottom_right_with_margins_on(ui.window, 60.0, 5.0)
-        .color(Some(UI_MAIN))
-        .set(state.ids.bg, ui);
-        Image::new(if self.show.bag_inv {
-            self.imgs.inv_frame_bag
-        } else {
-            self.imgs.inv_frame
-        })
-        .w_h(424.0, 708.0)
-        .middle_of(state.ids.bg)
-        .color(Some(UI_HIGHLIGHT_0))
-        .set(state.ids.bg_frame, ui);
-        // Title
-        Text::new(
-            &self
-                .localized_strings
-                .get("hud.bag.inventory")
-                .replace("{playername}", &self.stats.name.to_string().as_str()),
+
+        InventoryScroller::new(
+            self.imgs,
+            self.item_imgs,
+            self.fonts,
+            self.tooltip_manager,
+            self.slot_manager,
+            self.pulse,
+            self.localized_strings,
+            self.show.stats,
+            self.show.bag_inv,
+            self.msm,
+            true,
+            &item_tooltip,
+            self.stats.name.to_string(),
+            true,
+            &inventory,
+            &state.bg_ids,
         )
-        .mid_top_with_margin_on(state.ids.bg_frame, 9.0)
-        .font_id(self.fonts.cyri.conrod_id)
-        .font_size(self.fonts.cyri.scale(20))
-        .color(Color::Rgba(0.0, 0.0, 0.0, 1.0))
-        .set(state.ids.inventory_title_bg, ui);
-        Text::new(
-            &self
-                .localized_strings
-                .get("hud.bag.inventory")
-                .replace("{playername}", &self.stats.name.to_string().as_str()),
-        )
-        .top_left_with_margins_on(state.ids.inventory_title_bg, 2.0, 2.0)
-        .font_id(self.fonts.cyri.conrod_id)
-        .font_size(self.fonts.cyri.scale(20))
-        .color(TEXT_COLOR)
-        .set(state.ids.inventory_title, ui);
-        // Slots Scrollbar
-        if space_max > 45 && !self.show.bag_inv {
-            // Scrollbar-BG
-            Image::new(self.imgs.scrollbar_bg)
-                .w_h(9.0, 173.0)
-                .bottom_right_with_margins_on(state.ids.bg_frame, 42.0, 3.0)
-                .color(Some(UI_HIGHLIGHT_0))
-                .set(state.ids.scrollbar_bg, ui);
-            // Scrollbar
-            Scrollbar::y_axis(state.ids.inv_alignment)
-                .thickness(5.0)
-                .h(123.0)
-                .color(UI_MAIN)
-                .middle_of(state.ids.scrollbar_bg)
-                .set(state.ids.scrollbar_slots, ui);
-        } else if space_max > 135 {
-            // Scrollbar-BG
-            Image::new(self.imgs.scrollbar_bg_big)
-                .w_h(9.0, 592.0)
-                .bottom_right_with_margins_on(state.ids.bg_frame, 42.0, 3.0)
-                .color(Some(UI_HIGHLIGHT_0))
-                .set(state.ids.scrollbar_bg, ui);
-            // Scrollbar
-            Scrollbar::y_axis(state.ids.inv_alignment)
-                .thickness(5.0)
-                .h(542.0)
-                .color(UI_MAIN)
-                .middle_of(state.ids.scrollbar_bg)
-                .set(state.ids.scrollbar_slots, ui);
-        };
+        .set(state.ids.inventory_scroller, ui);
+
         // Char Pixel-Art
         Image::new(self.imgs.char_art)
             .w_h(40.0, 37.0)
-            .top_left_with_margins_on(state.ids.bg, 4.0, 2.0)
+            .top_left_with_margins_on(state.bg_ids.bg, 4.0, 2.0)
             .set(state.ids.char_ico, ui);
-        // Coin Icon and Currency Text
-        Image::new(self.imgs.coin_ico)
-            .w_h(16.0, 17.0)
-            .bottom_left_with_margins_on(state.ids.bg_frame, 2.0, 43.0)
-            .set(state.ids.coin_ico, ui);
-        Text::new(&format!("{}", currency))
-            .bottom_left_with_margins_on(state.ids.bg_frame, 6.0, 64.0)
-            .font_id(self.fonts.cyri.conrod_id)
-            .font_size(self.fonts.cyri.scale(14))
-            .color(Color::Rgba(0.871, 0.863, 0.05, 1.0))
-            .set(state.ids.currency_txt, ui);
-        //Free Bag-Space
-        Text::new(&bag_space)
-            .bottom_right_with_margins_on(state.ids.bg_frame, 6.0, 43.0)
-            .font_id(self.fonts.cyri.conrod_id)
-            .font_size(self.fonts.cyri.scale(14))
-            .color(if bag_space_percentage < 0.8 {
-                TEXT_COLOR
-            } else if bag_space_percentage < 1.0 {
-                LOW_HP_COLOR
-            } else {
-                CRITICAL_HP_COLOR
-            })
-            .set(state.ids.space_txt, ui);
-        // Alignment for Grid
-        Rectangle::fill_with(
-            [362.0, if self.show.bag_inv { 600.0 } else { 200.0 }],
-            color::TRANSPARENT,
-        )
-        .bottom_left_with_margins_on(state.ids.bg_frame, 29.0, 46.5)
-        .scroll_kids_vertically()
-        .set(state.ids.inv_alignment, ui);
         // Button to expand bag
         let txt = if self.show.bag_inv {
             "Show Loadout"
@@ -357,9 +618,10 @@ impl<'a> Widget for Bag<'a> {
             self.imgs.expand_btn_press
         });
         // Only show expand button when it's needed...
+        let space_max = inventory.slots().count();
         if space_max > 45 && !self.show.bag_inv {
             if expand_btn
-                .top_left_with_margins_on(state.ids.bg_frame, 460.0, 211.5)
+                .top_left_with_margins_on(state.bg_ids.bg_frame, 460.0, 211.5)
                 .with_tooltip(self.tooltip_manager, &txt, "", &bag_tooltip, TEXT_COLOR)
                 .set(state.ids.bag_expand_btn, ui)
                 .was_clicked()
@@ -369,7 +631,7 @@ impl<'a> Widget for Bag<'a> {
         } else if self.show.bag_inv {
             //... but always show it when the bag is expanded
             if expand_btn
-                .top_left_with_margins_on(state.ids.bg_frame, 53.0, 211.5)
+                .top_left_with_margins_on(state.bg_ids.bg_frame, 53.0, 211.5)
                 .with_tooltip(self.tooltip_manager, &txt, "", &bag_tooltip, TEXT_COLOR)
                 .set(state.ids.bag_expand_btn, ui)
                 .was_clicked()
@@ -378,29 +640,6 @@ impl<'a> Widget for Bag<'a> {
             }
         }
 
-        // Title
-        Text::new(
-            &self
-                .localized_strings
-                .get("hud.bag.inventory")
-                .replace("{playername}", &self.stats.name.to_string().as_str()),
-        )
-        .mid_top_with_margin_on(state.ids.bg_frame, 9.0)
-        .font_id(self.fonts.cyri.conrod_id)
-        .font_size(self.fonts.cyri.scale(22))
-        .color(Color::Rgba(0.0, 0.0, 0.0, 1.0))
-        .set(state.ids.inventory_title_bg, ui);
-        Text::new(
-            &self
-                .localized_strings
-                .get("hud.bag.inventory")
-                .replace("{playername}", &self.stats.name.to_string().as_str()),
-        )
-        .top_left_with_margins_on(state.ids.inventory_title_bg, 2.0, 2.0)
-        .font_id(self.fonts.cyri.conrod_id)
-        .font_size(self.fonts.cyri.scale(22))
-        .color(TEXT_COLOR)
-        .set(state.ids.inventory_title, ui);
         // Armor Slots
         let mut slot_maker = SlotMaker {
             empty_slot: self.imgs.armor_slot_empty,
@@ -464,7 +703,7 @@ impl<'a> Widget for Bag<'a> {
                 let combat_rating_txt = format!("{}", (combat_rating * 10.0) as usize);
 
                 let btn = if i.0 == 0 {
-                    btn.top_left_with_margins_on(state.ids.bg_frame, 55.0, 10.0)
+                    btn.top_left_with_margins_on(state.bg_ids.bg_frame, 55.0, 10.0)
                 } else {
                     btn.down_from(state.ids.stat_icons[i.0 - 1], 7.0)
                 };
@@ -517,7 +756,7 @@ impl<'a> Widget for Bag<'a> {
                 .unwrap_or(QUALITY_COMMON);
             slot_maker
                 .fabricate(EquipSlot::Armor(ArmorSlot::Head), [45.0; 2])
-                .mid_top_with_margin_on(state.ids.bg_frame, 60.0)
+                .mid_top_with_margin_on(state.bg_ids.bg_frame, 60.0)
                 .with_icon(self.imgs.head_bg, Vec2::new(32.0, 40.0), Some(UI_MAIN))
                 .filled_slot(filled_slot)
                 .with_tooltip(
@@ -771,7 +1010,7 @@ impl<'a> Widget for Bag<'a> {
                 .unwrap_or(QUALITY_COMMON);
             slot_maker
                 .fabricate(EquipSlot::Lantern, [45.0; 2])
-                .top_right_with_margins_on(state.ids.bg_frame, 60.0, 5.0)
+                .top_right_with_margins_on(state.bg_ids.bg_frame, 60.0, 5.0)
                 .with_icon(self.imgs.lantern_bg, Vec2::new(24.0, 38.0), Some(UI_MAIN))
                 .filled_slot(filled_slot)
                 .with_tooltip(
@@ -888,7 +1127,7 @@ impl<'a> Widget for Bag<'a> {
         slot_maker
             .fabricate(EquipSlot::Armor(ArmorSlot::Bag1), [35.0; 2])
             .bottom_left_with_margins_on(
-                state.ids.bg_frame,
+                state.bg_ids.bg_frame,
                 if self.show.bag_inv { 600.0 } else { 167.0 },
                 3.0,
             )
@@ -971,102 +1210,13 @@ impl<'a> Widget for Bag<'a> {
                 bag4_q_col,
             )
             .set(state.ids.bag4_slot, ui);
-        // Bag Slots
-        // Create available inventory slot widgets
-        if state.ids.inv_slots.len() < inventory.capacity() {
-            state.update(|s| {
-                s.ids
-                    .inv_slots
-                    .resize(inventory.capacity(), &mut ui.widget_id_generator());
-            });
-        }
 
-        // Determine the range of inventory slots that are provided by the loadout item
-        // that the mouse is over
-        let mouseover_loadout_slots = self
-            .slot_manager
-            .mouse_over_slot
-            .and_then(|x| {
-                if let SlotKind::Equip(e) = x {
-                    inventory.get_slot_range_for_equip_slot(e)
-                } else {
-                    None
-                }
-            })
-            .unwrap_or(0usize..0usize);
-
-        // Display inventory contents
-        let mut slot_maker = SlotMaker {
-            empty_slot: self.imgs.inv_slot,
-            filled_slot: self.imgs.inv_slot,
-            selected_slot: self.imgs.inv_slot_sel,
-            background_color: Some(UI_MAIN),
-            content_size: ContentSize {
-                width_height_ratio: 1.0,
-                max_fraction: 0.75,
-            },
-            selected_content_scale: 1.067,
-            amount_font: self.fonts.cyri.conrod_id,
-            amount_margins: Vec2::new(-4.0, 0.0),
-            amount_font_size: self.fonts.cyri.scale(12),
-            amount_text_color: TEXT_COLOR,
-            content_source: inventory,
-            image_source: self.item_imgs,
-            slot_manager: Some(self.slot_manager),
-            pulse: self.pulse,
-        };
-
-        for (i, (pos, item)) in inventory.slots_with_id().enumerate() {
-            let x = i % 9;
-            let y = i / 9;
-
-            // Slot
-            let mut slot_widget = slot_maker
-                .fabricate(InventorySlot(pos), [40.0; 2])
-                .top_left_with_margins_on(
-                    state.ids.inv_alignment,
-                    0.0 + y as f64 * (40.0),
-                    0.0 + x as f64 * (40.0),
-                );
-
-            // Highlight slots are provided by the loadout item that the mouse is over
-            if mouseover_loadout_slots.contains(&i) {
-                slot_widget = slot_widget.with_background_color(Color::Rgba(1.0, 1.0, 1.0, 1.0));
-            }
-
-            if let Some(item) = item {
-                let (title, desc) = super::util::item_text(item, &self.msm);
-                let quality_col = get_quality_col(item);
-                let quality_col_img = match item.quality() {
-                    Quality::Low => self.imgs.inv_slot_grey,
-                    Quality::Common => self.imgs.inv_slot,
-                    Quality::Moderate => self.imgs.inv_slot_green,
-                    Quality::High => self.imgs.inv_slot_blue,
-                    Quality::Epic => self.imgs.inv_slot_purple,
-                    Quality::Legendary => self.imgs.inv_slot_gold,
-                    Quality::Artifact => self.imgs.inv_slot_orange,
-                    _ => self.imgs.inv_slot_red,
-                };
-                slot_widget
-                    .filled_slot(quality_col_img)
-                    .with_tooltip(
-                        self.tooltip_manager,
-                        title,
-                        &*desc,
-                        &item_tooltip,
-                        quality_col,
-                    )
-                    .set(state.ids.inv_slots[i], ui);
-            } else {
-                slot_widget.set(state.ids.inv_slots[i], ui);
-            }
-        }
         // Close button
         if Button::image(self.imgs.close_btn)
             .w_h(24.0, 25.0)
             .hover_image(self.imgs.close_btn_hover)
             .press_image(self.imgs.close_btn_press)
-            .top_right_with_margins_on(state.ids.bg, 0.0, 0.0)
+            .top_right_with_margins_on(state.bg_ids.bg, 0.0, 0.0)
             .set(state.ids.bag_close, ui)
             .was_clicked()
         {
diff --git a/voxygen/src/hud/mod.rs b/voxygen/src/hud/mod.rs
index f7d1a5df8e..179866428b 100644
--- a/voxygen/src/hud/mod.rs
+++ b/voxygen/src/hud/mod.rs
@@ -2716,9 +2716,10 @@ impl Hud {
         // Maintain slot manager
         for event in self.slot_manager.maintain(ui_widgets) {
             use comp::slot::Slot;
-            use slots::SlotKind::*;
+            use slots::{InventorySlot, SlotKind::*};
             let to_slot = |slot_kind| match slot_kind {
-                Inventory(i) => Some(Slot::Inventory(i.0)),
+                Inventory(InventorySlot { slot, ours: true }) => Some(Slot::Inventory(slot)),
+                Inventory(InventorySlot { ours: false, .. }) => None,
                 Equip(e) => Some(Slot::Equip(e)),
                 Hotbar(_) => None,
                 Trade(_) => None,
@@ -2732,28 +2733,36 @@ impl Hud {
                             slot_b: b,
                             bypass_dialog: false,
                         });
-                    } else if let (Inventory(i), Hotbar(h)) = (a, b) {
-                        self.hotbar.add_inventory_link(h, i.0);
+                    } else if let (Inventory(InventorySlot { slot, ours: true }), Hotbar(h)) =
+                        (a, b)
+                    {
+                        self.hotbar.add_inventory_link(h, slot);
                         events.push(Event::ChangeHotbarState(Box::new(self.hotbar.to_owned())));
                     } else if let (Hotbar(a), Hotbar(b)) = (a, b) {
                         self.hotbar.swap(a, b);
                         events.push(Event::ChangeHotbarState(Box::new(self.hotbar.to_owned())));
-                    } else if let (Inventory(i), Trade(_)) = (a, b) {
-                        if let Some(inventory) = inventories.get(entity) {
-                            events.push(Event::TradeAction(TradeAction::AddItem {
-                                item: i.0,
-                                quantity: i.amount(inventory).unwrap_or(1),
-                            }));
-                        }
-                    } else if let (Trade(t), Inventory(_)) = (a, b) {
-                        if let Some(inventory) = inventories.get(entity) {
-                            if let Some(invslot) = t.invslot {
-                                events.push(Event::TradeAction(TradeAction::RemoveItem {
-                                    item: invslot,
-                                    quantity: t.amount(inventory).unwrap_or(1),
+                    } else if let (Inventory(i), Trade(t)) = (a, b) {
+                        if i.ours == t.ours {
+                            if let Some(inventory) = inventories.get(t.entity) {
+                                events.push(Event::TradeAction(TradeAction::AddItem {
+                                    item: i.slot,
+                                    quantity: i.amount(inventory).unwrap_or(1),
+                                    ours: i.ours,
                                 }));
                             }
                         }
+                    } else if let (Trade(t), Inventory(i)) = (a, b) {
+                        if i.ours == t.ours {
+                            if let Some(inventory) = inventories.get(t.entity) {
+                                if let Some(invslot) = t.invslot {
+                                    events.push(Event::TradeAction(TradeAction::RemoveItem {
+                                        item: invslot,
+                                        quantity: t.amount(inventory).unwrap_or(1),
+                                        ours: t.ours,
+                                    }));
+                                }
+                            }
+                        }
                     }
                 },
                 slot::Event::Dropped(from) => {
@@ -2763,6 +2772,16 @@ impl Hud {
                     } else if let Hotbar(h) = from {
                         self.hotbar.clear_slot(h);
                         events.push(Event::ChangeHotbarState(Box::new(self.hotbar.to_owned())));
+                    } else if let Trade(t) = from {
+                        if let Some(inventory) = inventories.get(t.entity) {
+                            if let Some(invslot) = t.invslot {
+                                events.push(Event::TradeAction(TradeAction::RemoveItem {
+                                    item: invslot,
+                                    quantity: t.amount(inventory).unwrap_or(1),
+                                    ours: t.ours,
+                                }));
+                            }
+                        }
                     }
                 },
                 slot::Event::Used(from) => {
@@ -2835,8 +2854,13 @@ impl Hud {
             slot_manager: &mut slots::SlotManager,
             hotbar: &mut hotbar::State,
         ) {
-            if let Some(slots::SlotKind::Inventory(i)) = slot_manager.selected() {
-                hotbar.add_inventory_link(slot, i.0);
+            use slots::InventorySlot;
+            if let Some(slots::SlotKind::Inventory(InventorySlot {
+                slot: i,
+                ours: true,
+            })) = slot_manager.selected()
+            {
+                hotbar.add_inventory_link(slot, i);
                 events.push(Event::ChangeHotbarState(Box::new(hotbar.to_owned())));
                 slot_manager.idle();
             } else {
diff --git a/voxygen/src/hud/slots.rs b/voxygen/src/hud/slots.rs
index bd8e4446d9..b6228e343e 100644
--- a/voxygen/src/hud/slots.rs
+++ b/voxygen/src/hud/slots.rs
@@ -13,6 +13,7 @@ use common::comp::{
     Energy, Inventory,
 };
 use conrod_core::{image, Color};
+use specs::Entity as EcsEntity;
 
 pub use common::comp::slot::{ArmorSlot, EquipSlot};
 
@@ -28,18 +29,21 @@ pub enum SlotKind {
 pub type SlotManager = slot::SlotManager<SlotKind>;
 
 #[derive(Clone, Copy, Debug, PartialEq)]
-pub struct InventorySlot(pub InvSlotId);
+pub struct InventorySlot {
+    pub slot: InvSlotId,
+    pub ours: bool,
+}
 
 impl SlotKey<Inventory, ItemImgs> for InventorySlot {
     type ImageKey = ItemKey;
 
     fn image_key(&self, source: &Inventory) -> Option<(Self::ImageKey, Option<Color>)> {
-        source.get(self.0).map(|i| (i.into(), None))
+        source.get(self.slot).map(|i| (i.into(), None))
     }
 
     fn amount(&self, source: &Inventory) -> Option<u32> {
         source
-            .get(self.0)
+            .get(self.slot)
             .map(|item| item.amount())
             .filter(|amount| *amount > 1)
     }
@@ -69,19 +73,32 @@ pub struct TradeSlot {
     pub index: usize,
     pub quantity: u32,
     pub invslot: Option<InvSlotId>,
+    pub entity: EcsEntity,
+    pub ours: bool,
 }
 
 impl SlotKey<Inventory, ItemImgs> for TradeSlot {
     type ImageKey = ItemKey;
 
     fn image_key(&self, source: &Inventory) -> Option<(Self::ImageKey, Option<Color>)> {
-        self.invslot
-            .and_then(|inv_id| InventorySlot(inv_id).image_key(source))
+        self.invslot.and_then(|inv_id| {
+            InventorySlot {
+                slot: inv_id,
+                ours: self.ours,
+            }
+            .image_key(source)
+        })
     }
 
     fn amount(&self, source: &Inventory) -> Option<u32> {
         self.invslot
-            .and_then(|inv_id| InventorySlot(inv_id).amount(source))
+            .and_then(|inv_id| {
+                InventorySlot {
+                    slot: inv_id,
+                    ours: self.ours,
+                }
+                .amount(source)
+            })
             .map(|x| x.min(self.quantity))
     }
 
diff --git a/voxygen/src/hud/trade.rs b/voxygen/src/hud/trade.rs
index 150082e625..5716dc5bbe 100644
--- a/voxygen/src/hud/trade.rs
+++ b/voxygen/src/hud/trade.rs
@@ -6,6 +6,7 @@ use super::{
     TEXT_COLOR, UI_HIGHLIGHT_0, UI_MAIN,
 };
 use crate::{
+    hud::bag::{BackgroundIds, InventoryScroller},
     i18n::Localization,
     ui::{
         fonts::Fonts,
@@ -28,10 +29,12 @@ use conrod_core::{
     widget::{self, Button, Image, Rectangle, State as ConrodState, Text},
     widget_ids, Color, Colorable, Labelable, Positionable, Sizeable, UiCell, Widget, WidgetCommon,
 };
+use specs::Entity as EcsEntity;
 use vek::*;
 
 pub struct State {
     ids: Ids,
+    bg_ids: BackgroundIds,
 }
 
 widget_ids! {
@@ -49,6 +52,7 @@ widget_ids! {
         phase_indicator,
         accept_button,
         decline_button,
+        inventory_scroller,
     }
 }
 
@@ -157,6 +161,7 @@ impl<'a> Trade<'a> {
         let inventories = self.client.inventories();
         let uid = trade.parties[who];
         let entity = self.client.state().ecs().entity_from_uid(uid.0)?;
+        let ours = entity == self.client.entity();
         // TODO: update in accordence with https://gitlab.com/veloren/veloren/-/issues/960
         let inventory = inventories.get(entity)?;
 
@@ -215,13 +220,15 @@ impl<'a> Trade<'a> {
                 index,
                 quantity,
                 invslot: Some(k),
+                ours,
+                entity,
             })
             .collect();
 
         if matches!(trade.phase(), TradePhase::Mutate) {
-            self.phase1_itemwidget(state, ui, inventory, who, &tradeslots);
+            self.phase1_itemwidget(state, ui, inventory, who, ours, entity, name, &tradeslots);
         } else {
-            self.phase2_itemwidget(state, ui, inventory, who, &tradeslots);
+            self.phase2_itemwidget(state, ui, inventory, who, ours, entity, &tradeslots);
         }
 
         None
@@ -233,6 +240,9 @@ impl<'a> Trade<'a> {
         ui: &mut UiCell<'_>,
         inventory: &Inventory,
         who: usize,
+        ours: bool,
+        entity: EcsEntity,
+        name: String,
         tradeslots: &[TradeSlot],
     ) {
         let item_tooltip = Tooltip::new({
@@ -253,6 +263,28 @@ impl<'a> Trade<'a> {
         .font_id(self.fonts.cyri.conrod_id)
         .desc_text_color(TEXT_COLOR);
 
+        if !ours {
+            InventoryScroller::new(
+                self.imgs,
+                self.item_imgs,
+                self.fonts,
+                self.tooltip_manager,
+                self.slot_manager,
+                self.pulse,
+                self.localized_strings,
+                false,
+                true,
+                self.msm,
+                false,
+                &item_tooltip,
+                name,
+                false,
+                &inventory,
+                &state.bg_ids,
+            )
+            .set(state.ids.inventory_scroller, ui);
+        }
+
         let mut slot_maker = SlotMaker {
             empty_slot: self.imgs.inv_slot,
             filled_slot: self.imgs.inv_slot,
@@ -289,6 +321,8 @@ impl<'a> Trade<'a> {
                 index: i,
                 quantity: 0,
                 invslot: None,
+                ours,
+                entity,
             });
             // Slot
             let slot_widget = slot_maker
@@ -334,6 +368,8 @@ impl<'a> Trade<'a> {
         ui: &mut UiCell<'_>,
         inventory: &Inventory,
         who: usize,
+        ours: bool,
+        entity: EcsEntity,
         tradeslots: &[TradeSlot],
     ) {
         if state.ids.inv_textslots.len() < 2 * MAX_TRADE_SLOTS {
@@ -348,6 +384,8 @@ impl<'a> Trade<'a> {
                 index: i,
                 quantity: 0,
                 invslot: None,
+                ours,
+                entity,
             });
             let itemname = slot
                 .invslot
@@ -435,8 +473,12 @@ impl<'a> Widget for Trade<'a> {
     type State = State;
     type Style = ();
 
-    fn init_state(&self, id_gen: widget::id::Generator) -> Self::State {
+    fn init_state(&self, mut id_gen: widget::id::Generator) -> Self::State {
         State {
+            bg_ids: BackgroundIds {
+                bg: id_gen.next(),
+                bg_frame: id_gen.next(),
+            },
             ids: Ids::new(id_gen),
         }
     }

From e582c2bdc6a5d8b41f4e21f142e0c508c433b6ad Mon Sep 17 00:00:00 2001
From: Sam <samuelkeiffer@gmail.com>
Date: Sun, 28 Feb 2021 15:02:03 -0500
Subject: [PATCH 03/16] Added invulnerability debuff. Currently tied to
 campfire spawned with '/campfire' command.

---
 common/src/combat.rs                     | 120 +++++++++++++----------
 common/src/comp/aura.rs                  |  10 +-
 common/src/comp/buff.rs                  |  15 ++-
 common/src/comp/stats.rs                 |   5 +
 common/sys/src/beam.rs                   |  14 ++-
 common/sys/src/buff.rs                   |  38 ++++---
 common/sys/src/melee.rs                  |  14 ++-
 common/sys/src/projectile.rs             |  17 +++-
 common/sys/src/shockwave.rs              |  14 ++-
 server/src/cmd.rs                        |  35 ++++---
 server/src/events/entity_creation.rs     |   4 +-
 server/src/events/entity_manipulation.rs |  20 ++--
 server/src/state_ext.rs                  |   7 +-
 voxygen/src/hud/bag.rs                   |   3 +-
 voxygen/src/hud/buffs.rs                 |  23 +----
 voxygen/src/hud/group.rs                 |  17 +---
 voxygen/src/hud/mod.rs                   |  14 +++
 voxygen/src/hud/overhead.rs              |  15 +--
 18 files changed, 231 insertions(+), 154 deletions(-)

diff --git a/common/src/combat.rs b/common/src/combat.rs
index 803b009693..fbf6e1c337 100644
--- a/common/src/combat.rs
+++ b/common/src/combat.rs
@@ -47,6 +47,13 @@ pub struct AttackerInfo<'a> {
     pub energy: Option<&'a Energy>,
 }
 
+#[cfg(not(target_arch = "wasm32"))]
+pub struct TargetInfo<'a> {
+    pub entity: EcsEntity,
+    pub inventory: Option<&'a Inventory>,
+    pub stats: Option<&'a Stats>,
+}
+
 #[cfg(not(target_arch = "wasm32"))]
 #[derive(Clone, Debug, Serialize, Deserialize)] // TODO: Yeet clone derive
 pub struct Attack {
@@ -99,9 +106,8 @@ impl Attack {
     pub fn apply_attack(
         &self,
         target_group: GroupTarget,
-        attacker_info: Option<AttackerInfo>,
-        target_entity: EcsEntity,
-        target_inventory: Option<&Inventory>,
+        attacker: Option<AttackerInfo>,
+        target: TargetInfo,
         dir: Dir,
         target_dodging: bool,
         // Currently just modifies damage, maybe look into modifying strength of other effects?
@@ -116,9 +122,10 @@ impl Attack {
             .filter(|d| d.target.map_or(true, |t| t == target_group))
             .filter(|d| !(matches!(d.target, Some(GroupTarget::OutOfGroup)) && target_dodging))
         {
+            let damage_reduction = Damage::compute_damage_reduction(target.inventory, target.stats);
             let change = damage.damage.calculate_health_change(
-                target_inventory,
-                attacker_info.map(|a| a.uid),
+                damage_reduction,
+                attacker.map(|a| a.uid),
                 is_crit,
                 self.crit_multiplier,
                 strength_modifier,
@@ -127,7 +134,7 @@ impl Attack {
             accumulated_damage += applied_damage;
             if change.amount != 0 {
                 emit(ServerEvent::Damage {
-                    entity: target_entity,
+                    entity: target.entity,
                     change,
                 });
                 for effect in damage.effects.iter() {
@@ -136,13 +143,13 @@ impl Attack {
                             let impulse = kb.calculate_impulse(dir);
                             if !impulse.is_approx_zero() {
                                 emit(ServerEvent::Knockback {
-                                    entity: target_entity,
+                                    entity: target.entity,
                                     impulse,
                                 });
                             }
                         },
                         CombatEffect::EnergyReward(ec) => {
-                            if let Some(attacker_entity) = attacker_info.map(|a| a.entity) {
+                            if let Some(attacker_entity) = attacker.map(|a| a.entity) {
                                 emit(ServerEvent::EnergyChange {
                                     entity: attacker_entity,
                                     change: EnergyChange {
@@ -155,19 +162,19 @@ impl Attack {
                         CombatEffect::Buff(b) => {
                             if thread_rng().gen::<f32>() < b.chance {
                                 emit(ServerEvent::Buff {
-                                    entity: target_entity,
+                                    entity: target.entity,
                                     buff_change: BuffChange::Add(
-                                        b.to_buff(attacker_info.map(|a| a.uid), applied_damage),
+                                        b.to_buff(attacker.map(|a| a.uid), applied_damage),
                                     ),
                                 });
                             }
                         },
                         CombatEffect::Lifesteal(l) => {
-                            if let Some(attacker_entity) = attacker_info.map(|a| a.entity) {
+                            if let Some(attacker_entity) = attacker.map(|a| a.entity) {
                                 let change = HealthChange {
                                     amount: (applied_damage * l) as i32,
                                     cause: HealthSource::Heal {
-                                        by: attacker_info.map(|a| a.uid),
+                                        by: attacker.map(|a| a.uid),
                                     },
                                 };
                                 if change.amount != 0 {
@@ -179,10 +186,10 @@ impl Attack {
                             }
                         },
                         CombatEffect::Poise(p) => {
-                            let change = PoiseChange::from_value(*p, target_inventory);
+                            let change = PoiseChange::from_value(*p, target.inventory);
                             if change.amount != 0 {
                                 emit(ServerEvent::PoiseChange {
-                                    entity: target_entity,
+                                    entity: target.entity,
                                     change,
                                     kb_dir: *dir,
                                 });
@@ -192,18 +199,18 @@ impl Attack {
                             let change = HealthChange {
                                 amount: *h as i32,
                                 cause: HealthSource::Heal {
-                                    by: attacker_info.map(|a| a.uid),
+                                    by: attacker.map(|a| a.uid),
                                 },
                             };
                             if change.amount != 0 {
                                 emit(ServerEvent::Damage {
-                                    entity: target_entity,
+                                    entity: target.entity,
                                     change,
                                 });
                             }
                         },
                         CombatEffect::Combo(c) => {
-                            if let Some(attacker_entity) = attacker_info.map(|a| a.entity) {
+                            if let Some(attacker_entity) = attacker.map(|a| a.entity) {
                                 emit(ServerEvent::ComboChange {
                                     entity: attacker_entity,
                                     change: *c,
@@ -227,7 +234,7 @@ impl Attack {
                         entity,
                         energy: Some(e),
                         ..
-                    }) = attacker_info
+                    }) = attacker
                     {
                         let sufficient_energy = e.current() as f32 >= *r;
                         if sufficient_energy {
@@ -252,13 +259,13 @@ impl Attack {
                         let impulse = kb.calculate_impulse(dir);
                         if !impulse.is_approx_zero() {
                             emit(ServerEvent::Knockback {
-                                entity: target_entity,
+                                entity: target.entity,
                                 impulse,
                             });
                         }
                     },
                     CombatEffect::EnergyReward(ec) => {
-                        if let Some(attacker_entity) = attacker_info.map(|a| a.entity) {
+                        if let Some(attacker_entity) = attacker.map(|a| a.entity) {
                             emit(ServerEvent::EnergyChange {
                                 entity: attacker_entity,
                                 change: EnergyChange {
@@ -271,19 +278,19 @@ impl Attack {
                     CombatEffect::Buff(b) => {
                         if thread_rng().gen::<f32>() < b.chance {
                             emit(ServerEvent::Buff {
-                                entity: target_entity,
+                                entity: target.entity,
                                 buff_change: BuffChange::Add(
-                                    b.to_buff(attacker_info.map(|a| a.uid), accumulated_damage),
+                                    b.to_buff(attacker.map(|a| a.uid), accumulated_damage),
                                 ),
                             });
                         }
                     },
                     CombatEffect::Lifesteal(l) => {
-                        if let Some(attacker_entity) = attacker_info.map(|a| a.entity) {
+                        if let Some(attacker_entity) = attacker.map(|a| a.entity) {
                             let change = HealthChange {
                                 amount: (accumulated_damage * l) as i32,
                                 cause: HealthSource::Heal {
-                                    by: attacker_info.map(|a| a.uid),
+                                    by: attacker.map(|a| a.uid),
                                 },
                             };
                             if change.amount != 0 {
@@ -295,10 +302,10 @@ impl Attack {
                         }
                     },
                     CombatEffect::Poise(p) => {
-                        let change = PoiseChange::from_value(p, target_inventory);
+                        let change = PoiseChange::from_value(p, target.inventory);
                         if change.amount != 0 {
                             emit(ServerEvent::PoiseChange {
-                                entity: target_entity,
+                                entity: target.entity,
                                 change,
                                 kb_dir: *dir,
                             });
@@ -308,18 +315,18 @@ impl Attack {
                         let change = HealthChange {
                             amount: h as i32,
                             cause: HealthSource::Heal {
-                                by: attacker_info.map(|a| a.uid),
+                                by: attacker.map(|a| a.uid),
                             },
                         };
                         if change.amount != 0 {
                             emit(ServerEvent::Damage {
-                                entity: target_entity,
+                                entity: target.entity,
                                 change,
                             });
                         }
                     },
                     CombatEffect::Combo(c) => {
-                        if let Some(attacker_entity) = attacker_info.map(|a| a.entity) {
+                        if let Some(attacker_entity) = attacker.map(|a| a.entity) {
                             emit(ServerEvent::ComboChange {
                                 entity: attacker_entity,
                                 change: c,
@@ -423,40 +430,49 @@ pub struct Damage {
 #[cfg(not(target_arch = "wasm32"))]
 impl Damage {
     /// Returns the total damage reduction provided by all equipped items
-    pub fn compute_damage_reduction(inventory: &Inventory) -> f32 {
-        let protection = inventory
-            .equipped_items()
-            .filter_map(|item| {
-                if let ItemKind::Armor(armor) = &item.kind() {
-                    Some(armor.get_protection())
-                } else {
-                    None
-                }
-            })
-            .map(|protection| match protection {
-                Protection::Normal(protection) => Some(protection),
-                Protection::Invincible => None,
-            })
-            .sum::<Option<f32>>();
+    pub fn compute_damage_reduction(inventory: Option<&Inventory>, stats: Option<&Stats>) -> f32 {
+        let invetory_dr = if let Some(inventory) = inventory {
+            let protection = inventory
+                .equipped_items()
+                .filter_map(|item| {
+                    if let ItemKind::Armor(armor) = &item.kind() {
+                        Some(armor.get_protection())
+                    } else {
+                        None
+                    }
+                })
+                .map(|protection| match protection {
+                    Protection::Normal(protection) => Some(protection),
+                    Protection::Invincible => None,
+                })
+                .sum::<Option<f32>>();
 
-        const FIFTY_PERCENT_DR_THRESHOLD: f32 = 60.0;
+            const FIFTY_PERCENT_DR_THRESHOLD: f32 = 60.0;
 
-        match protection {
-            Some(dr) => dr / (FIFTY_PERCENT_DR_THRESHOLD + dr.abs()),
-            None => 1.0,
-        }
+            match protection {
+                Some(dr) => dr / (FIFTY_PERCENT_DR_THRESHOLD + dr.abs()),
+                None => 1.0,
+            }
+        } else {
+            0.0
+        };
+        let stats_dr = if let Some(stats) = stats {
+            stats.damage_reduction
+        } else {
+            0.0
+        };
+        1.0 - (1.0 - invetory_dr) * (1.0 - stats_dr)
     }
 
     pub fn calculate_health_change(
         self,
-        inventory: Option<&Inventory>,
+        damage_reduction: f32,
         uid: Option<Uid>,
         is_crit: bool,
         crit_mult: f32,
         damage_modifier: f32,
     ) -> HealthChange {
         let mut damage = self.value * damage_modifier;
-        let damage_reduction = inventory.map_or(0.0, Damage::compute_damage_reduction);
         match self.source {
             DamageSource::Melee => {
                 // Critical hit
@@ -705,7 +721,7 @@ pub fn combat_rating(
     let defensive_weighting = 1.0;
     let offensive_weighting = 1.0;
     let defensive_rating = health.maximum() as f32
-        / (1.0 - Damage::compute_damage_reduction(inventory)).max(0.00001)
+        / (1.0 - Damage::compute_damage_reduction(Some(inventory), Some(stats))).max(0.00001)
         / 100.0;
     let offensive_rating = offensive_rating(inventory, &stats.skill_set, msm).max(0.1)
         + 0.05 * stats.skill_set.earned_sp(SkillGroupKind::General) as f32;
diff --git a/common/src/comp/aura.rs b/common/src/comp/aura.rs
index 30162d19ed..eb82775cdb 100644
--- a/common/src/comp/aura.rs
+++ b/common/src/comp/aura.rs
@@ -91,10 +91,12 @@ pub struct Auras {
 }
 
 impl Auras {
-    pub fn new(aura: Aura) -> Self {
-        let mut auras: SlotMap<AuraKey, Aura> = SlotMap::with_key();
-        auras.insert(aura);
-        Self { auras }
+    pub fn new(auras: Vec<Aura>) -> Self {
+        let mut auras_comp: SlotMap<AuraKey, Aura> = SlotMap::with_key();
+        for aura in auras {
+            auras_comp.insert(aura);
+        }
+        Self { auras: auras_comp }
     }
 
     pub fn insert(&mut self, aura: Aura) { self.auras.insert(aura); }
diff --git a/common/src/comp/buff.rs b/common/src/comp/buff.rs
index 5b4ec2d542..7dc9fd0dd0 100644
--- a/common/src/comp/buff.rs
+++ b/common/src/comp/buff.rs
@@ -31,6 +31,8 @@ pub enum BuffKind {
     IncreaseMaxEnergy,
     /// Raises maximum health
     IncreaseMaxHealth,
+    /// Makes you immune to attacks
+    Invulnerability,
 }
 
 #[cfg(not(target_arch = "wasm32"))]
@@ -46,6 +48,7 @@ impl BuffKind {
             BuffKind::CampfireHeal => true,
             BuffKind::IncreaseMaxEnergy => true,
             BuffKind::IncreaseMaxHealth => true,
+            BuffKind::Invulnerability => true,
         }
     }
 
@@ -98,9 +101,16 @@ pub enum BuffEffect {
         kind: ModifierKind,
     },
     /// Changes maximum health by a certain amount
-    MaxHealthModifier { value: f32, kind: ModifierKind },
+    MaxHealthModifier {
+        value: f32,
+        kind: ModifierKind,
+    },
     /// Changes maximum stamina by a certain amount
-    MaxEnergyModifier { value: f32, kind: ModifierKind },
+    MaxEnergyModifier {
+        value: f32,
+        kind: ModifierKind,
+    },
+    ImmuneToAttacks,
 }
 
 /// Actual de/buff.
@@ -203,6 +213,7 @@ impl Buff {
                 }],
                 data.duration,
             ),
+            BuffKind::Invulnerability => (vec![BuffEffect::ImmuneToAttacks], data.duration),
         };
         Buff {
             kind,
diff --git a/common/src/comp/stats.rs b/common/src/comp/stats.rs
index e333420e5e..a233b99c12 100644
--- a/common/src/comp/stats.rs
+++ b/common/src/comp/stats.rs
@@ -23,7 +23,10 @@ impl Error for StatChangeError {}
 #[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct Stats {
     pub name: String,
+    // TODO: Make skillset a separate component, probably too heavy for something that will
+    // potentially be updated every tick (especially as more buffs are added)
     pub skill_set: SkillSet,
+    pub damage_reduction: f32,
 }
 
 impl Stats {
@@ -31,6 +34,7 @@ impl Stats {
         Self {
             name,
             skill_set: SkillSet::default(),
+            damage_reduction: 0.0,
         }
     }
 
@@ -40,6 +44,7 @@ impl Stats {
         Self {
             name: "".to_owned(),
             skill_set: SkillSet::default(),
+            damage_reduction: 0.0,
         }
     }
 }
diff --git a/common/sys/src/beam.rs b/common/sys/src/beam.rs
index c4c2b863ea..0f4cdf130d 100644
--- a/common/sys/src/beam.rs
+++ b/common/sys/src/beam.rs
@@ -1,8 +1,8 @@
 use common::{
-    combat::AttackerInfo,
+    combat::{AttackerInfo, TargetInfo},
     comp::{
         Beam, BeamSegment, Body, Energy, Group, Health, HealthSource, Inventory, Last, Ori, Pos,
-        Scale,
+        Scale, Stats,
     },
     event::{EventBus, ServerEvent},
     resources::{DeltaTime, Time},
@@ -33,6 +33,7 @@ pub struct ReadData<'a> {
     inventories: ReadStorage<'a, Inventory>,
     groups: ReadStorage<'a, Group>,
     energies: ReadStorage<'a, Energy>,
+    stats: ReadStorage<'a, Stats>,
 }
 
 /// This system is responsible for handling beams that heal or do damage
@@ -157,11 +158,16 @@ impl<'a> System<'a> for Sys {
                                 energy: read_data.energies.get(entity),
                             });
 
+                    let target_info = TargetInfo {
+                        entity: target,
+                        inventory: read_data.inventories.get(target),
+                        stats: read_data.stats.get(target),
+                    };
+
                     beam_segment.properties.attack.apply_attack(
                         target_group,
                         attacker_info,
-                        target,
-                        read_data.inventories.get(target),
+                        target_info,
                         ori.look_dir(),
                         false,
                         1.0,
diff --git a/common/sys/src/buff.rs b/common/sys/src/buff.rs
index 7e5e6ebe7e..2a2aaa8c05 100644
--- a/common/sys/src/buff.rs
+++ b/common/sys/src/buff.rs
@@ -1,7 +1,7 @@
 use common::{
     comp::{
         Buff, BuffCategory, BuffChange, BuffEffect, BuffId, BuffSource, Buffs, Energy, Health,
-        HealthChange, HealthSource, Inventory, ModifierKind,
+        HealthChange, HealthSource, Inventory, ModifierKind, Stats,
     },
     event::{EventBus, ServerEvent},
     resources::DeltaTime,
@@ -27,17 +27,29 @@ impl<'a> System<'a> for Sys {
         WriteStorage<'a, Health>,
         WriteStorage<'a, Energy>,
         WriteStorage<'a, Buffs>,
+        WriteStorage<'a, Stats>,
     );
 
-    fn run(&mut self, (read_data, mut healths, mut energies, mut buffs): Self::SystemData) {
+    fn run(
+        &mut self,
+        (read_data, mut healths, mut energies, mut buffs, mut stats): Self::SystemData,
+    ) {
         let mut server_emitter = read_data.server_bus.emitter();
         let dt = read_data.dt.0;
         // Set to false to avoid spamming server
         buffs.set_event_emission(false);
         healths.set_event_emission(false);
         energies.set_event_emission(false);
-        for (entity, mut buff_comp, mut health, mut energy) in
-            (&read_data.entities, &mut buffs, &mut healths, &mut energies).join()
+        healths.set_event_emission(false);
+        stats.set_event_emission(false);
+        for (entity, mut buff_comp, mut health, mut energy, mut stat) in (
+            &read_data.entities,
+            &mut buffs,
+            &mut healths,
+            &mut energies,
+            &mut stats,
+        )
+            .join()
         {
             let (buff_comp_kinds, buff_comp_buffs) = buff_comp.parts();
             let mut expired_buffs = Vec::<BuffId>::new();
@@ -61,13 +73,12 @@ impl<'a> System<'a> for Sys {
                 }
             }
 
-            if let Some(inventory) = read_data.inventories.get(entity) {
-                let damage_reduction = Damage::compute_damage_reduction(inventory);
-                if (damage_reduction - 1.0).abs() < f32::EPSILON {
-                    for (id, buff) in buff_comp.buffs.iter() {
-                        if !buff.kind.is_buff() {
-                            expired_buffs.push(*id);
-                        }
+            let damage_reduction =
+                Damage::compute_damage_reduction(read_data.inventories.get(entity), Some(&stat));
+            if (damage_reduction - 1.0).abs() < f32::EPSILON {
+                for (id, buff) in buff_comp.buffs.iter() {
+                    if !buff.kind.is_buff() {
+                        expired_buffs.push(*id);
                     }
                 }
             }
@@ -77,6 +88,7 @@ impl<'a> System<'a> for Sys {
             energy.last_set();
             health.reset_max();
             energy.reset_max();
+            stat.damage_reduction = 0.0;
 
             // Iterator over the lists of buffs by kind
             let buff_comp = &mut *buff_comp;
@@ -147,6 +159,9 @@ impl<'a> System<'a> for Sys {
                                     energy.set_maximum(new_max);
                                 },
                             },
+                            BuffEffect::ImmuneToAttacks => {
+                                stat.damage_reduction = 1.0;
+                            },
                         };
                     }
                 }
@@ -176,6 +191,7 @@ impl<'a> System<'a> for Sys {
         buffs.set_event_emission(true);
         healths.set_event_emission(true);
         energies.set_event_emission(true);
+        stats.set_event_emission(true);
     }
 }
 
diff --git a/common/sys/src/melee.rs b/common/sys/src/melee.rs
index d9e248c720..548b76f143 100644
--- a/common/sys/src/melee.rs
+++ b/common/sys/src/melee.rs
@@ -1,6 +1,6 @@
 use common::{
-    combat::AttackerInfo,
-    comp::{Body, CharacterState, Energy, Group, Health, Inventory, Melee, Ori, Pos, Scale},
+    combat::{AttackerInfo, TargetInfo},
+    comp::{Body, CharacterState, Energy, Group, Health, Inventory, Melee, Ori, Pos, Scale, Stats},
     event::{EventBus, ServerEvent},
     metrics::SysMetrics,
     span,
@@ -29,6 +29,7 @@ pub struct ReadData<'a> {
     char_states: ReadStorage<'a, CharacterState>,
     server_bus: Read<'a, EventBus<ServerEvent>>,
     metrics: ReadExpect<'a, SysMetrics>,
+    stats: ReadStorage<'a, Stats>,
 }
 
 /// This system is responsible for handling accepted inputs like moving or
@@ -114,11 +115,16 @@ impl<'a> System<'a> for Sys {
                         energy: read_data.energies.get(attacker),
                     });
 
+                    let target_info = TargetInfo {
+                        entity: target,
+                        inventory: read_data.inventories.get(target),
+                        stats: read_data.stats.get(target),
+                    };
+
                     melee_attack.attack.apply_attack(
                         target_group,
                         attacker_info,
-                        target,
-                        read_data.inventories.get(target),
+                        target_info,
                         dir,
                         is_dodge,
                         1.0,
diff --git a/common/sys/src/projectile.rs b/common/sys/src/projectile.rs
index 329ad2df36..45701c3cb3 100644
--- a/common/sys/src/projectile.rs
+++ b/common/sys/src/projectile.rs
@@ -1,7 +1,8 @@
 use common::{
-    combat::AttackerInfo,
+    combat::{AttackerInfo, TargetInfo},
     comp::{
-        projectile, Energy, Group, HealthSource, Inventory, Ori, PhysicsState, Pos, Projectile, Vel,
+        projectile, Energy, Group, HealthSource, Inventory, Ori, PhysicsState, Pos, Projectile,
+        Stats, Vel,
     },
     event::{EventBus, ServerEvent},
     metrics::SysMetrics,
@@ -30,6 +31,7 @@ pub struct ReadData<'a> {
     inventories: ReadStorage<'a, Inventory>,
     groups: ReadStorage<'a, Group>,
     energies: ReadStorage<'a, Energy>,
+    stats: ReadStorage<'a, Stats>,
 }
 
 /// This system is responsible for handling projectile effect triggers
@@ -93,7 +95,7 @@ impl<'a> System<'a> for Sys {
                 for effect in projectile.hit_entity.drain(..) {
                     match effect {
                         projectile::Effect::Attack(attack) => {
-                            if let Some(target_entity) = read_data
+                            if let Some(target) = read_data
                                 .uid_allocator
                                 .retrieve_entity_internal(other.into())
                             {
@@ -110,11 +112,16 @@ impl<'a> System<'a> for Sys {
                                         }
                                     });
 
+                                let target_info = TargetInfo {
+                                    entity: target,
+                                    inventory: read_data.inventories.get(target),
+                                    stats: read_data.stats.get(target),
+                                };
+
                                 attack.apply_attack(
                                     target_group,
                                     attacker_info,
-                                    target_entity,
-                                    read_data.inventories.get(target_entity),
+                                    target_info,
                                     ori.look_dir(),
                                     false,
                                     1.0,
diff --git a/common/sys/src/shockwave.rs b/common/sys/src/shockwave.rs
index 0085125f75..80b5a12efa 100644
--- a/common/sys/src/shockwave.rs
+++ b/common/sys/src/shockwave.rs
@@ -1,8 +1,8 @@
 use common::{
-    combat::AttackerInfo,
+    combat::{AttackerInfo, TargetInfo},
     comp::{
         Body, Energy, Group, Health, HealthSource, Inventory, Last, Ori, PhysicsState, Pos, Scale,
-        Shockwave, ShockwaveHitEntities,
+        Shockwave, ShockwaveHitEntities, Stats,
     },
     event::{EventBus, ServerEvent},
     resources::{DeltaTime, Time},
@@ -34,6 +34,7 @@ pub struct ReadData<'a> {
     groups: ReadStorage<'a, Group>,
     physics_states: ReadStorage<'a, PhysicsState>,
     energies: ReadStorage<'a, Energy>,
+    stats: ReadStorage<'a, Stats>,
 }
 
 /// This system is responsible for handling accepted inputs like moving or
@@ -176,11 +177,16 @@ impl<'a> System<'a> for Sys {
                                 energy: read_data.energies.get(entity),
                             });
 
+                    let target_info = TargetInfo {
+                        entity: target,
+                        inventory: read_data.inventories.get(target),
+                        stats: read_data.stats.get(target),
+                    };
+
                     shockwave.properties.attack.apply_attack(
                         target_group,
                         attacker_info,
-                        target,
-                        read_data.inventories.get(target),
+                        target_info,
                         dir,
                         false,
                         1.0,
diff --git a/server/src/cmd.rs b/server/src/cmd.rs
index 0cd6ed1c7d..e81cac9d0f 100644
--- a/server/src/cmd.rs
+++ b/server/src/cmd.rs
@@ -975,17 +975,30 @@ fn handle_spawn_campfire(
                     animated: true,
                 })
                 .with(WaypointArea::default())
-                .with(comp::Auras::new(Aura::new(
-                    AuraKind::Buff {
-                        kind: BuffKind::CampfireHeal,
-                        data: BuffData::new(0.02, Some(Duration::from_secs(1))),
-                        category: BuffCategory::Natural,
-                        source: BuffSource::World,
-                    },
-                    5.0,
-                    None,
-                    AuraTarget::All,
-                )))
+                .with(comp::Auras::new(vec![
+                    Aura::new(
+                        AuraKind::Buff {
+                            kind: BuffKind::CampfireHeal,
+                            data: BuffData::new(0.02, Some(Duration::from_secs(1))),
+                            category: BuffCategory::Natural,
+                            source: BuffSource::World,
+                        },
+                        5.0,
+                        None,
+                        AuraTarget::All,
+                    ),
+                    Aura::new(
+                        AuraKind::Buff {
+                            kind: BuffKind::Invulnerability,
+                            data: BuffData::new(1.0, Some(Duration::from_secs(1))),
+                            category: BuffCategory::Natural,
+                            source: BuffSource::World,
+                        },
+                        100.0,
+                        None,
+                        AuraTarget::All,
+                    ),
+                ]))
                 .build();
 
             server.notify_client(
diff --git a/server/src/events/entity_creation.rs b/server/src/events/entity_creation.rs
index 6f7bab4552..0f02d79cb4 100644
--- a/server/src/events/entity_creation.rs
+++ b/server/src/events/entity_creation.rs
@@ -191,7 +191,7 @@ pub fn handle_create_waypoint(server: &mut Server, pos: Vec3<f32>) {
         })
         .with(WaypointArea::default())
         .with(comp::Mass(10_f32.powi(10)))
-        .with(comp::Auras::new(Aura::new(
+        .with(comp::Auras::new(vec![Aura::new(
             AuraKind::Buff {
                 kind: BuffKind::CampfireHeal,
                 data: BuffData::new(0.02, Some(Duration::from_secs(1))),
@@ -201,6 +201,6 @@ pub fn handle_create_waypoint(server: &mut Server, pos: Vec3<f32>) {
             5.0,
             None,
             AuraTarget::All,
-        )))
+        )]))
         .build();
 }
diff --git a/server/src/events/entity_manipulation.rs b/server/src/events/entity_manipulation.rs
index cb4762e5a9..2a42c497ab 100644
--- a/server/src/events/entity_manipulation.rs
+++ b/server/src/events/entity_manipulation.rs
@@ -511,14 +511,16 @@ pub fn handle_land_on_ground(server: &Server, entity: EcsEntity, vel: Vec3<f32>)
     if vel.z <= -30.0 {
         let falldmg = (vel.z.powi(2) / 20.0 - 40.0) * 10.0;
         let inventories = state.ecs().read_storage::<Inventory>();
+        let stats = state.ecs().read_storage::<Stats>();
         // Handle health change
         if let Some(mut health) = state.ecs().write_storage::<comp::Health>().get_mut(entity) {
             let damage = Damage {
                 source: DamageSource::Falling,
                 value: falldmg,
             };
-            let change =
-                damage.calculate_health_change(inventories.get(entity), None, false, 0.0, 1.0);
+            let damage_reduction =
+                Damage::compute_damage_reduction(inventories.get(entity), stats.get(entity));
+            let change = damage.calculate_health_change(damage_reduction, None, false, 0.0, 1.0);
             health.change_by(change);
         }
         // Handle poise change
@@ -674,14 +676,15 @@ pub fn handle_explosion(server: &Server, pos: Vec3<f32>, explosion: Explosion, o
             },
             RadiusEffect::Attack(attack) => {
                 let energies = &ecs.read_storage::<comp::Energy>();
-                for (entity_b, pos_b, _health_b, inventory_b_maybe) in (
+                for (entity_b, pos_b, _health_b, inventory_b_maybe, stats_b_maybe) in (
                     &ecs.entities(),
                     &ecs.read_storage::<comp::Pos>(),
                     &ecs.read_storage::<comp::Health>(),
                     ecs.read_storage::<comp::Inventory>().maybe(),
+                    ecs.read_storage::<comp::Stats>().maybe(),
                 )
                     .join()
-                    .filter(|(_, _, h, _)| !h.is_dead)
+                    .filter(|(_, _, h, _, _)| !h.is_dead)
                 {
                     // Check if it is a hit
                     let distance_squared = pos.distance_squared(pos_b.0);
@@ -714,13 +717,18 @@ pub fn handle_explosion(server: &Server, pos: Vec3<f32>, explosion: Explosion, o
                                     energy: energies.get(entity),
                                 });
 
+                        let target_info = combat::TargetInfo {
+                            entity: entity_b,
+                            inventory: inventory_b_maybe,
+                            stats: stats_b_maybe,
+                        };
+
                         let server_eventbus = ecs.read_resource::<EventBus<ServerEvent>>();
 
                         attack.apply_attack(
                             target_group,
                             attacker_info,
-                            entity_b,
-                            inventory_b_maybe,
+                            target_info,
                             dir,
                             false,
                             strength,
diff --git a/server/src/state_ext.rs b/server/src/state_ext.rs
index ad1dae6fe9..6f2c5fc852 100644
--- a/server/src/state_ext.rs
+++ b/server/src/state_ext.rs
@@ -4,6 +4,7 @@ use crate::{
 };
 use common::{
     character::CharacterId,
+    combat,
     comp::{
         self,
         skills::{GeneralSkill, Skill},
@@ -89,8 +90,12 @@ impl StateExt for State {
             },
             Effect::Damage(damage) => {
                 let inventories = self.ecs().read_storage::<Inventory>();
+                let stats = self.ecs().read_storage::<comp::Stats>();
                 let change = damage.calculate_health_change(
-                    inventories.get(entity),
+                    combat::Damage::compute_damage_reduction(
+                        inventories.get(entity),
+                        stats.get(entity),
+                    ),
                     source,
                     false,
                     0.0,
diff --git a/voxygen/src/hud/bag.rs b/voxygen/src/hud/bag.rs
index f5a5db77ba..9b14022788 100644
--- a/voxygen/src/hud/bag.rs
+++ b/voxygen/src/hud/bag.rs
@@ -457,7 +457,8 @@ impl<'a> Widget for Bag<'a> {
                 });
                 let protection_txt = format!(
                     "{}%",
-                    (100.0 * Damage::compute_damage_reduction(inventory)) as i32
+                    (100.0 * Damage::compute_damage_reduction(Some(inventory), Some(self.stats)))
+                        as i32
                 );
                 let health_txt = format!("{}", (self.health.maximum() as f32 / 10.0) as usize);
                 let stamina_txt = format!("{}", (self.energy.maximum() as f32 / 10.0) as usize);
diff --git a/voxygen/src/hud/buffs.rs b/voxygen/src/hud/buffs.rs
index 62c6056818..8b6afbb4b5 100644
--- a/voxygen/src/hud/buffs.rs
+++ b/voxygen/src/hud/buffs.rs
@@ -3,7 +3,7 @@ use super::{
     BUFF_COLOR, DEBUFF_COLOR, TEXT_COLOR,
 };
 use crate::{
-    hud::{get_buff_info, BuffPosition},
+    hud::{get_buff_image, get_buff_info, BuffPosition},
     i18n::Localization,
     ui::{fonts::Fonts, ImageFrame, Tooltip, TooltipManager, Tooltipable},
     GlobalState,
@@ -201,15 +201,7 @@ impl<'a> Widget for BuffsBar<'a> {
                         max_duration
                             .map_or(1000.0, |max| cur.as_secs_f32() / max.as_secs_f32() * 1000.0)
                     }) as u32; // Percentage to determine which frame of the timer overlay is displayed
-                    let buff_img = match buff.kind {
-                        BuffKind::Regeneration { .. } => self.imgs.buff_plus_0,
-                        BuffKind::Saturation { .. } => self.imgs.buff_saturation_0,
-                        BuffKind::Potion { .. } => self.imgs.buff_potion_0,
-                        BuffKind::CampfireHeal { .. } => self.imgs.buff_campfire_heal_0,
-                        BuffKind::IncreaseMaxHealth { .. } => self.imgs.buff_healthplus_0,
-                        BuffKind::IncreaseMaxEnergy { .. } => self.imgs.buff_energyplus_0,
-                        _ => self.imgs.missing_icon,
-                    };
+                    let buff_img = get_buff_image(buff.kind, self.imgs);
                     let buff_widget = Image::new(buff_img).w_h(40.0, 40.0);
                     // Sort buffs into rows of 11 slots
                     let x = i % 6;
@@ -437,16 +429,7 @@ impl<'a> Widget for BuffsBar<'a> {
                         max_duration
                             .map_or(1000.0, |max| cur.as_secs_f32() / max.as_secs_f32() * 1000.0)
                     }) as u32;
-                    let buff_img = match buff.kind {
-                        BuffKind::Regeneration { .. } => self.imgs.buff_plus_0,
-                        BuffKind::Saturation { .. } => self.imgs.buff_saturation_0,
-                        BuffKind::Bleeding { .. } => self.imgs.debuff_bleed_0,
-                        BuffKind::Cursed { .. } => self.imgs.debuff_skull_0,
-                        BuffKind::Potion { .. } => self.imgs.buff_potion_0,
-                        BuffKind::CampfireHeal { .. } => self.imgs.buff_campfire_heal_0,
-                        BuffKind::IncreaseMaxEnergy { .. } => self.imgs.buff_energyplus_0,
-                        BuffKind::IncreaseMaxHealth { .. } => self.imgs.buff_healthplus_0,
-                    };
+                    let buff_img = get_buff_image(buff.kind, &self.imgs);
                     let buff_widget = Image::new(buff_img).w_h(40.0, 40.0);
                     // Sort buffs into rows of 6 slots
                     let x = i % 6;
diff --git a/voxygen/src/hud/group.rs b/voxygen/src/hud/group.rs
index d199b5c5b2..37f23ade30 100644
--- a/voxygen/src/hud/group.rs
+++ b/voxygen/src/hud/group.rs
@@ -6,7 +6,7 @@ use super::{
 };
 
 use crate::{
-    hud::get_buff_info,
+    hud::{get_buff_image, get_buff_info},
     i18n::Localization,
     settings::Settings,
     ui::{fonts::Fonts, ImageFrame, Tooltip, TooltipManager, Tooltipable},
@@ -504,20 +504,7 @@ impl<'a> Widget for Group<'a> {
                                         cur.as_secs_f32() / max.as_secs_f32() * 1000.0
                                     })
                                 }) as u32; // Percentage to determine which frame of the timer overlay is displayed
-                                let buff_img = match buff.kind {
-                                    BuffKind::Regeneration { .. } => self.imgs.buff_plus_0,
-                                    BuffKind::Saturation { .. } => self.imgs.buff_saturation_0,
-                                    BuffKind::Bleeding { .. } => self.imgs.debuff_bleed_0,
-                                    BuffKind::Cursed { .. } => self.imgs.debuff_skull_0,
-                                    BuffKind::Potion { .. } => self.imgs.buff_potion_0,
-                                    BuffKind::CampfireHeal { .. } => self.imgs.buff_campfire_heal_0,
-                                    BuffKind::IncreaseMaxEnergy { .. } => {
-                                        self.imgs.buff_energyplus_0
-                                    },
-                                    BuffKind::IncreaseMaxHealth { .. } => {
-                                        self.imgs.buff_healthplus_0
-                                    },
-                                };
+                                let buff_img = get_buff_image(buff.kind, &self.imgs);
                                 let buff_widget = Image::new(buff_img).w_h(15.0, 15.0);
                                 let buff_widget = if let Some(id) = prev_id {
                                     buff_widget.right_from(id, 1.0)
diff --git a/voxygen/src/hud/mod.rs b/voxygen/src/hud/mod.rs
index f7d1a5df8e..cacb20b6f2 100644
--- a/voxygen/src/hud/mod.rs
+++ b/voxygen/src/hud/mod.rs
@@ -3170,3 +3170,17 @@ pub fn cr_color(combat_rating: f32) -> Color {
         _ => XP_COLOR,
     }
 }
+
+pub fn get_buff_image(buff: BuffKind, imgs: &Imgs) -> conrod_core::image::Id {
+    match buff {
+        BuffKind::Regeneration { .. } => imgs.buff_plus_0,
+        BuffKind::Saturation { .. } => imgs.buff_saturation_0,
+        BuffKind::Bleeding { .. } => imgs.debuff_bleed_0,
+        BuffKind::Cursed { .. } => imgs.debuff_skull_0,
+        BuffKind::Potion { .. } => imgs.buff_potion_0,
+        BuffKind::CampfireHeal { .. } => imgs.buff_campfire_heal_0,
+        BuffKind::IncreaseMaxEnergy { .. } => imgs.buff_energyplus_0,
+        BuffKind::IncreaseMaxHealth { .. } => imgs.buff_healthplus_0,
+        BuffKind::Invulnerability => imgs.buff_plus_0,
+    }
+}
diff --git a/voxygen/src/hud/overhead.rs b/voxygen/src/hud/overhead.rs
index c5376f0248..d9a62e05e2 100644
--- a/voxygen/src/hud/overhead.rs
+++ b/voxygen/src/hud/overhead.rs
@@ -4,12 +4,12 @@ use super::{
     TEXT_COLOR,
 };
 use crate::{
-    hud::get_buff_info,
+    hud::{get_buff_image, get_buff_info},
     i18n::Localization,
     settings::GameplaySettings,
     ui::{fonts::Fonts, Ingameable},
 };
-use common::comp::{BuffKind, Buffs, Energy, Health, SpeechBubble, SpeechBubbleType};
+use common::comp::{Buffs, Energy, Health, SpeechBubble, SpeechBubbleType};
 use conrod_core::{
     color,
     position::Align,
@@ -236,16 +236,7 @@ impl<'a> Widget for Overhead<'a> {
                                 cur.as_secs_f32() / max.as_secs_f32() * 1000.0
                             })
                         }) as u32; // Percentage to determine which frame of the timer overlay is displayed
-                        let buff_img = match buff.kind {
-                            BuffKind::Regeneration { .. } => self.imgs.buff_plus_0,
-                            BuffKind::Saturation { .. } => self.imgs.buff_saturation_0,
-                            BuffKind::Bleeding { .. } => self.imgs.debuff_bleed_0,
-                            BuffKind::Cursed { .. } => self.imgs.debuff_skull_0,
-                            BuffKind::Potion { .. } => self.imgs.buff_potion_0,
-                            BuffKind::CampfireHeal { .. } => self.imgs.buff_campfire_heal_0,
-                            BuffKind::IncreaseMaxEnergy { .. } => self.imgs.buff_energyplus_0,
-                            BuffKind::IncreaseMaxHealth { .. } => self.imgs.buff_healthplus_0,
-                        };
+                        let buff_img = get_buff_image(buff.kind, &self.imgs);
                         let buff_widget = Image::new(buff_img).w_h(20.0, 20.0);
                         // Sort buffs into rows of 5 slots
                         let x = i % 5;

From 45c739da023e88d77854e04cd6b4e6ee43dfb8e7 Mon Sep 17 00:00:00 2001
From: Sam <samuelkeiffer@gmail.com>
Date: Sun, 28 Feb 2021 16:04:33 -0500
Subject: [PATCH 04/16] Factored formatting of buff text out to a single
 function.

---
 assets/voxygen/i18n/de_DE/_manifest.ron |   4 +-
 assets/voxygen/i18n/en/buff.ron         |   8 ++
 assets/voxygen/i18n/en/debuff.ron       |  13 ---
 assets/voxygen/i18n/es_la/_manifest.ron |   4 +-
 assets/voxygen/i18n/fr_FR/_manifest.ron |   4 +-
 assets/voxygen/i18n/no/_manifest.ron    |   4 +-
 assets/voxygen/i18n/pt_BR/buff.ron      |   2 +
 assets/voxygen/i18n/pt_BR/debuff.ron    |  13 ---
 assets/voxygen/i18n/ru_RU/_manifest.ron |   4 +-
 assets/voxygen/i18n/tr_TR/buff.ron      |   2 +
 assets/voxygen/i18n/tr_TR/debuff.ron    |  13 ---
 assets/voxygen/i18n/uk_UA/buff.ron      |   2 +
 assets/voxygen/i18n/uk_UA/debuff.ron    |  13 ---
 voxygen/src/hud/buffs.rs                | 104 ++++--------------------
 voxygen/src/hud/group.rs                |  45 ++--------
 voxygen/src/hud/mod.rs                  |  47 ++++++++++-
 16 files changed, 92 insertions(+), 190 deletions(-)
 delete mode 100644 assets/voxygen/i18n/en/debuff.ron
 delete mode 100644 assets/voxygen/i18n/pt_BR/debuff.ron
 delete mode 100644 assets/voxygen/i18n/tr_TR/debuff.ron
 delete mode 100644 assets/voxygen/i18n/uk_UA/debuff.ron

diff --git a/assets/voxygen/i18n/de_DE/_manifest.ron b/assets/voxygen/i18n/de_DE/_manifest.ron
index 08ef6db554..4326243bf3 100644
--- a/assets/voxygen/i18n/de_DE/_manifest.ron
+++ b/assets/voxygen/i18n/de_DE/_manifest.ron
@@ -537,8 +537,8 @@ Willenskraft
         "buff.title.heal": "HoT Buff Test",
         "buff.desc.heal": "HoT Buff Test",
         // Debuffs
-        "debuff.title.bleed": "Blutung",
-        "debuff.desc.bleed": "Fügt regelmäßig Schaden zu.",
+        "buff.title.bleed": "Blutung",
+        "buff.desc.bleed": "Fügt regelmäßig Schaden zu.",
     },
 
     vector_map: {
diff --git a/assets/voxygen/i18n/en/buff.ron b/assets/voxygen/i18n/en/buff.ron
index b1a8b8a401..1c0de6e367 100644
--- a/assets/voxygen/i18n/en/buff.ron
+++ b/assets/voxygen/i18n/en/buff.ron
@@ -3,6 +3,7 @@
 /// Localization for "global" English
 (
     string_map: {
+        // Buffs
         "buff.remove": "Click to remove",
         "buff.title.missing": "Missing Title",
         "buff.desc.missing": "Missing Description",
@@ -14,6 +15,13 @@
         "buff.desc.saturation": "Gain health over time from consumables.",
         "buff.title.campfire_heal": "Campfire Heal",
         "buff.desc.campfire_heal": "Resting at a campfire heals 1% per second.",
+        "buff.title.invulnerability": "Invulnerability",
+        "buff.desc.invulnerability": "You cannot be damaged by any attack.",
+        // Debuffs
+        "buff.title.bleed": "Bleeding",
+        "buff.desc.bleed": "Inflicts regular damage.",
+        "buff.title.cursed": "Cursed",
+        "buff.desc.cursed": "You are cursed.",
     },
 
 
diff --git a/assets/voxygen/i18n/en/debuff.ron b/assets/voxygen/i18n/en/debuff.ron
deleted file mode 100644
index df35b4df6b..0000000000
--- a/assets/voxygen/i18n/en/debuff.ron
+++ /dev/null
@@ -1,13 +0,0 @@
-/// WARNING: Localization files shall be saved in UTF-8 format without BOM
-
-/// Localization for "global" English
-(
-    string_map: {
-        "debuff.title.bleed": "Bleeding",
-        "debuff.desc.bleed": "Inflicts regular damage.",
-    },
-
-
-    vector_map: {
-    }
-)
diff --git a/assets/voxygen/i18n/es_la/_manifest.ron b/assets/voxygen/i18n/es_la/_manifest.ron
index 31104e3192..e54485fc71 100644
--- a/assets/voxygen/i18n/es_la/_manifest.ron
+++ b/assets/voxygen/i18n/es_la/_manifest.ron
@@ -554,8 +554,8 @@ Protección
         "buff.title.campfire_heal": "Curación de fogata",
         "buff.desc.campfire_heal": "Descansar en una fogata recupera 1% por segundo.",
         // Debuffs
-        "debuff.title.bleed": "Sangrando",
-        "debuff.desc.bleed": "Inflinge daño regularmente.",
+        "buff.title.bleed": "Sangrando",
+        "buff.desc.bleed": "Inflinge daño regularmente.",
 
 
     },
diff --git a/assets/voxygen/i18n/fr_FR/_manifest.ron b/assets/voxygen/i18n/fr_FR/_manifest.ron
index ab8b149da9..1a5dc72d59 100644
--- a/assets/voxygen/i18n/fr_FR/_manifest.ron
+++ b/assets/voxygen/i18n/fr_FR/_manifest.ron
@@ -533,8 +533,8 @@ Protection
         "buff.title.campfire_heal": "Soin autour d'un feu de camp",
         "buff.desc.campfire_heal": "Se reposer à côté d'un feu de camp restaure 1% de santé par seconde.",
         // Debuffs
-        "debuff.title.bleed": "Saignement",
-        "debuff.desc.bleed": "Inflige régulièrement des dommages.",
+        "buff.title.bleed": "Saignement",
+        "buff.desc.bleed": "Inflige régulièrement des dommages.",
     },
 
 
diff --git a/assets/voxygen/i18n/no/_manifest.ron b/assets/voxygen/i18n/no/_manifest.ron
index fa9fc1de15..9e6a7677c3 100644
--- a/assets/voxygen/i18n/no/_manifest.ron
+++ b/assets/voxygen/i18n/no/_manifest.ron
@@ -534,8 +534,8 @@ Beskyttelse
         "buff.title.saturation": "Metning",
         "buff.desc.saturation": "Helbred over tid fra forbruksvarer.",
         // Debuffs
-        "debuff.title.bleed": "Blør",
-        "debuff.desc.bleed": "Påfører regelmessig skade.",
+        "buff.title.bleed": "Blør",
+        "buff.desc.bleed": "Påfører regelmessig skade.",
     },
 
 
diff --git a/assets/voxygen/i18n/pt_BR/buff.ron b/assets/voxygen/i18n/pt_BR/buff.ron
index bd6ff52ca2..f473aa96dc 100644
--- a/assets/voxygen/i18n/pt_BR/buff.ron
+++ b/assets/voxygen/i18n/pt_BR/buff.ron
@@ -14,6 +14,8 @@
         "buff.desc.saturation": "Ganha vida no decorrer do tempo através de consumíveis.",
         "buff.title.campfire_heal": "Cura de Acampamento",
         "buff.desc.campfire_heal": "Descansar próximo a uma fogueira de acampamento cura 1% de vida por segundo.",
+        "buff.title.bleed": "Sangramento",
+        "buff.desc.bleed": "Inflige Dano contínuo.",
     },
 
 
diff --git a/assets/voxygen/i18n/pt_BR/debuff.ron b/assets/voxygen/i18n/pt_BR/debuff.ron
deleted file mode 100644
index 947d2fb6d5..0000000000
--- a/assets/voxygen/i18n/pt_BR/debuff.ron
+++ /dev/null
@@ -1,13 +0,0 @@
-/// CUIDADO: Arquivos de tradução devem ser criados no formato UTF-8 sem Marca de Ordem de byte - BOM(https://pt.wikipedia.org/wiki/Marca_de_ordem_de_byte)
-
-/// Localization for Portuguese (Brazil)
-(
-    string_map: {
-        "debuff.title.bleed": "Sangramento",
-        "debuff.desc.bleed": "Inflige Dano contínuo.",
-    },
-
-
-    vector_map: {
-    }
-)
diff --git a/assets/voxygen/i18n/ru_RU/_manifest.ron b/assets/voxygen/i18n/ru_RU/_manifest.ron
index d5effe23ef..59cccf95fe 100644
--- a/assets/voxygen/i18n/ru_RU/_manifest.ron
+++ b/assets/voxygen/i18n/ru_RU/_manifest.ron
@@ -550,8 +550,8 @@ https://veloren.net/account/."#,
         "buff.title.saturation": "Сыт",
         "buff.desc.saturation": "Получайте здоровье от расходников в течении времени.",
         // Debuffs
-        "debuff.title.bleed": "Кровотечение",
-        "debuff.desc.bleed": "Наносит переодический урон.",
+        "buff.title.bleed": "Кровотечение",
+        "buff.desc.bleed": "Наносит переодический урон.",
 
     },
 
diff --git a/assets/voxygen/i18n/tr_TR/buff.ron b/assets/voxygen/i18n/tr_TR/buff.ron
index 9ebea8bd2e..398ed2acd9 100644
--- a/assets/voxygen/i18n/tr_TR/buff.ron
+++ b/assets/voxygen/i18n/tr_TR/buff.ron
@@ -14,6 +14,8 @@
         "buff.desc.saturation": "Tüketilebilen maddelerden zamanla can kazan.",
         "buff.title.campfire_heal": "Kamp Ateşi",
         "buff.desc.campfire_heal": "Kamp ateşinin yakınında oturmak canını saniyede %1 iyileştirir.",
+        "buff.title.bleed": "Kanama",
+        "buff.desc.bleed": "Devamlı hasar verir.",
     },
 
     vector_map: {
diff --git a/assets/voxygen/i18n/tr_TR/debuff.ron b/assets/voxygen/i18n/tr_TR/debuff.ron
deleted file mode 100644
index b61b4557f5..0000000000
--- a/assets/voxygen/i18n/tr_TR/debuff.ron
+++ /dev/null
@@ -1,13 +0,0 @@
-/// WARNING: Localization files shall be saved in UTF-8 format without BOM
-
-/// Localization for Turkish (Turkey)
-(
-    string_map: {
-        "debuff.title.bleed": "Kanama",
-        "debuff.desc.bleed": "Devamlı hasar verir.",
-    },
-
-
-    vector_map: {
-    }
-)
diff --git a/assets/voxygen/i18n/uk_UA/buff.ron b/assets/voxygen/i18n/uk_UA/buff.ron
index 81ce8a6b4c..9859b7b660 100644
--- a/assets/voxygen/i18n/uk_UA/buff.ron
+++ b/assets/voxygen/i18n/uk_UA/buff.ron
@@ -14,6 +14,8 @@
         "buff.desc.saturation": "Поступово відновлює здоров'я з їжі.",
         "buff.title.campfire_heal": "Відновлення біля ватри",
         "buff.desc.campfire_heal": "Відпочинок біля ватри лікує на 1% за секунду.",
+        "buff.title.bleed": "Кровотеча",
+        "buff.desc.bleed": "Наносить регулярні ушкодження.",
     },
 
 
diff --git a/assets/voxygen/i18n/uk_UA/debuff.ron b/assets/voxygen/i18n/uk_UA/debuff.ron
deleted file mode 100644
index 477443db4c..0000000000
--- a/assets/voxygen/i18n/uk_UA/debuff.ron
+++ /dev/null
@@ -1,13 +0,0 @@
-/// WARNING: Localization files shall be saved in UTF-8 format without BOM
-
-/// Localization for Ukrainian
-(
-    string_map: {
-        "debuff.title.bleed": "Кровотеча",
-        "debuff.desc.bleed": "Наносить регулярні ушкодження.",
-    },
-
-
-    vector_map: {
-    }
-)
diff --git a/voxygen/src/hud/buffs.rs b/voxygen/src/hud/buffs.rs
index 8b6afbb4b5..ed351b905c 100644
--- a/voxygen/src/hud/buffs.rs
+++ b/voxygen/src/hud/buffs.rs
@@ -3,7 +3,7 @@ use super::{
     BUFF_COLOR, DEBUFF_COLOR, TEXT_COLOR,
 };
 use crate::{
-    hud::{get_buff_image, get_buff_info, BuffPosition},
+    hud::{self, BuffPosition},
     i18n::Localization,
     ui::{fonts::Fonts, ImageFrame, Tooltip, TooltipManager, Tooltipable},
     GlobalState,
@@ -145,7 +145,7 @@ impl<'a> Widget for BuffsBar<'a> {
                 .set(state.ids.buffs_align, ui);
 
             // Buffs and Debuffs
-            let (buff_count, debuff_count) = buffs.iter_active().map(get_buff_info).fold(
+            let (buff_count, debuff_count) = buffs.iter_active().map(hud::get_buff_info).fold(
                 (0, 0),
                 |(buff_count, debuff_count), info| {
                     if info.is_buff {
@@ -183,7 +183,7 @@ impl<'a> Widget for BuffsBar<'a> {
                 .zip(
                     buffs
                         .iter_active()
-                        .map(get_buff_info)
+                        .map(hud::get_buff_info)
                         .filter(|info| info.is_buff),
                 )
                 .collect::<Vec<_>>();
@@ -201,7 +201,7 @@ impl<'a> Widget for BuffsBar<'a> {
                         max_duration
                             .map_or(1000.0, |max| cur.as_secs_f32() / max.as_secs_f32() * 1000.0)
                     }) as u32; // Percentage to determine which frame of the timer overlay is displayed
-                    let buff_img = get_buff_image(buff.kind, self.imgs);
+                    let buff_img = hud::get_buff_image(buff.kind, self.imgs);
                     let buff_widget = Image::new(buff_img).w_h(40.0, 40.0);
                     // Sort buffs into rows of 11 slots
                     let x = i % 6;
@@ -221,46 +221,10 @@ impl<'a> Widget for BuffsBar<'a> {
                         )
                         .set(*id, ui);
                     // Create Buff tooltip
-                    let title = match buff.kind {
-                        BuffKind::Regeneration { .. } => localized_strings.get("buff.title.heal"),
-                        BuffKind::Saturation { .. } => {
-                            localized_strings.get("buff.title.saturation")
-                        },
-                        BuffKind::Potion { .. } => localized_strings.get("buff.title.potion"),
-                        BuffKind::CampfireHeal { .. } => {
-                            localized_strings.get("buff.title.campfire_heal")
-                        },
-                        BuffKind::IncreaseMaxHealth { .. } => {
-                            localized_strings.get("buff.title.IncreaseMaxHealth")
-                        },
-                        BuffKind::IncreaseMaxEnergy { .. } => {
-                            localized_strings.get("buff.title.staminaup")
-                        },
-                        _ => localized_strings.get("buff.title.missing"),
-                    };
-                    let remaining_time = if current_duration.is_none() {
-                        "Permanent".to_string()
-                    } else {
-                        format!("Remaining: {:.0}s", current_duration.unwrap().as_secs_f32())
-                    };
+                    let title = hud::get_buff_title(buff.kind, localized_strings);
+                    let desc_txt = hud::get_buff_desc(buff.kind, localized_strings);
+                    let remaining_time = hud::get_buff_time(*buff);
                     let click_to_remove = format!("<{}>", &localized_strings.get("buff.remove"));
-                    let desc_txt = match buff.kind {
-                        BuffKind::Regeneration { .. } => localized_strings.get("buff.desc.heal"),
-                        BuffKind::Saturation { .. } => {
-                            localized_strings.get("buff.desc.saturation")
-                        },
-                        BuffKind::Potion { .. } => localized_strings.get("buff.desc.potion"),
-                        BuffKind::CampfireHeal { .. } => {
-                            localized_strings.get("buff.desc.campfire_heal")
-                        },
-                        BuffKind::IncreaseMaxHealth { .. } => {
-                            localized_strings.get("buff.desc.IncreaseMaxHealth")
-                        },
-                        BuffKind::IncreaseMaxEnergy { .. } => {
-                            localized_strings.get("buff.desc.IncreaseMaxEnergy")
-                        },
-                        _ => localized_strings.get("buff.desc.missing"),
-                    };
                     let desc = format!("{}\n\n{}\n\n{}", desc_txt, remaining_time, click_to_remove);
                     // Timer overlay
                     if Button::image(match duration_percentage as u64 {
@@ -300,7 +264,7 @@ impl<'a> Widget for BuffsBar<'a> {
                 .zip(
                     buffs
                         .iter_active()
-                        .map(get_buff_info)
+                        .map(hud::get_buff_info)
                         .filter(|info| !info.is_buff),
                 )
                 .collect::<Vec<_>>();
@@ -343,19 +307,9 @@ impl<'a> Widget for BuffsBar<'a> {
                         )
                         .set(*id, ui);
                     // Create Debuff tooltip
-                    let title = match debuff.kind {
-                        BuffKind::Bleeding { .. } => localized_strings.get("debuff.title.bleed"),
-                        _ => localized_strings.get("buff.title.missing"),
-                    };
-                    let remaining_time = if current_duration.is_none() {
-                        "Permanent".to_string()
-                    } else {
-                        format!("Remaining: {:.0}s", current_duration.unwrap().as_secs_f32())
-                    };
-                    let desc_txt = match debuff.kind {
-                        BuffKind::Bleeding { .. } => localized_strings.get("debuff.desc.bleed"),
-                        _ => localized_strings.get("debuff.desc.missing"),
-                    };
+                    let title = hud::get_buff_title(debuff.kind, localized_strings);
+                    let desc_txt = hud::get_buff_desc(debuff.kind, localized_strings);
+                    let remaining_time = hud::get_buff_time(*debuff);
                     let desc = format!("{}\n\n{}", desc_txt, remaining_time);
                     Image::new(match duration_percentage as u64 {
                         875..=1000 => self.imgs.nothing, // 8/8
@@ -412,7 +366,7 @@ impl<'a> Widget for BuffsBar<'a> {
                 .copied()
                 .zip(state.ids.buff_timers.iter().copied())
                 .zip(state.ids.buff_txts.iter().copied())
-                .zip(buffs.iter_active().map(get_buff_info))
+                .zip(buffs.iter_active().map(hud::get_buff_info))
                 .collect::<Vec<_>>();
 
             // Sort the buffs by kind
@@ -429,7 +383,7 @@ impl<'a> Widget for BuffsBar<'a> {
                         max_duration
                             .map_or(1000.0, |max| cur.as_secs_f32() / max.as_secs_f32() * 1000.0)
                     }) as u32;
-                    let buff_img = get_buff_image(buff.kind, &self.imgs);
+                    let buff_img = hud::get_buff_image(buff.kind, &self.imgs);
                     let buff_widget = Image::new(buff_img).w_h(40.0, 40.0);
                     // Sort buffs into rows of 6 slots
                     let x = i % 6;
@@ -449,36 +403,10 @@ impl<'a> Widget for BuffsBar<'a> {
                         )
                         .set(*id, ui);
                     // Create Buff tooltip
-                    let title = match buff.kind {
-                        BuffKind::Regeneration { .. } => localized_strings.get("buff.title.heal"),
-                        BuffKind::Saturation { .. } => {
-                            localized_strings.get("buff.title.saturation")
-                        },
-                        BuffKind::Potion { .. } => localized_strings.get("buff.title.potion"),
-                        BuffKind::Bleeding { .. } => localized_strings.get("debuff.title.bleed"),
-                        BuffKind::CampfireHeal { .. } => {
-                            localized_strings.get("buff.title.campfire_heal")
-                        },
-                        _ => localized_strings.get("buff.title.missing"),
-                    };
-                    let remaining_time = if current_duration.is_none() {
-                        "".to_string()
-                    } else {
-                        format!("{:.0}s", current_duration.unwrap().as_secs_f32())
-                    };
+                    let title = hud::get_buff_title(buff.kind, localized_strings);
+                    let desc_txt = hud::get_buff_desc(buff.kind, localized_strings);
+                    let remaining_time = hud::get_buff_time(*buff);
                     let click_to_remove = format!("<{}>", &localized_strings.get("buff.remove"));
-                    let desc_txt = match buff.kind {
-                        BuffKind::Regeneration { .. } => localized_strings.get("buff.desc.heal"),
-                        BuffKind::Saturation { .. } => {
-                            localized_strings.get("buff.desc.saturation")
-                        },
-                        BuffKind::Potion { .. } => localized_strings.get("buff.desc.potion"),
-                        BuffKind::Bleeding { .. } => localized_strings.get("debuff.desc.bleed"),
-                        BuffKind::CampfireHeal { .. } => {
-                            localized_strings.get("buff.desc.campfire_heal")
-                        },
-                        _ => localized_strings.get("buff.desc.missing"),
-                    };
                     let desc = if buff.is_buff {
                         format!("{}\n\n{}", desc_txt, click_to_remove)
                     } else {
diff --git a/voxygen/src/hud/group.rs b/voxygen/src/hud/group.rs
index 37f23ade30..ab756dd06d 100644
--- a/voxygen/src/hud/group.rs
+++ b/voxygen/src/hud/group.rs
@@ -6,7 +6,7 @@ use super::{
 };
 
 use crate::{
-    hud::{get_buff_image, get_buff_info},
+    hud,
     i18n::Localization,
     settings::Settings,
     ui::{fonts::Fonts, ImageFrame, Tooltip, TooltipManager, Tooltipable},
@@ -16,9 +16,7 @@ use crate::{
 use client::{self, Client};
 use common::{
     combat,
-    comp::{
-        group::Role, inventory::item::MaterialStatManifest, invite::InviteKind, BuffKind, Stats,
-    },
+    comp::{group::Role, inventory::item::MaterialStatManifest, invite::InviteKind, Stats},
     uid::{Uid, UidAllocator},
 };
 use common_net::sync::WorldSyncExt;
@@ -493,7 +491,7 @@ impl<'a> Widget for Group<'a> {
                             .copied()
                             .zip(state.ids.buff_timers.iter().copied())
                             .skip(total_buff_count - buff_count)
-                            .zip(buffs.iter_active().map(get_buff_info))
+                            .zip(buffs.iter_active().map(hud::get_buff_info))
                             .for_each(|((id, timer_id), buff)| {
                                 let max_duration = buff.data.duration;
                                 let pulsating_col = Color::Rgba(1.0, 1.0, 1.0, buff_ani);
@@ -504,7 +502,7 @@ impl<'a> Widget for Group<'a> {
                                         cur.as_secs_f32() / max.as_secs_f32() * 1000.0
                                     })
                                 }) as u32; // Percentage to determine which frame of the timer overlay is displayed
-                                let buff_img = get_buff_image(buff.kind, &self.imgs);
+                                let buff_img = hud::get_buff_image(buff.kind, &self.imgs);
                                 let buff_widget = Image::new(buff_img).w_h(15.0, 15.0);
                                 let buff_widget = if let Some(id) = prev_id {
                                     buff_widget.right_from(id, 1.0)
@@ -528,38 +526,9 @@ impl<'a> Widget for Group<'a> {
                                     )
                                     .set(id, ui);
                                 // Create Buff tooltip
-                                let title = match buff.kind {
-                                    BuffKind::Regeneration { .. } => {
-                                        localized_strings.get("buff.title.heal")
-                                    },
-                                    BuffKind::Saturation { .. } => {
-                                        localized_strings.get("buff.title.saturation")
-                                    },
-                                    BuffKind::Bleeding { .. } => {
-                                        localized_strings.get("debuff.title.bleed")
-                                    },
-                                    _ => localized_strings.get("buff.title.missing"),
-                                };
-                                let remaining_time = if current_duration.is_none() {
-                                    "Permanent".to_string()
-                                } else {
-                                    format!(
-                                        "Remaining: {:.0}s",
-                                        current_duration.unwrap().as_secs_f32()
-                                    )
-                                };
-                                let desc_txt = match buff.kind {
-                                    BuffKind::Regeneration { .. } => {
-                                        localized_strings.get("buff.desc.heal")
-                                    },
-                                    BuffKind::Saturation { .. } => {
-                                        localized_strings.get("buff.desc.saturation")
-                                    },
-                                    BuffKind::Bleeding { .. } => {
-                                        localized_strings.get("debuff.desc.bleed")
-                                    },
-                                    _ => localized_strings.get("buff.desc.missing"),
-                                };
+                                let title = hud::get_buff_title(buff.kind, localized_strings);
+                                let desc_txt = hud::get_buff_desc(buff.kind, localized_strings);
+                                let remaining_time = hud::get_buff_time(buff);
                                 let desc = format!("{}\n\n{}", desc_txt, remaining_time);
                                 Image::new(match duration_percentage as u64 {
                                     875..=1000 => self.imgs.nothing, // 8/8
diff --git a/voxygen/src/hud/mod.rs b/voxygen/src/hud/mod.rs
index cacb20b6f2..2081832dc6 100644
--- a/voxygen/src/hud/mod.rs
+++ b/voxygen/src/hud/mod.rs
@@ -3173,14 +3173,57 @@ pub fn cr_color(combat_rating: f32) -> Color {
 
 pub fn get_buff_image(buff: BuffKind, imgs: &Imgs) -> conrod_core::image::Id {
     match buff {
+        // Buffs
         BuffKind::Regeneration { .. } => imgs.buff_plus_0,
         BuffKind::Saturation { .. } => imgs.buff_saturation_0,
-        BuffKind::Bleeding { .. } => imgs.debuff_bleed_0,
-        BuffKind::Cursed { .. } => imgs.debuff_skull_0,
         BuffKind::Potion { .. } => imgs.buff_potion_0,
         BuffKind::CampfireHeal { .. } => imgs.buff_campfire_heal_0,
         BuffKind::IncreaseMaxEnergy { .. } => imgs.buff_energyplus_0,
         BuffKind::IncreaseMaxHealth { .. } => imgs.buff_healthplus_0,
+        // TODO: Before merge replace with actual icon
         BuffKind::Invulnerability => imgs.buff_plus_0,
+        //  Debuffs
+        BuffKind::Bleeding { .. } => imgs.debuff_bleed_0,
+        BuffKind::Cursed { .. } => imgs.debuff_skull_0,
+    }
+}
+
+pub fn get_buff_title(buff: BuffKind, localized_strings: &Localization) -> &str {
+    match buff {
+        // Buffs
+        BuffKind::Regeneration { .. } => localized_strings.get("buff.title.heal"),
+        BuffKind::Saturation { .. } => localized_strings.get("buff.title.saturation"),
+        BuffKind::Potion { .. } => localized_strings.get("buff.title.potion"),
+        BuffKind::CampfireHeal { .. } => localized_strings.get("buff.title.campfire_heal"),
+        BuffKind::IncreaseMaxHealth { .. } => localized_strings.get("buff.title.IncreaseMaxHealth"),
+        BuffKind::IncreaseMaxEnergy { .. } => localized_strings.get("buff.title.staminaup"),
+        BuffKind::Invulnerability => localized_strings.get("buff.title.invulnerability"),
+        // Debuffs
+        BuffKind::Bleeding { .. } => localized_strings.get("buff.title.bleed"),
+        BuffKind::Cursed { .. } => localized_strings.get("buff.title.cursed"),
+    }
+}
+
+pub fn get_buff_desc(buff: BuffKind, localized_strings: &Localization) -> &str {
+    match buff {
+        // Buffs
+        BuffKind::Regeneration { .. } => localized_strings.get("buff.desc.heal"),
+        BuffKind::Saturation { .. } => localized_strings.get("buff.desc.saturation"),
+        BuffKind::Potion { .. } => localized_strings.get("buff.desc.potion"),
+        BuffKind::CampfireHeal { .. } => localized_strings.get("buff.desc.campfire_heal"),
+        BuffKind::IncreaseMaxHealth { .. } => localized_strings.get("buff.desc.IncreaseMaxHealth"),
+        BuffKind::IncreaseMaxEnergy { .. } => localized_strings.get("buff.desc.IncreaseMaxEnergy"),
+        BuffKind::Invulnerability => localized_strings.get("buff.desc.invulnerability"),
+        // Debuffs
+        BuffKind::Bleeding { .. } => localized_strings.get("buff.desc.bleed"),
+        BuffKind::Cursed { .. } => localized_strings.get("buff.desc.cursed"),
+    }
+}
+
+pub fn get_buff_time(buff: BuffInfo) -> String {
+    if let Some(dur) = buff.dur {
+        format!("Remaining: {:.0}s", dur.as_secs_f32())
+    } else {
+        "Permanent".to_string()
     }
 }

From 3f72de01f5690eb919c8ac288bf4b8d9cb113e4b Mon Sep 17 00:00:00 2001
From: ccgauche <gaucheron.laurent@gmail.com>
Date: Sun, 28 Feb 2021 22:39:53 +0100
Subject: [PATCH 05/16] Update lib.rs

---
 plugin/api/src/lib.rs | 128 +++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 125 insertions(+), 3 deletions(-)

diff --git a/plugin/api/src/lib.rs b/plugin/api/src/lib.rs
index 043ac0ea0f..0ce193cac7 100644
--- a/plugin/api/src/lib.rs
+++ b/plugin/api/src/lib.rs
@@ -8,7 +8,27 @@ pub use common::{resources::GameMode, uid::Uid};
 mod errors;
 
 pub use errors::*;
+pub use event::*;
 
+/// The [`Action`] enum represents a push modification that will be made in the
+/// ECS in the next tick Note that all actions when sent are async and will not
+/// be executed in order like [`Retrieve`] that are sync. All actions sent will
+/// be executed in the send order in the ticking before the rest of the logic
+/// applies.
+///
+/// # Usage:
+/// ```rust
+/// # use veloren_plugin_api::*;
+/// # pub fn emit_action(action: Action) { emit_actions(vec![action]) }
+/// # pub fn emit_actions(_actions: Vec<Action>) {}
+/// // Packing actions is better than sending multiple ones at the same time!
+/// emit_actions(vec![
+///     Action::KillEntity(Uid(1)),
+///     Action::PlayerSendMessage(Uid(0), "This is a test message".to_owned()),
+/// ]);
+/// // You can also use this to only send one action
+/// emit_action(Action::KillEntity(Uid(1)));
+/// ```
 #[derive(Deserialize, Serialize, Debug)]
 pub enum Action {
     ServerClose,
@@ -17,26 +37,98 @@ pub enum Action {
     KillEntity(Uid),
 }
 
+/// The [`Retrieve`] enum represents read of the ECS is sync and blocking.
+/// This enum shouldn't be used by itself. You should always prefer `get`
+/// methods on Plugin API Types For instance, prefer this method:
+/// ```rust
+/// # use veloren_plugin_api::*;
+/// # let entityid = Player {id: Uid(0)};
+/// # trait G { fn get_entity_health(&self) -> Option<i64>; }
+/// # impl G for Player {fn get_entity_health(&self) -> Option<i64> {Some(1)}}
+/// let life = entityid.get_entity_health().unwrap();
+/// // Do something with life
+/// ```
+/// Over this one:
+/// ```rust
+/// # use veloren_plugin_api::*;
+/// # let entityid = Uid(0);
+/// # fn retrieve_action(r: &Retrieve) -> Result<RetrieveResult, RetrieveError> { Ok(RetrieveResult::GetEntityHealth(Health::empty()))}
+/// let life = if let RetrieveResult::GetEntityHealth(e) =
+///     retrieve_action(&Retrieve::GetEntityHealth(entityid)).unwrap()
+/// {
+///     e
+/// } else {
+///      unreachable!()
+/// };
+/// // Do something with life
+/// ```
 #[derive(Deserialize, Serialize, Debug)]
 pub enum Retrieve {
     GetPlayerName(Uid),
     GetEntityHealth(Uid),
 }
 
+/// The [`RetrieveResult`] struct is generated while using the `retrieve_action`
+/// function
+///
+/// You should always prefer using `get` methods available in Plugin API types.
+///
+/// Example:
+/// ```rust
+/// # use veloren_plugin_api::*;
+/// # let entityid = Uid(0);
+/// # fn retrieve_action(r: &Retrieve) -> Result<RetrieveResult, RetrieveError> { Ok(RetrieveResult::GetEntityHealth(Health::empty()))}
+/// let life = if let RetrieveResult::GetEntityHealth(e) =
+///     retrieve_action(&Retrieve::GetEntityHealth(entityid)).unwrap()
+/// {
+///     e
+/// } else {
+///      unreachable!()
+/// };
+/// // Do something with life
+/// ```
 #[derive(Serialize, Deserialize, Debug)]
 pub enum RetrieveResult {
     GetPlayerName(String),
     GetEntityHealth(Health),
 }
 
+/// This trait is implement by all events and ensure type safety of FFI.
 pub trait Event: Serialize + DeserializeOwned + Send + Sync {
     type Response: Serialize + DeserializeOwned + Send + Sync;
 }
 
+/// This module contains all events from the api
 pub mod event {
     use super::*;
     use serde::{Deserialize, Serialize};
 
+    /// This event is called when a chat command is run.
+    /// Your event should be named `on_command_<Your command>`
+    ///
+    /// If you return an Error the displayed message will be the error message
+    /// in red You can return a Vec<String> that will be print to player
+    /// chat as info
+    ///
+    /// # Example
+    /// ```ignore
+    /// #[event_handler]
+    /// pub fn on_command_testplugin(command: ChatCommandEvent) -> Result<Vec<String>, String> {
+    ///     Ok(vec![format!(
+    ///         "Player of id {:?} named {} with {:?} sended command with args {:?}",
+    ///         command.player.id,
+    ///         command
+    ///             .player
+    ///             .get_player_name()
+    ///             .expect("Can't get player name"),
+    ///         command
+    ///             .player
+    ///             .get_entity_health()
+    ///             .expect("Can't get player health"),
+    ///         command.command_args
+    ///     )])
+    /// }
+    /// ```
     #[derive(Serialize, Deserialize, Debug, Clone, Eq, PartialEq)]
     pub struct ChatCommandEvent {
         pub command: String,
@@ -48,11 +140,25 @@ pub mod event {
         type Response = Result<Vec<String>, String>;
     }
 
+    /// This struct represent a player
     #[derive(Serialize, Deserialize, Debug, Clone, Eq, PartialEq)]
     pub struct Player {
         pub id: Uid,
     }
 
+    /// This event is called when a player connects.
+    /// Your event should be named `on_join`
+    ///
+    /// You can either return `CloseConnection` or `None`
+    /// If `CloseConnection` is returned the player will be kicked
+    ///
+    /// # Example
+    /// ```ignore
+    /// #[event_handler]
+    /// pub fn on_join(command: PlayerJoinEvent) -> PlayerJoinResult {
+    ///     PlayerJoinResult::CloseConnection
+    /// }
+    /// ```
     #[derive(Serialize, Deserialize, Debug, Clone, Eq, PartialEq)]
     pub struct PlayerJoinEvent {
         pub player_name: String,
@@ -63,6 +169,11 @@ pub mod event {
         type Response = PlayerJoinResult;
     }
 
+    /// This is the return type of an `on_join` event. See [`PlayerJoinEvent`]
+    ///
+    /// Variants:
+    ///  - `CloseConnection` will kick the player.
+    ///  - `None` will let the player join the server.
     #[derive(Serialize, Deserialize, Debug, Clone, Eq, PartialEq)]
     pub enum PlayerJoinResult {
         CloseConnection,
@@ -73,6 +184,20 @@ pub mod event {
         fn default() -> Self { Self::None }
     }
 
+    /// This event is called when the plugin is loaded
+    /// Your event should be named `on_load`
+    ///
+    /// # Example
+    /// ```ignore
+    /// #[event_handler]
+    /// pub fn on_load(load: PluginLoadEvent) {
+    ///     match load.game_mode {
+    ///         GameMode::Server => emit_action(Action::Print("Hello, server!".to_owned())),
+    ///         GameMode::Client => emit_action(Action::Print("Hello, client!".to_owned())),
+    ///         GameMode::Singleplayer => emit_action(Action::Print("Hello, singleplayer!".to_owned())),
+    ///     }
+    /// }
+    /// ```
     #[derive(Serialize, Deserialize, Debug, Clone, Eq, PartialEq)]
     pub struct PluginLoadEvent {
         pub game_mode: GameMode,
@@ -82,9 +207,6 @@ pub mod event {
         type Response = ();
     }
 
-    // #[derive(Serialize, Deserialize, Debug)]
-    // pub struct EmptyResult;
-
     // impl Default for PlayerJoinResult {
     //     fn default() -> Self {
     //         Self::None

From 7837f480cdb21b5b1f6ef55dbdef585b59cb92ea Mon Sep 17 00:00:00 2001
From: Sam <samuelkeiffer@gmail.com>
Date: Sun, 28 Feb 2021 17:30:57 -0500
Subject: [PATCH 06/16] Buff icon

---
 .../icons/de_buffs/buff_invincibility_0.png      | Bin 0 -> 2068 bytes
 voxygen/src/hud/img_ids.rs                       |   1 +
 voxygen/src/hud/mod.rs                           |   3 +--
 3 files changed, 2 insertions(+), 2 deletions(-)
 create mode 100644 assets/voxygen/element/icons/de_buffs/buff_invincibility_0.png

diff --git a/assets/voxygen/element/icons/de_buffs/buff_invincibility_0.png b/assets/voxygen/element/icons/de_buffs/buff_invincibility_0.png
new file mode 100644
index 0000000000000000000000000000000000000000..e122097434a247553d9d1ea08e14cba4b7268d8c
GIT binary patch
literal 2068
zcmcIlU1%It6rN&iV?v;{q9WQ3Q-s!JcJADn%<K%i37g$*v(SxcvXIy!c<0WY-66X(
z<IE(x$%8)u3u3W-6wwzId@B^+>_b3`z6qgEJ}N4dB7!I?3h~U&?skQk=EY@q@7}ZL
ze&;*qd}r?4iwhSf#-17DIBudcUs{6oiR3f-2z-CO^3yCVN1~+*bKK3ZpS=g0k$Rz8
z;J91Y$Nwge!v68ai?uSW^?H5k+PM?j@x8r0*q-((Sy+z7OAE_j0o!LgpX`9;v0(nC
zh~vgjCZ8kR`yV{bamP-&wbgjFdeNkQD?@DGVwp}W0B?@V&2|Dp*I3M3tnPYw;pf{s
z0`J;+VP(3CszH%8-1)7LEpIK<=++uFY+-h0Vl3A&0infW!gpFtFETrMp$lxn@5C$#
zeAgvj%L|1hBEMQ)<cogDcrAlOiV)^?BO`07s-Y<!Ba9?8Ey-AvH4~|(tn<B>0O5E(
z7ut@wR65@a2fMt`h~vPNq;|WVX)75&tV^<C7!tw~#v*u#(WV!Zj_5^aQji`@iA6MY
zgV^;wK7l2czaHlWV4SAX3I^C-)T<X%PU?_Ak~1htt?yW^9_-p`4ZNecya7>qr1u4m
zYMTL*mRRJkhm@5!m=~Yv2MZd0>_-j%Ke!G4{ue`=4gv=2VY6E!n@X(7T7VsauiWJq
zn8lEh*bi&I-|RPRu^*Agat8BfS6t8b+tIm%QSSgNk(lL$q<f+aZ(PIJRI{dnCJ{Cf
zN?og<2b;v?aL&H%I-7@atyay77sbS*tWwGgKq}+9wn>oeWNlRybxT)7hpLunDaZhF
zie^v)+l0tnUU0tT)Aghh$@x^iwod_LP)$?8wyb7BOAey8sH&<gW(`XbsikR1qdKxw
zr;qkx=)wq*<}hl)$_7Nk!8&%RE)q*;qHd@NaIhf~9XT>pfRlp-{z2TL-}J+(Z$otz
zfw!sY_+g8He%uzRGb!-ueMy6;AqXTh??%wU&F;9Qv(p`#W%lZjsW$>mm+$J)Bs3X=
zyg-xwGh67H-F*ssxD-;@c7p-v0lG-tBHxMIBxHp;G~wa8lMazcL^cji<8b=;KhsFD
zX@hum1`k@8z~RJlQu0h1?pjXTzrnc&a_LL10K<@|AR4MvR|RvVK4coGV5YCnEXiUR
z5Dc?oXrg9;K8fR~B2`p<8rin38cNEn=^h9)S1#xnmF9|yQ79K=Ia@5CVp%I?@%g!e
zTt@qVq^4npIqBi4rKg6T<y~5-6)p<cLEZYdRI(e~bj*XQhj5RPAD$YAJMeO)RH&U@
z{&079><u*f*0<mM_}5N&>iXR`Z@u%{_OFvicNg7zH$Hv->fOsH9BXRyV>))__2Xat
z()jMqscZMQE8l<dGC6m3();a-url+)$esJgzWjalUGdL9p8H60Z;YIN^1Vx!lB>2-
LUMSt1du96{Mh|k(

literal 0
HcmV?d00001

diff --git a/voxygen/src/hud/img_ids.rs b/voxygen/src/hud/img_ids.rs
index 9c031af1fb..d7da861e52 100644
--- a/voxygen/src/hud/img_ids.rs
+++ b/voxygen/src/hud/img_ids.rs
@@ -447,6 +447,7 @@ image_ids! {
         buff_campfire_heal_0: "voxygen.element.icons.de_buffs.buff_campfire_heal_0",
         buff_energyplus_0: "voxygen.element.icons.de_buffs.buff_energyplus_0",
         buff_healthplus_0: "voxygen.element.icons.de_buffs.buff_healthplus_0",
+        buff_invincibility_0: "voxygen.element.icons.de_buffs.buff_invincibility_0",
 
         // Debuffs
         debuff_skull_0: "voxygen.element.icons.de_buffs.debuff_skull_0",
diff --git a/voxygen/src/hud/mod.rs b/voxygen/src/hud/mod.rs
index 2081832dc6..9ba15d483a 100644
--- a/voxygen/src/hud/mod.rs
+++ b/voxygen/src/hud/mod.rs
@@ -3180,8 +3180,7 @@ pub fn get_buff_image(buff: BuffKind, imgs: &Imgs) -> conrod_core::image::Id {
         BuffKind::CampfireHeal { .. } => imgs.buff_campfire_heal_0,
         BuffKind::IncreaseMaxEnergy { .. } => imgs.buff_energyplus_0,
         BuffKind::IncreaseMaxHealth { .. } => imgs.buff_healthplus_0,
-        // TODO: Before merge replace with actual icon
-        BuffKind::Invulnerability => imgs.buff_plus_0,
+        BuffKind::Invulnerability => imgs.buff_invincibility_0,
         //  Debuffs
         BuffKind::Bleeding { .. } => imgs.debuff_bleed_0,
         BuffKind::Cursed { .. } => imgs.debuff_skull_0,

From 884e74cab8859ec9d425b85486e7ee31360aa1a8 Mon Sep 17 00:00:00 2001
From: Sam <samuelkeiffer@gmail.com>
Date: Sun, 28 Feb 2021 18:14:59 -0500
Subject: [PATCH 07/16] Added command: '/safezone'

---
 common/src/cmd.rs    |  8 +++++
 common/src/combat.rs |  4 +--
 server/src/cmd.rs    | 75 ++++++++++++++++++++++++++++++--------------
 3 files changed, 61 insertions(+), 26 deletions(-)

diff --git a/common/src/cmd.rs b/common/src/cmd.rs
index 6b5cfb26f5..f6771bdcd3 100644
--- a/common/src/cmd.rs
+++ b/common/src/cmd.rs
@@ -70,6 +70,7 @@ pub enum ChatCommand {
     Players,
     Region,
     RemoveLights,
+    Safezone,
     Say,
     SetMotd,
     SkillPoint,
@@ -122,6 +123,7 @@ pub static CHAT_COMMANDS: &[ChatCommand] = &[
     ChatCommand::Players,
     ChatCommand::Region,
     ChatCommand::RemoveLights,
+    ChatCommand::Safezone,
     ChatCommand::Say,
     ChatCommand::SetMotd,
     ChatCommand::SkillPoint,
@@ -370,6 +372,11 @@ impl ChatCommand {
                 "Send messages to everyone in your region of the world",
                 NoAdmin,
             ),
+            ChatCommand::Safezone => cmd(
+                vec![Float("range", 100.0, Optional)],
+                "Creates a safezone",
+                Admin,
+            ),
             ChatCommand::Say => cmd(
                 vec![Message(Optional)],
                 "Send messages to everyone within shouting distance",
@@ -476,6 +483,7 @@ impl ChatCommand {
             ChatCommand::Players => "players",
             ChatCommand::Region => "region",
             ChatCommand::RemoveLights => "remove_lights",
+            ChatCommand::Safezone => "safezone",
             ChatCommand::Say => "say",
             ChatCommand::SetMotd => "set_motd",
             ChatCommand::SkillPoint => "skill_point",
diff --git a/common/src/combat.rs b/common/src/combat.rs
index fbf6e1c337..5687b237b2 100644
--- a/common/src/combat.rs
+++ b/common/src/combat.rs
@@ -431,7 +431,7 @@ pub struct Damage {
 impl Damage {
     /// Returns the total damage reduction provided by all equipped items
     pub fn compute_damage_reduction(inventory: Option<&Inventory>, stats: Option<&Stats>) -> f32 {
-        let invetory_dr = if let Some(inventory) = inventory {
+        let inventory_dr = if let Some(inventory) = inventory {
             let protection = inventory
                 .equipped_items()
                 .filter_map(|item| {
@@ -461,7 +461,7 @@ impl Damage {
         } else {
             0.0
         };
-        1.0 - (1.0 - invetory_dr) * (1.0 - stats_dr)
+        1.0 - (1.0 - inventory_dr) * (1.0 - stats_dr)
     }
 
     pub fn calculate_health_change(
diff --git a/server/src/cmd.rs b/server/src/cmd.rs
index e81cac9d0f..09a51eeec5 100644
--- a/server/src/cmd.rs
+++ b/server/src/cmd.rs
@@ -111,6 +111,7 @@ fn get_handler(cmd: &ChatCommand) -> CommandHandler {
         ChatCommand::Players => handle_players,
         ChatCommand::Region => handle_region,
         ChatCommand::RemoveLights => handle_remove_lights,
+        ChatCommand::Safezone => handle_safezone,
         ChatCommand::Say => handle_say,
         ChatCommand::SetMotd => handle_set_motd,
         ChatCommand::SkillPoint => handle_skill_point,
@@ -975,30 +976,17 @@ fn handle_spawn_campfire(
                     animated: true,
                 })
                 .with(WaypointArea::default())
-                .with(comp::Auras::new(vec![
-                    Aura::new(
-                        AuraKind::Buff {
-                            kind: BuffKind::CampfireHeal,
-                            data: BuffData::new(0.02, Some(Duration::from_secs(1))),
-                            category: BuffCategory::Natural,
-                            source: BuffSource::World,
-                        },
-                        5.0,
-                        None,
-                        AuraTarget::All,
-                    ),
-                    Aura::new(
-                        AuraKind::Buff {
-                            kind: BuffKind::Invulnerability,
-                            data: BuffData::new(1.0, Some(Duration::from_secs(1))),
-                            category: BuffCategory::Natural,
-                            source: BuffSource::World,
-                        },
-                        100.0,
-                        None,
-                        AuraTarget::All,
-                    ),
-                ]))
+                .with(comp::Auras::new(vec![Aura::new(
+                    AuraKind::Buff {
+                        kind: BuffKind::CampfireHeal,
+                        data: BuffData::new(0.02, Some(Duration::from_secs(1))),
+                        category: BuffCategory::Natural,
+                        source: BuffSource::World,
+                    },
+                    5.0,
+                    None,
+                    AuraTarget::All,
+                )]))
                 .build();
 
             server.notify_client(
@@ -1013,6 +1001,45 @@ fn handle_spawn_campfire(
     }
 }
 
+fn handle_safezone(
+    server: &mut Server,
+    client: EcsEntity,
+    target: EcsEntity,
+    args: String,
+    action: &ChatCommand,
+) {
+    let range = scan_fmt_some!(&args, &action.arg_fmt(), f32);
+
+    match server.state.read_component_copied::<comp::Pos>(target) {
+        Some(pos) => {
+            server
+                .state
+                .create_object(pos, comp::object::Body::BoltNature)
+                .with(comp::Auras::new(vec![Aura::new(
+                    AuraKind::Buff {
+                        kind: BuffKind::Invulnerability,
+                        data: BuffData::new(1.0, Some(Duration::from_secs(1))),
+                        category: BuffCategory::Natural,
+                        source: BuffSource::World,
+                    },
+                    range.unwrap_or(100.0),
+                    None,
+                    AuraTarget::All,
+                )]))
+                .build();
+
+            server.notify_client(
+                client,
+                ServerGeneral::server_msg(ChatType::CommandInfo, "Spawned a safe zone"),
+            );
+        },
+        None => server.notify_client(
+            client,
+            ServerGeneral::server_msg(ChatType::CommandError, "You have no position!"),
+        ),
+    }
+}
+
 fn handle_players(
     server: &mut Server,
     client: EcsEntity,

From f4a10912b02969a1a902511e9749b926f67e5029 Mon Sep 17 00:00:00 2001
From: jshipsey <jshipsey18@gmail.com>
Date: Sun, 28 Feb 2021 22:18:43 -0500
Subject: [PATCH 08/16] more asset organization

---
 .../{leather_adventurer => agile}/back.ron    |   2 +-
 .../{leather_adventurer => agile}/belt.ron    |   2 +-
 .../{leather_adventurer => agile}/chest.ron   |   2 +-
 .../{leather_adventurer => agile}/foot.ron    |   2 +-
 .../{leather_adventurer => agile}/hand.ron    |   2 +-
 .../{leather_adventurer => agile}/pants.ron   |   2 +-
 .../shoulder.ron                              |   2 +-
 assets/common/items/armor/cloth_blue/belt.ron |   2 +-
 .../common/items/armor/cloth_blue/chest.ron   |   2 +-
 assets/common/items/armor/cloth_blue/foot.ron |   2 +-
 assets/common/items/armor/cloth_blue/hand.ron |   2 +-
 .../common/items/armor/cloth_blue/pants.ron   |   2 +-
 .../common/items/armor/cloth_green/belt.ron   |   2 +-
 .../common/items/armor/cloth_green/chest.ron  |   2 +-
 .../common/items/armor/cloth_green/foot.ron   |   2 +-
 .../common/items/armor/cloth_green/hand.ron   |   2 +-
 .../common/items/armor/cloth_green/pants.ron  |   2 +-
 .../items/armor/cloth_green/shoulder.ron      |   2 +-
 .../common/items/armor/cloth_purple/belt.ron  |   2 +-
 .../common/items/armor/cloth_purple/chest.ron |   2 +-
 .../common/items/armor/cloth_purple/foot.ron  |   2 +-
 .../common/items/armor/cloth_purple/hand.ron  |   4 +-
 .../common/items/armor/cloth_purple/pants.ron |   2 +-
 .../items/armor/cloth_purple/shoulder.ron     |   2 +-
 .../cultist/{chest_blue.ron => chest.ron}     |   4 +-
 .../items/armor/cultist/chest_purple.ron      |  13 -
 .../cultist/{hand_purple.ron => hand.ron}     |   4 +-
 .../common/items/armor/cultist/hand_blue.ron  |  13 -
 .../cultist/{pants_purple.ron => pants.ron}   |   4 +-
 .../common/items/armor/cultist/pants_blue.ron |  13 -
 .../{shoulder_blue.ron => shoulder.ron}       |   4 +-
 .../items/armor/cultist/shoulder_purple.ron   |  13 -
 assets/common/items/armor/druid/shoulder.ron  |   2 +-
 .../armor/{leather_1 => leather}/belt.ron     |   2 +-
 .../armor/{leather_1 => leather}/chest.ron    |   2 +-
 .../armor/{leather_1 => leather}/foot.ron     |   2 +-
 .../armor/{leather_1 => leather}/hand.ron     |   2 +-
 .../armor/{leather_1 => leather}/pants.ron    |   2 +-
 .../armor/{leather_1 => leather}/shoulder.ron |   2 +-
 .../common/items/armor/leather_plate/belt.ron |   2 +-
 .../items/armor/leather_plate/chest.ron       |   2 +-
 .../common/items/armor/leather_plate/foot.ron |   2 +-
 .../common/items/armor/leather_plate/hand.ron |   2 +-
 .../items/armor/leather_plate/pants.ron       |   2 +-
 .../items/armor/leather_plate/shoulder.ron    |   2 +-
 .../back/{backpack_0.ron => backpack.ron}     |   2 +-
 ...ungeon_purple-0.ron => dungeon_purple.ron} |   2 +-
 .../armor/misc/foot/jackalope_slippers.ron    |   2 +-
 .../common/items/armor/misc/foot/sandals.ron  |   2 +-
 .../misc/neck/{neck_0.ron => plain_0.ron}     |   2 +-
 .../misc/neck/{neck_1.ron => plain_1.ron}     |   2 +-
 .../armor/misc/neck/{neck_2.ron => shell.ron} |   2 +-
 .../items/armor/misc/pants/worker_blue.ron    |   2 +-
 .../ring_gold_0.ron => misc/ring/gold.ron}    |   2 +-
 .../ring_0.ron => misc/ring/scratched.ron}    |   2 +-
 .../ring/skull.ron}                           |   2 +-
 .../shoulder/{leather_2.ron => leather_3.ron} |   2 +-
 .../armor/misc/shoulder/leather_strip.ron     |   2 +-
 .../items/armor/{ => misc}/tabard/admin.ron   |   0
 .../armor/{plate_green => plate}/belt.ron     |   4 +-
 .../armor/{plate_green => plate}/chest.ron    |   2 +-
 .../armor/{plate_green => plate}/foot.ron     |   2 +-
 .../armor/{plate_green => plate}/hand.ron     |   2 +-
 .../armor/{plate_green => plate}/pants.ron    |   2 +-
 .../armor/{plate_green => plate}/shoulder.ron |   2 +-
 assets/common/items/armor/rugged/chest.ron    |   2 +-
 assets/common/items/armor/rugged/pants.ron    |   2 +-
 assets/common/items/armor/steel/belt.ron      |   2 +-
 assets/common/items/armor/steel/chest.ron     |   2 +-
 assets/common/items/armor/steel/foot.ron      |   2 +-
 assets/common/items/armor/steel/hand.ron      |   2 +-
 assets/common/items/armor/steel/pants.ron     |   2 +-
 assets/common/items/armor/steel/shoulder.ron  |   2 +-
 .../items/armor/{leather_0 => swift}/belt.ron |   2 +-
 .../armor/{leather_0 => swift}/chest.ron      |   2 +-
 .../items/armor/{leather_0 => swift}/foot.ron |   2 +-
 .../items/armor/{leather_0 => swift}/hand.ron |   2 +-
 .../items/armor/{leather_0 => swift}/head.ron |   2 +-
 .../armor/{leather_0 => swift}/pants.ron      |   2 +-
 .../armor/{leather_0 => swift}/shoulder.ron   |   2 +-
 .../common/items/armor/twigflowers/belt.ron   |   2 +-
 .../common/items/armor/twigflowers/chest.ron  |   2 +-
 .../common/items/armor/twigflowers/foot.ron   |   2 +-
 .../common/items/armor/twigflowers/hand.ron   |   2 +-
 .../common/items/armor/twigflowers/pants.ron  |   2 +-
 .../items/armor/twigflowers/shoulder.ron      |   2 +-
 assets/common/items/armor/twigs/belt.ron      |   2 +-
 assets/common/items/armor/twigs/chest.ron     |   2 +-
 assets/common/items/armor/twigs/foot.ron      |   2 +-
 assets/common/items/armor/twigs/hand.ron      |   2 +-
 assets/common/items/armor/twigs/pants.ron     |   2 +-
 assets/common/items/armor/twigs/shoulder.ron  |   2 +-
 .../common/items/armor/twigsleaves/belt.ron   |   2 +-
 .../common/items/armor/twigsleaves/chest.ron  |   2 +-
 .../common/items/armor/twigsleaves/foot.ron   |   2 +-
 .../common/items/armor/twigsleaves/hand.ron   |   2 +-
 .../common/items/armor/twigsleaves/pants.ron  |   2 +-
 .../items/armor/twigsleaves/shoulder.ron      |   2 +-
 .../common/items/armor/velorite_mage/back.ron |   2 +-
 .../common/items/armor/velorite_mage/belt.ron |   2 +-
 .../items/armor/velorite_mage/chest.ron       |   2 +-
 .../common/items/armor/velorite_mage/foot.ron |   2 +-
 .../common/items/armor/velorite_mage/hand.ron |   2 +-
 .../items/armor/velorite_mage/pants.ron       |   2 +-
 .../items/armor/velorite_mage/shoulder.ron    |   2 +-
 .../common/items/debug/admin_black_hole.ron   |   2 +-
 assets/common/items/debug/cultist_belt.ron    |   2 +-
 assets/common/items/debug/cultist_boots.ron   |   2 +-
 .../common/items/debug/cultist_chest_blue.ron |   2 +-
 .../common/items/debug/cultist_hands_blue.ron |   2 +-
 .../common/items/debug/cultist_legs_blue.ron  |   2 +-
 .../items/debug/cultist_shoulder_blue.ron     |   2 +-
 ...ungeon_purple-0.ron => dungeon_purple.ron} |   2 +-
 .../back/{backpack_0.ron => backpack.ron}     |   2 +-
 ...{backpack_blue_0.ron => backpack_blue.ron} |   2 +-
 ...ungeon_purple-0.ron => dungeon_purple.ron} |   2 +-
 .../{leather_blue_0.ron => leather_blue.ron}  |   2 +-
 .../npc_armor/chest/cultist_chest_purple.ron  |   2 +-
 .../{leather_blue_0.ron => leather_blue.ron}  |   2 +-
 .../chest/{plate_red_0.ron => plate.ron}      |   2 +-
 .../{plate_green_0.ron => plate_red.ron}      |   2 +-
 .../npc_armor/hand/cultist_hands_purple.ron   |   2 +-
 .../npc_armor/pants/cultist_legs_purple.ron   |   2 +-
 .../{leather_blue_0.ron => leather_blue.ron}  |   2 +-
 .../pants/{plate_red_0.ron => plate.ron}      |   2 +-
 .../{plate_green_0.ron => plate_red.ron}      |   2 +-
 .../shoulder/cultist_shoulder_purple.ron      |   2 +-
 .../common/items/tag_examples/cloth_item.ron  |  24 +-
 .../loot_tables/loot_table_armor_cloth.ron    |  60 +-
 .../loot_tables/loot_table_armor_heavy.ron    |  26 +-
 .../loot_tables/loot_table_armor_light.ron    |  38 +-
 .../loot_tables/loot_table_armor_misc.ron     |  10 +-
 .../loot_tables/loot_table_armor_nature.ron   |  48 +-
 .../loot_tables/loot_table_cultists.ron       |  76 +--
 .../loot_tables/loot_table_humanoids.ron      |   2 +-
 .../loot_tables/loot_table_mindflayer.ron     |  14 +-
 .../loot_tables/loot_table_miniboss.ron       |  16 +-
 .../common/loot_tables/loot_table_saurok.ron  |   4 +-
 .../loot_tables/loot_table_villager.ron       |  22 +-
 assets/common/recipe_book.ron                 |  40 +-
 assets/voxygen/item_image_manifest.ron        | 589 +++++++++---------
 .../{back/short-2.vox => agile/back.vox}      | Bin
 .../{belt/leather-2.vox => agile/belt.vox}    | Bin
 .../{chest/leather-2.vox => agile/chest.vox}  | Bin
 .../{foot/leather-2.vox => agile/foot.vox}    | Bin
 .../leather_left-2.vox => agile/hand.vox}     | Bin
 .../{pants/leather-2.vox => agile/pants.vox}  | Bin
 .../leather_left-2.vox => agile/shoulder.vox} | Bin
 .../{belt/assa.vox => assassin/belt.vox}      | Bin
 .../{chest/assa.vox => assassin/chest.vox}    | Bin
 .../{foot/assa.vox => assassin/foot.vox}      | Bin
 .../assa_right.vox => assassin/hand.vox}      | Bin
 .../{pants/assa.vox => assassin/pants.vox}    | Bin
 .../assa_right.vox => assassin/shoulder.vox}  | Bin
 .../voxel/armor/belt/cultist_right.vox        | Bin 1388 -> 0 bytes
 .../bonerattler.vox => bonerattler/belt.vox}  | Bin
 .../bonerattler.vox => bonerattler/chest.vox} | Bin
 .../bonerattler.vox => bonerattler/foot.vox}  | Bin
 .../hand.vox}                                 | Bin
 .../bonerattler.vox => bonerattler/pants.vox} | Bin
 .../shoulder.vox}                             | Bin
 .../cloth_blue-0.vox => cloth_blue/belt.vox}  | Bin
 .../cloth_blue-0.vox => cloth_blue/chest.vox} | Bin
 .../cloth_blue-0.vox => cloth_blue/foot.vox}  | Bin
 .../hand.vox}                                 | Bin
 .../cloth_blue-0.vox => cloth_blue/pants.vox} | Bin
 .../shoulder_0.vox}                           | Bin
 .../shoulder_1.vox}                           | Bin
 .../belt.vox}                                 | Bin
 .../chest.vox}                                | Bin
 .../foot.vox}                                 | Bin
 .../hand.vox}                                 | Bin
 .../pants.vox}                                | Bin
 .../shoulder.vox}                             | Bin
 .../belt.vox}                                 | Bin
 .../chest.vox}                                | Bin
 .../foot.vox}                                 | Bin
 .../hand.vox}                                 | Bin
 .../pants.vox}                                | Bin
 .../shoulder.vox}                             | Bin
 .../{belt/cultist.vox => cultist/belt.vox}    | Bin
 .../{chest/cultist.vox => cultist/chest.vox}  | Bin
 .../{foot/cultist.vox => cultist/foot.vox}    | Bin
 .../cultist_right.vox => cultist/hand.vox}    | Bin
 .../{pants/cultist.vox => cultist/pants.vox}  | Bin
 .../armor/{belt/druid.vox => druid/belt.vox}  | Bin
 .../{chest/druid.vox => druid/chest.vox}      | Bin
 .../armor/{foot/druid.vox => druid/foot.vox}  | Bin
 .../{hand/druid_right.vox => druid/hand.vox}  | Bin
 .../{pants/druid.vox => druid/pants.vox}      | Bin
 .../druid_left.vox => druid/shoulder.vox}     | Bin
 assets/voxygen/voxel/armor/hand/assa_left.vox | Bin 1240 -> 0 bytes
 assets/voxygen/voxel/armor/hand/bare_left.vox | Bin 1240 -> 0 bytes
 .../voxel/armor/hand/bonerattler_left.vox     | Bin 1240 -> 0 bytes
 .../voxel/armor/hand/cloth_basic_left.vox     | Bin 1240 -> 0 bytes
 .../voxel/armor/hand/cloth_blue_right-0.vox   | Bin 1240 -> 0 bytes
 .../voxel/armor/hand/cloth_green_left-0.vox   | Bin 1240 -> 0 bytes
 .../voxel/armor/hand/cloth_purple_right-0.vox | Bin 1240 -> 0 bytes
 .../voxygen/voxel/armor/hand/druid_left.vox   | Bin 1240 -> 0 bytes
 .../voxel/armor/hand/hand_left_none.vox       | Bin 1240 -> 0 bytes
 .../voxel/armor/hand/leather_left-0.vox       | Bin 1240 -> 0 bytes
 .../voxel/armor/hand/leather_right-2.vox      | Bin 1240 -> 0 bytes
 .../armor/hand/plate_leather_right-0.vox      | Bin 1240 -> 0 bytes
 .../voxygen/voxel/armor/hand/plate_left-0.vox | Bin 1240 -> 0 bytes
 .../voxel/armor/hand/steel_right-0.vox        | Bin 1240 -> 0 bytes
 .../voxel/armor/hand/tarasque_left.vox        | Bin 55771 -> 0 bytes
 .../voxel/armor/hand/twigs_glove_right.vox    | Bin 1240 -> 0 bytes
 .../armor/hand/twigsflowers_glove_right.vox   | Bin 1260 -> 0 bytes
 .../armor/hand/twigsleaves_glove_right.vox    | Bin 1252 -> 0 bytes
 .../armor/hand/velorite_battlemage_left.vox   | Bin 1288 -> 0 bytes
 .../voxel/armor/hand/warlock_right.vox        | Bin 1688 -> 0 bytes
 .../voxygen/voxel/armor/hand/warlord_left.vox | Bin 1516 -> 0 bytes
 .../shoulder.vox}                             | Bin
 .../back.vox}                                 | Bin
 .../chest.vox}                                | Bin
 .../pants.vox}                                | Bin
 .../belt.vox}                                 | Bin
 .../chest.vox}                                | Bin
 .../foot.vox}                                 | Bin
 .../hand.vox}                                 | Bin
 .../pants.vox}                                | Bin
 .../shoulder.vox}                             | Bin
 .../voxel/armor/{ => misc}/back/admin.vox     | Bin
 .../armor/{ => misc}/back/backpack-grey.vox   | Bin
 .../backpack-0.vox => misc/back/backpack.vox} | Bin
 .../back/dungeon_purple.vox}                  | Bin
 .../voxel/armor/{ => misc}/back/short-0.vox   | Bin
 .../voxel/armor/{ => misc}/back/short-1.vox   | Bin
 .../armor/{ => misc}/belt/cloth_black.vox     | Bin
 .../armor/{ => misc}/belt/cloth_blood.vox     | Bin
 .../armor/{ => misc}/belt/cloth_grey.vox      | Bin
 .../armor/{ => misc}/belt/cloth_turq.vox      | Bin
 .../voxel/armor/{ => misc}/belt/dark.vox      | Bin
 .../belt_none.vox => misc/belt/none.vox}      | Bin
 .../{ => misc}/chest/cloth_red_kimono.vox     | Bin
 .../armor/{ => misc}/chest/grayscale.vox      | Bin
 .../chest_none.vox => misc/chest/none.vox}    | Bin
 .../chest/plate_grey.vox}                     | Bin
 .../chest/shirt_white.vox}                    | Bin
 .../chest/worker_green.vox}                   | Bin
 .../chest/worker_red.vox}                     | Bin
 .../chest/worker_white.vox}                   | Bin
 .../foot/cloth_sandal.vox}                    | Bin
 .../{foot/dark-0.vox => misc/foot/dark.vox}   | Bin
 .../foot/dark_jester_elf.vox}                 | Bin
 .../foot/jackalope.vox}                       | Bin
 .../foot_none.vox => misc/foot/none.vox}      | Bin
 .../bare_right.vox => misc/hand/bare.vox}     | Bin
 .../hand/cloth_basic.vox}                     | Bin
 .../hand/none.vox}                            | Bin
 .../armor/{ => misc}/head/assa_mask-0.vox     | Bin
 .../voxel/armor/{ => misc}/head/leather-0.vox | Bin
 .../voxel/armor/{ => misc}/head/warlock.vox   | Bin
 .../voxel/armor/{ => misc}/head/warlord.vox   | Bin
 .../armor/{ => misc}/lantern/black-0.vox      | Bin
 .../voxel/armor/{ => misc}/lantern/blue-0.vox | Bin
 .../armor/{ => misc}/lantern/green-0.vox      | Bin
 .../voxel/armor/{ => misc}/lantern/red-0.vox  | Bin
 .../{ => misc}/pants/cloth_red_kimono.vox     | Bin
 .../pants/grayscale_pants.vox}                | Bin
 .../pants_none.vox => misc/pants/none.vox}    | Bin
 .../pants/plate_grey.vox}                     | Bin
 .../pants/worker_blue.vox}                    | Bin
 .../simple_gold-0.vox => misc/ring/gold.vox}  | Bin
 .../ring/scratched.vox}                       | Bin
 .../high_purp-0.vox => misc/ring/skull.vox}   | Bin
 .../shoulder/chain.vox}                       | Bin
 .../shoulder/iron_spikes.vox}                 | Bin
 .../shoulder/leather_iron_0.vox}              | Bin
 .../shoulder/leather_iron_1.vox}              | Bin
 .../shoulder/leather_iron_2.vox}              | Bin
 .../shoulder/leather_iron_3.vox}              | Bin
 .../shoulder/leather_strip.vox}               | Bin
 .../{belt/plate-0.vox => plate/belt.vox}      | Bin
 .../plate_green-0.vox => plate/chest.vox}     | Bin
 .../{foot/plate-0.vox => plate/foot.vox}      | Bin
 .../plate_right-0.vox => plate/hand.vox}      | Bin
 .../plate_green-0.vox => plate/pants.vox}     | Bin
 .../plate_right-0.vox => plate/shoulder.vox}  | Bin
 .../{chest/rugged-0.vox => rugged/chest.vox}  | Bin
 .../{pants/rugged-0.vox => rugged/pants.vox}  | Bin
 .../voxel/armor/shoulder/assa_left.vox        | Bin 1384 -> 0 bytes
 .../armor/shoulder/bonerattler_right.vox      | Bin 1388 -> 0 bytes
 .../voxel/armor/shoulder/chain_left-1.vox     | Bin 1436 -> 0 bytes
 .../voxel/armor/shoulder/chain_left.vox       | Bin 1596 -> 0 bytes
 .../voxel/armor/shoulder/chain_right-1.vox    | Bin 1436 -> 0 bytes
 .../armor/shoulder/cloth_blue_right-0.vox     | Bin 1340 -> 0 bytes
 .../armor/shoulder/cloth_blue_right-1.vox     | Bin 1176 -> 0 bytes
 .../armor/shoulder/cloth_green_right-0.vox    | Bin 1340 -> 0 bytes
 .../armor/shoulder/cloth_purple_left-0.vox    | Bin 1340 -> 0 bytes
 .../voxel/armor/shoulder/cultist_right.vox    | Bin 1388 -> 0 bytes
 .../voxel/armor/shoulder/druid_right.vox      | Bin 1628 -> 0 bytes
 .../armor/shoulder/iron_spikes_right.vox      | Bin 1320 -> 0 bytes
 .../armor/shoulder/leather_iron_right-0.vox   | Bin 1228 -> 0 bytes
 .../armor/shoulder/leather_iron_right-1.vox   | Bin 1236 -> 0 bytes
 .../armor/shoulder/leather_iron_right-2.vox   | Bin 1240 -> 0 bytes
 .../armor/shoulder/leather_iron_right-3.vox   | Bin 1216 -> 0 bytes
 .../voxel/armor/shoulder/leather_left-0.vox   | Bin 1416 -> 0 bytes
 .../voxel/armor/shoulder/leather_left-1.vox   | Bin 1472 -> 0 bytes
 .../voxel/armor/shoulder/leather_right-2.vox  | Bin 1368 -> 0 bytes
 .../armor/shoulder/leather_strips_right.vox   | Bin 1172 -> 0 bytes
 .../armor/shoulder/plate_leather_right-0.vox  | Bin 1392 -> 0 bytes
 .../voxel/armor/shoulder/plate_left-0.vox     | Bin 1460 -> 0 bytes
 .../voxel/armor/shoulder/steel_right-0.vox    | Bin 1488 -> 0 bytes
 .../voxel/armor/shoulder/tarasque_left.vox    | Bin 55999 -> 0 bytes
 .../voxel/armor/shoulder/twigs_right.vox      | Bin 1492 -> 0 bytes
 .../shoulder/twigsflowers_shoulder_right.vox  | Bin 1564 -> 0 bytes
 .../shoulder/twigsleaves_shoulder_right.vox   | Bin 1516 -> 0 bytes
 .../voxel/armor/shoulder/warlock_right.vox    | Bin 1564 -> 0 bytes
 .../voxel/armor/shoulder/warlord_left.vox     | Bin 1668 -> 0 bytes
 .../{belt/steel-0.vox => steel/belt.vox}      | Bin
 .../{chest/steel-0.vox => steel/chest.vox}    | Bin
 .../{foot/steel-0.vox => steel/foot.vox}      | Bin
 .../{hand/steel_left-0.vox => steel/hand.vox} | Bin
 .../{pants/steel-0.vox => steel/pants.vox}    | Bin
 .../steel_left-0.vox => steel/shoulder.vox}   | Bin
 .../{belt/leather-0.vox => swift/belt.vox}    | Bin
 .../{chest/leather-0.vox => swift/chest.vox}  | Bin
 .../{foot/leather-0.vox => swift/foot.vox}    | Bin
 .../leather_right-0.vox => swift/hand.vox}    | Bin
 .../{pants/leather-0.vox => swift/pants.vox}  | Bin
 .../shoulder.vox}                             | Bin
 .../{belt/tarasque.vox => tarasque/belt.vox}  | Bin
 .../tarasque.vox => tarasque/chest.vox}       | Bin
 .../{foot/tarasque.vox => tarasque/foot.vox}  | Bin
 .../tarasque_right.vox => tarasque/hand.vox}  | Bin
 .../tarasque.vox => tarasque/pants.vox}       | Bin
 .../shoulder.vox}                             | Bin
 .../{belt/twigs_belt.vox => twigs/belt.vox}   | Bin
 .../twigs_chest.vox => twigs/chest.vox}       | Bin
 .../{foot/twigs_foot.vox => twigs/foot.vox}   | Bin
 .../twigs_glove_left.vox => twigs/hand.vox}   | Bin
 .../twigs_pants.vox => twigs/pants.vox}       | Bin
 .../twigs_left.vox => twigs/shoulder.vox}     | Bin
 .../belt.vox}                                 | Bin
 .../chest.vox}                                | Bin
 .../foot.vox}                                 | Bin
 .../hand.vox}                                 | Bin
 .../pants.vox}                                | Bin
 .../shoulder.vox}                             | Bin
 .../belt.vox}                                 | Bin
 .../chest.vox}                                | Bin
 .../foot.vox}                                 | Bin
 .../hand.vox}                                 | Bin
 .../pants.vox}                                | Bin
 .../shoulder.vox}                             | Bin
 .../back.vox}                                 | Bin
 .../belt.vox}                                 | Bin
 .../chest.vox}                                | Bin
 .../foot.vox}                                 | Bin
 .../hand.vox}                                 | Bin
 .../pants.vox}                                | Bin
 .../shoulder.vox}                             | Bin
 .../{back/warlock.vox => warlock/back.vox}    | Bin
 .../{belt/warlock.vox => warlock/belt.vox}    | Bin
 .../{chest/warlock.vox => warlock/chest.vox}  | Bin
 .../{foot/warlock.vox => warlock/foot.vox}    | Bin
 .../warlock_left.vox => warlock/hand.vox}     | Bin
 .../{pants/warlock.vox => warlock/pants.vox}  | Bin
 .../warlock_left.vox => warlock/shoulder.vox} | Bin
 .../{back/warlord.vox => warlord/back.vox}    | Bin
 .../{belt/warlord.vox => warlord/belt.vox}    | Bin
 .../{chest/warlord.vox => warlord/chest.vox}  | Bin
 .../{foot/warlord.vox => warlord/foot.vox}    | Bin
 .../warlord_right.vox => warlord/hand.vox}    | Bin
 .../{pants/warlord.vox => warlord/pants.vox}  | Bin
 .../shoulder.vox}                             | Bin
 .../voxel/humanoid_armor_back_manifest.ron    |  34 +-
 .../voxel/humanoid_armor_belt_manifest.ron    |  76 ++-
 .../voxel/humanoid_armor_chest_manifest.ron   | 116 ++--
 .../voxel/humanoid_armor_foot_manifest.ron    |  76 +--
 .../voxel/humanoid_armor_hand_manifest.ron    | 120 ++--
 .../voxel/humanoid_armor_pants_manifest.ron   |  94 +--
 .../humanoid_armor_shoulder_manifest.ron      | 152 +++--
 .../voxel/humanoid_lantern_manifest.ron       |   8 +-
 common/src/comp/inventory/loadout_builder.rs  | 138 ++--
 server/src/rtsim/entity.rs                    |  14 +-
 377 files changed, 1017 insertions(+), 1088 deletions(-)
 rename assets/common/items/armor/{leather_adventurer => agile}/back.ron (90%)
 rename assets/common/items/armor/{leather_adventurer => agile}/belt.ron (89%)
 rename assets/common/items/armor/{leather_adventurer => agile}/chest.ron (89%)
 rename assets/common/items/armor/{leather_adventurer => agile}/foot.ron (89%)
 rename assets/common/items/armor/{leather_adventurer => agile}/hand.ron (89%)
 rename assets/common/items/armor/{leather_adventurer => agile}/pants.ron (89%)
 rename assets/common/items/armor/{leather_adventurer => agile}/shoulder.ron (88%)
 rename assets/common/items/armor/cultist/{chest_blue.ron => chest.ron} (77%)
 delete mode 100644 assets/common/items/armor/cultist/chest_purple.ron
 rename assets/common/items/armor/cultist/{hand_purple.ron => hand.ron} (76%)
 delete mode 100644 assets/common/items/armor/cultist/hand_blue.ron
 rename assets/common/items/armor/cultist/{pants_purple.ron => pants.ron} (76%)
 delete mode 100644 assets/common/items/armor/cultist/pants_blue.ron
 rename assets/common/items/armor/cultist/{shoulder_blue.ron => shoulder.ron} (76%)
 delete mode 100644 assets/common/items/armor/cultist/shoulder_purple.ron
 rename assets/common/items/armor/{leather_1 => leather}/belt.ron (88%)
 rename assets/common/items/armor/{leather_1 => leather}/chest.ron (88%)
 rename assets/common/items/armor/{leather_1 => leather}/foot.ron (88%)
 rename assets/common/items/armor/{leather_1 => leather}/hand.ron (88%)
 rename assets/common/items/armor/{leather_1 => leather}/pants.ron (88%)
 rename assets/common/items/armor/{leather_1 => leather}/shoulder.ron (87%)
 rename assets/common/items/armor/misc/back/{backpack_0.ron => backpack.ron} (89%)
 rename assets/common/items/armor/misc/back/{dungeon_purple-0.ron => dungeon_purple.ron} (87%)
 rename assets/common/items/armor/misc/neck/{neck_0.ron => plain_0.ron} (89%)
 rename assets/common/items/armor/misc/neck/{neck_1.ron => plain_1.ron} (89%)
 rename assets/common/items/armor/misc/neck/{neck_2.ron => shell.ron} (89%)
 rename assets/common/items/armor/{ring/ring_gold_0.ron => misc/ring/gold.ron} (88%)
 rename assets/common/items/armor/{ring/ring_0.ron => misc/ring/scratched.ron} (87%)
 rename assets/common/items/armor/{ring/ring_purp_high_0.ron => misc/ring/skull.ron} (88%)
 rename assets/common/items/armor/misc/shoulder/{leather_2.ron => leather_3.ron} (88%)
 rename assets/common/items/armor/{ => misc}/tabard/admin.ron (100%)
 rename assets/common/items/armor/{plate_green => plate}/belt.ron (82%)
 rename assets/common/items/armor/{plate_green => plate}/chest.ron (90%)
 rename assets/common/items/armor/{plate_green => plate}/foot.ron (90%)
 rename assets/common/items/armor/{plate_green => plate}/hand.ron (90%)
 rename assets/common/items/armor/{plate_green => plate}/pants.ron (89%)
 rename assets/common/items/armor/{plate_green => plate}/shoulder.ron (88%)
 rename assets/common/items/armor/{leather_0 => swift}/belt.ron (88%)
 rename assets/common/items/armor/{leather_0 => swift}/chest.ron (87%)
 rename assets/common/items/armor/{leather_0 => swift}/foot.ron (88%)
 rename assets/common/items/armor/{leather_0 => swift}/hand.ron (88%)
 rename assets/common/items/armor/{leather_0 => swift}/head.ron (88%)
 rename assets/common/items/armor/{leather_0 => swift}/pants.ron (87%)
 rename assets/common/items/armor/{leather_0 => swift}/shoulder.ron (87%)
 rename assets/common/items/debug/{dungeon_purple-0.ron => dungeon_purple.ron} (87%)
 rename assets/common/items/npc_armor/back/{backpack_0.ron => backpack.ron} (88%)
 rename assets/common/items/npc_armor/back/{backpack_blue_0.ron => backpack_blue.ron} (87%)
 rename assets/common/items/npc_armor/back/{dungeon_purple-0.ron => dungeon_purple.ron} (87%)
 rename assets/common/items/npc_armor/back/{leather_blue_0.ron => leather_blue.ron} (87%)
 rename assets/common/items/npc_armor/chest/{leather_blue_0.ron => leather_blue.ron} (86%)
 rename assets/common/items/npc_armor/chest/{plate_red_0.ron => plate.ron} (88%)
 rename assets/common/items/npc_armor/chest/{plate_green_0.ron => plate_red.ron} (87%)
 rename assets/common/items/npc_armor/pants/{leather_blue_0.ron => leather_blue.ron} (86%)
 rename assets/common/items/npc_armor/pants/{plate_red_0.ron => plate.ron} (88%)
 rename assets/common/items/npc_armor/pants/{plate_green_0.ron => plate_red.ron} (87%)
 rename assets/voxygen/voxel/armor/{back/short-2.vox => agile/back.vox} (100%)
 rename assets/voxygen/voxel/armor/{belt/leather-2.vox => agile/belt.vox} (100%)
 rename assets/voxygen/voxel/armor/{chest/leather-2.vox => agile/chest.vox} (100%)
 rename assets/voxygen/voxel/armor/{foot/leather-2.vox => agile/foot.vox} (100%)
 rename assets/voxygen/voxel/armor/{hand/leather_left-2.vox => agile/hand.vox} (100%)
 rename assets/voxygen/voxel/armor/{pants/leather-2.vox => agile/pants.vox} (100%)
 rename assets/voxygen/voxel/armor/{shoulder/leather_left-2.vox => agile/shoulder.vox} (100%)
 rename assets/voxygen/voxel/armor/{belt/assa.vox => assassin/belt.vox} (100%)
 rename assets/voxygen/voxel/armor/{chest/assa.vox => assassin/chest.vox} (100%)
 rename assets/voxygen/voxel/armor/{foot/assa.vox => assassin/foot.vox} (100%)
 rename assets/voxygen/voxel/armor/{hand/assa_right.vox => assassin/hand.vox} (100%)
 rename assets/voxygen/voxel/armor/{pants/assa.vox => assassin/pants.vox} (100%)
 rename assets/voxygen/voxel/armor/{shoulder/assa_right.vox => assassin/shoulder.vox} (100%)
 delete mode 100644 assets/voxygen/voxel/armor/belt/cultist_right.vox
 rename assets/voxygen/voxel/armor/{belt/bonerattler.vox => bonerattler/belt.vox} (100%)
 rename assets/voxygen/voxel/armor/{chest/bonerattler.vox => bonerattler/chest.vox} (100%)
 rename assets/voxygen/voxel/armor/{foot/bonerattler.vox => bonerattler/foot.vox} (100%)
 rename assets/voxygen/voxel/armor/{hand/bonerattler_right.vox => bonerattler/hand.vox} (100%)
 rename assets/voxygen/voxel/armor/{pants/bonerattler.vox => bonerattler/pants.vox} (100%)
 rename assets/voxygen/voxel/armor/{shoulder/bonerattler_left.vox => bonerattler/shoulder.vox} (100%)
 rename assets/voxygen/voxel/armor/{belt/cloth_blue-0.vox => cloth_blue/belt.vox} (100%)
 rename assets/voxygen/voxel/armor/{chest/cloth_blue-0.vox => cloth_blue/chest.vox} (100%)
 rename assets/voxygen/voxel/armor/{foot/cloth_blue-0.vox => cloth_blue/foot.vox} (100%)
 rename assets/voxygen/voxel/armor/{hand/cloth_blue_left-0.vox => cloth_blue/hand.vox} (100%)
 rename assets/voxygen/voxel/armor/{pants/cloth_blue-0.vox => cloth_blue/pants.vox} (100%)
 rename assets/voxygen/voxel/armor/{shoulder/cloth_blue_left-0.vox => cloth_blue/shoulder_0.vox} (100%)
 rename assets/voxygen/voxel/armor/{shoulder/cloth_blue_left-1.vox => cloth_blue/shoulder_1.vox} (100%)
 rename assets/voxygen/voxel/armor/{belt/cloth_green-0.vox => cloth_green/belt.vox} (100%)
 rename assets/voxygen/voxel/armor/{chest/cloth_green-0.vox => cloth_green/chest.vox} (100%)
 rename assets/voxygen/voxel/armor/{foot/cloth_green-0.vox => cloth_green/foot.vox} (100%)
 rename assets/voxygen/voxel/armor/{hand/cloth_green_right-0.vox => cloth_green/hand.vox} (100%)
 rename assets/voxygen/voxel/armor/{pants/cloth_green-0.vox => cloth_green/pants.vox} (100%)
 rename assets/voxygen/voxel/armor/{shoulder/cloth_green_left-0.vox => cloth_green/shoulder.vox} (100%)
 rename assets/voxygen/voxel/armor/{belt/cloth_purple-0.vox => cloth_purple/belt.vox} (100%)
 rename assets/voxygen/voxel/armor/{chest/cloth_purple-0.vox => cloth_purple/chest.vox} (100%)
 rename assets/voxygen/voxel/armor/{foot/cloth_purple-0.vox => cloth_purple/foot.vox} (100%)
 rename assets/voxygen/voxel/armor/{hand/cloth_purple_left-0.vox => cloth_purple/hand.vox} (100%)
 rename assets/voxygen/voxel/armor/{pants/cloth_purple-0.vox => cloth_purple/pants.vox} (100%)
 rename assets/voxygen/voxel/armor/{shoulder/cloth_purple_right-0.vox => cloth_purple/shoulder.vox} (100%)
 rename assets/voxygen/voxel/armor/{belt/cultist.vox => cultist/belt.vox} (100%)
 rename assets/voxygen/voxel/armor/{chest/cultist.vox => cultist/chest.vox} (100%)
 rename assets/voxygen/voxel/armor/{foot/cultist.vox => cultist/foot.vox} (100%)
 rename assets/voxygen/voxel/armor/{hand/cultist_right.vox => cultist/hand.vox} (100%)
 rename assets/voxygen/voxel/armor/{pants/cultist.vox => cultist/pants.vox} (100%)
 rename assets/voxygen/voxel/armor/{belt/druid.vox => druid/belt.vox} (100%)
 rename assets/voxygen/voxel/armor/{chest/druid.vox => druid/chest.vox} (100%)
 rename assets/voxygen/voxel/armor/{foot/druid.vox => druid/foot.vox} (100%)
 rename assets/voxygen/voxel/armor/{hand/druid_right.vox => druid/hand.vox} (100%)
 rename assets/voxygen/voxel/armor/{pants/druid.vox => druid/pants.vox} (100%)
 rename assets/voxygen/voxel/armor/{shoulder/druid_left.vox => druid/shoulder.vox} (100%)
 delete mode 100644 assets/voxygen/voxel/armor/hand/assa_left.vox
 delete mode 100644 assets/voxygen/voxel/armor/hand/bare_left.vox
 delete mode 100644 assets/voxygen/voxel/armor/hand/bonerattler_left.vox
 delete mode 100644 assets/voxygen/voxel/armor/hand/cloth_basic_left.vox
 delete mode 100644 assets/voxygen/voxel/armor/hand/cloth_blue_right-0.vox
 delete mode 100644 assets/voxygen/voxel/armor/hand/cloth_green_left-0.vox
 delete mode 100644 assets/voxygen/voxel/armor/hand/cloth_purple_right-0.vox
 delete mode 100644 assets/voxygen/voxel/armor/hand/druid_left.vox
 delete mode 100644 assets/voxygen/voxel/armor/hand/hand_left_none.vox
 delete mode 100644 assets/voxygen/voxel/armor/hand/leather_left-0.vox
 delete mode 100644 assets/voxygen/voxel/armor/hand/leather_right-2.vox
 delete mode 100644 assets/voxygen/voxel/armor/hand/plate_leather_right-0.vox
 delete mode 100644 assets/voxygen/voxel/armor/hand/plate_left-0.vox
 delete mode 100644 assets/voxygen/voxel/armor/hand/steel_right-0.vox
 delete mode 100644 assets/voxygen/voxel/armor/hand/tarasque_left.vox
 delete mode 100644 assets/voxygen/voxel/armor/hand/twigs_glove_right.vox
 delete mode 100644 assets/voxygen/voxel/armor/hand/twigsflowers_glove_right.vox
 delete mode 100644 assets/voxygen/voxel/armor/hand/twigsleaves_glove_right.vox
 delete mode 100644 assets/voxygen/voxel/armor/hand/velorite_battlemage_left.vox
 delete mode 100644 assets/voxygen/voxel/armor/hand/warlock_right.vox
 delete mode 100644 assets/voxygen/voxel/armor/hand/warlord_left.vox
 rename assets/voxygen/voxel/armor/{shoulder/leather_right-1.vox => leather/shoulder.vox} (100%)
 rename assets/voxygen/voxel/armor/{back/leather_blue-0.vox => leather_blue/back.vox} (100%)
 rename assets/voxygen/voxel/armor/{chest/leather_blue-0.vox => leather_blue/chest.vox} (100%)
 rename assets/voxygen/voxel/armor/{pants/leather_blue-0.vox => leather_blue/pants.vox} (100%)
 rename assets/voxygen/voxel/armor/{belt/plate_leather-0.vox => leather_plate/belt.vox} (100%)
 rename assets/voxygen/voxel/armor/{chest/plate_leather.vox => leather_plate/chest.vox} (100%)
 rename assets/voxygen/voxel/armor/{foot/plate_leather.vox => leather_plate/foot.vox} (100%)
 rename assets/voxygen/voxel/armor/{hand/plate_leather_left-0.vox => leather_plate/hand.vox} (100%)
 rename assets/voxygen/voxel/armor/{pants/plate_leather-0.vox => leather_plate/pants.vox} (100%)
 rename assets/voxygen/voxel/armor/{shoulder/plate_leather_left-0.vox => leather_plate/shoulder.vox} (100%)
 rename assets/voxygen/voxel/armor/{ => misc}/back/admin.vox (100%)
 rename assets/voxygen/voxel/armor/{ => misc}/back/backpack-grey.vox (100%)
 rename assets/voxygen/voxel/armor/{back/backpack-0.vox => misc/back/backpack.vox} (100%)
 rename assets/voxygen/voxel/armor/{back/dung_purp-0.vox => misc/back/dungeon_purple.vox} (100%)
 rename assets/voxygen/voxel/armor/{ => misc}/back/short-0.vox (100%)
 rename assets/voxygen/voxel/armor/{ => misc}/back/short-1.vox (100%)
 rename assets/voxygen/voxel/armor/{ => misc}/belt/cloth_black.vox (100%)
 rename assets/voxygen/voxel/armor/{ => misc}/belt/cloth_blood.vox (100%)
 rename assets/voxygen/voxel/armor/{ => misc}/belt/cloth_grey.vox (100%)
 rename assets/voxygen/voxel/armor/{ => misc}/belt/cloth_turq.vox (100%)
 rename assets/voxygen/voxel/armor/{ => misc}/belt/dark.vox (100%)
 rename assets/voxygen/voxel/armor/{belt/belt_none.vox => misc/belt/none.vox} (100%)
 rename assets/voxygen/voxel/armor/{ => misc}/chest/cloth_red_kimono.vox (100%)
 rename assets/voxygen/voxel/armor/{ => misc}/chest/grayscale.vox (100%)
 rename assets/voxygen/voxel/armor/{chest/chest_none.vox => misc/chest/none.vox} (100%)
 rename assets/voxygen/voxel/armor/{chest/plate_grey-0.vox => misc/chest/plate_grey.vox} (100%)
 rename assets/voxygen/voxel/armor/{chest/shirt_white-0.vox => misc/chest/shirt_white.vox} (100%)
 rename assets/voxygen/voxel/armor/{chest/worker_green-0.vox => misc/chest/worker_green.vox} (100%)
 rename assets/voxygen/voxel/armor/{chest/worker_red-0.vox => misc/chest/worker_red.vox} (100%)
 rename assets/voxygen/voxel/armor/{chest/worker_white-0.vox => misc/chest/worker_white.vox} (100%)
 rename assets/voxygen/voxel/armor/{foot/cloth_sandals.vox => misc/foot/cloth_sandal.vox} (100%)
 rename assets/voxygen/voxel/armor/{foot/dark-0.vox => misc/foot/dark.vox} (100%)
 rename assets/voxygen/voxel/armor/{foot/dark_jester-elf_shoe.vox => misc/foot/dark_jester_elf.vox} (100%)
 rename assets/voxygen/voxel/armor/{foot/jackalope_slippers.vox => misc/foot/jackalope.vox} (100%)
 rename assets/voxygen/voxel/armor/{foot/foot_none.vox => misc/foot/none.vox} (100%)
 rename assets/voxygen/voxel/armor/{hand/bare_right.vox => misc/hand/bare.vox} (100%)
 rename assets/voxygen/voxel/armor/{hand/cloth_basic_right.vox => misc/hand/cloth_basic.vox} (100%)
 rename assets/voxygen/voxel/armor/{hand/hand_right_none.vox => misc/hand/none.vox} (100%)
 rename assets/voxygen/voxel/armor/{ => misc}/head/assa_mask-0.vox (100%)
 rename assets/voxygen/voxel/armor/{ => misc}/head/leather-0.vox (100%)
 rename assets/voxygen/voxel/armor/{ => misc}/head/warlock.vox (100%)
 rename assets/voxygen/voxel/armor/{ => misc}/head/warlord.vox (100%)
 rename assets/voxygen/voxel/armor/{ => misc}/lantern/black-0.vox (100%)
 rename assets/voxygen/voxel/armor/{ => misc}/lantern/blue-0.vox (100%)
 rename assets/voxygen/voxel/armor/{ => misc}/lantern/green-0.vox (100%)
 rename assets/voxygen/voxel/armor/{ => misc}/lantern/red-0.vox (100%)
 rename assets/voxygen/voxel/armor/{ => misc}/pants/cloth_red_kimono.vox (100%)
 rename assets/voxygen/voxel/armor/{pants/grayscale.vox => misc/pants/grayscale_pants.vox} (100%)
 rename assets/voxygen/voxel/armor/{pants/pants_none.vox => misc/pants/none.vox} (100%)
 rename assets/voxygen/voxel/armor/{pants/plate_grey-0.vox => misc/pants/plate_grey.vox} (100%)
 rename assets/voxygen/voxel/armor/{pants/worker_blue-0.vox => misc/pants/worker_blue.vox} (100%)
 rename assets/voxygen/voxel/armor/{ring/simple_gold-0.vox => misc/ring/gold.vox} (100%)
 rename assets/voxygen/voxel/armor/{ring/simple_purp-0.vox => misc/ring/scratched.vox} (100%)
 rename assets/voxygen/voxel/armor/{ring/high_purp-0.vox => misc/ring/skull.vox} (100%)
 rename assets/voxygen/voxel/armor/{shoulder/chain_right.vox => misc/shoulder/chain.vox} (100%)
 rename assets/voxygen/voxel/armor/{shoulder/iron_spikes_left.vox => misc/shoulder/iron_spikes.vox} (100%)
 rename assets/voxygen/voxel/armor/{shoulder/leather_iron_left-0.vox => misc/shoulder/leather_iron_0.vox} (100%)
 rename assets/voxygen/voxel/armor/{shoulder/leather_iron_left-1.vox => misc/shoulder/leather_iron_1.vox} (100%)
 rename assets/voxygen/voxel/armor/{shoulder/leather_iron_left-2.vox => misc/shoulder/leather_iron_2.vox} (100%)
 rename assets/voxygen/voxel/armor/{shoulder/leather_iron_left-3.vox => misc/shoulder/leather_iron_3.vox} (100%)
 rename assets/voxygen/voxel/armor/{shoulder/leather_strips_left.vox => misc/shoulder/leather_strip.vox} (100%)
 rename assets/voxygen/voxel/armor/{belt/plate-0.vox => plate/belt.vox} (100%)
 rename assets/voxygen/voxel/armor/{chest/plate_green-0.vox => plate/chest.vox} (100%)
 rename assets/voxygen/voxel/armor/{foot/plate-0.vox => plate/foot.vox} (100%)
 rename assets/voxygen/voxel/armor/{hand/plate_right-0.vox => plate/hand.vox} (100%)
 rename assets/voxygen/voxel/armor/{pants/plate_green-0.vox => plate/pants.vox} (100%)
 rename assets/voxygen/voxel/armor/{shoulder/plate_right-0.vox => plate/shoulder.vox} (100%)
 rename assets/voxygen/voxel/armor/{chest/rugged-0.vox => rugged/chest.vox} (100%)
 rename assets/voxygen/voxel/armor/{pants/rugged-0.vox => rugged/pants.vox} (100%)
 delete mode 100644 assets/voxygen/voxel/armor/shoulder/assa_left.vox
 delete mode 100644 assets/voxygen/voxel/armor/shoulder/bonerattler_right.vox
 delete mode 100644 assets/voxygen/voxel/armor/shoulder/chain_left-1.vox
 delete mode 100644 assets/voxygen/voxel/armor/shoulder/chain_left.vox
 delete mode 100644 assets/voxygen/voxel/armor/shoulder/chain_right-1.vox
 delete mode 100644 assets/voxygen/voxel/armor/shoulder/cloth_blue_right-0.vox
 delete mode 100644 assets/voxygen/voxel/armor/shoulder/cloth_blue_right-1.vox
 delete mode 100644 assets/voxygen/voxel/armor/shoulder/cloth_green_right-0.vox
 delete mode 100644 assets/voxygen/voxel/armor/shoulder/cloth_purple_left-0.vox
 delete mode 100644 assets/voxygen/voxel/armor/shoulder/cultist_right.vox
 delete mode 100644 assets/voxygen/voxel/armor/shoulder/druid_right.vox
 delete mode 100644 assets/voxygen/voxel/armor/shoulder/iron_spikes_right.vox
 delete mode 100644 assets/voxygen/voxel/armor/shoulder/leather_iron_right-0.vox
 delete mode 100644 assets/voxygen/voxel/armor/shoulder/leather_iron_right-1.vox
 delete mode 100644 assets/voxygen/voxel/armor/shoulder/leather_iron_right-2.vox
 delete mode 100644 assets/voxygen/voxel/armor/shoulder/leather_iron_right-3.vox
 delete mode 100644 assets/voxygen/voxel/armor/shoulder/leather_left-0.vox
 delete mode 100644 assets/voxygen/voxel/armor/shoulder/leather_left-1.vox
 delete mode 100644 assets/voxygen/voxel/armor/shoulder/leather_right-2.vox
 delete mode 100644 assets/voxygen/voxel/armor/shoulder/leather_strips_right.vox
 delete mode 100644 assets/voxygen/voxel/armor/shoulder/plate_leather_right-0.vox
 delete mode 100644 assets/voxygen/voxel/armor/shoulder/plate_left-0.vox
 delete mode 100644 assets/voxygen/voxel/armor/shoulder/steel_right-0.vox
 delete mode 100644 assets/voxygen/voxel/armor/shoulder/tarasque_left.vox
 delete mode 100644 assets/voxygen/voxel/armor/shoulder/twigs_right.vox
 delete mode 100644 assets/voxygen/voxel/armor/shoulder/twigsflowers_shoulder_right.vox
 delete mode 100644 assets/voxygen/voxel/armor/shoulder/twigsleaves_shoulder_right.vox
 delete mode 100644 assets/voxygen/voxel/armor/shoulder/warlock_right.vox
 delete mode 100644 assets/voxygen/voxel/armor/shoulder/warlord_left.vox
 rename assets/voxygen/voxel/armor/{belt/steel-0.vox => steel/belt.vox} (100%)
 rename assets/voxygen/voxel/armor/{chest/steel-0.vox => steel/chest.vox} (100%)
 rename assets/voxygen/voxel/armor/{foot/steel-0.vox => steel/foot.vox} (100%)
 rename assets/voxygen/voxel/armor/{hand/steel_left-0.vox => steel/hand.vox} (100%)
 rename assets/voxygen/voxel/armor/{pants/steel-0.vox => steel/pants.vox} (100%)
 rename assets/voxygen/voxel/armor/{shoulder/steel_left-0.vox => steel/shoulder.vox} (100%)
 rename assets/voxygen/voxel/armor/{belt/leather-0.vox => swift/belt.vox} (100%)
 rename assets/voxygen/voxel/armor/{chest/leather-0.vox => swift/chest.vox} (100%)
 rename assets/voxygen/voxel/armor/{foot/leather-0.vox => swift/foot.vox} (100%)
 rename assets/voxygen/voxel/armor/{hand/leather_right-0.vox => swift/hand.vox} (100%)
 rename assets/voxygen/voxel/armor/{pants/leather-0.vox => swift/pants.vox} (100%)
 rename assets/voxygen/voxel/armor/{shoulder/leather_right-0.vox => swift/shoulder.vox} (100%)
 rename assets/voxygen/voxel/armor/{belt/tarasque.vox => tarasque/belt.vox} (100%)
 rename assets/voxygen/voxel/armor/{chest/tarasque.vox => tarasque/chest.vox} (100%)
 rename assets/voxygen/voxel/armor/{foot/tarasque.vox => tarasque/foot.vox} (100%)
 rename assets/voxygen/voxel/armor/{hand/tarasque_right.vox => tarasque/hand.vox} (100%)
 rename assets/voxygen/voxel/armor/{pants/tarasque.vox => tarasque/pants.vox} (100%)
 rename assets/voxygen/voxel/armor/{shoulder/tarasque_right.vox => tarasque/shoulder.vox} (100%)
 rename assets/voxygen/voxel/armor/{belt/twigs_belt.vox => twigs/belt.vox} (100%)
 rename assets/voxygen/voxel/armor/{chest/twigs_chest.vox => twigs/chest.vox} (100%)
 rename assets/voxygen/voxel/armor/{foot/twigs_foot.vox => twigs/foot.vox} (100%)
 rename assets/voxygen/voxel/armor/{hand/twigs_glove_left.vox => twigs/hand.vox} (100%)
 rename assets/voxygen/voxel/armor/{pants/twigs_pants.vox => twigs/pants.vox} (100%)
 rename assets/voxygen/voxel/armor/{shoulder/twigs_left.vox => twigs/shoulder.vox} (100%)
 rename assets/voxygen/voxel/armor/{belt/twigsflowers_belt.vox => twigsflowers/belt.vox} (100%)
 rename assets/voxygen/voxel/armor/{chest/twigsflowers_chest.vox => twigsflowers/chest.vox} (100%)
 rename assets/voxygen/voxel/armor/{foot/twigsflowers_foot.vox => twigsflowers/foot.vox} (100%)
 rename assets/voxygen/voxel/armor/{hand/twigsflowers_glove_left.vox => twigsflowers/hand.vox} (100%)
 rename assets/voxygen/voxel/armor/{pants/twigsflowers_pants.vox => twigsflowers/pants.vox} (100%)
 rename assets/voxygen/voxel/armor/{shoulder/twigsflowers_shoulder_left.vox => twigsflowers/shoulder.vox} (100%)
 rename assets/voxygen/voxel/armor/{belt/twigsleaves_belt.vox => twigsleaves/belt.vox} (100%)
 rename assets/voxygen/voxel/armor/{chest/twigsleaves_chest.vox => twigsleaves/chest.vox} (100%)
 rename assets/voxygen/voxel/armor/{foot/twigsleaves_foot.vox => twigsleaves/foot.vox} (100%)
 rename assets/voxygen/voxel/armor/{hand/twigsleaves_glove_left.vox => twigsleaves/hand.vox} (100%)
 rename assets/voxygen/voxel/armor/{pants/twigsleaves_pants.vox => twigsleaves/pants.vox} (100%)
 rename assets/voxygen/voxel/armor/{shoulder/twigsleaves_shoulder_left.vox => twigsleaves/shoulder.vox} (100%)
 rename assets/voxygen/voxel/armor/{back/velorite_battlemage.vox => velorite_battlemage/back.vox} (100%)
 rename assets/voxygen/voxel/armor/{belt/velorite_battlemage.vox => velorite_battlemage/belt.vox} (100%)
 rename assets/voxygen/voxel/armor/{chest/velorite_battlemage.vox => velorite_battlemage/chest.vox} (100%)
 rename assets/voxygen/voxel/armor/{foot/velorite_battlemage.vox => velorite_battlemage/foot.vox} (100%)
 rename assets/voxygen/voxel/armor/{hand/velorite_battlemage_right.vox => velorite_battlemage/hand.vox} (100%)
 rename assets/voxygen/voxel/armor/{pants/velorite_battlemage.vox => velorite_battlemage/pants.vox} (100%)
 rename assets/voxygen/voxel/armor/{shoulder/velorite_battlemage_left.vox => velorite_battlemage/shoulder.vox} (100%)
 rename assets/voxygen/voxel/armor/{back/warlock.vox => warlock/back.vox} (100%)
 rename assets/voxygen/voxel/armor/{belt/warlock.vox => warlock/belt.vox} (100%)
 rename assets/voxygen/voxel/armor/{chest/warlock.vox => warlock/chest.vox} (100%)
 rename assets/voxygen/voxel/armor/{foot/warlock.vox => warlock/foot.vox} (100%)
 rename assets/voxygen/voxel/armor/{hand/warlock_left.vox => warlock/hand.vox} (100%)
 rename assets/voxygen/voxel/armor/{pants/warlock.vox => warlock/pants.vox} (100%)
 rename assets/voxygen/voxel/armor/{shoulder/warlock_left.vox => warlock/shoulder.vox} (100%)
 rename assets/voxygen/voxel/armor/{back/warlord.vox => warlord/back.vox} (100%)
 rename assets/voxygen/voxel/armor/{belt/warlord.vox => warlord/belt.vox} (100%)
 rename assets/voxygen/voxel/armor/{chest/warlord.vox => warlord/chest.vox} (100%)
 rename assets/voxygen/voxel/armor/{foot/warlord.vox => warlord/foot.vox} (100%)
 rename assets/voxygen/voxel/armor/{hand/warlord_right.vox => warlord/hand.vox} (100%)
 rename assets/voxygen/voxel/armor/{pants/warlord.vox => warlord/pants.vox} (100%)
 rename assets/voxygen/voxel/armor/{shoulder/warlord_right.vox => warlord/shoulder.vox} (100%)

diff --git a/assets/common/items/armor/leather_adventurer/back.ron b/assets/common/items/armor/agile/back.ron
similarity index 90%
rename from assets/common/items/armor/leather_adventurer/back.ron
rename to assets/common/items/armor/agile/back.ron
index 84ae5a60a3..398a212094 100644
--- a/assets/common/items/armor/leather_adventurer/back.ron
+++ b/assets/common/items/armor/agile/back.ron
@@ -2,7 +2,7 @@ ItemDef(
     name: "Agile Cape",
     description: "\'Tightly packed pieces of leather to endure all weather.\'",
     kind: Armor((
-        kind: Back("Short2"),
+        kind: Back("Agile"),
         stats: (
             protection: Normal(0.2),
             poise_resilience: Normal(0.1),
diff --git a/assets/common/items/armor/leather_adventurer/belt.ron b/assets/common/items/armor/agile/belt.ron
similarity index 89%
rename from assets/common/items/armor/leather_adventurer/belt.ron
rename to assets/common/items/armor/agile/belt.ron
index 187ddc53aa..01fe69e95a 100644
--- a/assets/common/items/armor/leather_adventurer/belt.ron
+++ b/assets/common/items/armor/agile/belt.ron
@@ -2,7 +2,7 @@ ItemDef(
     name: "Agile Belt",
     description: "\'Tightly packed pieces of leather to endure all weather.\'",
     kind: Armor((
-        kind: Belt("Leather2"),
+        kind: Belt("Agile"),
         stats: (
             protection: Normal(1.0),
             poise_resilience: Normal(1.0),
diff --git a/assets/common/items/armor/leather_adventurer/chest.ron b/assets/common/items/armor/agile/chest.ron
similarity index 89%
rename from assets/common/items/armor/leather_adventurer/chest.ron
rename to assets/common/items/armor/agile/chest.ron
index ea6caa82ea..825e4fc5fc 100644
--- a/assets/common/items/armor/leather_adventurer/chest.ron
+++ b/assets/common/items/armor/agile/chest.ron
@@ -2,7 +2,7 @@ ItemDef(
     name: "Agile Chest",
     description: "Tightly packed pieces of leather to endure all weather.",
     kind: Armor((
-        kind: Chest("Leather2"),
+        kind: Chest("Agile"),
         stats: (
             protection: Normal(8.0),
             poise_resilience: Normal(3.0),
diff --git a/assets/common/items/armor/leather_adventurer/foot.ron b/assets/common/items/armor/agile/foot.ron
similarity index 89%
rename from assets/common/items/armor/leather_adventurer/foot.ron
rename to assets/common/items/armor/agile/foot.ron
index 3369b5f82b..1eb2e32154 100644
--- a/assets/common/items/armor/leather_adventurer/foot.ron
+++ b/assets/common/items/armor/agile/foot.ron
@@ -2,7 +2,7 @@ ItemDef(
     name: "Agile Kickers",
     description: "\'Tightly packed pieces of leather to endure all weather.",
     kind: Armor((
-        kind: Foot("Leather2"),
+        kind: Foot("Agile"),
         stats: (
             protection: Normal(2.0),
             poise_resilience: Normal(1.0),
diff --git a/assets/common/items/armor/leather_adventurer/hand.ron b/assets/common/items/armor/agile/hand.ron
similarity index 89%
rename from assets/common/items/armor/leather_adventurer/hand.ron
rename to assets/common/items/armor/agile/hand.ron
index 227ebbe8b6..f26a394bdb 100644
--- a/assets/common/items/armor/leather_adventurer/hand.ron
+++ b/assets/common/items/armor/agile/hand.ron
@@ -2,7 +2,7 @@ ItemDef(
     name: "Agile Gauntlets",
     description: "\'Tightly packed pieces of leather to endure all weather.\'",
     kind: Armor((
-        kind: Hand("Leather2"),
+        kind: Hand("Agile"),
         stats: (
             protection: Normal(4.0),
             poise_resilience: Normal(4.0),
diff --git a/assets/common/items/armor/leather_adventurer/pants.ron b/assets/common/items/armor/agile/pants.ron
similarity index 89%
rename from assets/common/items/armor/leather_adventurer/pants.ron
rename to assets/common/items/armor/agile/pants.ron
index d0b0534a84..7244899d6a 100644
--- a/assets/common/items/armor/leather_adventurer/pants.ron
+++ b/assets/common/items/armor/agile/pants.ron
@@ -2,7 +2,7 @@ ItemDef(
     name: "Agile Pantalons",
     description: "\'Tightly packed pieces of leather to endure all weather.\'",
     kind: Armor((
-        kind: Pants("Leather2"),
+        kind: Pants("Agile"),
         stats: (
             protection: Normal(6.0),
             poise_resilience: Normal(3.0),
diff --git a/assets/common/items/armor/leather_adventurer/shoulder.ron b/assets/common/items/armor/agile/shoulder.ron
similarity index 88%
rename from assets/common/items/armor/leather_adventurer/shoulder.ron
rename to assets/common/items/armor/agile/shoulder.ron
index 9ee24ad808..8cf36a908e 100644
--- a/assets/common/items/armor/leather_adventurer/shoulder.ron
+++ b/assets/common/items/armor/agile/shoulder.ron
@@ -2,7 +2,7 @@ ItemDef(
     name: "Agile Guards",
     description: "Tightly packed pieces of leather to endure all weather.",
     kind: Armor((
-        kind: Shoulder("Leather2"),
+        kind: Shoulder("Agile"),
         stats: (
             protection: Normal(8.0),
             poise_resilience: Normal(4.0),
diff --git a/assets/common/items/armor/cloth_blue/belt.ron b/assets/common/items/armor/cloth_blue/belt.ron
index 2ead514736..28ef54799c 100644
--- a/assets/common/items/armor/cloth_blue/belt.ron
+++ b/assets/common/items/armor/cloth_blue/belt.ron
@@ -2,7 +2,7 @@ ItemDef(
     name: "Blue Linen Belt",
     description: "A stylish rough fabric belt, dyed blue.",
     kind: Armor((
-        kind: Belt("ClothBlue0"),
+        kind: Belt("ClothBlue"),
         stats: (
             protection: Normal(1.0),
             poise_resilience: Normal(1.0),
diff --git a/assets/common/items/armor/cloth_blue/chest.ron b/assets/common/items/armor/cloth_blue/chest.ron
index 15212dc6c3..0f48e87d36 100644
--- a/assets/common/items/armor/cloth_blue/chest.ron
+++ b/assets/common/items/armor/cloth_blue/chest.ron
@@ -2,7 +2,7 @@ ItemDef(
     name: "Blue Linen Chest",
     description: "A stylish rough fabric surcoat, dyed blue.",
     kind: Armor((
-        kind: Chest("ClothBlue0"),
+        kind: Chest("ClothBlue"),
         stats: (
             protection: Normal(1.0),
             poise_resilience: Normal(1.0),
diff --git a/assets/common/items/armor/cloth_blue/foot.ron b/assets/common/items/armor/cloth_blue/foot.ron
index b5c70238e9..dd15879046 100644
--- a/assets/common/items/armor/cloth_blue/foot.ron
+++ b/assets/common/items/armor/cloth_blue/foot.ron
@@ -2,7 +2,7 @@ ItemDef(
     name: "Blue Linen Boots",
     description: "Cobbled rough fabric boots, dyed blue.",
     kind: Armor((
-        kind: Foot("ClothBlue0"),
+        kind: Foot("ClothBlue"),
         stats: (
             protection: Normal(0.0),
             poise_resilience: Normal(0.0),
diff --git a/assets/common/items/armor/cloth_blue/hand.ron b/assets/common/items/armor/cloth_blue/hand.ron
index 946d7d5096..ddc21118b6 100644
--- a/assets/common/items/armor/cloth_blue/hand.ron
+++ b/assets/common/items/armor/cloth_blue/hand.ron
@@ -2,7 +2,7 @@ ItemDef(
     name: "Blue Linen Wrists",
     description: "Rough cloth bracelets provide a stylish fashion statement, dyed blue.",
     kind: Armor((
-        kind: Hand("ClothBlue0"),
+        kind: Hand("ClothBlue"),
         stats: (
             protection: Normal(0.0),
             poise_resilience: Normal(0.0),
diff --git a/assets/common/items/armor/cloth_blue/pants.ron b/assets/common/items/armor/cloth_blue/pants.ron
index dc2de84afa..991a375a88 100644
--- a/assets/common/items/armor/cloth_blue/pants.ron
+++ b/assets/common/items/armor/cloth_blue/pants.ron
@@ -2,7 +2,7 @@ ItemDef(
     name: "Blue Linen Skirt",
     description: "A stylish, rough fabric skirt, dyed blue.",
     kind: Armor((
-        kind: Pants("ClothBlue0"),
+        kind: Pants("ClothBlue"),
         stats: (
             protection: Normal(1.0),
             poise_resilience: Normal(1.0),
diff --git a/assets/common/items/armor/cloth_green/belt.ron b/assets/common/items/armor/cloth_green/belt.ron
index 952605b13e..961dd4398c 100644
--- a/assets/common/items/armor/cloth_green/belt.ron
+++ b/assets/common/items/armor/cloth_green/belt.ron
@@ -2,7 +2,7 @@ ItemDef(
     name: "Green Linen Belt",
     description: "A stylish rough fabric belt, dyed green.",
     kind: Armor((
-        kind: Belt("ClothGreen0"),
+        kind: Belt("ClothGreen"),
         stats: (
             protection: Normal(1.0),
             poise_resilience: Normal(1.0),
diff --git a/assets/common/items/armor/cloth_green/chest.ron b/assets/common/items/armor/cloth_green/chest.ron
index a1157ddf54..80e844b7cf 100644
--- a/assets/common/items/armor/cloth_green/chest.ron
+++ b/assets/common/items/armor/cloth_green/chest.ron
@@ -2,7 +2,7 @@ ItemDef(
     name: "Green Linen Chest",
     description: "A stylish rough fabric surcoat, dyed green.",
     kind: Armor((
-        kind: Chest("ClothGreen0"),
+        kind: Chest("ClothGreen"),
         stats: (
             protection: Normal(1.0),
             poise_resilience: Normal(1.0),
diff --git a/assets/common/items/armor/cloth_green/foot.ron b/assets/common/items/armor/cloth_green/foot.ron
index 8b3b52205e..6eaa31cef0 100644
--- a/assets/common/items/armor/cloth_green/foot.ron
+++ b/assets/common/items/armor/cloth_green/foot.ron
@@ -2,7 +2,7 @@ ItemDef(
     name: "Green Linen Boots",
     description: "Cobbled rough fabric boots, dyed green.",
     kind: Armor((
-        kind: Foot("ClothGreen0"),
+        kind: Foot("ClothGreen"),
         stats: (
             protection: Normal(0.0),
             poise_resilience: Normal(0.0),
diff --git a/assets/common/items/armor/cloth_green/hand.ron b/assets/common/items/armor/cloth_green/hand.ron
index 7c8f5297be..330e942996 100644
--- a/assets/common/items/armor/cloth_green/hand.ron
+++ b/assets/common/items/armor/cloth_green/hand.ron
@@ -2,7 +2,7 @@ ItemDef(
     name: "Green Linen Wrists",
     description: "Rough cloth bracelets provide a stylish fashion statement, dyed green.",
     kind: Armor((
-        kind: Hand("ClothGreen0"),
+        kind: Hand("ClothGreen"),
         stats: (
             protection: Normal(0.0),
             poise_resilience: Normal(0.0),
diff --git a/assets/common/items/armor/cloth_green/pants.ron b/assets/common/items/armor/cloth_green/pants.ron
index 7f3378424a..66e02e82b7 100644
--- a/assets/common/items/armor/cloth_green/pants.ron
+++ b/assets/common/items/armor/cloth_green/pants.ron
@@ -2,7 +2,7 @@ ItemDef(
     name: "Green Linen Skirt",
     description: "A stylish, rough fabric skirt, dyed green.",
     kind: Armor((
-        kind: Pants("ClothGreen0"),
+        kind: Pants("ClothGreen"),
         stats: (
             protection: Normal(1.0),
             poise_resilience: Normal(1.0),
diff --git a/assets/common/items/armor/cloth_green/shoulder.ron b/assets/common/items/armor/cloth_green/shoulder.ron
index d069f517e4..f88213f29f 100644
--- a/assets/common/items/armor/cloth_green/shoulder.ron
+++ b/assets/common/items/armor/cloth_green/shoulder.ron
@@ -2,7 +2,7 @@ ItemDef(
     name: "Green Linen Coat",
     description: "A rough fabric coat, dyed green.",
     kind: Armor((
-        kind: Shoulder("ClothGreen0"),
+        kind: Shoulder("ClothGreen"),
         stats: (
             protection: Normal(1.0),
             poise_resilience: Normal(1.0),
diff --git a/assets/common/items/armor/cloth_purple/belt.ron b/assets/common/items/armor/cloth_purple/belt.ron
index afd0fc7401..db714546a9 100644
--- a/assets/common/items/armor/cloth_purple/belt.ron
+++ b/assets/common/items/armor/cloth_purple/belt.ron
@@ -2,7 +2,7 @@ ItemDef(
     name: "Purple Linen Belt",
     description: "A stylish rough fabric belt, dyed purple.",
     kind: Armor((
-        kind: Belt("ClothPurple0"),
+        kind: Belt("ClothPurple"),
         stats: (
             protection: Normal(1.0),
             poise_resilience: Normal(1.0),
diff --git a/assets/common/items/armor/cloth_purple/chest.ron b/assets/common/items/armor/cloth_purple/chest.ron
index 61013cfc0c..2212b075f5 100644
--- a/assets/common/items/armor/cloth_purple/chest.ron
+++ b/assets/common/items/armor/cloth_purple/chest.ron
@@ -2,7 +2,7 @@ ItemDef(
     name: "Purple Linen Chest",
     description: "A stylish rough fabric surcoat, dyed purple.",
     kind: Armor((
-        kind: Chest("ClothPurple0"),
+        kind: Chest("ClothPurple"),
         stats: (
             protection: Normal(1.0),
             poise_resilience: Normal(1.0),
diff --git a/assets/common/items/armor/cloth_purple/foot.ron b/assets/common/items/armor/cloth_purple/foot.ron
index 38df61bf13..32adc3427c 100644
--- a/assets/common/items/armor/cloth_purple/foot.ron
+++ b/assets/common/items/armor/cloth_purple/foot.ron
@@ -2,7 +2,7 @@ ItemDef(
     name: "Purple Linen Boots",
     description: "Cobbled rough fabric boots, dyed purple.",
     kind: Armor((
-        kind: Foot("ClothPurple0"),
+        kind: Foot("ClothPurple"),
         stats: (
             protection: Normal(0.0),
             poise_resilience: Normal(0.0),
diff --git a/assets/common/items/armor/cloth_purple/hand.ron b/assets/common/items/armor/cloth_purple/hand.ron
index 19dc537539..d57beebeba 100644
--- a/assets/common/items/armor/cloth_purple/hand.ron
+++ b/assets/common/items/armor/cloth_purple/hand.ron
@@ -1,8 +1,8 @@
 ItemDef(
-    name: "Purple Silk Wrists",
+    name: "Purple Linen Wrists",
     description: "Rough cloth bracelets provide a stylish fashion statement, dyed purple.",
     kind: Armor((
-        kind: Hand("ClothPurple0"),
+        kind: Hand("ClothPurple"),
         stats: (
             protection: Normal(0.0),
             poise_resilience: Normal(0.0),
diff --git a/assets/common/items/armor/cloth_purple/pants.ron b/assets/common/items/armor/cloth_purple/pants.ron
index 969bc1eabf..36888a2211 100644
--- a/assets/common/items/armor/cloth_purple/pants.ron
+++ b/assets/common/items/armor/cloth_purple/pants.ron
@@ -2,7 +2,7 @@ ItemDef(
     name: "Purple Linen Skirt",
     description: "A stylish, rough fabric skirt, dyed purple.",
     kind: Armor((
-        kind: Pants("ClothPurple0"),
+        kind: Pants("ClothPurple"),
         stats: (
             protection: Normal(1.0),
             poise_resilience: Normal(1.0),
diff --git a/assets/common/items/armor/cloth_purple/shoulder.ron b/assets/common/items/armor/cloth_purple/shoulder.ron
index 1238c718a7..d4ab23ccab 100644
--- a/assets/common/items/armor/cloth_purple/shoulder.ron
+++ b/assets/common/items/armor/cloth_purple/shoulder.ron
@@ -2,7 +2,7 @@ ItemDef(
     name: "Purple Linen Coat",
     description: "A rough fabric coat, dyed purple.",
     kind: Armor((
-        kind: Shoulder("ClothPurple0"),
+        kind: Shoulder("ClothPurple"),
         stats: (
             protection: Normal(1.0),
             poise_resilience: Normal(1.0),
diff --git a/assets/common/items/armor/cultist/chest_blue.ron b/assets/common/items/armor/cultist/chest.ron
similarity index 77%
rename from assets/common/items/armor/cultist/chest_blue.ron
rename to assets/common/items/armor/cultist/chest.ron
index 6abfad9c7a..fb311475a5 100644
--- a/assets/common/items/armor/cultist/chest_blue.ron
+++ b/assets/common/items/armor/cultist/chest.ron
@@ -1,8 +1,8 @@
 ItemDef(
-    name: "Velorite Chest",
+    name: "Cultist Chest",
     description: "Ceremonial attire used by members.",
     kind: Armor((
-        kind: Chest("VeloriteMage0"),
+        kind: Chest("Cultist"),
         stats: (
             protection: Normal(30.0),
             poise_resilience: Normal(15.0),
diff --git a/assets/common/items/armor/cultist/chest_purple.ron b/assets/common/items/armor/cultist/chest_purple.ron
deleted file mode 100644
index a268cb5334..0000000000
--- a/assets/common/items/armor/cultist/chest_purple.ron
+++ /dev/null
@@ -1,13 +0,0 @@
-ItemDef(
-    name: "Purple Cultist Chest",
-    description: "Ceremonial attire used by members.",
-    kind: Armor((
-        kind: Chest("CultistPurple"),
-        stats: (
-            protection: Normal(30.0),
-            poise_resilience: Normal(15.0),
-        ),
-    )),
-    quality: Epic,
-    tags: [],
-)
\ No newline at end of file
diff --git a/assets/common/items/armor/cultist/hand_purple.ron b/assets/common/items/armor/cultist/hand.ron
similarity index 76%
rename from assets/common/items/armor/cultist/hand_purple.ron
rename to assets/common/items/armor/cultist/hand.ron
index b3e944bc92..cf48b137fa 100644
--- a/assets/common/items/armor/cultist/hand_purple.ron
+++ b/assets/common/items/armor/cultist/hand.ron
@@ -1,8 +1,8 @@
 ItemDef(
-    name: "Purple Cultist Gloves",
+    name: "Cultist Gloves",
     description: "Ceremonial attire used by members.",
     kind: Armor((
-        kind: Hand("CultistPurple"),
+        kind: Hand("Cultist"),
         stats: (
             protection: Normal(12.0),
             poise_resilience: Normal(8.0),
diff --git a/assets/common/items/armor/cultist/hand_blue.ron b/assets/common/items/armor/cultist/hand_blue.ron
deleted file mode 100644
index 78cbbc7590..0000000000
--- a/assets/common/items/armor/cultist/hand_blue.ron
+++ /dev/null
@@ -1,13 +0,0 @@
-ItemDef(
-    name: "Velorite Gloves",
-    description: "Ceremonial attire used by members.",
-    kind: Armor((
-        kind: Hand("VeloriteMage0"),
-        stats: (
-            protection: Normal(12.0),
-            poise_resilience: Normal(10.0),
-        ),
-    )),
-    quality: Epic,
-    tags: [],
-)
\ No newline at end of file
diff --git a/assets/common/items/armor/cultist/pants_purple.ron b/assets/common/items/armor/cultist/pants.ron
similarity index 76%
rename from assets/common/items/armor/cultist/pants_purple.ron
rename to assets/common/items/armor/cultist/pants.ron
index c80fdc1b44..e50ab01fc8 100644
--- a/assets/common/items/armor/cultist/pants_purple.ron
+++ b/assets/common/items/armor/cultist/pants.ron
@@ -1,8 +1,8 @@
 ItemDef(
-    name: "Purple Cultist Skirt",
+    name: "Cultist Skirt",
     description: "Ceremonial attire used by members.",
     kind: Armor((
-        kind: Pants("CultistPurple"),
+        kind: Pants("Cultist"),
         stats: (
             protection: Normal(24.0),
             poise_resilience: Normal(14.0),
diff --git a/assets/common/items/armor/cultist/pants_blue.ron b/assets/common/items/armor/cultist/pants_blue.ron
deleted file mode 100644
index 3702f459a3..0000000000
--- a/assets/common/items/armor/cultist/pants_blue.ron
+++ /dev/null
@@ -1,13 +0,0 @@
-ItemDef(
-    name: "Velorite Skirt",
-    description: "Ceremonial attire used by members.",
-    kind: Armor((
-        kind: Pants("VeloriteMage0"),
-        stats: (
-            protection: Normal(24.0),
-            poise_resilience: Normal(10.0),
-        ),
-    )),
-    quality: Epic,
-    tags: [],
-)
\ No newline at end of file
diff --git a/assets/common/items/armor/cultist/shoulder_blue.ron b/assets/common/items/armor/cultist/shoulder.ron
similarity index 76%
rename from assets/common/items/armor/cultist/shoulder_blue.ron
rename to assets/common/items/armor/cultist/shoulder.ron
index 8069c5cdc3..e6e742acca 100644
--- a/assets/common/items/armor/cultist/shoulder_blue.ron
+++ b/assets/common/items/armor/cultist/shoulder.ron
@@ -1,8 +1,8 @@
 ItemDef(
-    name: "Velorite Mantle",
+    name: "Cultist Mantle",
     description: "Ceremonial attire used by members.",
     kind: Armor((
-        kind: Shoulder("VeloriteMage0"),
+        kind: Shoulder("Cultist"),
         stats: (
             protection: Normal(18.0),
             poise_resilience: Normal(10.0),
diff --git a/assets/common/items/armor/cultist/shoulder_purple.ron b/assets/common/items/armor/cultist/shoulder_purple.ron
deleted file mode 100644
index d1ae261e23..0000000000
--- a/assets/common/items/armor/cultist/shoulder_purple.ron
+++ /dev/null
@@ -1,13 +0,0 @@
-ItemDef(
-    name: "Purple Cultist Mantle",
-    description: "Ceremonial attire used by members.",
-    kind: Armor((
-        kind: Shoulder("CultistPurple"),
-        stats: (
-            protection: Normal(18.0),
-            poise_resilience: Normal(10.0),
-        ),
-    )),
-    quality: Epic,
-    tags: [],
-)
\ No newline at end of file
diff --git a/assets/common/items/armor/druid/shoulder.ron b/assets/common/items/armor/druid/shoulder.ron
index 3b08aa2b29..7d5db1b9cb 100644
--- a/assets/common/items/armor/druid/shoulder.ron
+++ b/assets/common/items/armor/druid/shoulder.ron
@@ -2,7 +2,7 @@ ItemDef(
     name: "Druid Shoulders",
     description: "Forged for protectors of the wild.",
     kind: Armor((
-        kind: Shoulder("DruidShoulder"),
+        kind: Shoulder("Druid"),
         stats: (
             protection: Normal(3.0),
             poise_resilience: Normal(6.0),
diff --git a/assets/common/items/armor/leather_1/belt.ron b/assets/common/items/armor/leather/belt.ron
similarity index 88%
rename from assets/common/items/armor/leather_1/belt.ron
rename to assets/common/items/armor/leather/belt.ron
index a3b0f23a32..c66a57c9f5 100644
--- a/assets/common/items/armor/leather_1/belt.ron
+++ b/assets/common/items/armor/leather/belt.ron
@@ -2,7 +2,7 @@ ItemDef(
     name: "Leather Belt",
     description: "A belt made from simple leather.",
     kind: Armor((
-        kind: Belt("Leather2"),
+        kind: Belt("Leather"),
         stats: (
             protection: Normal(1.0),
             poise_resilience: Normal(1.0),
diff --git a/assets/common/items/armor/leather_1/chest.ron b/assets/common/items/armor/leather/chest.ron
similarity index 88%
rename from assets/common/items/armor/leather_1/chest.ron
rename to assets/common/items/armor/leather/chest.ron
index 749da4db1d..bb7db69674 100644
--- a/assets/common/items/armor/leather_1/chest.ron
+++ b/assets/common/items/armor/leather/chest.ron
@@ -2,7 +2,7 @@ ItemDef(
     name: "Leather Cuirass",
     description: "A cuirass made of simple leather.",
     kind: Armor((
-        kind: Chest("Leather2"),
+        kind: Chest("Leather"),
         stats: (
             protection: Normal(10.0),
             poise_resilience: Normal(8.0),
diff --git a/assets/common/items/armor/leather_1/foot.ron b/assets/common/items/armor/leather/foot.ron
similarity index 88%
rename from assets/common/items/armor/leather_1/foot.ron
rename to assets/common/items/armor/leather/foot.ron
index 1c24f94bb7..9aaba380b3 100644
--- a/assets/common/items/armor/leather_1/foot.ron
+++ b/assets/common/items/armor/leather/foot.ron
@@ -2,7 +2,7 @@ ItemDef(
     name: "Leather Boots",
     description: "Boots made of simple leather.",
     kind: Armor((
-        kind: Foot("Leather2"),
+        kind: Foot("Leather"),
         stats: (
             protection: Normal(2.0),
             poise_resilience: Normal(3.0),
diff --git a/assets/common/items/armor/leather_1/hand.ron b/assets/common/items/armor/leather/hand.ron
similarity index 88%
rename from assets/common/items/armor/leather_1/hand.ron
rename to assets/common/items/armor/leather/hand.ron
index c0be4105a0..08d438daa8 100644
--- a/assets/common/items/armor/leather_1/hand.ron
+++ b/assets/common/items/armor/leather/hand.ron
@@ -2,7 +2,7 @@ ItemDef(
     name: "Leather Gloves",
     description: "Gloves made of simple leather.",
     kind: Armor((
-        kind: Hand("Leather2"),
+        kind: Hand("Leather"),
         stats: (
             protection: Normal(4.0),
             poise_resilience: Normal(5.0),
diff --git a/assets/common/items/armor/leather_1/pants.ron b/assets/common/items/armor/leather/pants.ron
similarity index 88%
rename from assets/common/items/armor/leather_1/pants.ron
rename to assets/common/items/armor/leather/pants.ron
index 1c80fee2dd..fd3131ed53 100644
--- a/assets/common/items/armor/leather_1/pants.ron
+++ b/assets/common/items/armor/leather/pants.ron
@@ -2,7 +2,7 @@ ItemDef(
     name: "Leather Leg Armour",
     description: "Leg armour made of simple leather.",
     kind: Armor((
-        kind: Pants("Leather2"),
+        kind: Pants("Leather"),
         stats: (
             protection: Normal(8.0),
             poise_resilience: Normal(4.0),
diff --git a/assets/common/items/armor/leather_1/shoulder.ron b/assets/common/items/armor/leather/shoulder.ron
similarity index 87%
rename from assets/common/items/armor/leather_1/shoulder.ron
rename to assets/common/items/armor/leather/shoulder.ron
index 6cec22e471..c82e4e36ec 100644
--- a/assets/common/items/armor/leather_1/shoulder.ron
+++ b/assets/common/items/armor/leather/shoulder.ron
@@ -2,7 +2,7 @@ ItemDef(
     name: "Leather Shoulder Pad",
     description: "A simple shoulder pad made of leather.",
     kind: Armor((
-        kind: Shoulder("Leather2"),
+        kind: Shoulder("Leather"),
         stats: (
             protection: Normal(6.0),
             poise_resilience: Normal(2.0),
diff --git a/assets/common/items/armor/leather_plate/belt.ron b/assets/common/items/armor/leather_plate/belt.ron
index 0478cd0930..8a1adb2638 100644
--- a/assets/common/items/armor/leather_plate/belt.ron
+++ b/assets/common/items/armor/leather_plate/belt.ron
@@ -2,7 +2,7 @@ ItemDef(
     name: "Leather Plate Belt",
     description: "Leather adorned with steel for better protection.",
     kind: Armor((
-        kind: Belt("PlateLeather"),
+        kind: Belt("LeatherPlate"),
         stats: (
             protection: Normal(4.0),
             poise_resilience: Normal(8.0),
diff --git a/assets/common/items/armor/leather_plate/chest.ron b/assets/common/items/armor/leather_plate/chest.ron
index 418bb7a532..57b651fe5b 100644
--- a/assets/common/items/armor/leather_plate/chest.ron
+++ b/assets/common/items/armor/leather_plate/chest.ron
@@ -2,7 +2,7 @@ ItemDef(
     name: "Leather Plate Chest",
     description: "Leather adorned with steel for better protection.",
     kind: Armor((
-        kind: Chest("PlateLeather"),
+        kind: Chest("LeatherPlate"),
         stats: (
             protection: Normal(25.0),
             poise_resilience: Normal(40.0),
diff --git a/assets/common/items/armor/leather_plate/foot.ron b/assets/common/items/armor/leather_plate/foot.ron
index 79df40ad5d..ea45f479eb 100644
--- a/assets/common/items/armor/leather_plate/foot.ron
+++ b/assets/common/items/armor/leather_plate/foot.ron
@@ -2,7 +2,7 @@ ItemDef(
     name: "Leather Plate Boots",
     description: "Leather adorned with steel for better protection.",
     kind: Armor((
-        kind: Foot("PlateLeather"),
+        kind: Foot("LeatherPlate"),
         stats: (
             protection: Normal(5.0),
             poise_resilience: Normal(10.0),
diff --git a/assets/common/items/armor/leather_plate/hand.ron b/assets/common/items/armor/leather_plate/hand.ron
index dac425fb98..a7382c206a 100644
--- a/assets/common/items/armor/leather_plate/hand.ron
+++ b/assets/common/items/armor/leather_plate/hand.ron
@@ -2,7 +2,7 @@ ItemDef(
     name: "Leather Plate Gloves",
     description: "Leather adorned with steel for better protection.",
     kind: Armor((
-        kind: Hand("PlateLeather"),
+        kind: Hand("LeatherPlate"),
         stats: (
             protection: Normal(10.0),
             poise_resilience: Normal(15.0),
diff --git a/assets/common/items/armor/leather_plate/pants.ron b/assets/common/items/armor/leather_plate/pants.ron
index 0ba0823495..9d5b30b25a 100644
--- a/assets/common/items/armor/leather_plate/pants.ron
+++ b/assets/common/items/armor/leather_plate/pants.ron
@@ -2,7 +2,7 @@ ItemDef(
     name: "Leather Plate Chausses",
     description: "Leather adorned with steel for better protection.",
     kind: Armor((
-        kind: Pants("PlateLeather"),
+        kind: Pants("LeatherPlate"),
         stats: (
             protection: Normal(20.0),
             poise_resilience: Normal(26.0),
diff --git a/assets/common/items/armor/leather_plate/shoulder.ron b/assets/common/items/armor/leather_plate/shoulder.ron
index f01b48eb91..e7161f708f 100644
--- a/assets/common/items/armor/leather_plate/shoulder.ron
+++ b/assets/common/items/armor/leather_plate/shoulder.ron
@@ -2,7 +2,7 @@ ItemDef(
     name: "Leather Plate Shoulder Pad",
     description: "Leather adorned with steel for better protection.",
     kind: Armor((
-        kind: Shoulder("PlateLeather"),
+        kind: Shoulder("LeatherPlate"),
         stats: (
             protection: Normal(15.0),
             poise_resilience: Normal(20.0),
diff --git a/assets/common/items/armor/misc/back/backpack_0.ron b/assets/common/items/armor/misc/back/backpack.ron
similarity index 89%
rename from assets/common/items/armor/misc/back/backpack_0.ron
rename to assets/common/items/armor/misc/back/backpack.ron
index 14c4380464..9a67d6c42b 100644
--- a/assets/common/items/armor/misc/back/backpack_0.ron
+++ b/assets/common/items/armor/misc/back/backpack.ron
@@ -2,7 +2,7 @@ ItemDef(
     name: "Traveler\'s Backpack",
     description: "Comfort and capacity united.",
     kind: Armor((
-        kind: Back("Backpack0"),
+        kind: Back("Backpack"),
         stats: (
             protection: Normal(0.0),
             poise_resilience: Normal(0.0),
diff --git a/assets/common/items/armor/misc/back/dungeon_purple-0.ron b/assets/common/items/armor/misc/back/dungeon_purple.ron
similarity index 87%
rename from assets/common/items/armor/misc/back/dungeon_purple-0.ron
rename to assets/common/items/armor/misc/back/dungeon_purple.ron
index 45a2ee2027..84a341127c 100644
--- a/assets/common/items/armor/misc/back/dungeon_purple-0.ron
+++ b/assets/common/items/armor/misc/back/dungeon_purple.ron
@@ -2,7 +2,7 @@ ItemDef(
     name: "Purple Cultist Cape",
     description: "Smells like dark magic and candles.",
     kind: Armor((
-        kind: Back("DungPurp0"),
+        kind: Back("DungeonPurple"),
         stats: (
             protection: Normal(3.0),
             poise_resilience: Normal(1.0),
diff --git a/assets/common/items/armor/misc/foot/jackalope_slippers.ron b/assets/common/items/armor/misc/foot/jackalope_slippers.ron
index 091bfbbc84..fab40c9ac9 100644
--- a/assets/common/items/armor/misc/foot/jackalope_slippers.ron
+++ b/assets/common/items/armor/misc/foot/jackalope_slippers.ron
@@ -2,7 +2,7 @@ ItemDef(
     name: "Fluffy Jackalope Slippers",
     description: "So warm and cozy!",
     kind: Armor((
-        kind: Foot("JackalopeSlips"),
+        kind: Foot("Jackalope"),
         stats: (
             protection: Normal(0.0),
             poise_resilience: Normal(10.0),
diff --git a/assets/common/items/armor/misc/foot/sandals.ron b/assets/common/items/armor/misc/foot/sandals.ron
index 673ecd1f90..7c3aee3513 100644
--- a/assets/common/items/armor/misc/foot/sandals.ron
+++ b/assets/common/items/armor/misc/foot/sandals.ron
@@ -2,7 +2,7 @@ ItemDef(
     name: "Worn out Sandals",
     description: "Loyal companions.",
     kind: Armor((
-        kind: Foot("Sandal0"),
+        kind: Foot("Sandal"),
         stats: (
             protection: Normal(0.0),
             poise_resilience: Normal(0.0),
diff --git a/assets/common/items/armor/misc/neck/neck_0.ron b/assets/common/items/armor/misc/neck/plain_0.ron
similarity index 89%
rename from assets/common/items/armor/misc/neck/neck_0.ron
rename to assets/common/items/armor/misc/neck/plain_0.ron
index 64087a68f6..8c1a5df87d 100644
--- a/assets/common/items/armor/misc/neck/neck_0.ron
+++ b/assets/common/items/armor/misc/neck/plain_0.ron
@@ -2,7 +2,7 @@ ItemDef(
     name: "Plain Necklace",
     description: "It\'s become tarnished with age.",
     kind: Armor((
-        kind: Neck("Neck0"),
+        kind: Neck("Plain0"),
         stats: (
             protection: Normal(1.0),
             poise_resilience: Normal(1.0),
diff --git a/assets/common/items/armor/misc/neck/neck_1.ron b/assets/common/items/armor/misc/neck/plain_1.ron
similarity index 89%
rename from assets/common/items/armor/misc/neck/neck_1.ron
rename to assets/common/items/armor/misc/neck/plain_1.ron
index e36af099b6..60e9a98cf1 100644
--- a/assets/common/items/armor/misc/neck/neck_1.ron
+++ b/assets/common/items/armor/misc/neck/plain_1.ron
@@ -2,7 +2,7 @@ ItemDef(
     name: "Gem of lesser Protection",
     description: "Surrounded by a discrete magical glow.",
     kind: Armor((
-        kind: Neck("Neck1"),
+        kind: Neck("Plain1"),
         stats: (
             protection: Normal(2.0),
             poise_resilience: Normal(1.0),
diff --git a/assets/common/items/armor/misc/neck/neck_2.ron b/assets/common/items/armor/misc/neck/shell.ron
similarity index 89%
rename from assets/common/items/armor/misc/neck/neck_2.ron
rename to assets/common/items/armor/misc/neck/shell.ron
index 9a17ee9d0c..4bba778bd7 100644
--- a/assets/common/items/armor/misc/neck/neck_2.ron
+++ b/assets/common/items/armor/misc/neck/shell.ron
@@ -2,7 +2,7 @@ ItemDef(
     name: "Seashell Necklace",
     description: "Contains the guardian aura of the ocean",
     kind: Armor((
-        kind: Neck("NeckShell"),
+        kind: Neck("Shell"),
         stats: (
             protection: Normal(2.0),
             poise_resilience: Normal(1.0),
diff --git a/assets/common/items/armor/misc/pants/worker_blue.ron b/assets/common/items/armor/misc/pants/worker_blue.ron
index a2cf9f7b08..b24428bf78 100644
--- a/assets/common/items/armor/misc/pants/worker_blue.ron
+++ b/assets/common/items/armor/misc/pants/worker_blue.ron
@@ -2,7 +2,7 @@ ItemDef(
     name: "Blue Worker Pants",
     description: "Pants used by a farmer, until recently.",
     kind: Armor((
-        kind: Pants("WorkerBlue0"),
+        kind: Pants("WorkerBlue"),
         stats: (
             protection: Normal(1.0),
             poise_resilience: Normal(1.0),
diff --git a/assets/common/items/armor/ring/ring_gold_0.ron b/assets/common/items/armor/misc/ring/gold.ron
similarity index 88%
rename from assets/common/items/armor/ring/ring_gold_0.ron
rename to assets/common/items/armor/misc/ring/gold.ron
index 6149fec8a9..8acae0e3e1 100644
--- a/assets/common/items/armor/ring/ring_gold_0.ron
+++ b/assets/common/items/armor/misc/ring/gold.ron
@@ -2,7 +2,7 @@ ItemDef(
     name: "Gold Ring",
     description: "Someone is surely missing it...",
     kind: Armor((
-        kind: Ring("RingGold0"),
+        kind: Ring("Gold"),
         stats: (
             protection: Normal(0.5),
             poise_resilience: Normal(0.0),
diff --git a/assets/common/items/armor/ring/ring_0.ron b/assets/common/items/armor/misc/ring/scratched.ron
similarity index 87%
rename from assets/common/items/armor/ring/ring_0.ron
rename to assets/common/items/armor/misc/ring/scratched.ron
index c1d4e65674..fed0e9d2df 100644
--- a/assets/common/items/armor/ring/ring_0.ron
+++ b/assets/common/items/armor/misc/ring/scratched.ron
@@ -2,7 +2,7 @@ ItemDef(
     name: "Scratched Ring",
     description: "Barely fits your finger.",
     kind: Armor((
-        kind: Ring("Ring0"),
+        kind: Ring("Scratched"),
         stats: (
             protection: Normal(0.1),
             poise_resilience: Normal(0.0),
diff --git a/assets/common/items/armor/ring/ring_purp_high_0.ron b/assets/common/items/armor/misc/ring/skull.ron
similarity index 88%
rename from assets/common/items/armor/ring/ring_purp_high_0.ron
rename to assets/common/items/armor/misc/ring/skull.ron
index 863dd6907a..edfa8639e7 100644
--- a/assets/common/items/armor/ring/ring_purp_high_0.ron
+++ b/assets/common/items/armor/misc/ring/skull.ron
@@ -2,7 +2,7 @@ ItemDef(
     name: "Cultist Signet Ring ",
     description: "Once belonged to a cultist.",
     kind: Armor((
-        kind: Ring("RingSkull0"),
+        kind: Ring("Skull"),
         stats: (
             protection: Normal(3.0),
             poise_resilience: Normal(1.0),
diff --git a/assets/common/items/armor/misc/shoulder/leather_2.ron b/assets/common/items/armor/misc/shoulder/leather_3.ron
similarity index 88%
rename from assets/common/items/armor/misc/shoulder/leather_2.ron
rename to assets/common/items/armor/misc/shoulder/leather_3.ron
index c551338e0d..4794d5cb03 100644
--- a/assets/common/items/armor/misc/shoulder/leather_2.ron
+++ b/assets/common/items/armor/misc/shoulder/leather_3.ron
@@ -2,7 +2,7 @@ ItemDef(
     name: "Leather Pauldrons",
     description: "Animal hide tanned and formed into shoulder pads.",
     kind: Armor((
-        kind: Shoulder("Leather0"),
+        kind: Shoulder("Leather3"),
         stats: (
             protection: Normal(6.0),
             poise_resilience: Normal(3.0),
diff --git a/assets/common/items/armor/misc/shoulder/leather_strip.ron b/assets/common/items/armor/misc/shoulder/leather_strip.ron
index 7ff99561a2..d771916b4e 100644
--- a/assets/common/items/armor/misc/shoulder/leather_strip.ron
+++ b/assets/common/items/armor/misc/shoulder/leather_strip.ron
@@ -2,7 +2,7 @@ ItemDef(
     name: "Leather Strips",
     description: "Tanned animal hide strips formed into loose shoulder pads.",
     kind: Armor((
-        kind: Shoulder("LeatherStrips"),
+        kind: Shoulder("LeatherStrip"),
         stats: (
             protection: Normal(4.0),
             poise_resilience: Normal(1.0),
diff --git a/assets/common/items/armor/tabard/admin.ron b/assets/common/items/armor/misc/tabard/admin.ron
similarity index 100%
rename from assets/common/items/armor/tabard/admin.ron
rename to assets/common/items/armor/misc/tabard/admin.ron
diff --git a/assets/common/items/armor/plate_green/belt.ron b/assets/common/items/armor/plate/belt.ron
similarity index 82%
rename from assets/common/items/armor/plate_green/belt.ron
rename to assets/common/items/armor/plate/belt.ron
index f82ddd629b..6156ebc5a5 100644
--- a/assets/common/items/armor/plate_green/belt.ron
+++ b/assets/common/items/armor/plate/belt.ron
@@ -1,8 +1,8 @@
 ItemDef(
-    name: "Iron Belt",
+    name: "Plate Belt",
     description: "A tanned leather belt with a forged iron buckle.",
     kind: Armor((
-        kind: Belt("Plate0"),
+        kind: Belt("Plate"),
         stats: (
             protection: Normal(3.0),
             poise_resilience: Normal(4.0),
diff --git a/assets/common/items/armor/plate_green/chest.ron b/assets/common/items/armor/plate/chest.ron
similarity index 90%
rename from assets/common/items/armor/plate_green/chest.ron
rename to assets/common/items/armor/plate/chest.ron
index 58724b374b..42d10380e8 100644
--- a/assets/common/items/armor/plate_green/chest.ron
+++ b/assets/common/items/armor/plate/chest.ron
@@ -2,7 +2,7 @@ ItemDef(
     name: "Iron Chestplate",
     description: "Formed iron plate resulting in very heavy but solid protection, worn over a simple rough linen shirt, dyed green.",
     kind: Armor((
-        kind: Chest("PlateGreen0"),
+        kind: Chest("Plate"),
         stats: (
             protection: Normal(20.0),
             poise_resilience: Normal(18.0),
diff --git a/assets/common/items/armor/plate_green/foot.ron b/assets/common/items/armor/plate/foot.ron
similarity index 90%
rename from assets/common/items/armor/plate_green/foot.ron
rename to assets/common/items/armor/plate/foot.ron
index 1408c3b485..ee345d2b1a 100644
--- a/assets/common/items/armor/plate_green/foot.ron
+++ b/assets/common/items/armor/plate/foot.ron
@@ -2,7 +2,7 @@ ItemDef(
     name: "Iron Feet",
     description: "Quickly shaped iron plates, forming boots that are uncomfortable but durable.",
     kind: Armor((
-        kind: Foot("Plate0"),
+        kind: Foot("Plate"),
         stats: (
             protection: Normal(4.0),
             poise_resilience: Normal(8.0),
diff --git a/assets/common/items/armor/plate_green/hand.ron b/assets/common/items/armor/plate/hand.ron
similarity index 90%
rename from assets/common/items/armor/plate_green/hand.ron
rename to assets/common/items/armor/plate/hand.ron
index 0469dd3bb7..dee9f57b94 100644
--- a/assets/common/items/armor/plate_green/hand.ron
+++ b/assets/common/items/armor/plate/hand.ron
@@ -2,7 +2,7 @@ ItemDef(
     name: "Iron Handguards",
     description: "Heavy chunks of metal plate, not the most comfortable but keeps the wearer safe.",
     kind: Armor((
-        kind: Hand("Plate0"),
+        kind: Hand("Plate"),
         stats: (
             protection: Normal(8.0),
             poise_resilience: Normal(11.0),
diff --git a/assets/common/items/armor/plate_green/pants.ron b/assets/common/items/armor/plate/pants.ron
similarity index 89%
rename from assets/common/items/armor/plate_green/pants.ron
rename to assets/common/items/armor/plate/pants.ron
index 7521ed2d68..2ce11fd3cd 100644
--- a/assets/common/items/armor/plate_green/pants.ron
+++ b/assets/common/items/armor/plate/pants.ron
@@ -2,7 +2,7 @@ ItemDef(
     name: "Iron Legguards",
     description: "Heavy iron plate formed into protective greaves, decorated with rough green fabric.",
     kind: Armor((
-        kind: Pants("PlateGreen0"),
+        kind: Pants("Plate"),
         stats: (
             protection: Normal(16.0),
             poise_resilience: Normal(14.0),
diff --git a/assets/common/items/armor/plate_green/shoulder.ron b/assets/common/items/armor/plate/shoulder.ron
similarity index 88%
rename from assets/common/items/armor/plate_green/shoulder.ron
rename to assets/common/items/armor/plate/shoulder.ron
index 38e890af99..f0565c8c7b 100644
--- a/assets/common/items/armor/plate_green/shoulder.ron
+++ b/assets/common/items/armor/plate/shoulder.ron
@@ -2,7 +2,7 @@ ItemDef(
     name: "Iron Shoulderguards",
     description: "Heavy iron shoulder protection.",
     kind: Armor((
-        kind: Shoulder("Plate0"),
+        kind: Shoulder("Plate"),
         stats: (
             protection: Normal(12.0),
             poise_resilience: Normal(16.0),
diff --git a/assets/common/items/armor/rugged/chest.ron b/assets/common/items/armor/rugged/chest.ron
index 05d690740c..82a93eaa8d 100644
--- a/assets/common/items/armor/rugged/chest.ron
+++ b/assets/common/items/armor/rugged/chest.ron
@@ -2,7 +2,7 @@ ItemDef(
     name: "Rugged Shirt",
     description: "Smells like Adventure.",
     kind: Armor((
-        kind: Chest("Rugged0"),
+        kind: Chest("Rugged"),
         stats: (
             protection: Normal(1.0),
             poise_resilience: Normal(1.0),
diff --git a/assets/common/items/armor/rugged/pants.ron b/assets/common/items/armor/rugged/pants.ron
index 293afc8a91..ffa158a07a 100644
--- a/assets/common/items/armor/rugged/pants.ron
+++ b/assets/common/items/armor/rugged/pants.ron
@@ -2,7 +2,7 @@ ItemDef(
     name: "Rugged Commoner\'s Pants",
     description: "They remind you of the old days.",
     kind: Armor((
-        kind: Pants("Rugged0"),
+        kind: Pants("Rugged"),
         stats: (
             protection: Normal(1.0),
             poise_resilience: Normal(1.0),
diff --git a/assets/common/items/armor/steel/belt.ron b/assets/common/items/armor/steel/belt.ron
index f97a186550..44e377a5df 100644
--- a/assets/common/items/armor/steel/belt.ron
+++ b/assets/common/items/armor/steel/belt.ron
@@ -2,7 +2,7 @@ ItemDef(
     name: "Steel Belt",
     description: "Metal alloy interlocking plates to improve protection.",
     kind: Armor((
-        kind: Belt("Steel0"),
+        kind: Belt("Steel"),
         stats: (
             protection: Normal(4.0),
             poise_resilience: Normal(8.0),
diff --git a/assets/common/items/armor/steel/chest.ron b/assets/common/items/armor/steel/chest.ron
index 58c346e008..137f6fa6ab 100644
--- a/assets/common/items/armor/steel/chest.ron
+++ b/assets/common/items/armor/steel/chest.ron
@@ -2,7 +2,7 @@ ItemDef(
     name: "Steel Cuirass",
     description: "The metal alloy provides a somewhat lighter and stronger cuirass.",
     kind: Armor((
-        kind: Chest("Steel0"),
+        kind: Chest("Steel"),
         stats: (
             protection: Normal(25.0),
             poise_resilience: Normal(40.0),
diff --git a/assets/common/items/armor/steel/foot.ron b/assets/common/items/armor/steel/foot.ron
index 49ca7b4782..c34a4f01a4 100644
--- a/assets/common/items/armor/steel/foot.ron
+++ b/assets/common/items/armor/steel/foot.ron
@@ -2,7 +2,7 @@ ItemDef(
     name: "Steel Boots",
     description: "Metal alloy boots providing a more comfortable and durable protection.",
     kind: Armor((
-        kind: Foot("Steel0"),
+        kind: Foot("Steel"),
         stats: (
             protection: Normal(5.0),
             poise_resilience: Normal(10.0),
diff --git a/assets/common/items/armor/steel/hand.ron b/assets/common/items/armor/steel/hand.ron
index 772dbd9780..8fee785e9b 100644
--- a/assets/common/items/armor/steel/hand.ron
+++ b/assets/common/items/armor/steel/hand.ron
@@ -2,7 +2,7 @@ ItemDef(
     name: "Steel Gauntlets",
     description: "The metal alloy provides better protection and lighter weight, a quite comfortable gauntlet.",
     kind: Armor((
-        kind: Hand("Steel0"),
+        kind: Hand("Steel"),
         stats: (
             protection: Normal(10.0),
             poise_resilience: Normal(15.0),
diff --git a/assets/common/items/armor/steel/pants.ron b/assets/common/items/armor/steel/pants.ron
index 367ab1193d..da749c30f4 100644
--- a/assets/common/items/armor/steel/pants.ron
+++ b/assets/common/items/armor/steel/pants.ron
@@ -2,7 +2,7 @@ ItemDef(
     name: "Steel Chausses",
     description: "The metal alloy provides improvements to fit, durability, and lightness.",
     kind: Armor((
-        kind: Pants("Steel0"),
+        kind: Pants("Steel"),
         stats: (
             protection: Normal(20.0),
             poise_resilience: Normal(26.0),
diff --git a/assets/common/items/armor/steel/shoulder.ron b/assets/common/items/armor/steel/shoulder.ron
index 778be25538..ce7af493fb 100644
--- a/assets/common/items/armor/steel/shoulder.ron
+++ b/assets/common/items/armor/steel/shoulder.ron
@@ -2,7 +2,7 @@ ItemDef(
     name: "Steel Shoulder Pad",
     description: "The metal alloy plates provide better protection and comfort.",
     kind: Armor((
-        kind: Shoulder("Steel0"),
+        kind: Shoulder("Steel"),
         stats: (
             protection: Normal(15.0),
             poise_resilience: Normal(20.0),
diff --git a/assets/common/items/armor/leather_0/belt.ron b/assets/common/items/armor/swift/belt.ron
similarity index 88%
rename from assets/common/items/armor/leather_0/belt.ron
rename to assets/common/items/armor/swift/belt.ron
index ee4ef7f357..b37f56cd56 100644
--- a/assets/common/items/armor/leather_0/belt.ron
+++ b/assets/common/items/armor/swift/belt.ron
@@ -2,7 +2,7 @@ ItemDef(
     name: "Swift Belt",
     description: "Swift like the wind.",
     kind: Armor((
-        kind: Belt("Leather0"),
+        kind: Belt("Swift"),
         stats: (
             protection: Normal(1.0),
             poise_resilience: Normal(1.0),
diff --git a/assets/common/items/armor/leather_0/chest.ron b/assets/common/items/armor/swift/chest.ron
similarity index 87%
rename from assets/common/items/armor/leather_0/chest.ron
rename to assets/common/items/armor/swift/chest.ron
index 17aaf77fe4..41acaa1db1 100644
--- a/assets/common/items/armor/leather_0/chest.ron
+++ b/assets/common/items/armor/swift/chest.ron
@@ -2,7 +2,7 @@ ItemDef(
     name: "Swift Chest",
     description: "Swift like the wind.",
     kind: Armor((
-        kind: Chest("Leather0"),
+        kind: Chest("Swift"),
         stats: (
             protection: Normal(10.0),
             poise_resilience: Normal(7.0),
diff --git a/assets/common/items/armor/leather_0/foot.ron b/assets/common/items/armor/swift/foot.ron
similarity index 88%
rename from assets/common/items/armor/leather_0/foot.ron
rename to assets/common/items/armor/swift/foot.ron
index f8657eb430..b2f8392de9 100644
--- a/assets/common/items/armor/leather_0/foot.ron
+++ b/assets/common/items/armor/swift/foot.ron
@@ -2,7 +2,7 @@ ItemDef(
     name: "Swift Boots",
     description: "Swift like the wind.",
     kind: Armor((
-        kind: Foot("Leather0"),
+        kind: Foot("Swift"),
         stats: (
             protection: Normal(2.0),
             poise_resilience: Normal(2.0),
diff --git a/assets/common/items/armor/leather_0/hand.ron b/assets/common/items/armor/swift/hand.ron
similarity index 88%
rename from assets/common/items/armor/leather_0/hand.ron
rename to assets/common/items/armor/swift/hand.ron
index a47f26bcdb..d916cd40f1 100644
--- a/assets/common/items/armor/leather_0/hand.ron
+++ b/assets/common/items/armor/swift/hand.ron
@@ -2,7 +2,7 @@ ItemDef(
     name: "Swift Gloves",
     description: "Swift like the wind.",
     kind: Armor((
-        kind: Hand("Leather0"),
+        kind: Hand("Swift"),
         stats: (
             protection: Normal(4.0),
             poise_resilience: Normal(3.0),
diff --git a/assets/common/items/armor/leather_0/head.ron b/assets/common/items/armor/swift/head.ron
similarity index 88%
rename from assets/common/items/armor/leather_0/head.ron
rename to assets/common/items/armor/swift/head.ron
index fcb6d867a0..6d76d2f0ff 100644
--- a/assets/common/items/armor/leather_0/head.ron
+++ b/assets/common/items/armor/swift/head.ron
@@ -2,7 +2,7 @@ ItemDef(
     name: "Swift Leather Cap",
     description: "Swift like the wind.",
     kind: Armor((
-        kind: Head("Leather0"),
+        kind: Head("Swift"),
         stats: (
             protection: Normal(0.0),
             poise_resilience: Normal(0.0),
diff --git a/assets/common/items/armor/leather_0/pants.ron b/assets/common/items/armor/swift/pants.ron
similarity index 87%
rename from assets/common/items/armor/leather_0/pants.ron
rename to assets/common/items/armor/swift/pants.ron
index ca6b94d8f2..2310dbb5b2 100644
--- a/assets/common/items/armor/leather_0/pants.ron
+++ b/assets/common/items/armor/swift/pants.ron
@@ -2,7 +2,7 @@ ItemDef(
     name: "Swift Pants",
     description: "Swift like the wind.",
     kind: Armor((
-        kind: Pants("Leather0"),
+        kind: Pants("Swift"),
         stats: (
             protection: Normal(8.0),
             poise_resilience: Normal(4.0),
diff --git a/assets/common/items/armor/leather_0/shoulder.ron b/assets/common/items/armor/swift/shoulder.ron
similarity index 87%
rename from assets/common/items/armor/leather_0/shoulder.ron
rename to assets/common/items/armor/swift/shoulder.ron
index e5fd445778..78dbf14989 100644
--- a/assets/common/items/armor/leather_0/shoulder.ron
+++ b/assets/common/items/armor/swift/shoulder.ron
@@ -2,7 +2,7 @@ ItemDef(
     name: "Swift Shoulderpads",
     description: "Swift like the wind.",
     kind: Armor((
-        kind: Shoulder("Leather1"),
+        kind: Shoulder("Swift"),
         stats: (
             protection: Normal(6.0),
             poise_resilience: Normal(5.0),
diff --git a/assets/common/items/armor/twigflowers/belt.ron b/assets/common/items/armor/twigflowers/belt.ron
index 23374046b8..fd32d9d2d0 100644
--- a/assets/common/items/armor/twigflowers/belt.ron
+++ b/assets/common/items/armor/twigflowers/belt.ron
@@ -2,7 +2,7 @@ ItemDef(
     name: "Flowery Belt",
     description: "Magically imbued twigs, held together with a flower intertwining its stem to hold the belt together.",
     kind: Armor((
-        kind: Belt("Twigsflowers"),
+        kind: Belt("TwigsFlowers"),
         stats: (
             protection: Normal(2.0),
             poise_resilience: Normal(1.0),
diff --git a/assets/common/items/armor/twigflowers/chest.ron b/assets/common/items/armor/twigflowers/chest.ron
index 7b72cdeb9b..2cb32230da 100644
--- a/assets/common/items/armor/twigflowers/chest.ron
+++ b/assets/common/items/armor/twigflowers/chest.ron
@@ -2,7 +2,7 @@ ItemDef(
     name: "Flowery Shirt",
     description: "Magically imbued twigs decorated with flowers and their stems, letting others know your intentions of peace and love.",
     kind: Armor((
-        kind: Chest("Twigsflowers"),
+        kind: Chest("TwigsFlowers"),
         stats: (
             protection: Normal(15.0),
             poise_resilience: Normal(8.0),
diff --git a/assets/common/items/armor/twigflowers/foot.ron b/assets/common/items/armor/twigflowers/foot.ron
index 22b188712a..268e6d594c 100644
--- a/assets/common/items/armor/twigflowers/foot.ron
+++ b/assets/common/items/armor/twigflowers/foot.ron
@@ -2,7 +2,7 @@ ItemDef(
     name: "Flowery Boots",
     description: "Woven and magically imbued, these boots of twigs and flowers provide simple protection and peace to the wearer.",
     kind: Armor((
-        kind: Foot("Twigsflowers"),
+        kind: Foot("TwigsFlowers"),
         stats: (
             protection: Normal(3.0),
             poise_resilience: Normal(2.0),
diff --git a/assets/common/items/armor/twigflowers/hand.ron b/assets/common/items/armor/twigflowers/hand.ron
index 6fef157d8c..7abaa4029a 100644
--- a/assets/common/items/armor/twigflowers/hand.ron
+++ b/assets/common/items/armor/twigflowers/hand.ron
@@ -2,7 +2,7 @@ ItemDef(
     name: "Flowery Wraps",
     description: "Wrapped and intertwined twigs held together with magic and flowers with their stems, providing peace and protection for the wearer.",
     kind: Armor((
-        kind: Hand("Twigsflowers"),
+        kind: Hand("TwigsFlowers"),
         stats: (
             protection: Normal(6.0),
             poise_resilience: Normal(4.0),
diff --git a/assets/common/items/armor/twigflowers/pants.ron b/assets/common/items/armor/twigflowers/pants.ron
index bc8a9bd377..8c8897c30e 100644
--- a/assets/common/items/armor/twigflowers/pants.ron
+++ b/assets/common/items/armor/twigflowers/pants.ron
@@ -2,7 +2,7 @@ ItemDef(
     name: "Flowery Pants",
     description: "Chainmail woven twigs enhanced with flower stems to provide protection and peace.",
     kind: Armor((
-        kind: Pants("Twigsflowers"),
+        kind: Pants("TwigsFlowers"),
         stats: (
             protection: Normal(12.0),
             poise_resilience: Normal(4.0),
diff --git a/assets/common/items/armor/twigflowers/shoulder.ron b/assets/common/items/armor/twigflowers/shoulder.ron
index e6ab824376..848850f6b7 100644
--- a/assets/common/items/armor/twigflowers/shoulder.ron
+++ b/assets/common/items/armor/twigflowers/shoulder.ron
@@ -2,7 +2,7 @@ ItemDef(
     name: "Flowery Shoulders",
     description: "Flowers join the tied twigs to provide protection and peace to the wearer.",
     kind: Armor((
-        kind: Shoulder("FlowerShoulder"),
+        kind: Shoulder("TwigsFlowers"),
         stats: (
             protection: Normal(9.0),
             poise_resilience: Normal(3.0),
diff --git a/assets/common/items/armor/twigs/belt.ron b/assets/common/items/armor/twigs/belt.ron
index 3fbe526fd9..334f8619b1 100644
--- a/assets/common/items/armor/twigs/belt.ron
+++ b/assets/common/items/armor/twigs/belt.ron
@@ -2,7 +2,7 @@ ItemDef(
     name: "Twig Belt",
     description: "Small bits of nature magically held together into the shape of a belt.",
     kind: Armor((
-        kind: Belt("Twig"),
+        kind: Belt("Twigs"),
         stats: (
             protection: Normal(2.0),
             poise_resilience: Normal(1.0),
diff --git a/assets/common/items/armor/twigs/chest.ron b/assets/common/items/armor/twigs/chest.ron
index 41eeb25fe9..a87010b7b3 100644
--- a/assets/common/items/armor/twigs/chest.ron
+++ b/assets/common/items/armor/twigs/chest.ron
@@ -2,7 +2,7 @@ ItemDef(
     name: "Twig Shirt",
     description: "Small sticks magically imbued to hold together to form a shirt.",
     kind: Armor((
-        kind: Chest("Twig"),
+        kind: Chest("Twigs"),
         stats: (
             protection: Normal(15.0),
             poise_resilience: Normal(10.0),
diff --git a/assets/common/items/armor/twigs/foot.ron b/assets/common/items/armor/twigs/foot.ron
index 8d799d1ab3..7be3596542 100644
--- a/assets/common/items/armor/twigs/foot.ron
+++ b/assets/common/items/armor/twigs/foot.ron
@@ -2,7 +2,7 @@ ItemDef(
     name: "Twig Boots",
     description: "Small twigs intertwined and imbued with magic to provide simple protection.",
     kind: Armor((
-        kind: Foot("Twig"),
+        kind: Foot("Twigs"),
         stats: (
             protection: Normal(3.0),
             poise_resilience: Normal(2.0),
diff --git a/assets/common/items/armor/twigs/hand.ron b/assets/common/items/armor/twigs/hand.ron
index 6484eb5758..cb7d01f5b8 100644
--- a/assets/common/items/armor/twigs/hand.ron
+++ b/assets/common/items/armor/twigs/hand.ron
@@ -2,7 +2,7 @@ ItemDef(
     name: "Twig Wraps",
     description: "Magically imbued twigs interlocked into simple hand wraps.",
     kind: Armor((
-        kind: Hand("Twig"),
+        kind: Hand("Twigs"),
         stats: (
             protection: Normal(6.0),
             poise_resilience: Normal(6.0),
diff --git a/assets/common/items/armor/twigs/pants.ron b/assets/common/items/armor/twigs/pants.ron
index b87af412ae..48e4adb233 100644
--- a/assets/common/items/armor/twigs/pants.ron
+++ b/assets/common/items/armor/twigs/pants.ron
@@ -2,7 +2,7 @@ ItemDef(
     name: "Twig Pants",
     description: "Magically imbued twigs formed into links similar to chainmail.",
     kind: Armor((
-        kind: Pants("Twig"),
+        kind: Pants("Twigs"),
         stats: (
             protection: Normal(12.0),
             poise_resilience: Normal(9.0),
diff --git a/assets/common/items/armor/twigs/shoulder.ron b/assets/common/items/armor/twigs/shoulder.ron
index ae1413c410..4170468403 100644
--- a/assets/common/items/armor/twigs/shoulder.ron
+++ b/assets/common/items/armor/twigs/shoulder.ron
@@ -2,7 +2,7 @@ ItemDef(
     name: "Twiggy Shoulders",
     description: "Spaulders made from tightly tied twigs.",
     kind: Armor((
-        kind: Shoulder("TwiggyShoulder"),
+        kind: Shoulder("Twigs"),
         stats: (
             protection: Normal(9.0),
             poise_resilience: Normal(14.0),
diff --git a/assets/common/items/armor/twigsleaves/belt.ron b/assets/common/items/armor/twigsleaves/belt.ron
index 50f597b147..fefd67422b 100644
--- a/assets/common/items/armor/twigsleaves/belt.ron
+++ b/assets/common/items/armor/twigsleaves/belt.ron
@@ -2,7 +2,7 @@ ItemDef(
     name: "Leafy Belt",
     description: "Dried leaves cover over the standard twig belt, providing a slightly different texture.",
     kind: Armor((
-        kind: Belt("Twigsleaves"),
+        kind: Belt("TwigsLeaves"),
         stats: (
             protection: Normal(2.0),
             poise_resilience: Normal(3.0),
diff --git a/assets/common/items/armor/twigsleaves/chest.ron b/assets/common/items/armor/twigsleaves/chest.ron
index 6983782860..03b005b64f 100644
--- a/assets/common/items/armor/twigsleaves/chest.ron
+++ b/assets/common/items/armor/twigsleaves/chest.ron
@@ -2,7 +2,7 @@ ItemDef(
     name: "Leafy Shirt",
     description: "Leaves cover the magically imbued twig shirt, providing a more natural appearance.",
     kind: Armor((
-        kind: Chest("Twigsleaves"),
+        kind: Chest("TwigsLeaves"),
         stats: (
             protection: Normal(15.0),
             poise_resilience: Normal(10.0),
diff --git a/assets/common/items/armor/twigsleaves/foot.ron b/assets/common/items/armor/twigsleaves/foot.ron
index 93a4857127..ae77fa5366 100644
--- a/assets/common/items/armor/twigsleaves/foot.ron
+++ b/assets/common/items/armor/twigsleaves/foot.ron
@@ -2,7 +2,7 @@ ItemDef(
     name: "Leafy Boots",
     description: "Leaves cover the magically entwined twigs to provide simple protection from the elements.",
     kind: Armor((
-        kind: Foot("Twigsleaves"),
+        kind: Foot("TwigsLeaves"),
         stats: (
             protection: Normal(3.0),
             poise_resilience: Normal(2.0),
diff --git a/assets/common/items/armor/twigsleaves/hand.ron b/assets/common/items/armor/twigsleaves/hand.ron
index 4b1c9728e6..acea0a22fe 100644
--- a/assets/common/items/armor/twigsleaves/hand.ron
+++ b/assets/common/items/armor/twigsleaves/hand.ron
@@ -2,7 +2,7 @@ ItemDef(
     name: "Leafy Wraps",
     description: "Leaves help hide the magic-interlocking twigs, and provide mild protection from the elements.",
     kind: Armor((
-        kind: Hand("Twigsleaves"),
+        kind: Hand("TwigsLeaves"),
         stats: (
             protection: Normal(6.0),
             poise_resilience: Normal(7.0),
diff --git a/assets/common/items/armor/twigsleaves/pants.ron b/assets/common/items/armor/twigsleaves/pants.ron
index b76e1ef31d..63825a46e2 100644
--- a/assets/common/items/armor/twigsleaves/pants.ron
+++ b/assets/common/items/armor/twigsleaves/pants.ron
@@ -2,7 +2,7 @@ ItemDef(
     name: "Leafy Pants",
     description: "Leaves cover the magically imbued chainmail twigs, providing protection from the elements.",
     kind: Armor((
-        kind: Pants("Twigsleaves"),
+        kind: Pants("TwigsLeaves"),
         stats: (
             protection: Normal(12.0),
             poise_resilience: Normal(8.0),
diff --git a/assets/common/items/armor/twigsleaves/shoulder.ron b/assets/common/items/armor/twigsleaves/shoulder.ron
index a5c880ecd5..815a58203a 100644
--- a/assets/common/items/armor/twigsleaves/shoulder.ron
+++ b/assets/common/items/armor/twigsleaves/shoulder.ron
@@ -2,7 +2,7 @@ ItemDef(
     name: "Leafy Shoulders",
     description: "Leaves cover over the twigs to provide better protection from the elements.",
     kind: Armor((
-        kind: Shoulder("LeafyShoulder"),
+        kind: Shoulder("TwigsLeaves"),
         stats: (
             protection: Normal(9.0),
             poise_resilience: Normal(2.0),
diff --git a/assets/common/items/armor/velorite_mage/back.ron b/assets/common/items/armor/velorite_mage/back.ron
index 22b553472d..bcdea7d8fb 100644
--- a/assets/common/items/armor/velorite_mage/back.ron
+++ b/assets/common/items/armor/velorite_mage/back.ron
@@ -2,7 +2,7 @@ ItemDef(
     name: "Velorite Battlemage Cloak",
     description: "Keeps your shoulders warm.",
     kind: Armor((
-        kind: Back("VeloriteMage0"),
+        kind: Back("VeloriteMage"),
         stats: (
             protection: Normal(2.8),
             poise_resilience: Normal(2.0),
diff --git a/assets/common/items/armor/velorite_mage/belt.ron b/assets/common/items/armor/velorite_mage/belt.ron
index 671238d880..9617a3f25e 100644
--- a/assets/common/items/armor/velorite_mage/belt.ron
+++ b/assets/common/items/armor/velorite_mage/belt.ron
@@ -2,7 +2,7 @@ ItemDef(
     name: "Velorite Battlemage Belt",
     description: "",
     kind: Armor((
-        kind: Belt("VeloriteMage0"),
+        kind: Belt("VeloriteMage"),
         stats: (
             protection: Normal(5.8),
             poise_resilience: Normal(5.0),
diff --git a/assets/common/items/armor/velorite_mage/chest.ron b/assets/common/items/armor/velorite_mage/chest.ron
index 6498069dd3..d1b97f6b1e 100644
--- a/assets/common/items/armor/velorite_mage/chest.ron
+++ b/assets/common/items/armor/velorite_mage/chest.ron
@@ -2,7 +2,7 @@ ItemDef(
     name: "Velorite Battlemage Vest",
     description: "",
     kind: Armor((
-        kind: Chest("VeloriteMage0"),
+        kind: Chest("VeloriteMage"),
         stats: (
             protection: Normal(28.0),
             poise_resilience: Normal(20.0),
diff --git a/assets/common/items/armor/velorite_mage/foot.ron b/assets/common/items/armor/velorite_mage/foot.ron
index 12dc4d8935..388fa8fb16 100644
--- a/assets/common/items/armor/velorite_mage/foot.ron
+++ b/assets/common/items/armor/velorite_mage/foot.ron
@@ -2,7 +2,7 @@ ItemDef(
     name: "Velorite Battlemage Boots",
     description: "",
     kind: Armor((
-        kind: Foot("VeloriteMage0"),
+        kind: Foot("VeloriteMage"),
         stats: (
             protection: Normal(5.9),
             poise_resilience: Normal(5.0),
diff --git a/assets/common/items/armor/velorite_mage/hand.ron b/assets/common/items/armor/velorite_mage/hand.ron
index 81eb510f9e..4ce489f50b 100644
--- a/assets/common/items/armor/velorite_mage/hand.ron
+++ b/assets/common/items/armor/velorite_mage/hand.ron
@@ -2,7 +2,7 @@ ItemDef(
     name: "Velorite Battlemage Gauntlets",
     description: "",
     kind: Armor((
-        kind: Hand("VeloriteMage0"),
+        kind: Hand("VeloriteMage"),
         stats: (
             protection: Normal(11.5),
             poise_resilience: Normal(13.0),
diff --git a/assets/common/items/armor/velorite_mage/pants.ron b/assets/common/items/armor/velorite_mage/pants.ron
index 661dbd0539..8661cf605f 100644
--- a/assets/common/items/armor/velorite_mage/pants.ron
+++ b/assets/common/items/armor/velorite_mage/pants.ron
@@ -2,7 +2,7 @@ ItemDef(
     name: "Velorite Battlemage Kilt",
     description: "",
     kind: Armor((
-        kind: Pants("VeloriteMage0"),
+        kind: Pants("VeloriteMage"),
         stats: (
             protection: Normal(23.0),
             poise_resilience: Normal(23.0),
diff --git a/assets/common/items/armor/velorite_mage/shoulder.ron b/assets/common/items/armor/velorite_mage/shoulder.ron
index 5e06b5a57a..deb330f2b9 100644
--- a/assets/common/items/armor/velorite_mage/shoulder.ron
+++ b/assets/common/items/armor/velorite_mage/shoulder.ron
@@ -2,7 +2,7 @@ ItemDef(
     name: "Velorite Battlemage Guards",
     description: "",
     kind: Armor((
-        kind: Shoulder("VeloriteMage0"),
+        kind: Shoulder("VeloriteMage"),
         stats: (
             protection: Normal(17.0),
             poise_resilience: Normal(17.0),
diff --git a/assets/common/items/debug/admin_black_hole.ron b/assets/common/items/debug/admin_black_hole.ron
index a799fa831c..ec1ea70993 100644
--- a/assets/common/items/debug/admin_black_hole.ron
+++ b/assets/common/items/debug/admin_black_hole.ron
@@ -3,7 +3,7 @@ ItemDef(
     description: "It just works.",
     kind: Armor(
         (
-            kind: Bag("BrownFace"),
+            kind: Bag("BlackHole"),
             stats: (
                 protection: Normal(0.0),
                 poise_resilience: Normal(0.0)
diff --git a/assets/common/items/debug/cultist_belt.ron b/assets/common/items/debug/cultist_belt.ron
index 9a0529f3c9..fc29f57504 100644
--- a/assets/common/items/debug/cultist_belt.ron
+++ b/assets/common/items/debug/cultist_belt.ron
@@ -3,7 +3,7 @@ ItemDef(
     description: "",
     kind: Armor(
         (
-            kind: Belt("VeloriteMage0"),
+            kind: Belt("VeloriteMage"),
             stats: (
                 protection: Invincible,
                 poise_resilience: Invincible,
diff --git a/assets/common/items/debug/cultist_boots.ron b/assets/common/items/debug/cultist_boots.ron
index 425fb9e91b..31f9f0a4b4 100644
--- a/assets/common/items/debug/cultist_boots.ron
+++ b/assets/common/items/debug/cultist_boots.ron
@@ -3,7 +3,7 @@ ItemDef(
     description: "",
     kind: Armor(
         (
-            kind: Foot("VeloriteMage0"),
+            kind: Foot("VeloriteMage"),
             stats: (
                 protection: Invincible,
                 poise_resilience: Invincible,
diff --git a/assets/common/items/debug/cultist_chest_blue.ron b/assets/common/items/debug/cultist_chest_blue.ron
index 9029128195..9f8f44ecbf 100644
--- a/assets/common/items/debug/cultist_chest_blue.ron
+++ b/assets/common/items/debug/cultist_chest_blue.ron
@@ -3,7 +3,7 @@ ItemDef(
     description: "",
     kind: Armor(
         (
-            kind: Chest("VeloriteMage0"),
+            kind: Chest("VeloriteMage"),
             stats: (
                 protection: Invincible,
                 poise_resilience: Invincible,
diff --git a/assets/common/items/debug/cultist_hands_blue.ron b/assets/common/items/debug/cultist_hands_blue.ron
index 71a43df9c6..9cc5e51a3b 100644
--- a/assets/common/items/debug/cultist_hands_blue.ron
+++ b/assets/common/items/debug/cultist_hands_blue.ron
@@ -3,7 +3,7 @@ ItemDef(
     description: "",
     kind: Armor(
         (
-            kind: Hand("VeloriteMage0"),
+            kind: Hand("VeloriteMage"),
             stats: (
                 protection: Invincible,
                 poise_resilience: Invincible,
diff --git a/assets/common/items/debug/cultist_legs_blue.ron b/assets/common/items/debug/cultist_legs_blue.ron
index 8362061d70..aa52c7e443 100644
--- a/assets/common/items/debug/cultist_legs_blue.ron
+++ b/assets/common/items/debug/cultist_legs_blue.ron
@@ -3,7 +3,7 @@ ItemDef(
     description: "",
     kind: Armor(
         (
-            kind: Pants("VeloriteMage0"),
+            kind: Pants("VeloriteMage"),
             stats: (
                 protection: Invincible,
                 poise_resilience: Invincible,
diff --git a/assets/common/items/debug/cultist_shoulder_blue.ron b/assets/common/items/debug/cultist_shoulder_blue.ron
index e87f3acb33..e7198a8230 100644
--- a/assets/common/items/debug/cultist_shoulder_blue.ron
+++ b/assets/common/items/debug/cultist_shoulder_blue.ron
@@ -3,7 +3,7 @@ ItemDef(
     description: "",
     kind: Armor(
         (
-            kind: Shoulder("VeloriteMage0"),
+            kind: Shoulder("VeloriteMage"),
             stats: (
                 protection: Invincible,
                 poise_resilience: Invincible,
diff --git a/assets/common/items/debug/dungeon_purple-0.ron b/assets/common/items/debug/dungeon_purple.ron
similarity index 87%
rename from assets/common/items/debug/dungeon_purple-0.ron
rename to assets/common/items/debug/dungeon_purple.ron
index ef80eb5100..e9f05131be 100644
--- a/assets/common/items/debug/dungeon_purple-0.ron
+++ b/assets/common/items/debug/dungeon_purple.ron
@@ -3,7 +3,7 @@ ItemDef(
     description: "Where did I put my banhammer again?",
     kind: Armor(
         (
-            kind: Back("VeloriteMage0"),
+            kind: Back("VeloriteMage"),
             stats: (
                 protection: Invincible,
                 poise_resilience: Invincible,
diff --git a/assets/common/items/npc_armor/back/backpack_0.ron b/assets/common/items/npc_armor/back/backpack.ron
similarity index 88%
rename from assets/common/items/npc_armor/back/backpack_0.ron
rename to assets/common/items/npc_armor/back/backpack.ron
index 75d1e809cb..d08bdaddd6 100644
--- a/assets/common/items/npc_armor/back/backpack_0.ron
+++ b/assets/common/items/npc_armor/back/backpack.ron
@@ -3,7 +3,7 @@ ItemDef(
     description: "Keeps all your stuff together.",
     kind: Armor(
         (
-            kind: Back("Backpack0"),
+            kind: Back("Backpack"),
             stats: (
                 protection: Normal(0.0),
                 poise_resilience: Normal(0.0),
diff --git a/assets/common/items/npc_armor/back/backpack_blue_0.ron b/assets/common/items/npc_armor/back/backpack_blue.ron
similarity index 87%
rename from assets/common/items/npc_armor/back/backpack_blue_0.ron
rename to assets/common/items/npc_armor/back/backpack_blue.ron
index fc34ec36f7..070dcbb5b9 100644
--- a/assets/common/items/npc_armor/back/backpack_blue_0.ron
+++ b/assets/common/items/npc_armor/back/backpack_blue.ron
@@ -3,7 +3,7 @@ ItemDef(
     description: "Keeps all your stuff together.",
     kind: Armor(
         (
-            kind: Back("BackpackBlue0"),
+            kind: Back("BackpackBlue"),
             stats: (
                 protection: Normal(0.0),
                 poise_resilience: Normal(0.0),
diff --git a/assets/common/items/npc_armor/back/dungeon_purple-0.ron b/assets/common/items/npc_armor/back/dungeon_purple.ron
similarity index 87%
rename from assets/common/items/npc_armor/back/dungeon_purple-0.ron
rename to assets/common/items/npc_armor/back/dungeon_purple.ron
index 0ff9efc262..c95589191f 100644
--- a/assets/common/items/npc_armor/back/dungeon_purple-0.ron
+++ b/assets/common/items/npc_armor/back/dungeon_purple.ron
@@ -3,7 +3,7 @@ ItemDef(
     description: "Smells like dark magic and candles.",
     kind: Armor(
         (
-            kind: Back("DungPurp0"),
+            kind: Back("DungeonPurple"),
             stats: (
                 protection: Normal(1.0),
                 poise_resilience: Normal(0.0),
diff --git a/assets/common/items/npc_armor/back/leather_blue_0.ron b/assets/common/items/npc_armor/back/leather_blue.ron
similarity index 87%
rename from assets/common/items/npc_armor/back/leather_blue_0.ron
rename to assets/common/items/npc_armor/back/leather_blue.ron
index 282b419469..aa658b190a 100644
--- a/assets/common/items/npc_armor/back/leather_blue_0.ron
+++ b/assets/common/items/npc_armor/back/leather_blue.ron
@@ -3,7 +3,7 @@ ItemDef(
     description: "",
     kind: Armor(
         (
-            kind: Back("LeatherBlue0"),
+            kind: Back("LeatherBlue"),
             stats: (
                 protection: Normal(1.0),
                 poise_resilience: Normal(0.0),
diff --git a/assets/common/items/npc_armor/chest/cultist_chest_purple.ron b/assets/common/items/npc_armor/chest/cultist_chest_purple.ron
index 5fb93245d0..095159e682 100644
--- a/assets/common/items/npc_armor/chest/cultist_chest_purple.ron
+++ b/assets/common/items/npc_armor/chest/cultist_chest_purple.ron
@@ -3,7 +3,7 @@ ItemDef(
     description: "Ceremonial attire used by members.",
     kind: Armor(
         (
-            kind: Chest("CultistPurple"),
+            kind: Chest("Cultist"),
             stats: (
                 protection: Normal(5.0),
                 poise_resilience: Normal(5.0),
diff --git a/assets/common/items/npc_armor/chest/leather_blue_0.ron b/assets/common/items/npc_armor/chest/leather_blue.ron
similarity index 86%
rename from assets/common/items/npc_armor/chest/leather_blue_0.ron
rename to assets/common/items/npc_armor/chest/leather_blue.ron
index a908907165..0d002e5998 100644
--- a/assets/common/items/npc_armor/chest/leather_blue_0.ron
+++ b/assets/common/items/npc_armor/chest/leather_blue.ron
@@ -3,7 +3,7 @@ ItemDef(
     description: "",
     kind: Armor(
         (
-            kind: Chest("LeatherBlue0"),
+            kind: Chest("LeatherBlue"),
             stats: (
                 protection: Normal(5.0),
                 poise_resilience: Normal(5.0),
diff --git a/assets/common/items/npc_armor/chest/plate_red_0.ron b/assets/common/items/npc_armor/chest/plate.ron
similarity index 88%
rename from assets/common/items/npc_armor/chest/plate_red_0.ron
rename to assets/common/items/npc_armor/chest/plate.ron
index bc59433616..f09d6ae8de 100644
--- a/assets/common/items/npc_armor/chest/plate_red_0.ron
+++ b/assets/common/items/npc_armor/chest/plate.ron
@@ -3,7 +3,7 @@ ItemDef(
     description: "A chestplate forged from iron.",
     kind: Armor(
         (
-            kind: Chest("PlateRed0"),
+            kind: Chest("Plate"),
             stats: (
                 protection: Normal(5.0),
                 poise_resilience: Normal(5.0),
diff --git a/assets/common/items/npc_armor/chest/plate_green_0.ron b/assets/common/items/npc_armor/chest/plate_red.ron
similarity index 87%
rename from assets/common/items/npc_armor/chest/plate_green_0.ron
rename to assets/common/items/npc_armor/chest/plate_red.ron
index d22f3f99c5..ee8a80a515 100644
--- a/assets/common/items/npc_armor/chest/plate_green_0.ron
+++ b/assets/common/items/npc_armor/chest/plate_red.ron
@@ -3,7 +3,7 @@ ItemDef(
     description: "A chestplate forged from iron.",
     kind: Armor(
         (
-            kind: Chest("PlateGreen0"),
+            kind: Chest("PlateRed"),
             stats: (
                 protection: Normal(5.0),
                 poise_resilience: Normal(5.0),
diff --git a/assets/common/items/npc_armor/hand/cultist_hands_purple.ron b/assets/common/items/npc_armor/hand/cultist_hands_purple.ron
index 3b067742c7..dfa37f71bf 100644
--- a/assets/common/items/npc_armor/hand/cultist_hands_purple.ron
+++ b/assets/common/items/npc_armor/hand/cultist_hands_purple.ron
@@ -3,7 +3,7 @@ ItemDef(
     description: "Ceremonial attire used by members.",
     kind: Armor(
         (
-            kind: Hand("CultistPurple"),
+            kind: Hand("Cultist"),
             stats: (
                 protection: Normal(2.0),
                 poise_resilience: Normal(2.0),
diff --git a/assets/common/items/npc_armor/pants/cultist_legs_purple.ron b/assets/common/items/npc_armor/pants/cultist_legs_purple.ron
index 5d366ff2c2..3fe3eea349 100644
--- a/assets/common/items/npc_armor/pants/cultist_legs_purple.ron
+++ b/assets/common/items/npc_armor/pants/cultist_legs_purple.ron
@@ -3,7 +3,7 @@ ItemDef(
     description: "Ceremonial attire used by members.",
     kind: Armor(
         (
-            kind: Pants("CultistPurple"),
+            kind: Pants("Cultist"),
             stats: (
                 protection: Normal(10.0),
                 poise_resilience: Normal(10.0),
diff --git a/assets/common/items/npc_armor/pants/leather_blue_0.ron b/assets/common/items/npc_armor/pants/leather_blue.ron
similarity index 86%
rename from assets/common/items/npc_armor/pants/leather_blue_0.ron
rename to assets/common/items/npc_armor/pants/leather_blue.ron
index 44d7fa645e..18da3a7fe9 100644
--- a/assets/common/items/npc_armor/pants/leather_blue_0.ron
+++ b/assets/common/items/npc_armor/pants/leather_blue.ron
@@ -3,7 +3,7 @@ ItemDef(
     description: "",
     kind: Armor(
         (
-            kind: Pants("LeatherBlue0"),
+            kind: Pants("LeatherBlue"),
             stats: (
                 protection: Normal(10.0),
                 poise_resilience: Normal(10.0),
diff --git a/assets/common/items/npc_armor/pants/plate_red_0.ron b/assets/common/items/npc_armor/pants/plate.ron
similarity index 88%
rename from assets/common/items/npc_armor/pants/plate_red_0.ron
rename to assets/common/items/npc_armor/pants/plate.ron
index b94c79701c..cdad145aba 100644
--- a/assets/common/items/npc_armor/pants/plate_red_0.ron
+++ b/assets/common/items/npc_armor/pants/plate.ron
@@ -3,7 +3,7 @@ ItemDef(
     description: "Greaves forged from iron.",
     kind: Armor(
         (
-            kind: Pants("PlateRed0"),
+            kind: Pants("Plate"),
             stats: (
                 protection: Normal(10.0),
                 poise_resilience: Normal(10.0),
diff --git a/assets/common/items/npc_armor/pants/plate_green_0.ron b/assets/common/items/npc_armor/pants/plate_red.ron
similarity index 87%
rename from assets/common/items/npc_armor/pants/plate_green_0.ron
rename to assets/common/items/npc_armor/pants/plate_red.ron
index b5b693a66a..c43c6ae91d 100644
--- a/assets/common/items/npc_armor/pants/plate_green_0.ron
+++ b/assets/common/items/npc_armor/pants/plate_red.ron
@@ -3,7 +3,7 @@ ItemDef(
     description: "Greaves forged from iron.",
     kind: Armor(
         (
-            kind: Pants("PlateGreen0"),
+            kind: Pants("PlateRed"),
             stats: (
                 protection: Normal(10.0),
                 poise_resilience: Normal(10.0),
diff --git a/assets/common/items/npc_armor/shoulder/cultist_shoulder_purple.ron b/assets/common/items/npc_armor/shoulder/cultist_shoulder_purple.ron
index 5223c9aa3a..ccff4f1e5b 100644
--- a/assets/common/items/npc_armor/shoulder/cultist_shoulder_purple.ron
+++ b/assets/common/items/npc_armor/shoulder/cultist_shoulder_purple.ron
@@ -3,7 +3,7 @@ ItemDef(
     description: "Ceremonial attire used by members.",
     kind: Armor(
         (
-            kind: Shoulder("CultistPurple"),
+            kind: Shoulder("Cultist"),
             stats: (
                 protection: Normal(5.0),
                 poise_resilience: Normal(5.0),
diff --git a/assets/common/items/tag_examples/cloth_item.ron b/assets/common/items/tag_examples/cloth_item.ron
index 04560f9956..5dfac4ce75 100644
--- a/assets/common/items/tag_examples/cloth_item.ron
+++ b/assets/common/items/tag_examples/cloth_item.ron
@@ -3,18 +3,18 @@ ItemDef(
     description: "Various colored fabric armors.",
     kind: TagExamples(
         item_ids: [
-            "common.items.armor.foot.cloth_blue_0",
-            "common.items.armor.hand.cloth_blue_0",
-            "common.items.armor.pants.cloth_blue_0",
-            "common.items.armor.shoulder.cloth_blue_0",
-            "common.items.armor.foot.cloth_green_0",
-            "common.items.armor.hand.cloth_green_0",
-            "common.items.armor.pants.cloth_green_0",
-            "common.items.armor.shoulder.cloth_green_0",
-            "common.items.armor.foot.cloth_purple_0",
-            "common.items.armor.hand.cloth_purple_0",
-            "common.items.armor.pants.cloth_purple_0",
-            "common.items.armor.shoulder.cloth_purple_0",
+            "common.items.armor.cloth_blue.foot",
+            "common.items.armor.cloth_blue.hand",
+            "common.items.armor.cloth_blue.pants",
+            "common.items.armor.cloth_blue.shoulder",
+            "common.items.armor.cloth_green.foot",
+            "common.items.armor.cloth_green.hand",
+            "common.items.armor.cloth_green.pants",
+            "common.items.armor.cloth_green.shoulder",
+            "common.items.armor.cloth_purple.foot",
+            "common.items.armor.cloth_purple.hand",
+            "common.items.armor.cloth_purple.pants",
+            "common.items.armor.cloth_purple.shoulder",
         ],
     ),
     quality: Common,
diff --git a/assets/common/loot_tables/loot_table_armor_cloth.ron b/assets/common/loot_tables/loot_table_armor_cloth.ron
index 5640a27b42..e05ff8303a 100644
--- a/assets/common/loot_tables/loot_table_armor_cloth.ron
+++ b/assets/common/loot_tables/loot_table_armor_cloth.ron
@@ -1,38 +1,38 @@
 [
     // belts
-    (0.33, "common.items.armor.belt.cloth_blue_0"),
-    (0.33, "common.items.armor.belt.cloth_green_0"),
-    (0.33, "common.items.armor.belt.cloth_purple_0"),
+    (0.33, "common.items.armor.cloth_blue.belt"),
+    (0.33, "common.items.armor.cloth_green.belt"),
+    (0.33, "common.items.armor.cloth_purple.belt"),
     // chests
-    (0.08, "common.items.armor.chest.cloth_blue_0"),
-    (0.08, "common.items.armor.chest.cloth_green_0"),
-    (0.08, "common.items.armor.chest.cloth_purple_0"),
-    (0.08, "common.items.armor.chest.worker_green_0"),
-    (0.08, "common.items.armor.chest.worker_green_1"),
-    (0.08, "common.items.armor.chest.worker_orange_0"),
-    (0.08, "common.items.armor.chest.worker_orange_1"),
-    (0.08, "common.items.armor.chest.worker_purple_0"),
-    (0.08, "common.items.armor.chest.worker_purple_1"),
-    (0.08, "common.items.armor.chest.worker_red_0"),
-    (0.08, "common.items.armor.chest.worker_red_1"),
-    (0.08, "common.items.armor.chest.worker_yellow_0"),
-    (0.08, "common.items.armor.chest.worker_yellow_1"),
+    (0.08, "common.items.armor.cloth_blue.chest"),
+    (0.08, "common.items.armor.cloth_green.chest"),
+    (0.08, "common.items.armor.cloth_purple.chest"),
+    (0.08, "common.items.armor.misc.chest.worker_green_0"),
+    (0.08, "common.items.armor.misc.chest.worker_green_1"),
+    (0.08, "common.items.armor.misc.chest.worker_orange_0"),
+    (0.08, "common.items.armor.misc.chest.worker_orange_1"),
+    (0.08, "common.items.armor.misc.chest.worker_purple_0"),
+    (0.08, "common.items.armor.misc.chest.worker_purple_1"),
+    (0.08, "common.items.armor.misc.chest.worker_red_0"),
+    (0.08, "common.items.armor.misc.chest.worker_red_1"),
+    (0.08, "common.items.armor.misc.chest.worker_yellow_0"),
+    (0.08, "common.items.armor.misc.chest.worker_yellow_1"),
     // shoes
-    (0.33, "common.items.armor.foot.cloth_blue_0"),
-    (0.33, "common.items.armor.foot.cloth_green_0"),
-    (0.33, "common.items.armor.foot.cloth_purple_0"),
+    (0.33, "common.items.armor.cloth_blue.foot"),
+    (0.33, "common.items.armor.cloth_green.foot"),
+    (0.33, "common.items.armor.cloth_purple.foot"),
     // pants
-    (0.25, "common.items.armor.pants.cloth_blue_0"),
-    (0.25, "common.items.armor.pants.cloth_green_0"),
-    (0.25, "common.items.armor.pants.cloth_purple_0"),
-    (0.25, "common.items.armor.pants.worker_blue_0"),
+    (0.25, "common.items.armor.cloth_blue.pants"),
+    (0.25, "common.items.armor.cloth_green.pants"),
+    (0.25, "common.items.armor.cloth_purple.pants"),
+    (0.25, "common.items.armor.misc.pants.worker_blue"),
     // shoulders
-    (0.25, "common.items.armor.shoulder.cloth_blue_0"),
-    (0.25, "common.items.armor.shoulder.cloth_blue_1"),
-    (0.25, "common.items.armor.shoulder.cloth_green_0"),
-    (0.25, "common.items.armor.shoulder.cloth_purple_0"),
+    (0.25, "common.items.armor.cloth_blue.shoulder_0"),
+    (0.25, "common.items.armor.cloth_blue.shoulder_1"),
+    (0.25, "common.items.armor.cloth_green.shoulder"),
+    (0.25, "common.items.armor.cloth_purple.shoulder"),
     //gloves
-    (0.33, "common.items.armor.hand.cloth_blue_0"),
-    (0.33, "common.items.armor.hand.cloth_green_0"),
-    (0.33, "common.items.armor.hand.cloth_purple_0"),
+    (0.33, "common.items.armor.cloth_blue.hand"),
+    (0.33, "common.items.armor.cloth_green.hand"),
+    (0.33, "common.items.armor.cloth_purple.hand"),
 ]
diff --git a/assets/common/loot_tables/loot_table_armor_heavy.ron b/assets/common/loot_tables/loot_table_armor_heavy.ron
index 66afe487b8..d855f91675 100644
--- a/assets/common/loot_tables/loot_table_armor_heavy.ron
+++ b/assets/common/loot_tables/loot_table_armor_heavy.ron
@@ -1,21 +1,21 @@
 [
     // belts
-    (0.67, "common.items.armor.belt.plate_0"),
-    (0.33, "common.items.armor.belt.steel_0"),
+    (0.67, "common.items.armor.plate.belt"),
+    (0.33, "common.items.armor.steel.belt"),
     // chests
-    (0.67, "common.items.armor.chest.plate_green_0"),
-    (0.33, "common.items.armor.chest.steel_0"),
+    (0.67, "common.items.armor.plate.chest"),
+    (0.33, "common.items.armor.steel.chest"),
     // shoes
-    (0.67, "common.items.armor.foot.plate_0"),
-    (0.33, "common.items.armor.foot.steel_0"),
+    (0.67, "common.items.armor.plate.foot"),
+    (0.33, "common.items.armor.steel.foot"),
     // pants
-    (0.67, "common.items.armor.pants.plate_green_0"),
-    (0.66, "common.items.armor.pants.steel_0"),
+    (0.67, "common.items.armor.plate.pants"),
+    (0.66, "common.items.armor.steel.pants"),
     // shoulders
-    (0.40, "common.items.armor.shoulder.plate_0"),
-    (0.37, "common.items.armor.shoulder.iron_spikes"),
-    (0.33, "common.items.armor.shoulder.steel_0"),
+    (0.40, "common.items.armor.plate.shoulder"),
+    (0.37, "common.items.armor.misc.shoulder.iron_spikes"),
+    (0.33, "common.items.armor.steel.shoulder"),
     //gloves
-    (0.67, "common.items.armor.hand.plate_0"),
-    (0.33, "common.items.armor.hand.steel_0"),
+    (0.67, "common.items.armor.plate.hand"),
+    (0.33, "common.items.armor.steel.hand"),
 ]
\ No newline at end of file
diff --git a/assets/common/loot_tables/loot_table_armor_light.ron b/assets/common/loot_tables/loot_table_armor_light.ron
index e25ec5760c..6190933029 100644
--- a/assets/common/loot_tables/loot_table_armor_light.ron
+++ b/assets/common/loot_tables/loot_table_armor_light.ron
@@ -1,27 +1,27 @@
 [
     // belts
-    (0.50, "common.items.armor.belt.leather_0"),
-    (0.50, "common.items.armor.belt.leather_2"),
+    (0.50, "common.items.armor.swift.belt"),
+    (0.50, "common.items.armor.leather.belt"),
     // chests
-    (0.50, "common.items.armor.chest.leather_0"),
-    (0.50, "common.items.armor.chest.leather_2"),
+    (0.50, "common.items.armor.swift.chest"),
+    (0.50, "common.items.armor.leather.chest"),
     // shoes
-    (0.50, "common.items.armor.foot.leather_0"),
-    (0.50, "common.items.armor.foot.leather_2"),
+    (0.50, "common.items.armor.swift.foot"),
+    (0.50, "common.items.armor.leather.foot"),
     // pants
-    (0.33, "common.items.armor.pants.leather_0"),
-    (0.33, "common.items.armor.pants.leather_2"),
-    (0.33, "common.items.armor.pants.hunting"),
+    (0.33, "common.items.armor.swift.pants"),
+    (0.33, "common.items.armor.leather.pants"),
+    (0.33, "common.items.armor.misc.pants.hunting"),
     // shoulders
-    (0.10, "common.items.armor.shoulder.leather_strips"),
-    (0.20, "common.items.armor.shoulder.leather_0"),
-    (0.20, "common.items.armor.shoulder.leather_1"),
-    (0.20, "common.items.armor.shoulder.leather_2"),
-    (0.07, "common.items.armor.shoulder.leather_iron_0"),
-    (0.07, "common.items.armor.shoulder.leather_iron_1"),
-    (0.07, "common.items.armor.shoulder.leather_iron_2"),
-    (0.07, "common.items.armor.shoulder.leather_iron_3"),
+    (0.10, "common.items.armor.misc.shoulder.leather_strip"),
+    (0.20, "common.items.armor.swift.shoulder"),
+    (0.20, "common.items.armor.leather.shoulder"),
+    (0.20, "common.items.armor.agile.shoulder"),
+    (0.07, "common.items.armor.misc.shoulder.leather_iron_0"),
+    (0.07, "common.items.armor.misc.shoulder.leather_iron_1"),
+    (0.07, "common.items.armor.misc.shoulder.leather_iron_2"),
+    (0.07, "common.items.armor.misc.shoulder.leather_iron_3"),
     //gloves
-    (0.50, "common.items.armor.hand.leather_0"),
-    (0.50, "common.items.armor.hand.leather_2"),
+    (0.50, "common.items.armor.swift.hand"),
+    (0.50, "common.items.armor.leather.hand"),
 ]
\ No newline at end of file
diff --git a/assets/common/loot_tables/loot_table_armor_misc.ron b/assets/common/loot_tables/loot_table_armor_misc.ron
index e7233b64f5..beba2e7b11 100644
--- a/assets/common/loot_tables/loot_table_armor_misc.ron
+++ b/assets/common/loot_tables/loot_table_armor_misc.ron
@@ -1,12 +1,12 @@
 [
     // rings
-    (0.15, "common.items.armor.ring.ring_0"),
-    (0.05, "common.items.armor.ring.ring_gold_0"),
+    (0.15, "common.items.armor.misc.ring.scratched"),
+    (0.05, "common.items.armor.misc.ring.gold"),
     // capes
-    (0.25, "common.items.armor.back.short_0"),
-    (0.25, "common.items.armor.back.short_1"),
+    (0.25, "common.items.armor.misc.back.short_0"),
+    (0.25, "common.items.armor.misc.back.short_1"),
     // necks
-    (0.25, "common.items.armor.neck.neck_0"),
+    (0.25, "common.items.armor.misc.neck.plain_0"),
     // misc
     (0.05, "common.items.glider.glider_blue"),
 ]
\ No newline at end of file
diff --git a/assets/common/loot_tables/loot_table_armor_nature.ron b/assets/common/loot_tables/loot_table_armor_nature.ron
index fa371a7938..1bb0bb6531 100644
--- a/assets/common/loot_tables/loot_table_armor_nature.ron
+++ b/assets/common/loot_tables/loot_table_armor_nature.ron
@@ -1,32 +1,32 @@
 [
     // belts
-    (0.40, "common.items.armor.belt.druid"),
-    (0.20, "common.items.armor.belt.twig"),
-    (0.20, "common.items.armor.belt.twigsflowers"),
-    (0.20, "common.items.armor.belt.twigsleaves"),
+    (0.40, "common.items.armor.druid.belt"),
+    (0.20, "common.items.armor.twigs.belt"),
+    (0.20, "common.items.armor.twigsflowers.belt"),
+    (0.20, "common.items.armor.twigsleaves.belt"),
     // chests
-    (0.40, "common.items.armor.chest.druid"),
-    (0.20, "common.items.armor.chest.twig"),
-    (0.20, "common.items.armor.chest.twigsflowers"),
-    (0.20, "common.items.armor.chest.twigsleaves"),
+    (0.40, "common.items.armor.druid.chest"),
+    (0.20, "common.items.armor.twigs.chest"),
+    (0.20, "common.items.armor.twigsflowers.chest"),
+    (0.20, "common.items.armor.twigsleaves.chest"),
     // shoes
-    (0.40, "common.items.armor.foot.druid"),
-    (0.20, "common.items.armor.foot.twig"),
-    (0.20, "common.items.armor.foot.twigsflowers"),
-    (0.20, "common.items.armor.foot.twigsleaves"),
+    (0.40, "common.items.armor.druid.foot"),
+    (0.20, "common.items.armor.twigs.foot"),
+    (0.20, "common.items.armor.twigsflowers.foot"),
+    (0.20, "common.items.armor.twigsleaves.foot"),
     // pants
-    (0.40, "common.items.armor.pants.druid"),
-    (0.20, "common.items.armor.pants.twig"),
-    (0.20, "common.items.armor.pants.twigsflowers"),
-    (0.20, "common.items.armor.pants.twigsleaves"),
+    (0.40, "common.items.armor.druid.pants"),
+    (0.20, "common.items.armor.twigs.pants"),
+    (0.20, "common.items.armor.twigsflowers.pants"),
+    (0.20, "common.items.armor.twigsleaves.pants"),
     // shoulders
-    (0.40, "common.items.armor.shoulder.druidshoulder"),
-    (0.20, "common.items.armor.shoulder.twigs"),
-    (0.20, "common.items.armor.shoulder.twigsflowers"),
-    (0.20, "common.items.armor.shoulder.twigsleaves"),
+    (0.40, "common.items.armor.druid.shoulder"),
+    (0.20, "common.items.armor.twigs.shoulder"),
+    (0.20, "common.items.armor.twigsflowers.shoulder"),
+    (0.20, "common.items.armor.twigsleaves.shoulder"),
     //gloves
-    (0.40, "common.items.armor.hand.druid"),
-    (0.20, "common.items.armor.hand.twig"),
-    (0.20, "common.items.armor.hand.twigsflowers"),
-    (0.20, "common.items.armor.hand.twigsleaves"),
+    (0.40, "common.items.armor.druid.hand"),
+    (0.20, "common.items.armor.twigs.hand"),
+    (0.20, "common.items.armor.twigsflowers.hand"),
+    (0.20, "common.items.armor.twigsleaves.hand"),
 ]
\ No newline at end of file
diff --git a/assets/common/loot_tables/loot_table_cultists.ron b/assets/common/loot_tables/loot_table_cultists.ron
index 20dba99274..4acf24d46a 100644
--- a/assets/common/loot_tables/loot_table_cultists.ron
+++ b/assets/common/loot_tables/loot_table_cultists.ron
@@ -12,62 +12,62 @@
     (0.5, "common.items.food.mushroom_stick"),
     // Misc
     (4, "common.items.crafting_ing.empty_vial"),
-    (0.25, "common.items.armor.neck.neck_1"),
+    (0.25, "common.items.armor.misc.neck.plain_1"),
     (0.001, "common.items.glider.glider_purp"),
     (0.1, "common.items.glider.glider_blue"),
     (0.5, "common.items.utility.firework_purple"),
     (0.5, "common.items.utility.bomb"),
-    (0.5, "common.items.armor.ring.ring_gold_0"),
-    (0.25, "common.items.armor.ring.ring_purp_high_0"),
+    (0.5, "common.items.armor.misc.ring.gold"),
+    (0.25, "common.items.armor.misc.ring.skull"),
     // Heavy Armour
     // belts
-    (0.5, "common.items.armor.belt.plate_0"),
-    (0.3, "common.items.armor.belt.steel_0"),
+    (0.5, "common.items.armor.plate.belt"),
+    (0.3, "common.items.armor.steel.belt"),
     // chests
-    (0.5, "common.items.armor.chest.plate_green_0"),
-    (0.3, "common.items.armor.chest.steel_0"),
+    (0.5, "common.items.armor.plate.chest"),
+    (0.3, "common.items.armor.steel.chest"),
     // shoes
-    (0.5, "common.items.armor.foot.plate_0"),
-    (0.3, "common.items.armor.foot.steel_0"),
+    (0.5, "common.items.armor.plate.foot"),
+    (0.3, "common.items.armor.steel.foot"),
     // pants
-    (0.5, "common.items.armor.pants.plate_green_0"),
-    (0.3, "common.items.armor.pants.steel_0"),
+    (0.5, "common.items.armor.plate.pants"),
+    (0.3, "common.items.armor.steel.pants"),
     // shoulders
-    (0.40, "common.items.armor.shoulder.plate_0"),
-    (0.37, "common.items.armor.shoulder.iron_spikes"),
-    (0.33, "common.items.armor.shoulder.steel_0"),
+    (0.40, "common.items.armor.plate.shoulder"),
+    (0.37, "common.items.armor.misc.shoulder.iron_spikes"),
+    (0.33, "common.items.armor.steel.shoulder"),
     //gloves
-    (0.67, "common.items.armor.hand.plate_0"),
-    (0.33, "common.items.armor.hand.steel_0"),
+    (0.67, "common.items.armor.plate.hand"),
+    (0.33, "common.items.armor.steel.hand"),
     //Light Armour
     // belts
-    (0.50, "common.items.armor.belt.leather_0"),
-    (0.50, "common.items.armor.belt.leather_2"),
+    (0.50, "common.items.armor.swift.belt"),
+    (0.50, "common.items.armor.leather.belt"),
     // chests
-    (0.50, "common.items.armor.chest.leather_0"),
-    (0.50, "common.items.armor.chest.leather_2"),
+    (0.50, "common.items.armor.swift.chest"),
+    (0.50, "common.items.armor.leather.chest"),
     // shoes
-    (0.50, "common.items.armor.foot.leather_0"),
-    (0.50, "common.items.armor.foot.leather_2"),
+    (0.50, "common.items.armor.swift.foot"),
+    (0.50, "common.items.armor.leather.foot"),
     // pants
-    (0.33, "common.items.armor.pants.leather_0"),
-    (0.33, "common.items.armor.pants.leather_2"),
-    (0.33, "common.items.armor.pants.hunting"),
+    (0.33, "common.items.armor.swift.pants"),
+    (0.33, "common.items.armor.leather.pants"),
+    (0.33, "common.items.armor.misc.pants.hunting"),
     // shoulders
-    (0.6, "common.items.armor.shoulder.leather_strips"),
-    (0.4, "common.items.armor.shoulder.leather_0"),
-    (0.4, "common.items.armor.shoulder.leather_1"),
-    (0.4, "common.items.armor.shoulder.leather_2"),
-    (0.3, "common.items.armor.shoulder.leather_iron_0"),
-    (0.3, "common.items.armor.shoulder.leather_iron_1"),
-    (0.3, "common.items.armor.shoulder.leather_iron_2"),
-    (0.3, "common.items.armor.shoulder.leather_iron_3"),
+    (0.6, "common.items.armor.misc.shoulder.leather_strip"),
+    (0.4, "common.items.armor.swift.shoulder"),
+    (0.4, "common.items.armor.leather.shoulder"),
+    (0.4, "common.items.armor.misc.shoulder.leather_3"),
+    (0.3, "common.items.armor.misc.shoulder.leather_iron_0"),
+    (0.3, "common.items.armor.misc.shoulder.leather_iron_1"),
+    (0.3, "common.items.armor.misc.shoulder.leather_iron_2"),
+    (0.3, "common.items.armor.misc.shoulder.leather_iron_3"),
     //gloves
-    (0.50, "common.items.armor.hand.leather_0"),
-    (0.50, "common.items.armor.hand.leather_2"),    
+    (0.50, "common.items.armor.swift.hand"),
+    (0.50, "common.items.armor.leather.hand"),    
     //backpack
-    (0.001, "common.items.armor.back.backpack_0"),
-    (0.1, "common.items.armor.bag.heavy_seabag"),
+    (0.001, "common.items.armor.misc.back.backpack"),
+    (0.1, "common.items.armor.misc.bag.heavy_seabag"),
     // Common Weapons
     // swords
     (0.10, "common.items.weapons.sword.wood-0"),
@@ -221,4 +221,4 @@
     (0.10, "common.items.weapons.bow.eldwood-1"),
     (0.10, "common.items.weapons.bow.eldwood-2"),
     (0.001, "common.items.weapons.bow.sagitta"),
-]
+]
\ No newline at end of file
diff --git a/assets/common/loot_tables/loot_table_humanoids.ron b/assets/common/loot_tables/loot_table_humanoids.ron
index 67c6b966e1..cbaeadef71 100644
--- a/assets/common/loot_tables/loot_table_humanoids.ron
+++ b/assets/common/loot_tables/loot_table_humanoids.ron
@@ -6,7 +6,7 @@
     // Consumables
     (0.2, "common.items.consumable.potion_minor"),
     // Ring
-    (0.02, "common.items.armor.ring.ring_gold_0"),
+    (0.02, "common.items.armor.misc.ring.gold"),
     // Utility
     (0.05, "common.items.utility.collar"),
     // Food
diff --git a/assets/common/loot_tables/loot_table_mindflayer.ron b/assets/common/loot_tables/loot_table_mindflayer.ron
index 7d5da8547c..b5f4b266bc 100644
--- a/assets/common/loot_tables/loot_table_mindflayer.ron
+++ b/assets/common/loot_tables/loot_table_mindflayer.ron
@@ -1,12 +1,12 @@
 [
     // armor
-    (1, "common.items.armor.belt.cultist_belt"),
-    (1, "common.items.armor.chest.cultist_chest_purple"),
-    (1, "common.items.armor.foot.cultist_boots"),
-    (1, "common.items.armor.hand.cultist_hands_purple"),
-    (1, "common.items.armor.pants.cultist_legs_purple"),
-    (1, "common.items.armor.shoulder.cultist_shoulder_purple"),
-    (1, "common.items.armor.back.dungeon_purple-0"),
+    (1, "common.items.armor.cultist.belt"),
+    (1, "common.items.armor.cultist.chest"),
+    (1, "common.items.armor.cultist.foot"),
+    (1, "common.items.armor.cultist.hand"),
+    (1, "common.items.armor.cultist.pants"),
+    (1, "common.items.armor.cultist.shoulder"),
+    (1, "common.items.armor.misc.back.dungeon_purple"),
     // weapons
     (1, "common.items.weapons.staff.cultist_staff"),
     (1, "common.items.weapons.hammer.cultist_purp_2h-0"),
diff --git a/assets/common/loot_tables/loot_table_miniboss.ron b/assets/common/loot_tables/loot_table_miniboss.ron
index 763756cba4..1d8f6555c9 100644
--- a/assets/common/loot_tables/loot_table_miniboss.ron
+++ b/assets/common/loot_tables/loot_table_miniboss.ron
@@ -1,13 +1,13 @@
 [
     // armor
-    (1, "common.items.armor.belt.cultist_belt"),
-    (1, "common.items.armor.chest.cultist_chest_purple"),
-    (1, "common.items.armor.foot.cultist_boots"),
-    (1, "common.items.armor.hand.cultist_hands_purple"),
-    (1, "common.items.armor.pants.cultist_legs_purple"),
-    (1, "common.items.armor.shoulder.cultist_shoulder_purple"),
-    (1, "common.items.armor.back.dungeon_purple-0"),
-    (1, "common.items.armor.ring.ring_purp_high_0"),
+    (1, "common.items.armor.cultist.belt"),
+    (1, "common.items.armor.cultist.chest"),
+    (1, "common.items.armor.cultist.foot"),
+    (1, "common.items.armor.cultist.hand"),
+    (1, "common.items.armor.cultist.pants"),
+    (1, "common.items.armor.cultist.shoulder"),
+    (1, "common.items.armor.misc.back.dungeon_purple"),
+    (1, "common.items.armor.misc.ring.skull"),
     // weapons
     (1, "common.items.weapons.staff.cultist_staff"),
     (1, "common.items.weapons.hammer.cultist_purp_2h-0"),
diff --git a/assets/common/loot_tables/loot_table_saurok.ron b/assets/common/loot_tables/loot_table_saurok.ron
index 950ac51b7b..830f8dc884 100644
--- a/assets/common/loot_tables/loot_table_saurok.ron
+++ b/assets/common/loot_tables/loot_table_saurok.ron
@@ -6,11 +6,11 @@
     // Consumables
     (0.5, "common.items.consumable.potion_minor"),
     // Ring
-    (0.2, "common.items.armor.ring.ring_gold_0"),
+    (0.2, "common.items.armor.misc.ring.gold"),
     // Utility
     (0.1, "common.items.utility.collar"),
     // Bag
-    (0.1, "common.items.armor.bag.liana_kit"),
+    (0.1, "common.items.armor.misc.bag.liana_kit"),
     // Food
     (2.0, "common.items.food.coconut"),
     (0.3, "common.items.food.apple_mushroom_curry"),
diff --git a/assets/common/loot_tables/loot_table_villager.ron b/assets/common/loot_tables/loot_table_villager.ron
index 03189946ab..7ed913701c 100644
--- a/assets/common/loot_tables/loot_table_villager.ron
+++ b/assets/common/loot_tables/loot_table_villager.ron
@@ -7,17 +7,17 @@
     // Consumables
     (0.2, "common.items.consumable.potion_minor"),
     // Armour
-    (1, "common.items.armor.chest.worker_green_0"),
-    (1, "common.items.armor.chest.worker_green_1"),
-    (1, "common.items.armor.chest.worker_orange_0"),
-    (1, "common.items.armor.chest.worker_orange_1"),
-    (1, "common.items.armor.chest.worker_purple_0"),
-    (1, "common.items.armor.chest.worker_purple_1"),
-    (1, "common.items.armor.chest.worker_red_0"),
-    (1, "common.items.armor.chest.worker_red_1"),
-    (1, "common.items.armor.chest.worker_yellow_0"),
-    (1, "common.items.armor.chest.worker_yellow_1"),
-    (1, "common.items.armor.pants.worker_blue_0"),
+    (1, "common.items.armor.misc.chest.worker_green_0"),
+    (1, "common.items.armor.misc.chest.worker_green_1"),
+    (1, "common.items.armor.misc.chest.worker_orange_0"),
+    (1, "common.items.armor.misc.chest.worker_orange_1"),
+    (1, "common.items.armor.misc.chest.worker_purple_0"),
+    (1, "common.items.armor.misc.chest.worker_purple_1"),
+    (1, "common.items.armor.misc.chest.worker_red_0"),
+    (1, "common.items.armor.misc.chest.worker_red_1"),
+    (1, "common.items.armor.misc.chest.worker_yellow_0"),
+    (1, "common.items.armor.misc.chest.worker_yellow_1"),
+    (1, "common.items.armor.misc.pants.worker_blue_0"),
     // Utility
     (0.05, "common.items.utility.collar"),
     // Food
diff --git a/assets/common/recipe_book.ron b/assets/common/recipe_book.ron
index 2ab62ad899..bed5fe2810 100644
--- a/assets/common/recipe_book.ron
+++ b/assets/common/recipe_book.ron
@@ -252,35 +252,35 @@
         ],
     ),
     "adventure back": (
-        ("common.items.armor.back.leather_adventurer", 1),
+        ("common.items.armor.agile.back", 1),
         [(Item("common.items.crafting_ing.leather_scraps"), 4)],
     ),
     "adventure belt": (
-        ("common.items.armor.belt.leather_adventurer", 1),
+        ("common.items.armor.agile.belt", 1),
         [(Item("common.items.crafting_ing.leather_scraps"), 2)],
     ),
     "adventure chest": (
-        ("common.items.armor.chest.leather_adventurer", 1),
+        ("common.items.armor.agile.chest", 1),
         [(Item("common.items.crafting_ing.leather_scraps"), 12)],
     ),
     "adventure feet": (
-        ("common.items.armor.foot.leather_adventurer", 1),
+        ("common.items.armor.agile.foot", 1),
         [(Item("common.items.crafting_ing.leather_scraps"), 3)],
     ),
     "adventure hands": (
-        ("common.items.armor.hand.leather_adventurer", 1),
+        ("common.items.armor.agile.hand", 1),
         [(Item("common.items.crafting_ing.leather_scraps"), 4)],
     ),
     "adventure pants": (
-        ("common.items.armor.pants.leather_adventurer", 1),
+        ("common.items.armor.agile.pants", 1),
         [(Item("common.items.crafting_ing.leather_scraps"), 8)],
     ),
     "adventure shoulder": (
-        ("common.items.armor.shoulder.leather_adventurer", 1),
+        ("common.items.armor.agile.shoulder", 1),
         [(Item("common.items.crafting_ing.leather_scraps"), 12)],
     ),
     "Seashell Necklace": (
-        ("common.items.armor.neck.neck_2", 1),
+        ("common.items.armor.misc.neck.shell", 1),
         [
             (Item("common.items.crafting_ing.cloth_scraps"), 2),
             (Item("common.items.crafting_ing.sapphire"), 1),
@@ -297,57 +297,57 @@
         ],
     ),
     "tiny red pouch": (
-        ("common.items.armor.bag.tiny_red_pouch", 1),
+        ("common.items.armor.misc.bag.tiny_red_pouch", 1),
         [
             (Item("common.items.crafting_ing.cloth_scraps_red"), 3),
             (Item("common.items.crafting_tools.sewing_set"), 0),
         ],
     ),
     "tiny leather pouch": (
-        ("common.items.armor.bag.tiny_leather_pouch", 1),
+        ("common.items.armor.misc.bag.tiny_leather_pouch", 1),
         [
             (Item("common.items.crafting_ing.leather_scraps"), 6),
             (Item("common.items.crafting_tools.sewing_set"), 0),
         ],
     ),
     "knitted red pouch": (
-        ("common.items.armor.bag.knitted_red_pouch", 1),
+        ("common.items.armor.misc.bag.knitted_red_pouch", 1),
         [
             (Item("common.items.crafting_ing.cloth_scraps_red"), 3),
-            (Item("common.items.armor.bag.tiny_red_pouch"), 2),
+            (Item("common.items.armor.misc.bag.tiny_red_pouch"), 2),
             (Item("common.items.crafting_tools.sewing_set"), 0),
         ],
     ),
     "woven red bag": (
-        ("common.items.armor.bag.woven_red_bag", 1),
+        ("common.items.armor.misc.bag.woven_red_bag", 1),
         [
             (Item("common.items.crafting_ing.cloth_scraps_red"), 6),
-            (Item("common.items.armor.bag.knitted_red_pouch"), 1),
+            (Item("common.items.armor.misc.bag.knitted_red_pouch"), 1),
             (Item("common.items.crafting_tools.sewing_set"), 0),
         ],
     ),
     "traveler backpack": (
-        ("common.items.armor.back.backpack_0", 1),
+        ("common.items.armor.misc.back.backpack", 1),
         [
             (Item("common.items.crafting_ing.diamond"), 2),
             (Item("common.items.crafting_ing.twigs"), 2),
             (Item("common.items.crafting_ing.cloth_scraps"), 3),
             (Item("common.items.crafting_ing.leather_scraps"), 3),
-            (Item("common.items.armor.bag.tiny_leather_pouch"), 2),
+            (Item("common.items.armor.misc.bag.tiny_leather_pouch"), 2),
             (Item("common.items.crafting_tools.sewing_set"), 0),
         ],
     ),
     "sturdy red backpack": (
-        ("common.items.armor.bag.sturdy_red_backpack", 1),
+        ("common.items.armor.misc.bag.sturdy_red_backpack", 1),
         [
             (Item("common.items.crafting_ing.diamond"), 2),
             (Item("common.items.crafting_ing.cloth_scraps_red"), 3),
-            (Item("common.items.armor.bag.woven_red_bag"), 1),
+            (Item("common.items.armor.misc.bag.woven_red_bag"), 1),
             (Item("common.items.crafting_tools.sewing_set"), 0),
         ],
     ),
     "troll hide pack": (
-        ("common.items.armor.bag.troll_hide_pack", 1),
+        ("common.items.armor.misc.bag.troll_hide_pack", 1),
         [
             (Item("common.items.crafting_ing.leather_troll"), 10),
             (Item("common.items.crafting_ing.leather_scraps"), 10),
@@ -356,7 +356,7 @@
         ],
     ),
     "Mindflayer Spellbag": (
-        ("common.items.armor.bag.mindflayer_spellbag", 1),
+        ("common.items.armor.misc.bag.mindflayer_spellbag", 1),
         [
             (Item("common.items.crafting_ing.mindflayer_bag_damaged"), 1),
             (Item("common.items.crafting_ing.leather_scraps"), 10),
diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron
index c2e670c504..cb65368e4c 100644
--- a/assets/voxygen/item_image_manifest.ron
+++ b/assets/voxygen/item_image_manifest.ron
@@ -980,663 +980,672 @@
     ),
     // Armor
     // Starter Parts
-    Armor(Foot("Sandal0")): VoxTrans(
-        "voxel.armor.foot.cloth_sandals",
+    Armor(Foot("Sandal")): VoxTrans(
+        "voxel.armor.misc.foot.cloth_sandal",
         (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1,
     ),
-    Armor(Pants("Rugged0")): VoxTrans(
-        "voxel.armor.pants.rugged-0",
+    Armor(Pants("Rugged")): VoxTrans(
+        "voxel.armor.rugged.pants",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
     ),
-    Armor(Chest("Rugged0")): VoxTrans(
-        "voxel.armor.chest.rugged-0",
+    Armor(Chest("Rugged")): VoxTrans(
+        "voxel.armor.rugged.pants",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
     ),
     // Cultist Clothing
-    Armor(Chest("CultistPurple")): VoxTrans(
-        "voxel.armor.chest.cultist",
+    Armor(Chest("Cultist")): VoxTrans(
+        "voxel.armor.cultist.chest",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
     ),
-    Armor(Pants("CultistPurple")): VoxTrans(
-        "voxel.armor.pants.cultist",
+    Armor(Pants("Cultist")): VoxTrans(
+        "voxel.armor.cultist.pants",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
     ),
     Armor(Belt("Cultist")): VoxTrans(
-        "voxel.armor.belt.cultist",
+        "voxel.armor.cultist.belt",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.4,
     ),
     Armor(Foot("Cultist")): VoxTrans(
-        "voxel.armor.foot.cultist",
+        "voxel.armor.cultist.foot",
         (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1,
     ),
-    Armor(Hand("CultistPurple")): VoxTrans(
-        "voxel.armor.hand.cultist_right",
+    Armor(Hand("Cultist")): VoxTrans(
+        "voxel.armor.cultist.hand",
         (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0,
     ),
-    Armor(Shoulder("CultistPurple")): VoxTrans(
-        "voxel.armor.shoulder.cultist_right",
+    Armor(Shoulder("Cultist")): VoxTrans(
+        "voxel.armor.cultist.shoulder",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
     ),
-    Armor(Chest("CultistBlue")): VoxTrans(
-        "voxel.armor.chest.cultist",
+    Armor(Chest("Cultist")): VoxTrans(
+        "voxel.armor.cultist.chest",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
     ),
-    Armor(Pants("CultistBlue")): VoxTrans(
-        "voxel.armor.pants.cultist",
+    Armor(Pants("Cultist")): VoxTrans(
+        "voxel.armor.cultist.pants",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
     ),
-    Armor(Hand("CultistBlue")): VoxTrans(
-        "voxel.armor.hand.cultist_right",
+    Armor(Hand("Cultist")): VoxTrans(
+        "voxel.armor.cultist.hand",
         (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0,
     ),
-    Armor(Shoulder("CultistBlue")): VoxTrans(
-        "voxel.armor.shoulder.cultist_right",
+    Armor(Shoulder("Cultist")): VoxTrans(
+        "voxel.armor.cultist.shoulder",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
     ),
     // Druid Set
     Armor(Chest("Druid")): VoxTrans(
-        "voxel.armor.chest.druid",
+        "voxel.armor.druid.chest",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
     ),
     Armor(Pants("Druid")): VoxTrans(
-        "voxel.armor.pants.druid",
+        "voxel.armor.druid.pants",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
     ),
     Armor(Belt("Druid")): VoxTrans(
-        "voxel.armor.belt.druid",
+        "voxel.armor.druid.belt",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.4,
     ),
     Armor(Foot("Druid")): VoxTrans(
-        "voxel.armor.foot.druid",
+        "voxel.armor.druid.foot",
         (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1,
     ),
     Armor(Hand("Druid")): VoxTrans(
-        "voxel.armor.hand.druid_right",
+        "voxel.armor.druid.hand",
         (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0,
     ),
-    Armor(Shoulder("DruidShoulder")): VoxTrans(
-        "voxel.armor.shoulder.druid_right",
+    Armor(Shoulder("Druid")): VoxTrans(
+        "voxel.armor.druid.shoulder",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
     ),
     // Villager Clothing
-    Armor(Pants("WorkerBlue0")): VoxTrans(
-        "voxel.armor.pants.worker_blue-0",
+    Armor(Pants("WorkerBlue")): VoxTrans(
+        "voxel.armor.misc.pants.worker_blue",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
     ),
     Armor(Chest("WorkerGreen0")): VoxTrans(
-        "voxel.armor.chest.worker_green-0",
+        "voxel.armor.misc.chest.worker_green",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
     ),
     Armor(Chest("WorkerGreen1")): VoxTrans(
-        "voxel.armor.chest.shirt_white-0",
+        "voxel.armor.misc.chest.shirt_white",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
     ),
     Armor(Chest("WorkerRed0")): VoxTrans(
-        "voxel.armor.chest.worker_green-0",
+        "voxel.armor.misc.chest.worker_green",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
     ),
     Armor(Chest("WorkerRed1")): VoxTrans(
-        "voxel.armor.chest.shirt_white-0",
+        "voxel.armor.misc.chest.shirt_white",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
     ),
     Armor(Chest("WorkerPurple0")): VoxTrans(
-        "voxel.armor.chest.worker_green-0",
+        "voxel.armor.misc.chest.worker_green",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
     ),
     Armor(Chest("WorkerPurple1")): VoxTrans(
-        "voxel.armor.chest.shirt_white-0",
+        "voxel.armor.misc.chest.shirt_white",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
     ),
     Armor(Chest("WorkerYellow0")): VoxTrans(
-        "voxel.armor.chest.worker_green-0",
+        "voxel.armor.misc.chest.worker_green",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
     ),
     Armor(Chest("WorkerYellow1")): VoxTrans(
-        "voxel.armor.chest.shirt_white-0",
+        "voxel.armor.misc.chest.shirt_white",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
     ),
     Armor(Chest("WorkerOrange0")): VoxTrans(
-        "voxel.armor.chest.worker_green-0",
+        "voxel.armor.misc.chest.worker_green",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
     ),
     Armor(Chest("WorkerOrange1")): VoxTrans(
-        "voxel.armor.chest.shirt_white-0",
+        "voxel.armor.misc.chest.shirt_white",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
     ),
     // Velorite Battlemage Set
-    Armor(Chest("VeloriteMage0")): VoxTrans(
-        "voxel.armor.chest.velorite_battlemage",
+    Armor(Chest("VeloriteMage")): VoxTrans(
+        "voxel.armor.velorite_battlemage.chest",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
     ),
-    Armor(Pants("VeloriteMage0")): VoxTrans(
-        "voxel.armor.pants.velorite_battlemage",
+    Armor(Pants("VeloriteMage")): VoxTrans(
+        "voxel.armor.velorite_battlemage.pants",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
     ),
-    Armor(Belt("VeloriteMage0")): VoxTrans(
-        "voxel.armor.belt.velorite_battlemage",
+    Armor(Belt("VeloriteMage")): VoxTrans(
+        "voxel.armor.velorite_battlemage.belt",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.8,
     ),
-    Armor(Foot("VeloriteMage0")): VoxTrans(
-        "voxel.armor.foot.velorite_battlemage",
+    Armor(Foot("VeloriteMage")): VoxTrans(
+        "voxel.armor.velorite_battlemage.foot",
         (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1,
     ),
-    Armor(Hand("VeloriteMage0")): VoxTrans(
-        "voxel.armor.hand.velorite_battlemage_left",
+    Armor(Hand("VeloriteMage")): VoxTrans(
+        "voxel.armor.velorite_battlemage.hand",
         (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0,
     ),
-    Armor(Shoulder("VeloriteMage0")): VoxTrans(
-        "voxel.armor.shoulder.velorite_battlemage_left",
+    Armor(Shoulder("VeloriteMage")): VoxTrans(
+        "voxel.armor.velorite_battlemage.shoulder",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
     ),
-    Armor(Back("VeloriteMage0")): VoxTrans(
-        "voxel.armor.back.velorite_battlemage",
+    Armor(Back("VeloriteMage")): VoxTrans(
+        "voxel.armor.velorite_battlemage.back",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
     ),
     // Assassin Set
     Armor(Chest("Assassin")): VoxTrans(
-        "voxel.armor.chest.assa",
+        "voxel.armor.assassin.chest",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
     ),
     Armor(Pants("Assassin")): VoxTrans(
-        "voxel.armor.pants.assa",
+        "voxel.armor.assassin.pants",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
     ),
     Armor(Belt("Assassin")): VoxTrans(
-        "voxel.armor.belt.assa",
+        "voxel.armor.assassin.belt",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.8,
     ),
     Armor(Foot("Assassin")): VoxTrans(
-        "voxel.armor.foot.assa",
+        "voxel.armor.assassin.foot",
         (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1,
     ),
     Armor(Hand("Assassin")): VoxTrans(
-        "voxel.armor.hand.assa_right",
+        "voxel.armor.assassin.hand",
         (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0,
     ),
     Armor(Shoulder("Assassin")): VoxTrans(
-        "voxel.armor.shoulder.assa_right",
+        "voxel.armor.assassin.shoulder",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
     ),
     // Starting Armor - Plate
-    Armor(Chest("PlateGreen0")): VoxTrans(
-        "voxel.armor.chest.plate_green-0",
+    Armor(Chest("Plate")): VoxTrans(
+        "voxel.armor.plate.chest",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
     ),
-    Armor(Pants("PlateGreen0")): VoxTrans(
-        "voxel.armor.pants.plate_green-0",
+    Armor(Pants("Plate")): VoxTrans(
+        "voxel.armor.plate.pants",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
     ),
-    Armor(Belt("Plate0")): VoxTrans(
-        "voxel.armor.belt.plate-0",
+    Armor(Belt("Plate")): VoxTrans(
+        "voxel.armor.plate.belt",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.8,
     ),
-    Armor(Foot("Plate0")): VoxTrans(
-        "voxel.armor.foot.plate-0",
+    Armor(Foot("Plate")): VoxTrans(
+        "voxel.armor.plate.foot",
         (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1,
     ),
-    Armor(Hand("Plate0")): VoxTrans(
-        "voxel.armor.hand.plate_right-0",
+    Armor(Hand("Plate")): VoxTrans(
+        "voxel.armor.plate.hand",
         (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0,
     ),
-    Armor(Shoulder("Plate0")): VoxTrans(
-        "voxel.armor.shoulder.plate_right-0",
+    Armor(Shoulder("Plate")): VoxTrans(
+        "voxel.armor.plate.shoulder",
         (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
     ),
     //Steel0 Armor
-    Armor(Chest("Steel0")): VoxTrans(
-        "voxel.armor.chest.steel-0",
+    Armor(Chest("Steel")): VoxTrans(
+        "voxel.armor.steel.chest",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
     ),
-    Armor(Pants("Steel0")): VoxTrans(
-        "voxel.armor.pants.steel-0",
+    Armor(Pants("Steel")): VoxTrans(
+        "voxel.armor.steel.pants",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
     ),
-    Armor(Belt("Steel0")): VoxTrans(
-        "voxel.armor.belt.steel-0",
+    Armor(Belt("Steel")): VoxTrans(
+        "voxel.armor.steel.belt",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.8,
     ),
-    Armor(Foot("Steel0")): VoxTrans(
-        "voxel.armor.foot.steel-0",
+    Armor(Foot("Steel")): VoxTrans(
+        "voxel.armor.steel.foot",
         (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1,
     ),
-    Armor(Hand("Steel0")): VoxTrans(
-        "voxel.armor.hand.steel_right-0",
+    Armor(Hand("Steel")): VoxTrans(
+        "voxel.armor.steel.hand",
         (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0,
     ),
-    Armor(Shoulder("Steel0")): VoxTrans(
-        "voxel.armor.shoulder.steel_right-0",
+    Armor(Shoulder("Steel")): VoxTrans(
+        "voxel.armor.steel.shoulder",
         (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
     ),
-    //PlateLeather0 Armor
-    Armor(Chest("PlateLeather")): VoxTrans(
-        "voxel.armor.chest.plate_leather",
+    //PlateLeather Armor
+    Armor(Chest("LeatherPlate")): VoxTrans(
+        "voxel.armor.leather_plate.chest",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
     ),
-    Armor(Pants("PlateLeather")): VoxTrans(
-        "voxel.armor.pants.plate_leather-0",
+    Armor(Pants("LeatherPlate")): VoxTrans(
+        "voxel.armor.leather_plate.pants",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
     ),
-    Armor(Belt("PlateLeather")): VoxTrans(
-        "voxel.armor.belt.plate_leather-0",
+    Armor(Belt("LeatherPlate")): VoxTrans(
+        "voxel.armor.leather_plate.belt",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.8,
     ),
-    Armor(Foot("PlateLeather")): VoxTrans(
-        "voxel.armor.foot.plate_leather",
+    Armor(Foot("LeatherPlate")): VoxTrans(
+        "voxel.armor.leather_plate.foot",
         (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1,
     ),
-    Armor(Hand("PlateLeather")): VoxTrans(
-        "voxel.armor.hand.plate_leather_right-0",
+    Armor(Hand("LeatherPlate")): VoxTrans(
+        "voxel.armor.leather_plate.hand",
         (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0,
     ),
-    Armor(Shoulder("PlateLeather")): VoxTrans(
-        "voxel.armor.shoulder.plate_leather_right-0",
+    Armor(Shoulder("LeatherPlate")): VoxTrans(
+        "voxel.armor.leather_plate.shoulder",
         (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
     ),
     //Leather0 Armor
-    Armor(Chest("Leather0")): VoxTrans(
-        "voxel.armor.chest.leather-0",
+    Armor(Chest("Swift")): VoxTrans(
+        "voxel.armor.swift.chest",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
     ),
-    Armor(Pants("Leather0")): VoxTrans(
-        "voxel.armor.pants.leather-0",
+    Armor(Pants("Swift")): VoxTrans(
+        "voxel.armor.swift.pants",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
     ),
-    Armor(Belt("Leather0")): VoxTrans(
-        "voxel.armor.belt.leather-0",
+    Armor(Belt("Swift")): VoxTrans(
+        "voxel.armor.swift.belt",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.8,
     ),
-    Armor(Foot("Leather0")): VoxTrans(
-        "voxel.armor.foot.leather-0",
+    Armor(Foot("Swift")): VoxTrans(
+        "voxel.armor.swift.foot",
         (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1,
     ),
-    Armor(Hand("Leather0")): VoxTrans(
-        "voxel.armor.hand.leather_right-0",
+    Armor(Hand("Swift")): VoxTrans(
+        "voxel.armor.swift.hand",
         (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0,
     ),
-    Armor(Shoulder("Leather0")): VoxTrans(
-        "voxel.armor.shoulder.leather_right-0",
+    Armor(Shoulder("Swift")): VoxTrans(
+        "voxel.armor.swift.shoulder",
         (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
     ),
-    //Leather1 Armor
-    Armor(Shoulder("Leather1")): VoxTrans(
+    //Leather Armor
+    Armor(Shoulder("Leather")): VoxTrans(
         "voxel.armor.shoulder.leather_right-1",
         (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
     ),
-    //Leather2 Armor
-    Armor(Chest("Leather2")): VoxTrans(
-        "voxel.armor.chest.leather-2",
+    //Agile Armor
+    Armor(Chest("Agile")): VoxTrans(
+        "voxel.armor.agile.chest",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
     ),
-    Armor(Pants("Leather2")): VoxTrans(
-        "voxel.armor.pants.leather-2",
+    Armor(Pants("Agile")): VoxTrans(
+        "voxel.armor.agile.pants",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
     ),
-    Armor(Belt("Leather2")): VoxTrans(
-        "voxel.armor.belt.leather-2",
+    Armor(Belt("Agile")): VoxTrans(
+        "voxel.armor.agile.belt",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.8,
     ),
-    Armor(Foot("Leather2")): VoxTrans(
-        "voxel.armor.foot.leather-2",
+    Armor(Foot("Agile")): VoxTrans(
+        "voxel.armor.agile.foot",
         (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1,
     ),
-    Armor(Hand("Leather2")): VoxTrans(
-        "voxel.armor.hand.leather_right-2",
+    Armor(Hand("Agile")): VoxTrans(
+        "voxel.armor.agile.hand",
         (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0,
     ),
-    Armor(Shoulder("Leather2")): VoxTrans(
-        "voxel.armor.shoulder.leather_right-2",
+    Armor(Shoulder("Agile")): VoxTrans(
+        "voxel.armor.agile.shoulder",
         (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
     ),
+    //Blue Leather Armor
+    Armor(Chest("BlueLeather")): VoxTrans(
+        "voxel.armor.leather_blue.chest",
+        (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
+    ),
+    Armor(Pants("BlueLeather")): VoxTrans(
+        "voxel.armor.leather_blue.pants",
+        (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
+    ),
     //Linen Cloth
-    Armor(Chest("ClothBlue0")): VoxTrans(
-        "voxel.armor.chest.cloth_blue-0",
+    Armor(Chest("ClothBlue")): VoxTrans(
+        "voxel.armor.cloth_blue.chest",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
     ),
-    Armor(Pants("ClothBlue0")): VoxTrans(
-        "voxel.armor.pants.cloth_blue-0",
+    Armor(Pants("ClothBlue")): VoxTrans(
+        "voxel.armor.cloth_blue.pants",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
     ),
-    Armor(Belt("ClothBlue0")): VoxTrans(
-        "voxel.armor.belt.cloth_blue-0",
+    Armor(Belt("ClothBlue")): VoxTrans(
+        "voxel.armor.cloth_blue.belt",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.8,
     ),
-    Armor(Foot("ClothBlue0")): VoxTrans(
-        "voxel.armor.foot.cloth_blue-0",
+    Armor(Foot("ClothBlue")): VoxTrans(
+        "voxel.armor.cloth_blue.foot",
         (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1,
     ),
-    Armor(Hand("ClothBlue0")): VoxTrans(
-        "voxel.armor.hand.cloth_blue_right-0",
+    Armor(Hand("ClothBlue")): VoxTrans(
+        "voxel.armor.cloth_blue.hand",
         (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0,
     ),
     Armor(Shoulder("ClothBlue0")): VoxTrans(
-        "voxel.armor.shoulder.cloth_blue_right-0",
-        (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
-    ),
-    //////////////
-    Armor(Chest("ClothGreen0")): VoxTrans(
-        "voxel.armor.chest.cloth_green-0",
-        (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
-    ),
-    Armor(Pants("ClothGreen0")): VoxTrans(
-        "voxel.armor.pants.cloth_green-0",
-        (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
-    ),
-    Armor(Belt("ClothGreen0")): VoxTrans(
-        "voxel.armor.belt.cloth_green-0",
-        (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.8,
-    ),
-    Armor(Foot("ClothGreen0")): VoxTrans(
-        "voxel.armor.foot.cloth_green-0",
-        (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1,
-    ),
-    Armor(Hand("ClothGreen0")): VoxTrans(
-        "voxel.armor.hand.cloth_green_right-0",
-        (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0,
-    ),
-    Armor(Shoulder("ClothGreen0")): VoxTrans(
-        "voxel.armor.shoulder.cloth_green_right-0",
-        (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
-    ),
-    Armor(Shoulder("ClothGreen0")): VoxTrans(
-        "voxel.armor.shoulder.cloth_green_right-0",
-        (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
-    ),
-    //////
-    Armor(Chest("ClothPurple0")): VoxTrans(
-        "voxel.armor.chest.cloth_purple-0",
-        (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
-    ),
-    Armor(Pants("ClothPurple0")): VoxTrans(
-        "voxel.armor.pants.cloth_purple-0",
-        (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
-    ),
-    Armor(Belt("ClothPurple0")): VoxTrans(
-        "voxel.armor.belt.cloth_purple-0",
-        (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.8,
-    ),
-    Armor(Foot("ClothPurple0")): VoxTrans(
-        "voxel.armor.foot.cloth_purple-0",
-        (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1,
-    ),
-    Armor(Hand("ClothPurple0")): VoxTrans(
-        "voxel.armor.hand.cloth_purple_right-0",
-        (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0,
-    ),
-    Armor(Shoulder("ClothPurple0")): VoxTrans(
-        "voxel.armor.shoulder.cloth_purple_right-0",
+        "voxel.armor.cloth_blue.shoulder_0",
         (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
     ),
     Armor(Shoulder("ClothBlue1")): VoxTrans(
-        "voxel.armor.shoulder.cloth_blue_right-1",
+        "voxel.armor.cloth_blue.shoulder_1",
+        (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
+    ),
+    //////////////
+    Armor(Chest("ClothGreen")): VoxTrans(
+        "voxel.armor.cloth_green.chest",
+        (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
+    ),
+    Armor(Pants("ClothGreen")): VoxTrans(
+        "voxel.armor.cloth_green.pants",
+        (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
+    ),
+    Armor(Belt("ClothGreen")): VoxTrans(
+        "voxel.armor.cloth_green.belt",
+        (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.8,
+    ),
+    Armor(Foot("ClothGreen")): VoxTrans(
+        "voxel.armor.cloth_green.foot",
+        (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1,
+    ),
+    Armor(Hand("ClothGreen")): VoxTrans(
+        "voxel.armor.cloth_green.hand",
+        (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0,
+    ),
+    Armor(Shoulder("ClothGreen")): VoxTrans(
+        "voxel.armor.cloth_green.shoulder",
+        (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
+    ),
+    //////
+    Armor(Chest("ClothPurple")): VoxTrans(
+        "voxel.armor.cloth_purple.chest",
+        (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
+    ),
+    Armor(Pants("ClothPurple")): VoxTrans(
+        "voxel.armor.cloth_purple.pants",
+        (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
+    ),
+    Armor(Belt("ClothPurple")): VoxTrans(
+        "voxel.armor.cloth_purple.belt",
+        (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.8,
+    ),
+    Armor(Foot("ClothPurple")): VoxTrans(
+        "voxel.armor.cloth_purple.foot",
+        (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1,
+    ),
+    Armor(Hand("ClothPurple")): VoxTrans(
+        "voxel.armor.cloth_purple.hand",
+        (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0,
+    ),
+    Armor(Shoulder("ClothPurple")): VoxTrans(
+        "voxel.armor.cloth_purple.shoulder",
         (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
     ),
     Armor(Shoulder("IronSpikes")): VoxTrans(
-        "voxel.armor.shoulder.iron_spikes_right",
+        "voxel.armor.misc.shoulder.iron_spikes",
         (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
     ),
     Armor(Shoulder("IronLeather3")): VoxTrans(
-        "voxel.armor.shoulder.leather_iron_right-3",
+        "voxel.armor.misc.shoulder.leather_iron_3",
         (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
     ),
     Armor(Shoulder("IronLeather2")): VoxTrans(
-        "voxel.armor.shoulder.leather_iron_right-2",
+        "voxel.armor.misc.shoulder.leather_iron_2",
         (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
     ),
     Armor(Shoulder("IronLeather1")): VoxTrans(
-        "voxel.armor.shoulder.leather_iron_right-1",
+        "voxel.armor.misc.shoulder.leather_iron_1",
         (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
     ),
     Armor(Shoulder("IronLeather0")): VoxTrans(
-        "voxel.armor.shoulder.leather_iron_right-0",
+        "voxel.armor.misc.shoulder.leather_iron_0",
         (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
     ),
-    Armor(Shoulder("LeatherStrips")): VoxTrans(
-        "voxel.armor.shoulder.leather_strips_right",
+    Armor(Shoulder("LeatherStrip")): VoxTrans(
+        "voxel.armor.misc.shoulder.leather_strip",
         (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
     ),
-    Armor(Foot("JackalopeSlips")): VoxTrans(
-        "voxel.armor.foot.jackalope_slippers",
+    Armor(Foot("Jackalope")): VoxTrans(
+        "voxel.armor.misc.foot.jackalope",
         (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1,
     ),
     //Twig Set
-    Armor(Chest("Twig")): VoxTrans(
-        "voxel.armor.chest.twigs_chest",
+    Armor(Chest("Twigs")): VoxTrans(
+        "voxel.armor.twigs.chest",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
     ),
-    Armor(Pants("Twig")): VoxTrans(
-        "voxel.armor.pants.twigs_pants",
+    Armor(Pants("Twigs")): VoxTrans(
+        "voxel.armor.twigs.pants",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
     ),
-    Armor(Belt("Twig")): VoxTrans(
-        "voxel.armor.belt.twigs_belt",
+    Armor(Belt("Twigs")): VoxTrans(
+        "voxel.armor.twigs.belt",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.4,
     ),
-    Armor(Foot("Twig")): VoxTrans(
-        "voxel.armor.foot.twigs_foot",
+    Armor(Foot("Twigs")): VoxTrans(
+        "voxel.armor.twigs.foot",
         (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1,
     ),
-    Armor(Hand("Twig")): VoxTrans(
-        "voxel.armor.hand.twigs_glove_right",
+    Armor(Hand("Twigs")): VoxTrans(
+        "voxel.armor.twigs.hand",
         (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0,
     ),
-    Armor(Shoulder("TwiggyShoulder")): VoxTrans(
-        "voxel.armor.shoulder.twigs_right",
+    Armor(Shoulder("Twigs")): VoxTrans(
+        "voxel.armor.twigs.shoulders",
         (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
         ),
     //TwigsLeaves Set
-    Armor(Chest("Twigsleaves")): VoxTrans(
-        "voxel.armor.chest.twigsleaves_chest",
+    Armor(Chest("TwigsLeaves")): VoxTrans(
+        "voxel.armor.twigsleaves.chest",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
     ),
-    Armor(Pants("Twigsleaves")): VoxTrans(
-        "voxel.armor.pants.twigsleaves_pants",
+    Armor(Pants("TwigsLeaves")): VoxTrans(
+        "voxel.armor.twigsleaves.pants",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
     ),
-    Armor(Belt("Twigsleaves")): VoxTrans(
-        "voxel.armor.belt.twigsleaves_belt",
+    Armor(Belt("TwigsLeaves")): VoxTrans(
+        "voxel.armor.twigsleaves.belt",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.4,
     ),
-    Armor(Foot("Twigsleaves")): VoxTrans(
-        "voxel.armor.foot.twigsleaves_foot",
+    Armor(Foot("TwigsLeaves")): VoxTrans(
+        "voxel.armor.twigsleaves.foot",
         (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1,
     ),
-    Armor(Hand("Twigsleaves")): VoxTrans(
-        "voxel.armor.hand.twigsleaves_glove_right",
+    Armor(Hand("TwigsLeaves")): VoxTrans(
+        "voxel.armor.twigsleaves.hand",
         (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0,
     ),
-    Armor(Shoulder("LeafyShoulder")): VoxTrans(
-        "voxel.armor.shoulder.twigsleaves_shoulder_right",
+    Armor(Shoulder("TwigsLeaves")): VoxTrans(
+        "voxel.armor.twigsleaves.shoulder",
         (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
     ),
     //TwigsFlowers Set
-    Armor(Chest("Twigsflowers")): VoxTrans(
-        "voxel.armor.chest.twigsflowers_chest",
+    Armor(Chest("TwigsFlowers")): VoxTrans(
+        "voxel.armor.twigsflowers.chest",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
     ),
-    Armor(Pants("Twigsflowers")): VoxTrans(
-        "voxel.armor.pants.twigsflowers_pants",
+    Armor(Pants("TwigsFlowers")): VoxTrans(
+        "voxel.armor.twigsflowers.pants",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
     ),
-    Armor(Belt("Twigsflowers")): VoxTrans(
-        "voxel.armor.belt.twigsflowers_belt",
+    Armor(Belt("TwigsFlowers")): VoxTrans(
+        "voxel.armor.twigsflowers.belt",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.4,
     ),
-    Armor(Foot("Twigsflowers")): VoxTrans(
-        "voxel.armor.foot.twigsflowers_foot",
+    Armor(Foot("TwigsFlowers")): VoxTrans(
+        "voxel.armor.fotwigsflowersot.foot",
         (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1,
     ),
-    Armor(Hand("Twigsflowers")): VoxTrans(
-        "voxel.armor.hand.twigsflowers_glove_right",
+    Armor(Hand("TwigsFlowers")): VoxTrans(
+        "voxel.armor.twigsflowers.hand",
         (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0,
     ),
-    Armor(Shoulder("FlowerShoulder")): VoxTrans(
-        "voxel.armor.shoulder.twigsflowers_shoulder_right",
+    Armor(Shoulder("TwigsFlowers")): VoxTrans(
+        "voxel.armor.twigsflowers.shoulder",
         (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
     ),
     //Tarasque Set
     Armor(Chest("Tarasque")): VoxTrans(
-        "voxel.armor.chest.tarasque",
+        "voxel.armor.tarasque.chest",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
     ),
     Armor(Pants("Tarasque")): VoxTrans(
-        "voxel.armor.pants.tarasque",
+        "voxel.armor.tarasque.pants",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
     ),
     Armor(Belt("Tarasque")): VoxTrans(
-        "voxel.armor.belt.tarasque",
+        "voxel.armor.tarasque.belt",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.4,
     ),
     Armor(Foot("Tarasque")): VoxTrans(
-        "voxel.armor.foot.tarasque",
+        "voxel.armor.tarasque.foot",
         (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1,
     ),
     Armor(Hand("Tarasque")): VoxTrans(
-        "voxel.armor.hand.tarasque_right",
+        "voxel.armor.tarasque.hand",
         (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0,
     ),
     Armor(Shoulder("Tarasque")): VoxTrans(
-        "voxel.armor.shoulder.tarasque_right",
+        "voxel.armor.tarasque.shoulder",
         (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
     ),
     //Bonerattler Set
     Armor(Chest("Bonerattler")): VoxTrans(
-        "voxel.armor.chest.bonerattler",
+        "voxel.armor.bonerattler.chest",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
     ),
     Armor(Pants("Bonerattler")): VoxTrans(
-        "voxel.armor.pants.bonerattler",
+        "voxel.armor.bonerattler.pants",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
     ),
     Armor(Belt("Bonerattler")): VoxTrans(
-        "voxel.armor.belt.bonerattler",
+        "voxel.armor.bonerattler.belt",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.4,
     ),
     Armor(Foot("Bonerattler")): VoxTrans(
-        "voxel.armor.foot.bonerattler",
+        "voxel.armor.bonerattler.foot",
         (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1,
     ),
     Armor(Hand("Bonerattler")): VoxTrans(
-        "voxel.armor.hand.bonerattler_right",
+        "voxel.armor.bonerattler.hand",
         (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0,
     ),
     Armor(Shoulder("Bonerattler")): VoxTrans(
-        "voxel.armor.shoulder.bonerattler_right",
+        "voxel.armor.bonerattler.shoulder",
         (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
     ),
     //Warlord Set
     Armor(Chest("Warlord")): VoxTrans(
-        "voxel.armor.chest.warlord",
+        "voxel.armor.warlord.chest",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
     ),
     Armor(Pants("Warlord")): VoxTrans(
-        "voxel.armor.pants.warlord",
+        "voxel.armor.warlord.pants",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
     ),
     Armor(Belt("Warlord")): VoxTrans(
-        "voxel.armor.belt.warlord",
+        "voxel.armor.warlord.belt",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.4,
     ),
     Armor(Foot("Warlord")): VoxTrans(
-        "voxel.armor.foot.warlord",
+        "voxel.armor.warlord.foot",
         (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1,
     ),
     Armor(Hand("Warlord")): VoxTrans(
-        "voxel.armor.hand.warlord_right",
+        "voxel.armor.warlord.hand",
         (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0,
     ),
     Armor(Shoulder("Warlord")): VoxTrans(
-        "voxel.armor.shoulder.warlord_right",
+        "voxel.armor.warlord.shoulder",
         (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
     ),
     //Warlock Set
     Armor(Chest("Warlock")): VoxTrans(
-        "voxel.armor.chest.warlock",
+        "voxel.armor.warlock.chest",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
     ),
     Armor(Pants("Warlock")): VoxTrans(
-        "voxel.armor.pants.warlock",
+        "voxel.armor.warlock.pants",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
     ),
     Armor(Belt("Warlock")): VoxTrans(
-        "voxel.armor.belt.warlock",
+        "voxel.armor.warlock.belt",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.4,
     ),
     Armor(Foot("Warlock")): VoxTrans(
-        "voxel.armor.foot.warlock",
+        "voxel.armor.warlock.foot",
         (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1,
     ),
     Armor(Hand("Warlock")): VoxTrans(
-        "voxel.armor.hand.warlock_right",
+        "voxel.armor.warlock.hand",
         (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0,
     ),
     Armor(Shoulder("Warlock")): VoxTrans(
-        "voxel.armor.shoulder.warlock_right",
+        "voxel.armor.warlock.shoulder",
         (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
     ),
     //misc
      Armor(Pants("Hunting")): VoxTrans(
-        "voxel.armor.pants.grayscale",
+        "voxel.armor.misc.pants.grayscale",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
     ),
     // Backs
     Armor(Back("Short0")): VoxTrans(
-        "voxel.armor.back.short-0",
+        "voxel.armor.misc.back.short-0",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.0,
     ),
     Armor(Back("Short1")): VoxTrans(
-        "voxel.armor.back.short-1",
+        "voxel.armor.misc.back.short-1",
         (0.0, -2.0, 0.0), (-90.0, 180.0, 0.0), 1.0,
     ),
     Armor(Back("Admin")): VoxTrans(
-        "voxel.armor.back.admin",
+        "voxel.armor.misc.back.admin",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.0,
     ),
-    Armor(Back("DungPurp0")): VoxTrans(
-        "voxel.armor.back.dung_purp-0",
+    Armor(Back("DungeonPurple")): VoxTrans(
+        "voxel.armor.misc.back.dungeon_purple",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.0,
     ),
-    Armor(Back("Short2")): VoxTrans(
-        "voxel.armor.back.short-2",
+    Armor(Back("Agile")): VoxTrans(
+        "voxel.armor.agile.back",
         (0.0, -2.0, 0.0), (-90.0, 180.0, 0.0), 1.0,
     ),
-    Armor(Back("Backpack0")): VoxTrans(
-        "voxel.armor.back.backpack-0",
+    Armor(Back("LeatherBlue")): VoxTrans(
+        "voxel.armor.leather_blue.back",
+        (0.0, -2.0, 0.0), (-90.0, 180.0, 0.0), 1.0,
+    ),
+    Armor(Back("Backpack")): VoxTrans(
+        "voxel.armor.misc.backpack",
         (0.0, 0.0, 0.0), (-90.0, 0.0, 0.0), 1.0,
     ),
-    Armor(Back("BackpackBlue0")): VoxTrans(
-        "voxel.armor.back.backpack-0",
+    Armor(Back("BackpackBlue")): VoxTrans(
+        "voxel.armor.misc.back.backpack",
         (0.0, 0.0, 0.0), (-90.0, 0.0, 0.0), 1.0,
     ),
     Armor(Back("Warlord")): VoxTrans(
-        "voxel.armor.back.warlord",
+        "voxel.armor.warlord.back",
         (0.0, 0.0, 0.0), (-90.0, 0.0, 0.0), 1.0,
     ),
     Armor(Back("Warlock")): VoxTrans(
-        "voxel.armor.back.warlock",
+        "voxel.armor.warlock.back",
         (0.0, 0.0, 0.0), (-90.0, 0.0, 0.0), 1.0,
     ),
     // Rings
-    Armor(Ring("Ring0")): VoxTrans(
-        "voxel.armor.ring.simple_purp-0",
+    Armor(Ring("Scratched")): VoxTrans(
+        "voxel.armor.misc.ring.scratched",
         (0.0, 0.0, 0.0), (30.0, 0.0, 0.0), 0.9,
     ),
-    Armor(Ring("RingGold0")): VoxTrans(
-        "voxel.armor.ring.simple_gold-0",
+    Armor(Ring("Gold")): VoxTrans(
+        "voxel.armor.misc.ring.gold",
         (0.0, 0.0, 0.0), (30.0, 0.0, 0.0), 0.9,
     ),
-    Armor(Ring("RingSkull0")): VoxTrans(
-        "voxel.armor.ring.high_purp-0",
+    Armor(Ring("Skull")): VoxTrans(
+        "voxel.armor.misc.ring.skull",
         (0.0, 0.0, 0.0), (30.0, 0.0, 0.0), 0.9,
     ),
 
     // Necks
-    Armor(Neck("Neck0")): Png(
+    Armor(Neck("Plain0")): Png(
         "element.icons.neck-0",
     ),
-    Armor(Neck("Neck1")): Png(
+    Armor(Neck("Plain1")): Png(
         "element.icons.neck-1",
     ),
-    Armor(Neck("NeckShell")): Png(
+    Armor(Neck("Shell")): Png(
         "element.icons.neck-seashell",
     ),
 
@@ -1645,19 +1654,19 @@
         "element.icons.tabard_admin",
     ),
     // Heads
-    Armor(Head("Leather0")): VoxTrans(
-        "voxel.armor.head.leather-0",
+    Armor(Head("Swift")): VoxTrans(
+        "voxel.armor.misc.head.leather-0",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.0,
     ),
-    Armor(Head("AssaMask0")): VoxTrans(
-        "voxel.armor.head.assa_mask-0",
+    Armor(Head("Assassin")): VoxTrans(
+        "voxel.armor.misc.head.assa_mask-0",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.0,
     ),
     // Bags    
     Armor(Bag("RedFace")): Png (
         "element.icons.item_bag_red_face",
     ),
-    Armor(Bag("BrownFace")): Png (
+    Armor(Bag("BlackHole")): Png (
         "element.icons.item_bag_brown_face",
     ),
     Armor(Bag("BlueFace")): Png (
diff --git a/assets/voxygen/voxel/armor/back/short-2.vox b/assets/voxygen/voxel/armor/agile/back.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/back/short-2.vox
rename to assets/voxygen/voxel/armor/agile/back.vox
diff --git a/assets/voxygen/voxel/armor/belt/leather-2.vox b/assets/voxygen/voxel/armor/agile/belt.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/belt/leather-2.vox
rename to assets/voxygen/voxel/armor/agile/belt.vox
diff --git a/assets/voxygen/voxel/armor/chest/leather-2.vox b/assets/voxygen/voxel/armor/agile/chest.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/chest/leather-2.vox
rename to assets/voxygen/voxel/armor/agile/chest.vox
diff --git a/assets/voxygen/voxel/armor/foot/leather-2.vox b/assets/voxygen/voxel/armor/agile/foot.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/foot/leather-2.vox
rename to assets/voxygen/voxel/armor/agile/foot.vox
diff --git a/assets/voxygen/voxel/armor/hand/leather_left-2.vox b/assets/voxygen/voxel/armor/agile/hand.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/hand/leather_left-2.vox
rename to assets/voxygen/voxel/armor/agile/hand.vox
diff --git a/assets/voxygen/voxel/armor/pants/leather-2.vox b/assets/voxygen/voxel/armor/agile/pants.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/pants/leather-2.vox
rename to assets/voxygen/voxel/armor/agile/pants.vox
diff --git a/assets/voxygen/voxel/armor/shoulder/leather_left-2.vox b/assets/voxygen/voxel/armor/agile/shoulder.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/shoulder/leather_left-2.vox
rename to assets/voxygen/voxel/armor/agile/shoulder.vox
diff --git a/assets/voxygen/voxel/armor/belt/assa.vox b/assets/voxygen/voxel/armor/assassin/belt.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/belt/assa.vox
rename to assets/voxygen/voxel/armor/assassin/belt.vox
diff --git a/assets/voxygen/voxel/armor/chest/assa.vox b/assets/voxygen/voxel/armor/assassin/chest.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/chest/assa.vox
rename to assets/voxygen/voxel/armor/assassin/chest.vox
diff --git a/assets/voxygen/voxel/armor/foot/assa.vox b/assets/voxygen/voxel/armor/assassin/foot.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/foot/assa.vox
rename to assets/voxygen/voxel/armor/assassin/foot.vox
diff --git a/assets/voxygen/voxel/armor/hand/assa_right.vox b/assets/voxygen/voxel/armor/assassin/hand.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/hand/assa_right.vox
rename to assets/voxygen/voxel/armor/assassin/hand.vox
diff --git a/assets/voxygen/voxel/armor/pants/assa.vox b/assets/voxygen/voxel/armor/assassin/pants.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/pants/assa.vox
rename to assets/voxygen/voxel/armor/assassin/pants.vox
diff --git a/assets/voxygen/voxel/armor/shoulder/assa_right.vox b/assets/voxygen/voxel/armor/assassin/shoulder.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/shoulder/assa_right.vox
rename to assets/voxygen/voxel/armor/assassin/shoulder.vox
diff --git a/assets/voxygen/voxel/armor/belt/cultist_right.vox b/assets/voxygen/voxel/armor/belt/cultist_right.vox
deleted file mode 100644
index 22283d0b1f9b3bcc87684a598adf0f508f87ccbe..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1388
zcmbu8T}&KR6vxlKcXlOy1q2pY>H-TD7Mda-1rfxhWi3mkNKrz!6pewj%SvolgY9P1
zq+Qzv8<ZlUnzThU8y<|f5+s^FAZbW#vS|!yj4uu8gO9u!<J;f=&^{Te4^HySncti_
z=gi!>)7RZ!JR>4qZNY;K((e%I4Tb_w+QNe>k3Ee2heN>%WnUEu66KUmCF-OmhFC-?
zIx)mjYD8%|F~rj917+yM5Q`{_P7JXu<{flmh~;3tQw6n?PAsBCk7&`|Ml@$>&eEKv
zIg768#1KpCurhRFh-LJMvgnq+Xc#Svc?aD=XS9fNvbU4Hopx^%*2;7nW!Tq@Xw7qN
z*q3hThHmIYS#*nT(TQ@f)<JielZW>2Z4+y2$pk#&@i^{J2|BK=p)}_&{E?G`)zvOL
zg>Qo2|0|h(7n%q5An;Bre6vlEfCCbF95VL|WX*-lE<xU?pej&~T`56EMDSEXkUc4I
zeJ!Z(dIFuJnFyWD#z)J~qCGC?nHIdgAUORCYkS=AguN(>SE6CbkHTmUyc2FzCW}yW
zs~mX)g0i!MT{D7~6@k3Y`LPVh^wW^V9E_J|VgC7C+<mDK=qy3A2)Ix1EBT#FpAsy5
zDp;Kt-2RU47t93&KO7R=J0?g@l;Glf?yYE_+oVz{q|<3^Zf>Hd-i>g;i&#$uW`=7K
zf1?pI$M<1sxD80pp{mq{mf9j5c)0?@eT|583KB;Jv+oO5J`pr{+z3{dVW43*qU}xS
zt8^h;Ux<nQJFzrajnHdth`e<W@e@aI>C7?2-VI^$d<0AL7qEWw8nUvoke{7};^Jb|
z_`GP?{TyDb^&!wwgYH+FF!|vQEPUa`Z?`LP?@kr2a^_M}kiH@Ch@Zqr6h#t2u?(R^
zj>0Q_D3xxMNe4n)k5heu$sw-Gm|&kzF!+LCtX=RKuRrSj@$)ROvG%{;zpkzhmm6nM
zT{DN~@pC9h6yVmEg1bk!b(2Z>d_Ihgjp5afMMxrs+-NSAuRQpMXWZO79uF>`pGIr*
z6oxKcK>lDJ?tHrw%b@~Han1g@{`P%#ufx4*M2`cfugoLy)e=5lyot|$TF0If<7hoM
ziv!nJ(3@I^-|xqLK8j=z{0Xxz*!c0m^KEc{{a2oU;nsh)ZM>0ubdDLjX4|@lIlFkr
R-cjT?y@|r=h3)Q@zX3C#KcWBt

diff --git a/assets/voxygen/voxel/armor/belt/bonerattler.vox b/assets/voxygen/voxel/armor/bonerattler/belt.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/belt/bonerattler.vox
rename to assets/voxygen/voxel/armor/bonerattler/belt.vox
diff --git a/assets/voxygen/voxel/armor/chest/bonerattler.vox b/assets/voxygen/voxel/armor/bonerattler/chest.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/chest/bonerattler.vox
rename to assets/voxygen/voxel/armor/bonerattler/chest.vox
diff --git a/assets/voxygen/voxel/armor/foot/bonerattler.vox b/assets/voxygen/voxel/armor/bonerattler/foot.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/foot/bonerattler.vox
rename to assets/voxygen/voxel/armor/bonerattler/foot.vox
diff --git a/assets/voxygen/voxel/armor/hand/bonerattler_right.vox b/assets/voxygen/voxel/armor/bonerattler/hand.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/hand/bonerattler_right.vox
rename to assets/voxygen/voxel/armor/bonerattler/hand.vox
diff --git a/assets/voxygen/voxel/armor/pants/bonerattler.vox b/assets/voxygen/voxel/armor/bonerattler/pants.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/pants/bonerattler.vox
rename to assets/voxygen/voxel/armor/bonerattler/pants.vox
diff --git a/assets/voxygen/voxel/armor/shoulder/bonerattler_left.vox b/assets/voxygen/voxel/armor/bonerattler/shoulder.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/shoulder/bonerattler_left.vox
rename to assets/voxygen/voxel/armor/bonerattler/shoulder.vox
diff --git a/assets/voxygen/voxel/armor/belt/cloth_blue-0.vox b/assets/voxygen/voxel/armor/cloth_blue/belt.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/belt/cloth_blue-0.vox
rename to assets/voxygen/voxel/armor/cloth_blue/belt.vox
diff --git a/assets/voxygen/voxel/armor/chest/cloth_blue-0.vox b/assets/voxygen/voxel/armor/cloth_blue/chest.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/chest/cloth_blue-0.vox
rename to assets/voxygen/voxel/armor/cloth_blue/chest.vox
diff --git a/assets/voxygen/voxel/armor/foot/cloth_blue-0.vox b/assets/voxygen/voxel/armor/cloth_blue/foot.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/foot/cloth_blue-0.vox
rename to assets/voxygen/voxel/armor/cloth_blue/foot.vox
diff --git a/assets/voxygen/voxel/armor/hand/cloth_blue_left-0.vox b/assets/voxygen/voxel/armor/cloth_blue/hand.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/hand/cloth_blue_left-0.vox
rename to assets/voxygen/voxel/armor/cloth_blue/hand.vox
diff --git a/assets/voxygen/voxel/armor/pants/cloth_blue-0.vox b/assets/voxygen/voxel/armor/cloth_blue/pants.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/pants/cloth_blue-0.vox
rename to assets/voxygen/voxel/armor/cloth_blue/pants.vox
diff --git a/assets/voxygen/voxel/armor/shoulder/cloth_blue_left-0.vox b/assets/voxygen/voxel/armor/cloth_blue/shoulder_0.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/shoulder/cloth_blue_left-0.vox
rename to assets/voxygen/voxel/armor/cloth_blue/shoulder_0.vox
diff --git a/assets/voxygen/voxel/armor/shoulder/cloth_blue_left-1.vox b/assets/voxygen/voxel/armor/cloth_blue/shoulder_1.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/shoulder/cloth_blue_left-1.vox
rename to assets/voxygen/voxel/armor/cloth_blue/shoulder_1.vox
diff --git a/assets/voxygen/voxel/armor/belt/cloth_green-0.vox b/assets/voxygen/voxel/armor/cloth_green/belt.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/belt/cloth_green-0.vox
rename to assets/voxygen/voxel/armor/cloth_green/belt.vox
diff --git a/assets/voxygen/voxel/armor/chest/cloth_green-0.vox b/assets/voxygen/voxel/armor/cloth_green/chest.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/chest/cloth_green-0.vox
rename to assets/voxygen/voxel/armor/cloth_green/chest.vox
diff --git a/assets/voxygen/voxel/armor/foot/cloth_green-0.vox b/assets/voxygen/voxel/armor/cloth_green/foot.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/foot/cloth_green-0.vox
rename to assets/voxygen/voxel/armor/cloth_green/foot.vox
diff --git a/assets/voxygen/voxel/armor/hand/cloth_green_right-0.vox b/assets/voxygen/voxel/armor/cloth_green/hand.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/hand/cloth_green_right-0.vox
rename to assets/voxygen/voxel/armor/cloth_green/hand.vox
diff --git a/assets/voxygen/voxel/armor/pants/cloth_green-0.vox b/assets/voxygen/voxel/armor/cloth_green/pants.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/pants/cloth_green-0.vox
rename to assets/voxygen/voxel/armor/cloth_green/pants.vox
diff --git a/assets/voxygen/voxel/armor/shoulder/cloth_green_left-0.vox b/assets/voxygen/voxel/armor/cloth_green/shoulder.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/shoulder/cloth_green_left-0.vox
rename to assets/voxygen/voxel/armor/cloth_green/shoulder.vox
diff --git a/assets/voxygen/voxel/armor/belt/cloth_purple-0.vox b/assets/voxygen/voxel/armor/cloth_purple/belt.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/belt/cloth_purple-0.vox
rename to assets/voxygen/voxel/armor/cloth_purple/belt.vox
diff --git a/assets/voxygen/voxel/armor/chest/cloth_purple-0.vox b/assets/voxygen/voxel/armor/cloth_purple/chest.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/chest/cloth_purple-0.vox
rename to assets/voxygen/voxel/armor/cloth_purple/chest.vox
diff --git a/assets/voxygen/voxel/armor/foot/cloth_purple-0.vox b/assets/voxygen/voxel/armor/cloth_purple/foot.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/foot/cloth_purple-0.vox
rename to assets/voxygen/voxel/armor/cloth_purple/foot.vox
diff --git a/assets/voxygen/voxel/armor/hand/cloth_purple_left-0.vox b/assets/voxygen/voxel/armor/cloth_purple/hand.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/hand/cloth_purple_left-0.vox
rename to assets/voxygen/voxel/armor/cloth_purple/hand.vox
diff --git a/assets/voxygen/voxel/armor/pants/cloth_purple-0.vox b/assets/voxygen/voxel/armor/cloth_purple/pants.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/pants/cloth_purple-0.vox
rename to assets/voxygen/voxel/armor/cloth_purple/pants.vox
diff --git a/assets/voxygen/voxel/armor/shoulder/cloth_purple_right-0.vox b/assets/voxygen/voxel/armor/cloth_purple/shoulder.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/shoulder/cloth_purple_right-0.vox
rename to assets/voxygen/voxel/armor/cloth_purple/shoulder.vox
diff --git a/assets/voxygen/voxel/armor/belt/cultist.vox b/assets/voxygen/voxel/armor/cultist/belt.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/belt/cultist.vox
rename to assets/voxygen/voxel/armor/cultist/belt.vox
diff --git a/assets/voxygen/voxel/armor/chest/cultist.vox b/assets/voxygen/voxel/armor/cultist/chest.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/chest/cultist.vox
rename to assets/voxygen/voxel/armor/cultist/chest.vox
diff --git a/assets/voxygen/voxel/armor/foot/cultist.vox b/assets/voxygen/voxel/armor/cultist/foot.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/foot/cultist.vox
rename to assets/voxygen/voxel/armor/cultist/foot.vox
diff --git a/assets/voxygen/voxel/armor/hand/cultist_right.vox b/assets/voxygen/voxel/armor/cultist/hand.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/hand/cultist_right.vox
rename to assets/voxygen/voxel/armor/cultist/hand.vox
diff --git a/assets/voxygen/voxel/armor/pants/cultist.vox b/assets/voxygen/voxel/armor/cultist/pants.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/pants/cultist.vox
rename to assets/voxygen/voxel/armor/cultist/pants.vox
diff --git a/assets/voxygen/voxel/armor/belt/druid.vox b/assets/voxygen/voxel/armor/druid/belt.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/belt/druid.vox
rename to assets/voxygen/voxel/armor/druid/belt.vox
diff --git a/assets/voxygen/voxel/armor/chest/druid.vox b/assets/voxygen/voxel/armor/druid/chest.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/chest/druid.vox
rename to assets/voxygen/voxel/armor/druid/chest.vox
diff --git a/assets/voxygen/voxel/armor/foot/druid.vox b/assets/voxygen/voxel/armor/druid/foot.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/foot/druid.vox
rename to assets/voxygen/voxel/armor/druid/foot.vox
diff --git a/assets/voxygen/voxel/armor/hand/druid_right.vox b/assets/voxygen/voxel/armor/druid/hand.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/hand/druid_right.vox
rename to assets/voxygen/voxel/armor/druid/hand.vox
diff --git a/assets/voxygen/voxel/armor/pants/druid.vox b/assets/voxygen/voxel/armor/druid/pants.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/pants/druid.vox
rename to assets/voxygen/voxel/armor/druid/pants.vox
diff --git a/assets/voxygen/voxel/armor/shoulder/druid_left.vox b/assets/voxygen/voxel/armor/druid/shoulder.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/shoulder/druid_left.vox
rename to assets/voxygen/voxel/armor/druid/shoulder.vox
diff --git a/assets/voxygen/voxel/armor/hand/assa_left.vox b/assets/voxygen/voxel/armor/hand/assa_left.vox
deleted file mode 100644
index 16d8c22af08163a2db4374c03b21bc0dcfee8489..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1240
zcmaize@NVQ7{{OQ*BeQ$(0QJow@z~>{w(u%a+{sgYdhD?ZZ?@Wvy90mm$Z(MO^(5K
zZD3+Kcen+$%R=mk*(R4H`@^JU4QwnM5rhnh{_l^7{(JRY`d4UsKD>GJ{C=MA_w(uM
zI950*BK{WNVI}#_BGTy#dUvK2m9$OlP(Icj^u<y}71stCk~*eBj6N|Gre(n}Eghz5
zCPWm5!c0?}nb5$5VVHedb-_@Gp=_ijOl3*=HO^FsY4jPQHN>JZmJY+PESSooy0+^x
zwTGFik&4saW{Opg9N6C?I{&5+i9}eR5DtF4%pU9C{AsnawB#oxH+*0HFETwg+&%Sp
z-)yEV-h_B}Afd;Rsa?pjjZD9gJ1A6mOQ^glq=$qjqC)n#VEaO-^JmaLm`U(_Ht)?p
zMO#D&#Dq6yg|qiHH;|8Wpa@r_oQ9+aN7zcySU%;`1ytWDA-6|xofj%6g}sY{yrTVw
z(~;Pd$efjtk}PJP%i+O32edzpTLhotXT|S|*coB=im)^z+`Xl`N0{;oUmp?HP6|QQ
z&vXgnC)7S9w3Z3I&kJwwH0gfKAW)ajfVYU@Kq-^`HAId!GI^?%iT)N?nWAEkjlDGm
z9D1RY{;ozs?LzcbA^wiA_<>Mt&Egq*4m}Oe5^igvtK7yworAFh#Uy*H2)^7x==H-y
zP9JCV+)0Mt3Nn5%L~`a5>py-@Mn(qK>@1v)JW5?osw<0e*H_@(S3}2(O^m<0o7qo_
z_~mXnYxgSnNP8xyg_YaFZ$Amc1EpMx*0Ow~l|O#%Bs`kQSi;J!`*zkS*mnP+HsP9n
zm#y|^J__H*;fKT{_iu3K<12S<yMJwMEtebPR8>#m9=U)$YUj?U!h_=i)6<ldl`%9l
z#7hU~kmxWu;T-0#Zv4Y@`FeMpPA*@J(d?e!#ONjRdULt=Wij(XI}?S4{I`F=zexAd
zRk}M@2%mzpS7(TRmgN1pZ~5?>Rq9WV(0n1zq3eru-dx4w@vyF=NV<Z*NLv*iE^N&A
rQ192H{Q3s}eP>(p?dk1(>Ph8nnYZanCGXxpNM6%xII3p1ij{u=p#3oG

diff --git a/assets/voxygen/voxel/armor/hand/bare_left.vox b/assets/voxygen/voxel/armor/hand/bare_left.vox
deleted file mode 100644
index 0d150e82436504a347b0d8be6cde69af9b92ad72..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1240
zcmbu8e@N7K7{{OQ*ArxJVe>roZ0c^7-q~_G(>a|x)2q&AWo}ZJxiONGn-s^m)o}!M
zD{$gw?$8Fa>xx5U<VtR`2<D`T3nIeB7z~k!{_l^mKlaaS&lme+3~PVv`SRxdeLl~x
z&+~jfpYA>TOUFc{qs6~lNq(}4bom3m=PgAg;|VgA_a6xO<JO`|*(w=geWpST{Zp8>
zDZ{iSP1Dp6g`qGrbj{3EW2Ry0qPjv1Wg{bLDvM=TKT{#5l}K}lO?_-h!>~=6%A&ee
z#MBz5mBaGW+NQ-S`*v(=5#7Hf+({CRMtLwQ?3`HOhw)GN!)|AOz5`3H`oDW7a=Z>2
zd$!{Hs2O*n0r6!b!RL_Vi^zh5oDLy>K&bSUv-z5k6%<~G3ArPJ;~Sy2Bb)Yt90I3v
z`E2$j+M+^dT=;NWIC)QFJDn8wyC{o#s7re(3fXZDJMpASs9r25zegxLEo>eWn&t#~
zSL;WzkoY=e#?D~*dM01X<NjMk(Ec)w+Ol8qtKyL&enOc3Qkb6<ZeLg3D<plw_xpt9
zBSJv+6WzkdVO<Xkt!|<B4I$hn{IxhiXRVWdpNmLm1!H|RMBl4t>}V^aeJxnCt$f8n
zQ%woG-majpyPjaX5IZC!J{IP_5bBDZ_&sIx)NLWu)<Cz%L4R!#!#g&T?yVxQw}s#b
zyNMn@$k3@HM2-a*IU6KBd5)!96J%#+Q;@r!($Z3@-7f03Y~sxtH@>E7_H1up<kJmI
zUvlx=Z4b+LEBRV$rc-+CH-(442$B8@F2r7E;c6?7fA1nRl*90po$L1sS*GNf{a?_z
zJgt9zPQc2-|L*_Qf;`UGC#b4U(l~gA!dM}TmxcQW1yU*8Za3j@n0I#0Ah8H}p*&{C
zSI_X2Q}0f3G3U?5X>J_l@X$F5dh@ya?M7w;g^cRV{yl%o&&qY6>kgr#aB_T-*p)P&
z&)njxAD7sAe30fd33gqaqwCrdUayx2x)sS%@Fy8d!pe=+{jKQz`Y*fn1T9&UZ>FAZ
ZdlIu|+&}Vd*fu~x!}}CfO|Ml${sur$F7W^W

diff --git a/assets/voxygen/voxel/armor/hand/bonerattler_left.vox b/assets/voxygen/voxel/armor/hand/bonerattler_left.vox
deleted file mode 100644
index 3d61fefcda2c4d0c37e49fcde21f9dbd95bc7766..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1240
zcmbVLJxc>Y5S?8wRV*w7LGct5grpEODt^P|jB*@)qi7;xC!&QmR$`$bh^^RZkPtM5
zsnjM#8bOO#=s)mZh#=2dO^#D?@nhgIv-94(*)4W%V!rv9h{g<SoD<z@L^D=AR;>;k
zRYmwX&o9KSBh};xG9;0Zf*~0sxc&^{f~53GVhDz;>Sd9Sn?6=?pU(^_I5UVL70)_i
zNM%$s<QuR?%kUbu&<r89s30v$q?uA^CJD`u>df5qXw)FSzY1{Jw(THL`{LA!yR@#I
zvs>q``xm<qTOayS=bkCmiEy~$T-{VX^wkywx6A9^5(yM2f;ZDF>(kTFfWgK_*nt4d
zrY5x1)L^r-)6wQ~Ib^e0q*5uTSGt>5Ug{xi4HI7PPAblza8{95{@r>#tZ)#E-EC#H
z@ks+~%i|y1;m(SqxjNs+^Wz2le!tWE@M~*DUq=YBfp$!c^nT&o?<wTSlXL6-Q{!e2
zxK9EPnICtQ-tV<15{Y<vAe}}i6!PSir>^T2`S1Iu#`0L0ee#^?+Bm?_ZW8us-c#fC
Wmf!S?UlJ<+MqkqWRj=lFhTZ}Edi-?&

diff --git a/assets/voxygen/voxel/armor/hand/cloth_basic_left.vox b/assets/voxygen/voxel/armor/hand/cloth_basic_left.vox
deleted file mode 100644
index 0e78e7366100000e6a592ee564b0abe9e8e029f8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1240
zcmaizZ%kWN6u{4WKthHZCZ+u81nk(LWf?*lh#;0hWo5#~&}Qop7c(+QM_d|Hx27=}
zbxV+-3>&s3A~MquV}={4M6(Y_Cc!0SS#U8XhLFYh-4DhXzx+IJ?3;k+<@e6H=iGD8
zJ@>sEIC8vXLPR>6{hg}hhjfu{f6(`oHBd==LWb(&CxZTj<y0x%P=;8KsfeMLVp=c5
zFilfa6hl#49T^(T(1`leZWxLfs*N<mR4u03im8aC>l*2XsfeMrVk%;)t(X?p8dfc>
zZCYC8Slhv7(fvP`qY#V5cr-2?np|SH?Qj0H*;ricz>=H(Z?+}dYp0>-0KT(LxTfk6
zUj`D|flNP(EZNEK5b_3v3SSxfZV8zo;pw=LGbY%-5^6fKXdlcbcrk|$=bxiBCUhl)
zw`YY54>Y%{kfH%6r7<_PDKCz&4d-Yf?qo4l%Vp&C2&ET=eG@|Cf*`MJ{b(kVcm|oX
zF<iEjnHO?-__71qpQk|tzw)#4yOKCB%zh#)&ItEz>)0zy`-E?g32SGBppMT6gt61=
zj|eR;q4z~0(klG3JV{qgAp<@q(XMhP`l^Y&QO87o3*&vwurf`>Zaa<D#T<U6oW4LE
zp>`qurZDxcu<)@^TU3bOT}n^we!{Kw1l)E8Y8;HV?IG1$N$_Yhp;Mj2&YfiB{WC=0
z2{LvmL~7<Tt9K{K%E}@?XD1~kB~-bb)b8KQOVuuXja3|ZwVtsLb}{?8lV9$+S-W4s
zr&=?W6jtsCzx^ac2g<n?_po%cg+G4nCOneO=$AHbKPX_0;%)oCrsuL%|NJ-w>r31A
z9~gRX%l<u`ZTR|6;qiF5Qa43q)ie#mLlnddSiT`VJSmV&;&Qo&L?XO)Xby=-$qnZ+
ze|6&<p0(R4Dk|d2r36h4<D4G3Onz@3_rKo5e6WC+!||W`);w#i6WuF>`{BaX8RB20
z_-O7f*S}xoz`0?XhNd|D*#h0SR`GhhJkqU5rovyOtqSYkZR~Gd|F8dx>m7W2&o<R}
el3T|#V&!a__atT|?>ab0e*IfGDrYyFEB^wC5hgeQ

diff --git a/assets/voxygen/voxel/armor/hand/cloth_blue_right-0.vox b/assets/voxygen/voxel/armor/hand/cloth_blue_right-0.vox
deleted file mode 100644
index 314f5f497ba5c2bf584dbc3dc28e7f882a7a4941..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1240
zcmaiz|4-C)9LHau&v6@zY8c<4fC$4wC-Ft-g6K}U^q|uayvaf2oD2ymW9_CFW78Wn
zVi=q^B$l2?jL1S|7uEcMm=(3G8M%IAX089A^+UfrdL8(KDb;JA=jZi)eS5#Yyx(u{
zp8dI_BI0qncPo=G<3t+VKG%aWLCJClR^|JfeC}{esg$oUMGVsrLw|<3#tc)}vI^5`
zio#Hsrd17AHCWYCw~AAL%eWzyfN59)hGCg7O_fbcKvWi8n=v0lVa91loQ5h_ouN93
zLF3KUq?%a2813D;-6>jsjJQ6*-S{<nia(N*SzPoGqmSL6{3j9}sZ_RX!*!$@Tf~mI
ztVrhr$iySaSE(d=gtRVUv#WqDmxcIF;h~_AG%TcE6v{ja)OID}JCVfO^N&%}Bh-h5
zgR{c%8yZ`mNp?pb`8|b{M;&B!CzCgnN#Rru#Y+XGwFvnqge{{&)q)_6nm-Vagdaxc
zk{Kx2!1Plo+<Z0*Y9FUkTXrjcR{X9A9}{Lz3yagjw^vkl2oo;hv%SJfyWms#m{%A+
zq<X)w!zQ#oE%<AMzn0EYUzSOSD~~|^CPv#z=-F4n=;0lN+MKI%-TXu<RV6vpJ-3NA
zZv~yTLhvOa@`kYRj!>SRiMueLmh!E1*VyqErqWTC#n8@;L|cpSz38O#z;1euHZ$1U
zPT(~k!+o7Zr~A46;|C-pB#@r8f!y3&ifwt6Z+((yN^H2QirMqLot0O2@%2Fmm%Mhy
z>PmP|b4I81*slt|{UlucXpRe$GmMX)Clnf^doYoqnPjfq$Y6yWMy}1%`(cD5p||h_
zUjIk`V>*|6?Xmuu55hMQ_<n|0-v5OI;qUPFeTv6Fd0+qMyWXU~xt*@sMjGwT`}!{}
zEoG!4LQ(Mql>;Zq2xhQ!LAcp0Fg1nEX2b9I^TMt<Bp4v2JB9f(YiHP-sdpzkn~}aS
z)s-O*4fd1Xn#K>8HZt$aAfz+9cmDOB1)BCP)6{UC?!$2W%rwEtD5vJG@$MJPY&$wY
z^~nfz=N4$Vyo|%);I@_`@e2OLvMk*Ce67A)dcXe99(#f@T9;p)`ghx%n04ds+V9cr
PU8LJzCaY+6y&Up4XE8aa

diff --git a/assets/voxygen/voxel/armor/hand/cloth_green_left-0.vox b/assets/voxygen/voxel/armor/hand/cloth_green_left-0.vox
deleted file mode 100644
index 543f969ef304139abf0defd23be5fa64595342c6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1240
zcmaiz?@wE06vxlKr3n!=Ov-NsL?$a+hWr><K`a|}E7(m2Yeqp_mJx;woy0U-B_vw|
z1_=|ohT)=i9TLPT+ek&tULcu@#%U%lz9VxQ{{!O--+VkByqFv6x%Zp%oO7P<JwKl3
zdiU(l8y68zt$VjB`7%MI$?bF9A2(DiYp|-`-{NzJ<4%==Rb_}ihG`h0N?${CZQh2d
z6osKMO{+Ss8nkNEYD$9cw}cF_1jMie48sx?Q*F}{Fx577E%7~u!c0&~g3?v1&rqKk
zhw{aY=Uz*!k-a;&*NWC37p_IQ6Tikz@rTXE;-ZJReC+<@KauQAqpEEit|K+rBM!u6
zMY``pq7NZorIG9r(tCu>u0pn45)!+G2ZBP%sE~F+DEA~$-;<2*L<(=tKSEuf&=?jD
z&I-q`E4ML=oUVKd`iiKCImzy|kw20}(Nr!aONFGj2?ZyFE#pG<f*{SBKahxoA4KMC
z3>9u*`iWF-Je>{ok5Z*AyA?kxepiH#3A3k##cAQ&%W6A?s7v^4udvc7_|!h;6-E!K
z-!JU23++z|{yO2WrFUs8&!WqfPoQxV;~k~+?W<(`@D4&9wYTTG`LQ&rOLJ*>W)mIW
zO1kTX;0r?JHDTc`p&};>cToXt6<g`8bKosXqpLidk)0cfwHM=izLxF-yXiaH%5Z-t
zfmeKt4s;Wn9^}@KACQ!kL`KR6^78U1vFB5<^>Lmmwd1NTVb8M;R$ku4*9V<k^g5Vm
zDCHf^8Jp5$zasqhlW^gqInGbcaQ5suLZJzIhm#qZv2po&CM)DJc6FZq4<j52y@4<A
z>OcCQ(7D_lkN3}f5Wb1P_cOfo{x2K|e}{MAQ#}63d-^}u^E!jAo%GZ<)9k3dr~k6D
zGR7(+6qiJ)8ahd4Fq5V8!i`pesVVGsJAS{P=XT8@!2qefsmz~QJ;VMiy*oKMj17dT
zsS0suc#w?tbbh$Fk$GPxA)VRX^KbMl(6VotmZod;9){y*rU_2QI5l^bx4&3s+tDFv
zPDW^WZ-J&u%Q&4*ZfPl!sNhd5%fijiSL?f}_v`=S@n0}5>*_00{~lZ8tjoLOdk=5#
PA;a+^*~PQ#<&eJtpMp7g

diff --git a/assets/voxygen/voxel/armor/hand/cloth_purple_right-0.vox b/assets/voxygen/voxel/armor/hand/cloth_purple_right-0.vox
deleted file mode 100644
index 012a3205c7c6ed508d1e1d13d1f552b0a05a1585..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1240
zcmaiz|4-C)9LHau&v6@zY8c1&0wN3#ox~TR3!+20^q|uayvaf2oD2ymW9_CFW78Wn
zVi=q^B$u8*jL1S|7uEcMm=(3G8M%IAX089A^+UfrdL8(KDb;JA=jZi)eS5#Yyx(u{
zp8YwaBI2ob?^Y&X#)&kzeXa*%f|BJ9tjhN{`P|`{QYlYiiWsILhW-q5jTxq{Wfi8?
z6osKMO{*HLYOt!OZWX8gmI*^F0n@Mq48t;Rnkt)?fT%3GHe)`9!i>|9I1N><Izx35
zgT|YyNj0&4G1|Lxd$nl&G2;3-cjMRSDgLn8SX}fFqmSL6{3jBfDO9v<!*!$zd&Ggb
ztVrhr$oM13S1BZVgw!r!vn!u1mxcIF;h~_AG%TcC6iPh_)OID}JCVfO^N&%}Bh-h5
zgR{c%8yZ`mK~_gDc|8S`MV(}J+sGZtpkOMSqNRLNTZFt5!j@5?azT(r%^!$I!Ve>J
zHU{!HF#S|AH=oUf+Q+HTmfeb<6~8OO$AsC_!s4{>?G=@s!njNLY_G7=F8EYF<`sqy
zsopQ_unVnE3;r76ucdR;muAr6$|X?0iP5%VdiIqwdUyw+w(8ZnZhj(#%HnM5p4&v5
zx17#eA^4IIc|%xuM<~n6z+I3>OW9VsYaDnBQs^knWN7C`qOFDaUaY3`z;1euHZ$1U
zPT(~k!+o7Zr~A46;|C-pB#@T0ft;KiitM?RZGDnwitV^6i`etLgOyiz@%2F`m%I+f
z>WX<!b4I81*slt|{UlucXpV`=8P1-)Kqxdu_h2GJGd8Z=NN0s?My}1%`(cD5p||h_
zUjIk`V>*|6?Xmuu55hMQ_<n|0-v5OI;qUPFeTv6Fd0+n*y56L}xt*@sMj9Q}_w`>=
zQo=}igu<e6Dh5uH9!zIxLb%y1Fg1nUZpZKU^TMt<Bp4vMJDK@2YiHP-p?4=Mi;=!C
zRTUu)4fd1Pn#vECHZt!^C!{mGcmDOB1)BCP)6{UC?!$2W%rwEtD5vJG@$MJPY&$wY
z)yW8T=ND+Wyo}T7<hGU~@e2OLvMk*Ce67A)dcXe99(#f@T9;p)`ghx%n04ds+V9cr
PU8Ff)CbMvMy&Up4?{PWD

diff --git a/assets/voxygen/voxel/armor/hand/druid_left.vox b/assets/voxygen/voxel/armor/hand/druid_left.vox
deleted file mode 100644
index 7d3e7cbaabedb5fddc329aeaa16a270437ba885c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1240
zcmbW0ZA@EL7{{MpSVBY%lTx6}f*liDmLV?#vB=6w-O6MeLveJ7FB#cLM_d}yY)!Ld
zt6Rbd%CKR>$T~DlW6W?Pm1y<>$t1XhEDJ8i#1OI=zx%-$<CmY$9sA_iOnmPB<^Q~#
zbI;2?r+eSQvT+gVXbtRDk?*rbx&lG}lV+fn^?(hk2YZ5ngqc(;UlWU%k0BO|A}Si1
z?|l<PMKKf+V?rBFh(%QqLsc;p9VKm13`H#JTe7s9`iA<7p@?LEVv+0#Lscy5D~2M5
z`iACJ5A536Dms7DP>aQ4+#3^iPcE?8`WJs#t<2ANm?f?TzJ4ruUK^g??f8$i;7T?j
z{tZaz31sRSWWh#Whfp{uRQW5|dQHd)2~Wj^{87R7rBL6IOZ#9R!PEJipM93Ln9!LJ
z-klas-qF6Db{qpv%42RCGG0o;R-7Yt+^JG(7Aq+170OQwTgQdwIYD02@uN9N;%Q{Y
z%235d(k~Qn_vI33e-4i>IiUQc{H7#M2-6=6^J(GMb&b8klwbJffUt5z2x@$yTNpj8
z`H0|i34JdLkv8G)#YsBr?F{&xL^~@P@2@5HdL!dUeT?<D!qOB~n{71Lma=C@CH>uv
zgxZDpn?mw^VeTWL!C@!hE~mF)8{xJly4^Mg>Pr~ewS`PyHNpL@gx=mu?D!#uPaPrp
zUXanVAu{Q6EZ>|YH#e7}{Ed{Al~Lnz(y;A$UaEEBZ?0kAD@}}ku!-p_PJX`SX61Gj
zpX!*Il(2L|`1MC2I#9`_cpVE@ef<7Q7vbSNM!v9e{Z26}l(N6V$FcezVxIno)_+O&
z<x%VBha{{n(CoAF#ygJxz5cqoIxaLOsjivAGjxXHcrlBg33m_a(M_drxm-jd5nkOr
zgT$j0gbSFxxb_cE+4bx=99%e?pv5!B;o)->^%Zjat1Zk1iy6~B`}h8v?aXiWbS)7+
z3MVh7iGQBq!<m~*e7DT@<3qHZNwVki99`Fz@p`@7)2T>~!k=U<3#;F*&2LrD*MHR?
jTtU{=8>#zuaNU|#%>3hOX6H>i2PtZLi<0W;_1elm;~p~t

diff --git a/assets/voxygen/voxel/armor/hand/hand_left_none.vox b/assets/voxygen/voxel/armor/hand/hand_left_none.vox
deleted file mode 100644
index cc48bcbca8d629d48dfe7186d9316ffb8768860e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1240
zcmbu8?N3u@6u?g}nvk(AI7)%yfK?o}7#Z(F7%M`j#Z_04Mk+(&BuFZm>6S)GqmfP%
zM%Vxw+>*J<mWG*SsH7uX{J@Aa%!C=o%(5@U5aWNaEM{MRI~V-2h3E&*%`fMkmwV20
zp8Gt3y$6cMMa0+S-J?o=UMJG#4SJq84VARVtXF-YBj}BrPL<+SWfAi+6tU==Vyv@R
z6vHsor&tstO?`$L)C|+FwjvhQilK-Z*E~a6NfWK1h(+ruh9YX4O$@WXS!1P~b}+Td
zzMVUoMAvT$D$!_^<uPH`rCV&WKH@K{mAN^e8R9$d_fI6#ZKJ-k8qe`YoQXQbvmOaO
zhfKVL+_I7B6LR{5Qcnq6uL<cP;f0uxH6qx)6{>t0wDx5ZJe$SGGcVH;75s7G$dqvE
zu72ycQ_$<6IO?J%<t9ID#W8Hhl`N!uzJ#1kq4=z@bzEqe6=c8m?@veKFCx=c21_<D
z`C2yj-pGg6SE$#Ky~-cTLnVGvn7Sa$O$xWKtL+vhJi-tAgry!KsP@T#FmhD=5uw>B
zbiFP_T7-Y*FX6AU)9Z22@880BcLmY*TE>qxGuGV%3lo%Xve8gc$nH0{&>g5H)GEZ@
z6%ro`v!4nz1$MlyVmfQK5pJm?;Ih$MmCx|b&7``@2)@%q=<pt*Ck`@nx`+PvgN&RD
zk(xZu@^9aek&!`e)&`1-iYRwFsM+=^+bf)S8p_%GRvjZBZDi`QgFkP(Sh`cn7uqwG
z6c%m>4}KR0di)%3Zzj-Ojk}_R@K7ehSFBvWo5vD`EAi0}f?PiH9#@C@{xkn)x-V<Z
z&rA${Nx-jHo_YSt%1TCS6O@%tP(L_8UM!FKuY`LC_2?#(IGs)+kqB?^nnq&%WQVhv
zxw!fdPuunE6cjLeE>2_p7)OWBliQWUovWLf3Fa}Td-nhR_xon)XkVnGZGrGHICXK7
z*w-mOnZC*AKP^&yVvxpx1iQbSrR~}xZnv9dU5cbD{7u@TaR0~E_1)L=^|bioE6AGq
fMsnp2t{Kya>3>qp{CMMzK62|0kzY2oR<8UDZ-OMG

diff --git a/assets/voxygen/voxel/armor/hand/leather_left-0.vox b/assets/voxygen/voxel/armor/hand/leather_left-0.vox
deleted file mode 100644
index 21eb927e6c2289d4b2e64872df193f40bb2d7f66..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1240
zcmbu8|4ZC;9LHau&)q<>!s+?#G&QH`>6-Z^&9rq+uk9?ioGItcEMj*~ObQ9v$uU@0
z!V=55!!2l;g<K<MPV6%FgIN<Bm@HcmgbeW?=!b~tmq)M9xgR28{m=`ZJm0U^`}Otx
zrR$ilU`j;Vn!HDq<c3|O!|V6lZz(FayV#@b>-Kx2mQkf>mwaM~PfUdvx;6r0+JlB^
z516LeC!#P+wb|5W1`JUcmR)tR1;kJ`YyneQ)Zb7)Qz53|GemQUJt&4<W9&gwSyVT)
zj;S?FD~IK$wM~l+!*~4fp(fG(EkPw54zoQe9J##8KF1&Y=5VmG(q?UO)%(Rgk>bvv
zq33ZtuO7rTU5|M7AOrUyGpWdG1}SYq=AcmSDPjM-kTf7X5E0TQgpALGnzm$G2UGB$
zP2-*TL$rj2_Neg6oDjODvF%Rs`U@!vmr=XuCTGY&;kc8s*?cP3O33UHip~oAr-a63
zL0-`MBS}c~L1e+fxstua9!ux;Q#sK3Fbz7gS23svDWa!^xeLNdOt^VXb+<6%5tfb%
zTYZ9G_0wI##7VUe3(YQ}_X%ORMfh{=GVL`^`aOk=w3jj!s3P21$JD82CId~dK12Dw
z3>vHQdG_g20$p_sv<i_Ih3Pkh<@bczJSX0=B6?~MFw{~{S6K%AH93qQE@rW}0{`<(
z47_}l@arcSJJZL=Ykq#Z@ga+`QMP~hl;q@OveNcaP*6antB~3QkMLxb3r}Mu$DXNY
z;;mffJ}Ttrn`LZml=FesT$~lwuM0ar3M2icT#8h)dbOEff9YUoEQRqa4zAtGW{doL
z&VNbI<=^Hf9)a(s;rlE9d;aR`YR=b9Q&BlX!?`!fj%2g;v2go@KHb?_TrL;G!^1px
zWC4kckUo@7{NnB%o^k5i$;;#X+ffcSOmcE;l&s!NHa;&V?$2gY&+MP)-`=)NcjqSE
z9qSC8g3!enkxv$Rci~&!|9X?$1~0D8{scPaH*ve&Y-=l$q~LdKo5G#1cKf@d@9V$z
ztuMH-v4O=qJ39$pT3Sjl*Jl%d(At~-@*7f99b{!?Q&RjWPG@ey=k6CytVc&j2?m3N
dLLuVuII&oa+(Uz8)xShe#oTUA&G@$%`3pjnD5(Gd

diff --git a/assets/voxygen/voxel/armor/hand/leather_right-2.vox b/assets/voxygen/voxel/armor/hand/leather_right-2.vox
deleted file mode 100644
index c380321a6ee75c670471eaf8ab7c37216508cacd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1240
zcmbu8e@NVQ7{{OQ*9}A~T%J0$)SSz^b8LA!&AjYP&+S}pI-AU!NrbYA&4z?HIR^9E
zz|?Xkw*@V|ZDKQKn_N;1G%3-6jdhI(QieqS?H>{0Kd+u|>yL<7fAqkM=llNrcz%4o
zpHIV~qgf#lsVVmzR43nT5vlk2y^mQ!E#@z_sz2K3_l;PCYB`E2a?LapQxQYI6?042
zP{cH^nxYtr8FR%@ZKyUZEvgmMP;bP9MZIaw>pD?P)3|1c#!yT{<0+z;stwH}R(val
zwN7)3<u&)=eJ_`b)^8bVfk1$@VPXH}1$Nke=U1DJ`S}`aiW|PqA4!5InbM}cc;76;
zF<OFnw<7IvNcc%)A(@04A?2iy=gno;O(C{jcswX14hhMh3WYWCRG&=1e>RbKXP%}q
zAk>WrZ%hfN@9EyUG&0(<$q6_qig-xxw2?iShI2fV{KZ^SnuMIQ!mg0uo)hF%&EFG?
zj68u%+vv;P#>8_;+<!40s-K}$TlOhGD8DEp-NMud!u*7A=ay=Z5cUdR92QoO3x3tz
z4Z={1j&}(a4x#yZp{r8ZT)a$OVH$1TY<lYKgj!t$juaC*QNeI)IV^|C+mVdhmC1pZ
z?6fu%(_SqEUlT^(7Utd;iZashIdf<#+D&I=2@TF<+6vPd+_#fR^B(-Q<+Q(kkie;9
z^q)CS&s%<m&b1SnIM3R5pAa7(&-TP^WMyTM@5rWT_p`j<a^Q96bEv9>p?98QYAl-{
z?>Je#o5x3*GcqnL-xhxUUg&AFb17KB!i@?xeyXRlKY_vPHg4TZWtGfF_J2vw<=^^e
zCJ0NT@a^^g-G4zr0T+r#*^?ipw6B-cU@D7Og!{+z>W+`&a5(7d>f)9C(@3y~q|PK}
zE<XH+XVUcUWMpvR+z4f*!?g6DXM1xBcR$<7j6aoOJ+ptFe_hQSjYpz1)-Tg}0#09?
zAb2&xd(&U@;a5@ip6a8lca#Gk&ryFfipS$&O-qqjh2MyY3J<<~Sl<J^U;j04)o0W9
z78j>)M%VuxZjZCEvBBo%=AYxWwY5}LRpEBKak*UB?RLh-#+aO(Boc`*J3GtL(h|{V
kl$Dhg*4NkZ`~9@Ew9wJfL3ejIy}i8*3=9wog{+wJ2byO%YybcN

diff --git a/assets/voxygen/voxel/armor/hand/plate_leather_right-0.vox b/assets/voxygen/voxel/armor/hand/plate_leather_right-0.vox
deleted file mode 100644
index e097aa7209d61649569fb348a4ebb5d9791f0f0c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1240
zcmbW0e@NVQ7{{OQ_ii9s;qug}rRH4T>DcD!T;^q(p4++HbT*kclL%!Kn+*wZat!9R
zfvM$8ZcAHgAvR;S$tA@=lM)@+Sl5UkWk}@T{t*!(yn4>{M?@^>fj7^O&-3{_KR(Y>
zbM!=NKtw8vJx7$uw^osAkJtTJSW&Y4g>A}D)OtMwVWU#I!W0=a4H+^_W6%_1$TXCj
z#*l2m95PflBy3aJG*wm@=Aejm(=bJK%cdFThDCiWgNA9@6hoo1MjjNyifM*@tw@-Q
z6~nM@nqq1!Q)B8q^*8lBQ+<yee5qJ8|1hEC^Z8iq7Y<#UXQ%BCezVz_o2v*Pal`Y)
zBN1H`M?u|w+;0@(7|uuB+mPl+Wb{d7K91-LA^wbz<<4ODO(CLLc-$|<^a*jF3Aq(f
zl%I*ldm)B*rk|$NCsYjxuTKi+?&;mCM3S4*NcUxu7c3&F)ka!xBAH_;WG`e8Unitr
z5OxOy*Q_9~X#9={WZ(&8%0^elcE<O`a{q-SD1U|mE!m^^QSqx{pk0`JUzi&g?%Yzn
zNEmesUmg=yP6=Ms+iQfr2DP^dB@UtfIiamo*jTtmRc<0p?ld~8>;xK}_>LbSaJq#4
z#$s3+C2MCKE@ujdU$oO$bAaY@!T+i-{FX5Lo{*QEh$l0hy1YHKmgZBF8AnrY61@j^
z5v<>fx3ZY#*N)&jdy?++r|5XoOW(z2g5#H1{r*#;qN3Olvz^q`RI(ju<n4Ku=baAR
zu56B$<<s}}Q%sJe@zb45R_<o;p~ei32}`$yUw#len(SQl=P-Yxg!P}RY3+`t_qvT+
z_Yznk<&pJY)xP{&{Y?8|aTvb4zEyw0zU2R1e@;#gmk$iHH+z(Vu1*sC2`qdp+&`(K
zJ2r;H;h?Rpjh7EiA^r|xTVt8N^6(GOC+h4ZCv*AY0EGqpG<08LM}0hZKi|c)H-Ucb
z*+2VVRWVEL@esAuOSGPbb63Xke-h-~sc-n;>k#|Tc2U?l%;Aq_slFMasHlilO+_LU
z{Ej6gJoxHieh+lM{_8xPpH25IGE#R&{r?VbkFmbK&c?>Zmc6pFlCrWgTrL+*rxUx~
z&dA6J6B82zgF$9yW>{QYBoqp<yu8fX+8SQ3mxhK0T3T9YZ*Qlwvy+~l9s+?t_)Yl}
Dl!ZJ(

diff --git a/assets/voxygen/voxel/armor/hand/plate_left-0.vox b/assets/voxygen/voxel/armor/hand/plate_left-0.vox
deleted file mode 100644
index f20e1b9682b6a1ff0e7b7fe777f73e76d81c8b18..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1240
zcmaize@NVQ7{{OQS0%|6n&-K@tJB<xdb-TtnVX%Rx9wcF<!rLMnM6!BIY&!Ew&NIV
z*9In*GjR*5%i^#jW}BE4`@^JU4Qy;SA_y50{ofxE_}8oFtNjscYtNTA@8{>|^E}_r
z=hMCaQ1PUQgxZ4pl;rzNk*;7Qu*EV|GX6o9@}Y1fIAJ+eJey>Q^_dDWvcyoBnTDY-
zO*1W`FwC@JiQ1Z|x|wB~MwX#9hO%kpTeTbcT4!Wxn#M(Sg{W<8_%hbDn{`7WhO&{7
zHZ3+Y)=dlQKd}47HqrhqDYij89%pS_*z?g6&b-_FX|u7o7{Zdv!LR-oxjs8BJq-i~
zTB%4jBY`X=`Y1B>1hQl&HzX7u7b*i~R9z9WqrzheA%9G;e<9R|a_BgoOXN&G@610%
zdtB(85MG}VPTkVlPABgE5<GD)jdMO+gEmS=op@74)Lbv4ut)Hm5vnGI9SefIqWj0P
zk%`BVSsTM;c}zcBz@42g=y;kI5rT@J6~8McP6{*c3yagjjjL+=gsFh=^#Nh^s1Q-R
z^!ZY%0^6Ay68sfH?{mVNTTH@_7<AS<=?|0;>nvxoua@}1CMJ*h8SiU@<tZw++1XKB
z#NHRm>FaJH+94!f6_RfW3-9ULwmh~w3g~HkhQan`y1jP#>s^fQE@iH_n#jv-L|@xS
z{KR2KP9G)qMuf3*QRb%4vv&J)a&mI8<>%pcZKd4frlzWtmWE0KJ8Rj$tC_L4pJe8f
z5`MYiW%XtyAL^cSDPj4V@Y_#9tiPN~i8_`p`}yP7E(S+(8BN=`ddtBoMH};<>=wq3
z=zsaw{6p=+CH3ELe&!SKLlS;WKXm>^x09gP^T7G*>gu@Al%%?5ik9KCI1&!7e=6KL
zERaf3QBlFr&=4=}nMD#Y3I+?9zqomZr=5Ct+-@$Mo1nF2oFgOW+1gvk%`Z!tk2n}F
zF6Q3-J3|YE53UgIT4wMVoVqwo;<Gv4o&AmvzFnc=#4xRAlkEL?fvzhn_<TOrv=zx#
z@D~{?!rgB+`@5_6>tS(yf*bGbzI-k9;Fw0Nns7Lb-|yeht>k;x85kHK7K`Dkp7~Eq
GbLDSklPm=Q

diff --git a/assets/voxygen/voxel/armor/hand/steel_right-0.vox b/assets/voxygen/voxel/armor/hand/steel_right-0.vox
deleted file mode 100644
index 9f29e826f0d266cd29d3ded21074c361dfe926f9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1240
zcmbu8e@L8l7{H(R^#-C9E>E3WYR=`IjxA58nU|gEx#@D#*<{{KB9u*RHYCK!F__l|
zrj|3gZO~E^u^F>XE-40@l<2_5x<&*kLn8n7kBAiW({o#YM8x`|2R=OS^L&3iKi=nC
zbNE<_UqmX3$_}ZLZ!99!WghoqAwwnXFSe;ZR_iGn2su^K6jKD#5De466va^VTOMF;
znW7kqX>J)I)HV!rM8vXbO4uKUVj8NAuwm0wt%wn}C92KP9>cP3nwCw&w5&@=i)Gy~
zESsW!%}nnN#a1-7VHhJv_P<;tntw=8@p`?i^a}^B&au<_JHJ}3%+6MXmbhN_`6G#P
z#ZpkW5BHme*a!0w_co+C0vUc1nTsW=LWnyhWV+MYeM1Ou79RHr(S1Vfr$SCeB;}`~
z@SKb0-KnQ3@d{M~!W$F9nY((nDuJY?RMNZ|<OW<MwpvN;O(0`5nXLJA;_8I7bHZ-F
z;G7ZURgK>fjto43Oj_wm-_F=`G2DAG5z3#TKua!Deo%f<2HJ&*4}{q<;r30nUBa+i
z_~MALd_wT3-CiT~HK@N$D7Fjr&kJoO!p8hns&W!&a;MT!Wy9a-z<V?g|H)$d8;f9Z
zn9QBAI339xe91;*O&-nVg6}n9@NHq{eIYj~fwGJ=>T>tcT9QvqMl4M^iS+K@MWB8!
zp2{McUq6KR^l`e+o}l9`4}IsG35;D}<-1RajErPQ^mbBGQpmEWlDp?wUU1lPJF_@k
znor+5Pcbo+%8$1*SiY0VhZ-|5DlFa-e*RwQXtHtHm(ASuV%C1DrnNhY-fLEF-i>FO
z<VV(jS^M&D^)uyzg+ciC+W)RUJ3E_;d4ufD8m6GDlXzb|^B)WMj_c@-j$*glX=`ia
zl>?KAuY;J@7^W^g{D)@~bas-GxOjem!h(Jpx-YP!K8`z|?PAIkPrvr;pZ%|@n4$J)
zklN}+T2I26OJn#(0=zf*HCMh0vhQ>kg`I;O{Ah;i8$nzy7b}{Ige&|;SWvkC<-`2$
z>wNv!dMH1uzPE@7eKWfM?{I6BwY4=iHZ~skD=RB0EiJ|AbmDM0u-R-34Gl3qK29JI
uV0wC*g@pxz!5~XZORTQ0;_-NBXlS6NrG@tPb~-yd>FMdg@Arr9ls^GH07M)B

diff --git a/assets/voxygen/voxel/armor/hand/tarasque_left.vox b/assets/voxygen/voxel/armor/hand/tarasque_left.vox
deleted file mode 100644
index dc418324b74f1e6c424118f767571af863e8c0d3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 55771
zcmeI)XLuAv7zgkz7ZDpOpokbxz=BHLz2ry$TVfDHXa-ckvTpA7_7?VTk1HgxBKF>~
z_uhN&z4zXG@4b7@`|jSQa1X)<zx*FJ8Ft>;nRoU#bGtkc9(JBKE4)~eq$!OpQ^iSo
z<TXi}(K2VkDinyLsz;eMdrr%P+$u?$IIFTGtBNEmsw|6dQ5S_P98{^YQl%=Qs7jSW
zMZ}7TB_%Xgl0#!<DKs`D&LI)2A#qm4S+prsL@bM<h@9eE%pv9yMV3R2s;o9Cvf8Xt
zT@ghMH7cUWbQW!jXp^bPs<@_#y4tKLqArR^(xiwYiMi4<+olc+Jf)K?D#hTSIvweW
zZPQoxt5T_r&I(-<IW`NfQA~#_3Z<Yr^(*x?^0b;-SPMteGj^Chh^~u+y3<igP4&r*
zv)hJJB{=9B4K~td%A!D{33~RT#wB{`eS6U@F3~H}w-?>f61{5s_6k+%RoAx{-SrZ=
zqJ4X<P^s6LzP<WY>Qzs@+9ozNN_0cwpt!ZQwOmFF`n6o|*}k;;_}!w#3GUX*J#J|^
zm-X7A`^1Y!FH9CsJ!*c%`Snr5E4G*N4;i>daoAdei^B#FEDjp5T5&TyQk*`ct=Q5!
zsn|H7d8uPdIsQL)e}0yCEyh$2Ew*er@;_VW>gwwMEcfzSm$iT2XL4D`EpI=1{--p~
zoP0l3#6fQ!`mK!Lo%ybewW0`&xRXc}au&T#j1J4OlX>c=(@V(6dIdX4FF>tE=TW(g
z74zdL51`n{1TFN+F&r=JhqWA<c}}NMn_+9zHd?ER`l0UkZ1AHFKdR@65^kZB?t@1d
zZam9DPYu1jaWrJd(a<*IXy^lpqoD^IM?-HR91XpYaWws*G%G=AR)*5hGlTQotO})B
z4N5ZrN<)8<gY(?10i{_JN;42jLw{R|^V|%E(yRrgSsO|-1WL0Gl!ku7g7Z#W7fM4v
zn8Vqd^`JD>P@46jG+`*s22h&eP?`}?nvqbN4WTp}L1{LI(rf~y83m=;6iP$?%ns*I
z1e-%?Mnh?8pfp=RY3Lsw<GclQC`|-PQwyc3gVIEyG-IGN^-!7yD9u<X%{VB{cqq-5
zP@1ivG+RSywt>=Y3#Dm<(lkM7wu90%Lun>JX|{*bOoY<x0HtYx(oBNVv_fenLusZ!
zY3P44!TA}%G$_q<D9w&gnl>oS3@FV^D9uh#nw_CEyFh7XL1|_~Y34v_c7@XH2Bp~@
zO0x%)#(>i738gWiH0@BD7?dUsrLmwi2`G&XrAb0*94O6PD9t=5jSHnoL21%Z8V^d7
zfzr%}(qy4DIVepYN>hN+EP&E<KxsOmG+j`dy`VIELuvMb((DVR*$+yyKa^%6l;!{^
z%_1nxfl!)*pfm?VX%2zX915j53`%o2l;#L1&5=-=qo6cLLurnI(i{t=ISxv5Je1}H
zD9wpbnv<Y3Cqro#LupQd(wqvVISop4I+W%ND9xErnzNuZXG3Yufzq4{r8y5ub3T;j
z0w~ReP@0RNG#5i@E`icq3Z=OWN^?1s<_ajyl~9_ipfp!QX|93NTnnYS4oY)9l;#E~
z&5cl+o1io|Luqb-(%cHAxeZElJCx=QD9xQvn!BJhcSC9JfzsRyrMVAEb3c^k0VvIb
zP@0FJG!H{*9)Z$43Z;1rO7l3B<_RdxlTezcpfpcIX`X@7JPW0H4odSpl;#B}&5KZ)
zm!LE+Lup=t(!2_#c@0YQI+W%OD9xKtnzx`dZ$oL`fzrGSrFjoZ^FEa311QahP@0dR
zG#^80K7rDF3Z?lBO7l6C<_jpzmr$Copfq1YX}*Edd<&)d4odSql;#I0&5ux;pP)29
zLur12()<dg`3*|*JCx=RD9xWxn!lhle?w`CP#Q^=q*a8dN)#jCm9bW&O58~#3OTDE
z)jKT5PUb~7Nne5DtXHs;s;Fr-I*-a_te781c>u*mCTI!K5XZ~<VJ(Mdp3`a6X4o3F
zjn-<SeyICB8~mulkLr1%gj?vO``{6V8_#l(oz^sIglMHh5v45Qxvca8Zb*4?tK8k;
z&XPo)-rb#af^ry6FfRx5Ru)Z>XfzxYUIsI5yA}<OYT>BHS<I|u(xh6A=HGDK$;~TI
zS}(59L796`T1Y$pJ}EIrbAn1KoOahwLDT6h&wBnU)4+3sfwZ~3=Qi^xe^<>eBkrT?
z$_?{Y68-C<VO^^uJGZACt9M6gsJKFO!S>gqA<DCQwMLxRqZIKtUGrB~*EPD==HOmw
zWcgnCQ<?B=qqJ6jo{HPUjdpq6D{eL?cCB=dE19e}m;3X=CA<ZcqAuEB{A!pPE1NH5
zEguqz@}0E1X52E;Jf=rO_Xl!nfS~kc1XmJ{o8pSqneixrzgr6&|Bm^R8MAWTmuxdd
z8xyIC(DKZxl$m#?-SxZ_3sO#}zm@)$<zlAmfB5<NH0c5LKO3~aMn0Lfa!JqSCDmz;
zt%5mveN=g@EuQ{#oTrO<u9qczgBIp*o;q22)H%_{K_Xhu@-k3XquuUKLRYk~_@cST
z1w(qx?Jro|wkizbrVb~b4_->VO1lSHXkd9_uGm?p$Nf_iPtCiS%a}1I%^Tsr>o~2y
z^IC+vh(|i(nq9o}bi0d!iRfZ^B0rgx&x>R|mW{Wxd=s34BTK-#qjuYf^@>c6n8`ay
QWAw22;=wV?b*Y2?51}Q}m;e9(

diff --git a/assets/voxygen/voxel/armor/hand/twigs_glove_right.vox b/assets/voxygen/voxel/armor/hand/twigs_glove_right.vox
deleted file mode 100644
index 98e764dcc595d502f3836760c3973b56f42dd16c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1240
zcmeHGK}rKb5Uj2pStX)~2f<T7J&A{if*1*j5M)`5U?9Zg<VE!4GyH(~B0r(O2%B6s
zLR%BWTfBMOVrr_Uo1urMXK*vDzX7=JWIYMq1JKV#-Sv17k{_-}hj*jwH3o%!(X<$8
z_#ziaGnislnn1I8+(;_{P7Ev<)i|ZGP@*6?QI)A7nNbQ$W+qYu6{oxu2p@*<NrVz6
zZ}JxApgiRn%G;~U4)p#A7xFx>SoNTqfq$5Ry>88q@^oo$ecoQ0i~sVm`SNFe(Ae_v
s$&U99x4nI^>1Xu~e`@aj-Z@q6<9_Omaq8#ytKNF3`Ni|vA|L<%H!Yk2pa1{>

diff --git a/assets/voxygen/voxel/armor/hand/twigsflowers_glove_right.vox b/assets/voxygen/voxel/armor/hand/twigsflowers_glove_right.vox
deleted file mode 100644
index 6f409f646075bf9dd3dfab005d474dd9e8eb5c88..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1260
zcmeH{F-rqM5QXQ>teg^2#6qwNh=qtnL{W@LA_P4SBNzxVsnUp6{sS%j2mS-WpJZ!k
ztW0-jF}}UR%9M6D?01iMZ((+qz3X2N>dzu_(N4P*c?%-Fbl6#phD9qz=E&fBn7&eD
zZ4q#21X8G$77*|q3a}K&<3kmNh)zK?DyYPu6NXbI?D7So#Ka~7dZNT&@1pcXiK%^X
zWjQ1iN)-h53%ODa;Zu~EGNWFdowmzOaJ|mTvaF&ygX#|a!yVY@)O;sPW}dBow`OMX
zyS!~a`S{?`AI@L?oY!xx_-Jp<yW6YY+FbU-`jX!@*MH~kv-fT<@y00eqw&0-+|>N|
Kexc0cKkEm6>j%*Q

diff --git a/assets/voxygen/voxel/armor/hand/twigsleaves_glove_right.vox b/assets/voxygen/voxel/armor/hand/twigsleaves_glove_right.vox
deleted file mode 100644
index bda45dec342d90073449a4357ea915b4fb2cb0db..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1252
zcmeH{u}T9$5QhKx_v8!_MJxoXfCLM%h$x5=NrWKBkpv8cm{c~Rm5<>YSo=u6is|lx
zj{ja^7dyKf_S=7FhGm9jcc<f7>kYuLpN%B=NPtN;A8bWOCKo|$h}r!-dzVH#5~jh3
zp(HEU45pZsCZkyqC(=rQOB0N0QW1<RC6^Sc@@ax1Abi8*3kpzcK@k|f)Ky_fN=jjg
zY9$4wpyE_qdUt!%ubNk%F3a=0rapuE4*bI%I2<(nBv03#t*?4(bMak1bzlF?PdmH5
tINSHp@t*hEJATpH_UG=w@1AqjKAoiAS)_jXu<6&2O}~0+RQdQ<{QxCB1zi9D

diff --git a/assets/voxygen/voxel/armor/hand/velorite_battlemage_left.vox b/assets/voxygen/voxel/armor/hand/velorite_battlemage_left.vox
deleted file mode 100644
index 2de75e92e9b9cf3a6811d5d238e8406a6614ab2c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1288
zcmaKqT}+#06vxl|zFk6$Gi-DPI%sPlK=~Y>9a{tCqq=SaV>q%QLuW+SP>g8|Zlu{)
z6BlQ;EQoAgOae#<F~g0_>9Ry5j-kmk3&F%hmu1GA-FdMX<IT_0&Wl|jC;8?7oO5!X
z=bYzxx;qYd#zds8Dcr6ik8L7d;hxa5Nk?tNQye(h6TY2_ifmK044JY_nKCU^#Wajb
zOEFDV#jtd(SV=X^sHK>udDt?|sA1_^u@pnBNmH>DF|0{LF%?U(DPn3&F%?U(DPn0%
zF%?U(C4HOvilrEa?XYRsPFkvlX*+2umSR{Mw{)$#@5SaO(Row07vk|a4@ZPumzT)1
z|IK5&oyEmAl6EEh<+`K?9qjC_B@}JIH(rl~HXsAfAQPLBB?swkLgt`Q5-Ozhs*pAy
zY)l9l7X-)WLNL$8?!k0=PGxZRMlP*!p>tGteNH%bPis4!xFTNi<Hgin53)68$9v96
z@wA)D<w7!hh5S=O>6j2$5aeY&e>e>peGZwo^T$m;zs=P0^T*Zvn5g7Vtb%V|E90y7
z621ud7(FV?eIzW-2tQmCMuWmcNcei6aQ`i#NByJS!i6_9J|wjGgud;<P^<9I@?}=;
z>?IQNGTd3jSbr7q{eH%dv@p`&1a~JGYj5U!xRLi;0vvCsXQ<xK+ch=3Szbw>ubh^A
z4}nq_bv3zc3*=B7a+2Scjcb1vnSGh5eB<*jcDi%$=Q^o&W>Jylpu}OP(7u^aC`4Aq
zCOjSwl|C<Z<pu1h@(~JD((!`6hrXdadW5X5A`1)1?5y6+D01Qi5{WPzDdJM1nx!i(
z{P}Aau@BQZH*4qGy=?B|UU&XWdM}+d&Nb)f`*C=%l<F~1<z`P~5&hkM26hXHL&EsG
zLig$S*cfSI)1e*MJ8Q@am65Z(08go#JWqD2HknU9-a*><nN<JTiENf9h1FMdvgv7j
zJ|9CvL%g(W9!U(dCANhd7oWUg)ZyS(K>@e@UVaL@_@&3m@6k*=2@l@0`lm+nsdG6A
z7w6MkS5B<8o|@>H)LsX>?h-o!$1cv0n7YpS`S1AT+ZAfx`GAJg<Lvo#fv&471cN~y
zYAcea@E6vK@Zjc?{yr;nubZD1{jW;W*3?_m|DXG>X3e^%_RDD=B&+^awpProb%y*4
Dz6&@X

diff --git a/assets/voxygen/voxel/armor/hand/warlock_right.vox b/assets/voxygen/voxel/armor/hand/warlock_right.vox
deleted file mode 100644
index 6ea6aa73d8ccfd365fae865ed104d7734a0881f1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1688
zcmbu8?@yIw9LB%*uO}AOG=762AqEFb<A?kRw8Mdu9t{mKrbnXIWXi}TtT8=1b5l-`
zITMM{wuq=PUNp%Vv6?T)IYw^GHFB*tj=9!<&|2%w)%8eg)XZLVw$HBbecj*Zy6@*c
z_tU!fK;DRmG}TA;P$c1rv_zueNBjYQ53S<B!DwW^zGurY#X6HPL_0I!ENd;@)_DnI
zq+2VmUt8%mKFUjIrKqY~JFj19)uV~gs@oD}=^1*&7<xn*dX^qBmL5@>nT|R4@H6$>
zM(F`dl-Avv7-EUj^b9>>h$YU@v-F4|mN=^iv}2BA4$;aC7-bTcC~cT&m}!`4m`Tsj
zBZgSw3_VMa7-D_2t+$pKTW_d_W5e1yqF7T6Ra3REoY(Br>~X9eYsXr#R;-o(tai*M
z#&K=J+R)Qf?JGS`+mL68pTlg&Z0p&O6&o@h*A%Y7vF2EDUUA+j$6mq=$1KMj>xg1L
z)lfB6Qx$s^dlh>XdzHTr&oS3A*D=?HEY(syO)N34o);w~zH(o}JqqW9`*hYzI776@
z^Y#+^c7)iwa=*Y|JRZm0A;Hekd2C4i4ZozO;`;R_e+pM3Up|mE!F1HNZAJL??Ffw3
zK*A2v^)O`oamai+)-(w+jtNS_h1hgekklo3v`>&SC`kWIP|=i(UB}iSdO8K~%szp}
zxS)Ah@Y<B%<ad0wIUBj1`6!4NqjDyQoSszVpU+0|#Cnu26e6QdP;gqXX+%&rCy@PI
zKb8a;ehf05inE1lG5JgyZg0y0c0Gw&5k$xj<YzK`LNN87;QFNC<`*0X1><4CSNjBa
zjtHV0pJ){f9;V+bXb1?}s|CG{g5MWL(Oi*@&Tu|r%|#gLC`0_EDvTU$z)(j$usDvA
z4e6*WTaVq(6``ZG3SGMdeJ=~f-W1GT5LD)7BT`&|w#v=uX{<qOaXLCHa&UgfM$EKt
zLG;CXbiKL<@#BYZ?$i;)-iTsb_0yP{?8nlLQ6wiPBQs?!^78Uf8pucG=BMy%Spea>
zQtW-c27`%pnEE&$Ki(|Hom(aNkZaCN2o|pie)?Vz>ny_MzH-c8X+VaQAy<MZkv3Gz
zNrdJ72fqJhp3A?zKfWCUmgoQX`<IuO<6_kqwv>*e_UsvC^<`n<6T$660!&OG5D1{R
zw-+z$oQCwpkk*ri*-I<`;i+uio!nepd}|onYlm?7Tt70~GjQwkjhKyQVTfn;&-3^D
z{H%j5i|9EDoV+xNzE5ZH?(_|O@XZpo9zToiXU4GmqdBx(T|zJz#9eMhk_di<SrRON
zy|TY$-mm|f=T~^|JM%Rbi(&N`*Czg&^NYXD{W-p$x4L&-=om6<UO~>5srx-Ie*hj~
BT0;N;

diff --git a/assets/voxygen/voxel/armor/hand/warlord_left.vox b/assets/voxygen/voxel/armor/hand/warlord_left.vox
deleted file mode 100644
index 6269d9b0e9bc211e9d6698b40528a5acd2da6248..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1516
zcmbu8{Y#x?7{{;s<vB@KxI7-;mNVzlqig2Nd`V}=>1jJIx11&0nOVeS6O*Qd%)?=@
zoi}W(oS9pYnS~g{Y>7#+A54bWKt|Yz{W4@k|3O6b%eU{@B37*RLpOZ5uKRmk_xE}3
z`?;Ua1Bdb_M5L`Lu%AJ0IwBo`p#PENgu_KB$wTDO;b7o1#e}1m7$tF|C7}%?(Mk;%
zrJ`ChY86*T4QQiSQ&A;)K#PtW(NR%)P!X*(`}KfT)HF4sH8o<jj)|d0w4p|<(NSgT
zW9eg=i-~J7Q6nZM$_yx?i6K@|)6|G2hFDF_P$QZcVvUI@OCL)g%UmoyZOjl+mY$ZL
zmY$ZL)HF4si6K@~Gt`JChFD|iNgqoeqLf1qhaOH$Y39Uehv&nb7~{mWxZ+l;gto4@
zqjkd3hS-GFPQqwcLW>hK%EhyE#g%Zab?Bd5rx;b-(%aI<VZUX+Va;&O!9Ba1#NPR2
z0*-JvjN4;^y^|~0>i!MCxZPM@ZcCPMDe%<;N%MJ7-?bC|HyYucs)P6)NZ-Sd>Bk`}
z9;CGiGW!Lk{vvF@EJ*1SJQ@+Cj|x1W3#!^u(b}Je;OTU{z4!!L!h-g3!RvE^;qSS&
zJqLNc1t<)cpnAcF+(9=A&gGzFW(&$!i;&qRC_F9LJ|SpW639z@ekcVp{upH5jgg{F
zn0+P#H+JO$txuv}1Of6R`I(HL6wJLRSe_MJ`;v2?VA?PE`k>&}F+q^?lbwRmqtu54
z&0axwtzf7{@cZf{+N*NV>n}j4y%-Zc6$rmvgNftK80%>Q)}~Rq)q{qLE!g*5F?u>{
z(AO%6yds!-OR)5=pgJ!Hfs#UWRqw!HOC35(Jm{^;#koD(u+UwG;EPS@du>0$CywCk
zsbdJe8N{yIr?D^_$NJStq^71KD}594^Yc;eEkN~-r|@ir7ygEF9C*GCqtVTn`?vr%
zua)4|^-_GuXD-YL)~*PC`auxtEyl%2B~~sqBU37nCq9%)7iwh~etG|a`@hI@`M3S!
zyD4B}<$v$Lva%BAYo<_EK8^a3Gsuo)WAzikjU&9eGc)jdy%-uA!V7!nA(0R=1~agD
z;qEs)mBYJ}mxuGQaWvMC;po{ovbr;I{fli_3}$1DXZFwYPxd9f4tK0!@HjAhVHS~3
z7x2#fRebR6I(D8ILF1Vz?E7d59hcYP^Z9U_uOcY~zrw5wHom$0ejB`B|5fK-c;`P$
n#!x7Pd*`?^^H(jI{H^xq{C?WKy_<LUBdhLJ<d)6dZ@v5hXmL?^

diff --git a/assets/voxygen/voxel/armor/shoulder/leather_right-1.vox b/assets/voxygen/voxel/armor/leather/shoulder.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/shoulder/leather_right-1.vox
rename to assets/voxygen/voxel/armor/leather/shoulder.vox
diff --git a/assets/voxygen/voxel/armor/back/leather_blue-0.vox b/assets/voxygen/voxel/armor/leather_blue/back.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/back/leather_blue-0.vox
rename to assets/voxygen/voxel/armor/leather_blue/back.vox
diff --git a/assets/voxygen/voxel/armor/chest/leather_blue-0.vox b/assets/voxygen/voxel/armor/leather_blue/chest.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/chest/leather_blue-0.vox
rename to assets/voxygen/voxel/armor/leather_blue/chest.vox
diff --git a/assets/voxygen/voxel/armor/pants/leather_blue-0.vox b/assets/voxygen/voxel/armor/leather_blue/pants.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/pants/leather_blue-0.vox
rename to assets/voxygen/voxel/armor/leather_blue/pants.vox
diff --git a/assets/voxygen/voxel/armor/belt/plate_leather-0.vox b/assets/voxygen/voxel/armor/leather_plate/belt.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/belt/plate_leather-0.vox
rename to assets/voxygen/voxel/armor/leather_plate/belt.vox
diff --git a/assets/voxygen/voxel/armor/chest/plate_leather.vox b/assets/voxygen/voxel/armor/leather_plate/chest.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/chest/plate_leather.vox
rename to assets/voxygen/voxel/armor/leather_plate/chest.vox
diff --git a/assets/voxygen/voxel/armor/foot/plate_leather.vox b/assets/voxygen/voxel/armor/leather_plate/foot.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/foot/plate_leather.vox
rename to assets/voxygen/voxel/armor/leather_plate/foot.vox
diff --git a/assets/voxygen/voxel/armor/hand/plate_leather_left-0.vox b/assets/voxygen/voxel/armor/leather_plate/hand.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/hand/plate_leather_left-0.vox
rename to assets/voxygen/voxel/armor/leather_plate/hand.vox
diff --git a/assets/voxygen/voxel/armor/pants/plate_leather-0.vox b/assets/voxygen/voxel/armor/leather_plate/pants.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/pants/plate_leather-0.vox
rename to assets/voxygen/voxel/armor/leather_plate/pants.vox
diff --git a/assets/voxygen/voxel/armor/shoulder/plate_leather_left-0.vox b/assets/voxygen/voxel/armor/leather_plate/shoulder.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/shoulder/plate_leather_left-0.vox
rename to assets/voxygen/voxel/armor/leather_plate/shoulder.vox
diff --git a/assets/voxygen/voxel/armor/back/admin.vox b/assets/voxygen/voxel/armor/misc/back/admin.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/back/admin.vox
rename to assets/voxygen/voxel/armor/misc/back/admin.vox
diff --git a/assets/voxygen/voxel/armor/back/backpack-grey.vox b/assets/voxygen/voxel/armor/misc/back/backpack-grey.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/back/backpack-grey.vox
rename to assets/voxygen/voxel/armor/misc/back/backpack-grey.vox
diff --git a/assets/voxygen/voxel/armor/back/backpack-0.vox b/assets/voxygen/voxel/armor/misc/back/backpack.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/back/backpack-0.vox
rename to assets/voxygen/voxel/armor/misc/back/backpack.vox
diff --git a/assets/voxygen/voxel/armor/back/dung_purp-0.vox b/assets/voxygen/voxel/armor/misc/back/dungeon_purple.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/back/dung_purp-0.vox
rename to assets/voxygen/voxel/armor/misc/back/dungeon_purple.vox
diff --git a/assets/voxygen/voxel/armor/back/short-0.vox b/assets/voxygen/voxel/armor/misc/back/short-0.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/back/short-0.vox
rename to assets/voxygen/voxel/armor/misc/back/short-0.vox
diff --git a/assets/voxygen/voxel/armor/back/short-1.vox b/assets/voxygen/voxel/armor/misc/back/short-1.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/back/short-1.vox
rename to assets/voxygen/voxel/armor/misc/back/short-1.vox
diff --git a/assets/voxygen/voxel/armor/belt/cloth_black.vox b/assets/voxygen/voxel/armor/misc/belt/cloth_black.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/belt/cloth_black.vox
rename to assets/voxygen/voxel/armor/misc/belt/cloth_black.vox
diff --git a/assets/voxygen/voxel/armor/belt/cloth_blood.vox b/assets/voxygen/voxel/armor/misc/belt/cloth_blood.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/belt/cloth_blood.vox
rename to assets/voxygen/voxel/armor/misc/belt/cloth_blood.vox
diff --git a/assets/voxygen/voxel/armor/belt/cloth_grey.vox b/assets/voxygen/voxel/armor/misc/belt/cloth_grey.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/belt/cloth_grey.vox
rename to assets/voxygen/voxel/armor/misc/belt/cloth_grey.vox
diff --git a/assets/voxygen/voxel/armor/belt/cloth_turq.vox b/assets/voxygen/voxel/armor/misc/belt/cloth_turq.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/belt/cloth_turq.vox
rename to assets/voxygen/voxel/armor/misc/belt/cloth_turq.vox
diff --git a/assets/voxygen/voxel/armor/belt/dark.vox b/assets/voxygen/voxel/armor/misc/belt/dark.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/belt/dark.vox
rename to assets/voxygen/voxel/armor/misc/belt/dark.vox
diff --git a/assets/voxygen/voxel/armor/belt/belt_none.vox b/assets/voxygen/voxel/armor/misc/belt/none.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/belt/belt_none.vox
rename to assets/voxygen/voxel/armor/misc/belt/none.vox
diff --git a/assets/voxygen/voxel/armor/chest/cloth_red_kimono.vox b/assets/voxygen/voxel/armor/misc/chest/cloth_red_kimono.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/chest/cloth_red_kimono.vox
rename to assets/voxygen/voxel/armor/misc/chest/cloth_red_kimono.vox
diff --git a/assets/voxygen/voxel/armor/chest/grayscale.vox b/assets/voxygen/voxel/armor/misc/chest/grayscale.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/chest/grayscale.vox
rename to assets/voxygen/voxel/armor/misc/chest/grayscale.vox
diff --git a/assets/voxygen/voxel/armor/chest/chest_none.vox b/assets/voxygen/voxel/armor/misc/chest/none.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/chest/chest_none.vox
rename to assets/voxygen/voxel/armor/misc/chest/none.vox
diff --git a/assets/voxygen/voxel/armor/chest/plate_grey-0.vox b/assets/voxygen/voxel/armor/misc/chest/plate_grey.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/chest/plate_grey-0.vox
rename to assets/voxygen/voxel/armor/misc/chest/plate_grey.vox
diff --git a/assets/voxygen/voxel/armor/chest/shirt_white-0.vox b/assets/voxygen/voxel/armor/misc/chest/shirt_white.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/chest/shirt_white-0.vox
rename to assets/voxygen/voxel/armor/misc/chest/shirt_white.vox
diff --git a/assets/voxygen/voxel/armor/chest/worker_green-0.vox b/assets/voxygen/voxel/armor/misc/chest/worker_green.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/chest/worker_green-0.vox
rename to assets/voxygen/voxel/armor/misc/chest/worker_green.vox
diff --git a/assets/voxygen/voxel/armor/chest/worker_red-0.vox b/assets/voxygen/voxel/armor/misc/chest/worker_red.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/chest/worker_red-0.vox
rename to assets/voxygen/voxel/armor/misc/chest/worker_red.vox
diff --git a/assets/voxygen/voxel/armor/chest/worker_white-0.vox b/assets/voxygen/voxel/armor/misc/chest/worker_white.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/chest/worker_white-0.vox
rename to assets/voxygen/voxel/armor/misc/chest/worker_white.vox
diff --git a/assets/voxygen/voxel/armor/foot/cloth_sandals.vox b/assets/voxygen/voxel/armor/misc/foot/cloth_sandal.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/foot/cloth_sandals.vox
rename to assets/voxygen/voxel/armor/misc/foot/cloth_sandal.vox
diff --git a/assets/voxygen/voxel/armor/foot/dark-0.vox b/assets/voxygen/voxel/armor/misc/foot/dark.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/foot/dark-0.vox
rename to assets/voxygen/voxel/armor/misc/foot/dark.vox
diff --git a/assets/voxygen/voxel/armor/foot/dark_jester-elf_shoe.vox b/assets/voxygen/voxel/armor/misc/foot/dark_jester_elf.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/foot/dark_jester-elf_shoe.vox
rename to assets/voxygen/voxel/armor/misc/foot/dark_jester_elf.vox
diff --git a/assets/voxygen/voxel/armor/foot/jackalope_slippers.vox b/assets/voxygen/voxel/armor/misc/foot/jackalope.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/foot/jackalope_slippers.vox
rename to assets/voxygen/voxel/armor/misc/foot/jackalope.vox
diff --git a/assets/voxygen/voxel/armor/foot/foot_none.vox b/assets/voxygen/voxel/armor/misc/foot/none.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/foot/foot_none.vox
rename to assets/voxygen/voxel/armor/misc/foot/none.vox
diff --git a/assets/voxygen/voxel/armor/hand/bare_right.vox b/assets/voxygen/voxel/armor/misc/hand/bare.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/hand/bare_right.vox
rename to assets/voxygen/voxel/armor/misc/hand/bare.vox
diff --git a/assets/voxygen/voxel/armor/hand/cloth_basic_right.vox b/assets/voxygen/voxel/armor/misc/hand/cloth_basic.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/hand/cloth_basic_right.vox
rename to assets/voxygen/voxel/armor/misc/hand/cloth_basic.vox
diff --git a/assets/voxygen/voxel/armor/hand/hand_right_none.vox b/assets/voxygen/voxel/armor/misc/hand/none.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/hand/hand_right_none.vox
rename to assets/voxygen/voxel/armor/misc/hand/none.vox
diff --git a/assets/voxygen/voxel/armor/head/assa_mask-0.vox b/assets/voxygen/voxel/armor/misc/head/assa_mask-0.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/head/assa_mask-0.vox
rename to assets/voxygen/voxel/armor/misc/head/assa_mask-0.vox
diff --git a/assets/voxygen/voxel/armor/head/leather-0.vox b/assets/voxygen/voxel/armor/misc/head/leather-0.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/head/leather-0.vox
rename to assets/voxygen/voxel/armor/misc/head/leather-0.vox
diff --git a/assets/voxygen/voxel/armor/head/warlock.vox b/assets/voxygen/voxel/armor/misc/head/warlock.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/head/warlock.vox
rename to assets/voxygen/voxel/armor/misc/head/warlock.vox
diff --git a/assets/voxygen/voxel/armor/head/warlord.vox b/assets/voxygen/voxel/armor/misc/head/warlord.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/head/warlord.vox
rename to assets/voxygen/voxel/armor/misc/head/warlord.vox
diff --git a/assets/voxygen/voxel/armor/lantern/black-0.vox b/assets/voxygen/voxel/armor/misc/lantern/black-0.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/lantern/black-0.vox
rename to assets/voxygen/voxel/armor/misc/lantern/black-0.vox
diff --git a/assets/voxygen/voxel/armor/lantern/blue-0.vox b/assets/voxygen/voxel/armor/misc/lantern/blue-0.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/lantern/blue-0.vox
rename to assets/voxygen/voxel/armor/misc/lantern/blue-0.vox
diff --git a/assets/voxygen/voxel/armor/lantern/green-0.vox b/assets/voxygen/voxel/armor/misc/lantern/green-0.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/lantern/green-0.vox
rename to assets/voxygen/voxel/armor/misc/lantern/green-0.vox
diff --git a/assets/voxygen/voxel/armor/lantern/red-0.vox b/assets/voxygen/voxel/armor/misc/lantern/red-0.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/lantern/red-0.vox
rename to assets/voxygen/voxel/armor/misc/lantern/red-0.vox
diff --git a/assets/voxygen/voxel/armor/pants/cloth_red_kimono.vox b/assets/voxygen/voxel/armor/misc/pants/cloth_red_kimono.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/pants/cloth_red_kimono.vox
rename to assets/voxygen/voxel/armor/misc/pants/cloth_red_kimono.vox
diff --git a/assets/voxygen/voxel/armor/pants/grayscale.vox b/assets/voxygen/voxel/armor/misc/pants/grayscale_pants.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/pants/grayscale.vox
rename to assets/voxygen/voxel/armor/misc/pants/grayscale_pants.vox
diff --git a/assets/voxygen/voxel/armor/pants/pants_none.vox b/assets/voxygen/voxel/armor/misc/pants/none.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/pants/pants_none.vox
rename to assets/voxygen/voxel/armor/misc/pants/none.vox
diff --git a/assets/voxygen/voxel/armor/pants/plate_grey-0.vox b/assets/voxygen/voxel/armor/misc/pants/plate_grey.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/pants/plate_grey-0.vox
rename to assets/voxygen/voxel/armor/misc/pants/plate_grey.vox
diff --git a/assets/voxygen/voxel/armor/pants/worker_blue-0.vox b/assets/voxygen/voxel/armor/misc/pants/worker_blue.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/pants/worker_blue-0.vox
rename to assets/voxygen/voxel/armor/misc/pants/worker_blue.vox
diff --git a/assets/voxygen/voxel/armor/ring/simple_gold-0.vox b/assets/voxygen/voxel/armor/misc/ring/gold.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/ring/simple_gold-0.vox
rename to assets/voxygen/voxel/armor/misc/ring/gold.vox
diff --git a/assets/voxygen/voxel/armor/ring/simple_purp-0.vox b/assets/voxygen/voxel/armor/misc/ring/scratched.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/ring/simple_purp-0.vox
rename to assets/voxygen/voxel/armor/misc/ring/scratched.vox
diff --git a/assets/voxygen/voxel/armor/ring/high_purp-0.vox b/assets/voxygen/voxel/armor/misc/ring/skull.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/ring/high_purp-0.vox
rename to assets/voxygen/voxel/armor/misc/ring/skull.vox
diff --git a/assets/voxygen/voxel/armor/shoulder/chain_right.vox b/assets/voxygen/voxel/armor/misc/shoulder/chain.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/shoulder/chain_right.vox
rename to assets/voxygen/voxel/armor/misc/shoulder/chain.vox
diff --git a/assets/voxygen/voxel/armor/shoulder/iron_spikes_left.vox b/assets/voxygen/voxel/armor/misc/shoulder/iron_spikes.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/shoulder/iron_spikes_left.vox
rename to assets/voxygen/voxel/armor/misc/shoulder/iron_spikes.vox
diff --git a/assets/voxygen/voxel/armor/shoulder/leather_iron_left-0.vox b/assets/voxygen/voxel/armor/misc/shoulder/leather_iron_0.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/shoulder/leather_iron_left-0.vox
rename to assets/voxygen/voxel/armor/misc/shoulder/leather_iron_0.vox
diff --git a/assets/voxygen/voxel/armor/shoulder/leather_iron_left-1.vox b/assets/voxygen/voxel/armor/misc/shoulder/leather_iron_1.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/shoulder/leather_iron_left-1.vox
rename to assets/voxygen/voxel/armor/misc/shoulder/leather_iron_1.vox
diff --git a/assets/voxygen/voxel/armor/shoulder/leather_iron_left-2.vox b/assets/voxygen/voxel/armor/misc/shoulder/leather_iron_2.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/shoulder/leather_iron_left-2.vox
rename to assets/voxygen/voxel/armor/misc/shoulder/leather_iron_2.vox
diff --git a/assets/voxygen/voxel/armor/shoulder/leather_iron_left-3.vox b/assets/voxygen/voxel/armor/misc/shoulder/leather_iron_3.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/shoulder/leather_iron_left-3.vox
rename to assets/voxygen/voxel/armor/misc/shoulder/leather_iron_3.vox
diff --git a/assets/voxygen/voxel/armor/shoulder/leather_strips_left.vox b/assets/voxygen/voxel/armor/misc/shoulder/leather_strip.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/shoulder/leather_strips_left.vox
rename to assets/voxygen/voxel/armor/misc/shoulder/leather_strip.vox
diff --git a/assets/voxygen/voxel/armor/belt/plate-0.vox b/assets/voxygen/voxel/armor/plate/belt.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/belt/plate-0.vox
rename to assets/voxygen/voxel/armor/plate/belt.vox
diff --git a/assets/voxygen/voxel/armor/chest/plate_green-0.vox b/assets/voxygen/voxel/armor/plate/chest.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/chest/plate_green-0.vox
rename to assets/voxygen/voxel/armor/plate/chest.vox
diff --git a/assets/voxygen/voxel/armor/foot/plate-0.vox b/assets/voxygen/voxel/armor/plate/foot.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/foot/plate-0.vox
rename to assets/voxygen/voxel/armor/plate/foot.vox
diff --git a/assets/voxygen/voxel/armor/hand/plate_right-0.vox b/assets/voxygen/voxel/armor/plate/hand.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/hand/plate_right-0.vox
rename to assets/voxygen/voxel/armor/plate/hand.vox
diff --git a/assets/voxygen/voxel/armor/pants/plate_green-0.vox b/assets/voxygen/voxel/armor/plate/pants.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/pants/plate_green-0.vox
rename to assets/voxygen/voxel/armor/plate/pants.vox
diff --git a/assets/voxygen/voxel/armor/shoulder/plate_right-0.vox b/assets/voxygen/voxel/armor/plate/shoulder.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/shoulder/plate_right-0.vox
rename to assets/voxygen/voxel/armor/plate/shoulder.vox
diff --git a/assets/voxygen/voxel/armor/chest/rugged-0.vox b/assets/voxygen/voxel/armor/rugged/chest.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/chest/rugged-0.vox
rename to assets/voxygen/voxel/armor/rugged/chest.vox
diff --git a/assets/voxygen/voxel/armor/pants/rugged-0.vox b/assets/voxygen/voxel/armor/rugged/pants.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/pants/rugged-0.vox
rename to assets/voxygen/voxel/armor/rugged/pants.vox
diff --git a/assets/voxygen/voxel/armor/shoulder/assa_left.vox b/assets/voxygen/voxel/armor/shoulder/assa_left.vox
deleted file mode 100644
index 8f6a59973d5b4de3cd897d5f2ae1936e90f0f429..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1384
zcmaizZAhMF6vxkXzc|Sinvd_xEvNWe=6m91I(?eD+>^7(d}bCg*~Fyv5VFa`V0+rY
z#BxsDg32t!BxakK^so;mA!}e`*@z%yNc6oA5q<l0Zr7*KcEO)>&h<a%f1PvP*WD2~
zwr4^_TI-t+tC3e+k@n`Gf2SAdic#!PIErJP!RBnEj;<z!?N}k(vO=zFMQztaofrwZ
z3R_`Zg=5WHjukbQHEV2Z)^V+X?d8UpsO6Zbt2wUvPK*f{NAqpncTGSnd)8LoC@fFY
z(^j}%Y+F%h)0(Jl>)G0aqcE-s8Dm1W(K=f~;;4q|xvJ}`b;JZ5Pv7!<Z%^wKw)&3N
zxH^Zi)K}hC=ryRG=6SwnRnt}8Y;vBC_TkNLEaf#eCSYx9>5RH(i-{gNc%Xjs;x=zg
z2#3RLj0sI2udvtmH-GwkEHAg>t?SKS|1aX}lBwyc!2f0~`IFU%-$nW!L#CcYR+5Qt
z6;k?zLVqqrH-y+e;qi!&I4UH6DU`Ry(b6AJ@O&cgEj~qKSZEs;-k1~4-qYH)bTWIh
z$PO1!xll(&$Vb*lItA0aDY>0XN|%s*UMQLn_ALqeP>{h`Wc&$a-p5dG0yEDgaesdX
zv^-6X2+fM06~8OS&j@o@gyk9G&P|Q$gekx9%@JY!q!85jOouRfLiY!RhJ2y>dExDy
z7M(i`ZRP3o`m-2p%VVOal<?6iCQdal)>99wQxxt^W?$)U4!w{^Pe&DfEkfi~Ve%be
z=>s9hm%uY=Npw{{OQ^A$j)G)*%QF}`n8QMMF~OJX>3jV!;nT+%K6jGAw}Omb>|<f(
z5*t5$L0nuMzQhDFGg8UR&ZML$hnk8){QFA@yjacXySteCG>c#E6tI4`kdO4tg=t~+
zmhjt8!eDP6*CJ)CTyNlyU)u={$1^hP<L13I*4e%7`~!``HNBUu=4UYi-%r91vyYs=
zGBcg#g6wVQFDonKa@8coB~#Q4T_7!z#_i99`^N>Qr^(OHXJBA}mzw60$RJ6fBo?ne
z{D$Y!_3dP4a{1yowKZd$7`{YmcM5mE%3(2>#@L=c{P+B})+IWRuF=`PO6U}vy*fkW
z^9A0Y|Bes8U8Cak5VaR3IrPaA?Kjq_tE*!}Taj1=e_^i)526qId!X;@QM~?woB!FC
f_SW?FoHAa`mUaJfUh%F2{iIgEMn>`6R=M&IEwM=L

diff --git a/assets/voxygen/voxel/armor/shoulder/bonerattler_right.vox b/assets/voxygen/voxel/armor/shoulder/bonerattler_right.vox
deleted file mode 100644
index f849419e4d0338830430b3e9f3bf8fb9692bf3c1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1388
zcmbVMJ!=$E6us}g*;uSa3PDK7M6yBLEdshph#wQ!Syvf`Bt}s-yCK+#m?Ab-Vxb_2
zy`2VGf?Bwh+H8?hi?z^y;J*+d9M2utVU(Rs^ughtd(XM|y<5!OT5FzqAtEcaXq7>l
z1(6$3t8rWt9;R}Pa71&X6`e68JP|<}+5{#LD}fo4KnP11!<u7mByiRSw1<{lJnGbp
z)(Yxl?%BXHw*`d>9P3VNsuRMxQEiNx$GMCq;q=jObtdbcYRnBG<j%1#iS&>QXBwT$
zcR44aVV~zz)3>ru2u5caxsPZ+Vac79Q20he%@RU*8j~LChPvS$+|B8J<d(R8HLP*x
z<bWrR;}oS6KU1#S`{-kuXMI_IadQEU?d3y#*`5J!S1Kd>POeYDzdM83hr@jb?Kb*S
z#X-G3bk5S`B!a0a#HAAI)6<w4AIJUq`PAF%_0a8h(dl&3+Td+@acfEN;IiP?=a(aU
z(0@Hr*ZGV71ft3;HW%lHdRy0OxOaOs(VjoLlX^b9d5Rz3-lAA6rnO|=+-Y1mS4QK~
zS*%?-|A&^{r{9xYE$jOqj!#d3FT23kcZc3F*gx-{YPFg>1ABWYm&>`j&h&kMr2hB)
u>nr=%xcNP|XJO|VmLKmTezl+L$=l^9b$*ok*+Jt``~%Ow`n6Ag0KWm-#R*ja

diff --git a/assets/voxygen/voxel/armor/shoulder/chain_left-1.vox b/assets/voxygen/voxel/armor/shoulder/chain_left-1.vox
deleted file mode 100644
index 2464298173f34b5a8763bba65e27c47c7d0c75a9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1436
zcmb`Ge@L8l9LGQ3=Z8sFxIE9DF1=1|cV}$*BY!koXL@bta?9Dw-ImN_Lm!XPkdW;-
zjO}X7#Bz4H1#QlSNQ~JgmlXYBGGq+K7&amZ8Dm8M_D4kjy?cLe{{=IMzVPDn`~7{s
z-{*O{_w;zDM5Lo7vYSTE*dkq#X!t1|aOIFEh)H_(M<YFo4%a?nT1Lz?jF@fH+G^0s
z5yvJbQMNdSErW*cp|!GTpX4a!)u7EDo4!Sq#eR$Z)G=vI)|I7VhSt>D#AePgjXo=D
z*+<{DbZqpQCTEGoS!Hs6Q`hwj=V>h=w1z=z$e^uth)Lhjv0?NnLmZ2BlkgfGr8uj7
zZK-Lqt_&5kvs#=}oKrl%qOOKB7GqPRd#Gvfek|5Z_F9DZ=vc&LPH}&sCNI|!KBt(f
zZ|{!RTj*z3V`C$d$s`_33U*#tLAmQM{NZw8dAS36U5$LRF8LuhJcqpSj#MEq-2@5S
zkoc33nP(v@Zsd0eijE34O$c7RCdiEoo=yo07`v|s>N@h!el#D^lLh#A@j0|51)XU@
zY+i8UE@wN7QR?_mkqn|f6GF+53%>DU1ZT@oeRDI44hkwxQhQ3!yd;pfxql)Tl70rV
z;KJzU4VZhW5cgg!0otEOS_F&aC-N&v9~aDjCRm;m+`7&<B$x>czTGQW>lZ{BAMX}S
z9A<u4&>9f*HVTH@1m~IWtSg2S_94;f$JCJ;B=<F7YM>R%XWqeYvkt1t-Ds{U!>-r-
zIMUsKc)K9=u3-9o!P2LK`qE-Vf)zMezXd~WP3R7~;nbC2d`BfRy;~7|s|E2xyOBJ0
z0AnNlNW2%t#7A*t=1ybv#s%c%<zZvN26(+*R0n*h-|_-psR<z5T#Y?%G-2YyO_;yr
z!_T*ZSi4h&FSuuBR&e`!!NVT~3CEA~samXDZN=}ubYW;LALC!SaQ&_aYbg8A=YM#y
z|9?4uZEY>iHcVq{^$fO+o`NUk!OhEpdj|wp{C)%i0SuH6<ISB5kW>PNLxos8_vjst
z6!Y6DEyV|wX>8v%iNj;3v9Y%ZcfPK~V$_34-q}CzU-xOP{av>)Gyt49H;2@h8GN#E
z1E2q}ikFX#V*9CS?7Fywu4}6Zg+h2BfaDVV33F9&|GP)ecc0(azt#B@X8*ItSzUZw
OP3PCEWrf$Dm%jnM7(|-@

diff --git a/assets/voxygen/voxel/armor/shoulder/chain_left.vox b/assets/voxygen/voxel/armor/shoulder/chain_left.vox
deleted file mode 100644
index ba3a64e5f42ddfc93fa2d74124d18eaa6101b53c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1596
zcmeH{&1#!h5Qb;YkGg0f8wrF%a262+*+j)gZ4m{@t(Djcs^vJUZK+fywL_yCWUveQ
z1gX7n5^xM&R57g~2wW?)-WVJAhiuYSv&bS@)E7{)2<a6>P<Z=(F4^@Ck^_(C%*;D;
z<{Uos>DbiiO%W*$jebHSXCopLqm}$Sp~FR2-Xfk%O;<)=DmPp=h;=S*jf;Ely4Ksc
zi<qvDn3$ziZ=%MVxCu41?wD{-B9?K>IurE~+jaESQSYc{A4_YQS7O4R-bNkc-r2xd
z*L7jsQfFP@UFfr?Wi4^6RcoSZZP!xcoe4bmPB<TZV`z<u`>+qO+?&uhuB*mG9rKoW
zF)>xnXKdg@YdME8fgb1BFFa3Kr>^VOMvbz!n66XK5)z)rw=u*qXQ_3>h8kiS6P_#V
zE1X%BZx+5AbK=9iat>mNBVJig7;}s{#vEf_l`|^uNb6|5au(&eggQf=p-$;5eGPrl
zm?e&Q(LhyWVu&S9W9l_#BGeE^e1v^Pnm!`UOBX&G5_kLwNKa1>dV713NF<O<CXq^|
zkWQzO$z+htW|7b5Q79BJHa3QGxr|Dsf?BPH+1Xjt>vc354J<7!q1kL=d3hPDtE*UB
zTf@f223oBawzjs=Znv?svxD8;UF_}c;qdSfxzmC|LQw7#%)Be8rv+bU1S>hgT3&Fs
zAZV8ayJf-86+v#G59i-Yp_m!OMD~454}XZ6ksPiThcSO?1dEeJ1l4h@%#?9!ZW`<L
z&+%>J3cg>uihIp@Y_BZh{;dEH?+T7Og1>(e;1BXR20ZBlj&eA2{tWsr_hazNATkRX
z41F_%k@XRjwn~`%aT0TTb6EU!5xpN@L}I*x{@OJRe03ck1h<jBy@`CQgNxgTsQmN*
z*Y<x$n|C?l{Fs0HKh|@oo;ZQuPMyNDY85@HaSVR8jYjJ!PL@t0-A-fS$pYG!S+~Ht
zJFMe+-kQOUiGDn~S;BX<B>uV|;AV9I|Fnz1gH^n^lf;W3zQq3ZVQhYJ?zraF&$EX$
b{JB5%%6(&BvlloxI6$Y<`QKZI{{a62i4j$Y

diff --git a/assets/voxygen/voxel/armor/shoulder/chain_right-1.vox b/assets/voxygen/voxel/armor/shoulder/chain_right-1.vox
deleted file mode 100644
index 96e567d32fed171bbf2c10c48baa15fa1797575c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1436
zcmb`Ge@L8l9LGQ3@AEuMvclzg?#`vxsqIc<%OClp**eo}JC|F|X709R9vk|2jK&eN
z9fz@9jhR@^4!5AqEJR|=Ho2te50fEdFvhSELC6>*`nNwK`tRNQx&0T+Ao{|K&+qs5
z`+a`&?CteUiAZN_WDkv;wM4oj(eM*az_o!qMhwz>AR6gabh!2tt#wSBIwp!%sUenZ
zrfp43CAOht$Z&dSRSw4|qL^1h!XBZoh^g7H*-sr!t64X-ig90C9Bm@Z8HVmxIm<r!
zJOpFiuMN%;#aYwf{)SU`W;jo)HV|6Fq%~zo937(R8%}KMe$y0Nv91X(ZkrZo9pACk
z6xK~s#U!W2Ig4`^?{87pfisG+c5r&AY4G_d)--z+(M}K1%$eNZqNYV{i|4cq)xU4&
ztF7E8x0;%okV>U+e^RjP;tI-Lf8h_83(L!$aMqQ`H|tUma>H}j2j56Fg44~Aumy=f
z4w-oxvf@TTr=a+lVDp6F`KyAwxZugOppdcqvY@^*A05XE5It3h4;P<7drHui5ya*N
zC+~2!%ZpOmkBU?k8nPjjBwX;1dr>u8hMF5&P<%*Gaf;egf|ezLyvhBOd63LgkOdb;
zw`|1R3q`p5atYA!EHWZkBtMZ~N#=xL{u9CSoZ#j)#v#E>Sn%yW!P<Zz%J@W&VB!e#
z!-BS;psz_V+%CAld{?~}cG!<(R{&E-YmwUDh^fIgET4S~zs=gHE_b7)whX&p3E*f?
zBjO!`^xJ~zcLhry3mQtjh*VYJP{URv+MCf+<%V5fg7KY|$o6eR^o>@;5AQ+h_(6<~
z3?TVV6cZoBk)1n()$13LpP!FSg&X1X`A`$|qhafFc&Rpsa7zvLzSfM1_cvqyb3cB*
zS%tOR)%c8iW@iPrz85_BQINC)xR9>H%9S?!{!2F!V+9!h%7trpJXk~7f4={NO9TJQ
z{p;%LaISG0+iGU8ee^UuX%B9EA-H=`a5)e_Fc`#O`7mDJwE#&cQIsgc;`xW~aKy`R
zr?eFBRc5eb`y`Hxox!HQV%+|^5{pp}Ci%?%`TU(eN9#cMEhGkkljrA<{xXY?7Ovyd
zA6D_=@lotJJ&oO$me7556`@cF_XUtVf<Ixb3hsUP@O=09ef?XVKVj}adz5vGkE%KO
L^=dic_2=bpR>DLs

diff --git a/assets/voxygen/voxel/armor/shoulder/cloth_blue_right-0.vox b/assets/voxygen/voxel/armor/shoulder/cloth_blue_right-0.vox
deleted file mode 100644
index 3af71b87caaf345953340e283a5be2777e0ca814..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1340
zcmaiz|4)^56vxl=JX~T?4dXi$5Mgl9Nqi9^kS@wiFNB65lM9h^G9;voHKyD<Hf7L=
zX+R9gd+UnCh%8h_RPzU7uBc_r$n_gDYyAhUwSIYZ9_$BGs<XX!cD}vOm(TOm@7bR=
zCL-14p53Y>%OO(h@wy+d4HY%zK1G;fe}mWahiY54DU2}FXPBnXa){q>7y${Fpc!Tc
z3|kvUz!dSBh6D_U1e7Q!4vjgqCfx8_rsf-Fz_erGnroT?%MkU8&j{0+Fxw{z&9m%U
zL%EHBWf?(P)0$_Qenb06m>D!I%~j~2LDSM&%l2tZBxopfTIErWaPf($wxO_e9_?W%
zpP_S__72+5Sewo6XUFV(<q|`CnZCU{x0kOSLy5UI!JYVd{xrYE#IUqfjV&K}KK@Tc
zx#B2k+KT%~8O~5K;&veI_ahSzBVWW3RV~DK2%FrQY`!E!v<naR3eiJC+y$YaI+Dtc
zD7+`4d1K*GD*QstsBmyrIDTDgYm!K5ODDshP2s$Y<jxq<PbHB(l}he%Ch<)|#tC8b
zm{7VXNS*fYjzC5qLgr!^$lSp6ld;^`mJF4TQKBn*6hA6{Rg4}JX5SK)riHIBtL+jd
z+`^}Oh1FKUtM;*aVd#+hyM!H1q4_DHt3vp5`5kHsl4x_M(_NFrSW6!MeMO8N-oZ#q
z`PyAKJswACUMf}3WYJPzM0=&s`+^X9O;~(WC`?Jhlbu0R;TAe8imA_zqpcvBQ#&^@
z-<*T@`EuG1?8bkzk-?r;x?k}!)Ys1ZbU(Mgf1k+6ND`tqkd~H4t}~s&El==to)dRz
zE_<FWX7%M=e0k8t#rk5#tMUkH&-p2R_AA0KKL{5-oa6lD3}?@tV`OBU&cP^7&BSo|
zdLpZ&GJJJ`o)1DC8F?LV_pATde_Zc!cii5eg<kk71mDi^(tAH~VDua6`#zz%Yx17`
z&vp3dZ)~NbvW~jq@_Y8r&(CMLC`3-~1SJC}N$gEz`MhwWQDABcr_)JSR~OIinnQZK
ziS3MK;mqwf>`BsZCnbg9zER3bMmRLsPeOA%-(B3uf;W*7z1iLOuc=<7Vc!Z3wb$r8
z49Cw*(>poO>A9=C{rL)8j}B0FGDOw8i_~6P!R2ysOGl9i1;1mh2sb~wJ>O0JzWy(6
i|AMxxtFKJ`d+hI;b?ffndt`eD3B@mxoHM&#5BUpVqF6Kl

diff --git a/assets/voxygen/voxel/armor/shoulder/cloth_blue_right-1.vox b/assets/voxygen/voxel/armor/shoulder/cloth_blue_right-1.vox
deleted file mode 100644
index 8e731444982db9cb0f55149b2b6d99e5ca570a9a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1176
zcmWIZk5HJ#z`)?^=;;Tf7+P2u7=k^cTzNnoAYg@JpfE#3WRzzJNDv4_fS8$)VHYzK
z!%h|^AkECMn~9NeHwz=<E+!_%olMM(yI6pjfq`i^10&NeMj&QjV%o_F#0<<pJ`gjo
zfaI8g;><uX=G{T=PL2#9i-6$%?#chXy}d{AXc!F3G+^mh{@*dI{=Y+X?|-lK#Tb74
z|KZR7|EIqEZ$JG1|EoLC|KDU_Mp0vHYy02X+4;YppC5`iEYCRTtNnL2RQc~`q5VJ3
z%?v}0vMcw0U2k>_ahU%9za4POfz)JJx8s!$GZg$EZ6f~PPh0rEgDU@j3kAOanbuNp
gJ*Ggrje^<#8%DGLw@T#rZ<ogX-zJ|EEDy^60G#0ZX#fBK

diff --git a/assets/voxygen/voxel/armor/shoulder/cloth_green_right-0.vox b/assets/voxygen/voxel/armor/shoulder/cloth_green_right-0.vox
deleted file mode 100644
index a323d419b3e7517e159f58c60614f6ceeb4babe3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1340
zcmaiz|4)^56vxl=JX~T?4dXi$5Mgl9NqiByfpk%B3UoCDnOumRlOZ8xtlcU1j!hXf
zx}ZP|$yJENh%8h_RPzU7uBc_r$n_gDYyAhUwSIYZ9_$BGs<XX!cD}vOm(TOm?b)9;
zDk9#piruOt%OO%z;qyFT8!BqbeTp!}{(4`<AF6HHrZB?HfMJ>e%OOF-VT2@H`pqyi
zWZ2p;LZ(Q-G$dp=B&0<B;?S5wYr>77Woo`*hD<vauDPZevJ6qb1dK4P3A25o&^*ho
zHI&;3S(ec+Yg+RxGiYcZ2{Zc*OLG-EXuoM`t!4W(Cem*xbXw(6j&KQxskWi8bRO+t
zDW9Qpn)VLb&sdwy?q|pBeB}~Ddzpc~JGYmu9Ycw^Ho=|vdHxi?#l*0*<i(bcDn9;C
zM7iTAZrqCJNGZ;77vgasZTBM+4<ld15#<%)+l5V@Og3K<BHDxpyM^dMA?|`u;EklR
zJqq86Xx><Ol=7fZJt7>O6^>um+Ug`yTGPo0W>YxtCb=Vq^noO@r&7sX&LqB3$T%Tv
z9u-O!1*z5koe{{$L&#hVeVH4WelnID+mfO3F^YBN3dN6#Ulk+AgxNQRrD@^o%WAuY
z36JpUUSYLG@Tq;QP8d9-e!sB8DKtGL_{)Vqm*1hfAc<B_I-S*7j5g;H+*ict;T;S&
zm#y7()8lcJ<fT&eOcu>`MYL54-7g5^uL+B%g~F61DzY<ZEZjmzxr@5&I9dym8Q8gz
z`KBCv&zI45U^l^|4TQQ{=zPV;U{4$K)4kmK{(T}NBT0zfKw4TFxz2P7w>-hqc}_ef
zx$Jq?#p=tu`0}8ei*+u>s`7YSd(KbkvtJQ@`9Zkw;T-2DXE=NI9K*w7bcCW9n2F)?
z^+Z-lW$5YxT_22dWcYP_ov;35|1rJG-En(=7P{f9arkzIm)`q{10&y1*YgQp|KvUU
zpKA}$+t5OLWi7R?vU~Q=&(CM5Xq=qf35xqplGvTd@_FG#gTT}jPNx&U-_LWq=8*1A
zVmo44ICJ|AyOQ+VNl9U-XN1z?VGf0QNob1ayNerH@Fg;=H@o}()!s$w_pMN0bB&I}
zaQw_P-IMd2n!CzdpRcg>Xdk5~$EkXEk(x^@xZQ4U=_nGR;CHMQ;pS(z=ew!j*Z;-s
iU(l9y^_8iAkNsV<ZrvSxk8E!z!Sy1^IkW5akiP&YZ&gG9

diff --git a/assets/voxygen/voxel/armor/shoulder/cloth_purple_left-0.vox b/assets/voxygen/voxel/armor/shoulder/cloth_purple_left-0.vox
deleted file mode 100644
index a2ff46e0d8964ee46cd6b28080e52b9b00f12cc5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1340
zcmaiz{ZG|(6vxl^;gXAL7|&2Zguz88@gPJXU6h*wp&`iRLgbtb2`OWZDff;|88l)T
z5JPg+6)%j)LS;lXe<0?HTGotQzcI7cf6!X%msjVD{a{LUw)f7?<NKWR`F`v69!MDz
zk*d=2J*p(bB~nxF^FH7hDr(Ao3R`iY-dFyIYDcy!EZg*3rs+3a60lrG$PSZ9(>6nv
zqYWcuiug@KLY7NHwo4{$m&ROL6J`VqQ}YcoWIC}h%{9%CVTk(0Z`oR7J3dipp5@dU
z+S>>jmN99sY0b0DfTcXPZBAO2<|=Gkxh<`=9G}KSCM|_6P9N<NCVtyg+fZ0Kk8&8=
z&(b+fX9wl8)@F0~oS2iZy~I#1)4y-mj?%Sb=>A-r;7<HJf12N-qF7q0!jX^4KmJcd
zcw#7O+=lmP3GQGa;&mZy_ahSzBVWW2Q6<E-3!A;^Y`G+CXcHdn5h90#m<vK)RX7#x
z5%^9<^2WlWlm&$9QQ^?6aN@ewRwt0uno3$All*xPi5*d-4knN}l}z?>I<bvH+DT!{
zm{7bZNUidBZ9qmJLgu3APv6M&lhNGRo(L6>QKT!ED}Ge`su(>k%)TWoO$%RNR@);?
zc!f{*39BuFPwnG%!q8#$cM3b*Leo=1XPNNl^1D>$CD7_krK>uFvF02C`wJL5vXhbK
z(zUy8emsWaoMbAW$)LHefVK*u=LI47ny~n$ke`%5d1e}o`CI8IE2J(nhSt1926t^@
zz9|de^QE*M+(Y140|VVHbiLwZsJD&z={|0K|32a2;lxF5Bqb$<Y<DX8Tc6<R95>$L
zZ1z4|$m+|x`SOs5i*<#JSLX1Ja?VfbvtJQ@`9Zkw;T-2fGn_qpj**dZItC&boQdM{
z^>|iEX87s?-5&%wI`TTcu2=uD|G3`e?zpo*3q9~v5Wbz^rOBT-IQk8By`NCk8M<fx
zbM1cm8d_+tsHL{B^q&25b8{Ik2$GdOK~euH;(Ov*J}=y85SW_6?RL}I*~xRe=a8N*
zqC28lICJ|AyA$-=NlIe4ca)N%5e^UZ5!V#UcNaIY;EQKOZ+7?ntE(2N-@ihA%{4lX
zz=<={^n~U)J$IG2KVM<nv3^QU1*v>*k(x^@csw3%=_s;6!S7fr!p+Za&v#S5um6iX
izn~-Q>MK+K9{amy-MTyaJ+h;nxWX4n%$i+~L;eD^qFN3B

diff --git a/assets/voxygen/voxel/armor/shoulder/cultist_right.vox b/assets/voxygen/voxel/armor/shoulder/cultist_right.vox
deleted file mode 100644
index 76eb745193849cd8a2559aa1425384515676c0ec..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1388
zcmbu8T})eL7{{M;-nW(b6)L4bnFR_HT9zRn0};fsQAe4qV`#%VhQ>fPR*73R&DJza
zwz@62pbQDq#97faTo|#EN;JDbvXHr?Sqxc>Hw)Q?m)sfS-QR!Nt_;%)Px8xie&;>U
z^PKaX_k@B&m2)D}-yJx}AVU_B!9dvmWL|hs<*|ox=twwFXXLMn1c+gkK0}PtCQ(Ea
z!=MvIv|$7dlTH-TCSB2qB3jWkohYI;-9jgdXbatH1WYTPXkv(Y(iAhO#AGj%y-fBp
z*^6${i6YuG4;hM16w!*V>Ds)k7`3Kb=oUJoCWe)@t*mX$*H+`Ep@Pa#tgB9%CeKa9
zx^zWXbVVnIrfa&U6T`w>3*DklAKt&WTlCh*1UwRn1n$oWdatjc+Wr^*u-mb^+Mi#-
zH-Yc}l|r8b9m9Lzf4d8wR6E3PfkYmM%s&HJbD*$aP%<H?_t#=qMo<tDJe3p_O$!`f
z3tIZ0K;J|m!sm<d!Sb`{NeBjJ1#c}1&i=yO0ViDJZqy{aXwCXi9<{?g<%Bm~fyP_4
zC>a*ioEPkx6LhW!<Tdt>7eHp8hAi1JS!=_>^ToLPQaR99g$@yLpWs*WJDEKrSo~P9
zx*)jy9o;9G_X~bFEVy@Eke;f-<#(N1F@K&XlgS{L%VBeK69X+yjQib)57c39tO<$N
z+c0-xA7;k7f!sXms~zZUs=$Gl>o68-L!?iTJSIrJCs_GN(CTs`;H|-M>uyAQ+7a?P
zFy2y*sr@^V9ce)LP&XoP9z^2QQCvB99PxL;n7$Z6cHt7%Z(fJZW<zO_4V9IZX!N+z
zy8Ai2*yMq~vk}2p+A;n94lI7*#&5U1xOb->pRs2)Ey&#vxWq@|B#H`&pi)LrCCA{F
z5UM4J8tFxt^EeX{OpkIdF~L5MVB`fstVi$(uRrSj@pB5;So`1a-`w1ct8FPXG|r=A
z@&d||Ww`aF;O<dw-E<lrj|Z_>46pVsL6UJ4M~kt1?ZG!Z=j7gTxp4L3EV?>oFnZ+@
zN=Hg?=i8lF4wqquGyCWK^Y`Uz9U06adIC6mZ2`%zviNZ6CO-XX9eYkqqU%Bm2R>iH
zU}haYpAYx>C{jT1C)B!N<HrZjx554OU+eq}xBjzj<BjyA*SM0;**5RtT0VKl-U*bp
Nzk%|G#qI8uzX73vKCS=&

diff --git a/assets/voxygen/voxel/armor/shoulder/druid_right.vox b/assets/voxygen/voxel/armor/shoulder/druid_right.vox
deleted file mode 100644
index 8dee9ef073d988e0f2bda905fed88f4da42922b8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1628
zcmbW0ZA_JA7{{;YetFI*s$m}94G1+n=p+Oog6JTg1Pv7_k|WW}WXjOxSYyi0-1LOo
zIcF3iLtzn7JFwOyWyETJAm$jkG3Us&w#JxieeXkStuO!nXrBse>)w95?*IR~U#|Op
z?x*R%;oLzHsjsfv&mgs~NMl_n_}Hpoqm)O8ha7GW)uk(T*m?-NQL81Y#EENhqE-=2
zT!)^DX=0U%Tg~XInDVN)_A2Hy$Lp9lddP8fLOFU^6GKGNQ+il2YGR009INST`dUXd
z`-WIe-_SSo88tD)8XXr)-_mE)#1Km@E`66iqb7z}m*YM3J*>sUT8JUat7F=$qvDuh
z$1&r|F){6!xG2LK&5%+is)-?@=@F&r5koAs82UsJO^l&$OiV0&qKGDjSRyWcqFk;+
z3=t1K5BK-b^O%@&ENif=!Hz3sS%V!CO-+=hCPrJ{4Lza^Jz|JhdPEUT3=x-}%e7pN
zV_$h}Tq&1la=E5EuC&WFsSUMp6UtB<mv>BUnYYyJE7y%3+Ow-#%>5@KU<-%CxYsYJ
z9ht{Q-|zU<=fm7w{b~wV>%RO~k^`xzXxWM2i7NO<%OODv>39?}_9SFJ70LC2w3C9Z
z!F+7HCh&F$9*+pt_X$!z7nIZ|VeiRggwCx;Z00HK4htFv1aD6Y&fMYLhD>C)=V4R0
z0HxCbWOe$G*PDrgL=K7;@{!ge*mO>?ZBS4-E09;Xf43Jh@C0PahiLvfOgx){yDww`
zd!I&y2<pi9<YzK)S}=J@FgGE%b)7mO7z+x%IwV*=CJ0fVZW8nzrQao}@e5j?6Ljqs
z{IM{ChLTLQ2lLR~umyu{I}m=g41>pO(BD=KERJF8##B`9$icoBx1g=53>|v~k=F&I
z?+Ru=5R_(TqOM>QT1vO0b9XtK3R2Ntl7-$qn=##5h|s}mbiBDA;ZsKtKYI+_?}X6T
z(}C%U3s|~2f~2G*q_1Cx+}vCg`SVb^{TV#J!;fHP5e~dmj=uLcVDjTU{BWxP%eS}U
zL+&}95G>vh{PdlmyL}6;M2azgwFbZZ*oe+}GI~Gr;rg8nEF%X8^J{RTq#5Cgwtt-e
z3h(7%=f}6Bz{)%-YkYX^t?d7O{^H_dTr3+!VbK^WqUVtj$-u%Vg1blfbQ1~q{eE<H
zb>ZdODM+LnDV-^px%}W8p3UUj$<D^bo&i)<^y6s!0@7R4aQlnRm<eT|pLh26`(GWm
zx>j@JB07%)XD&}5^650*pSp>mZ<et0R1{U`N3rjtSu|c-LLd;pJ(eO~g5RK*1S?-Z
usBeYu>%a2+3-AADYsMRihv%4CowMe=zjCXSH|#oz^zt{5RXDlUSostAEp*=i

diff --git a/assets/voxygen/voxel/armor/shoulder/iron_spikes_right.vox b/assets/voxygen/voxel/armor/shoulder/iron_spikes_right.vox
deleted file mode 100644
index cca6ba68eba7b8670c51e418f20689846b3578b0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1320
zcmeH{&nrYx6vxj!=iWC&BuZH+KQ@v^Xu>dK8k#0gQDUZ)jUT0C#a1aRE9IZDw0igc
z1xnc{Wo2PU9p4#|Y2pu%SD((g-|zRl*L}Tr*H<?BuZU<lUy4zv#}TcSD#iBN0$1uA
z8=IBVLtQ1xpbAm2LO~)x2E9RV0uu)|oQPpB%!vge44;DoVxa+c&>ee@IN)yHkOX5S
zVI!Vd5&<j{1XvIOw$Oob@SJ#xFc(Q6V-sVnC$`?OO&E}%7aJG|Ad9ty2go7sYI)~L
z9C8jhmsnJ?&a*^eb!j0__G82M*Oyu@m;d>H2Y>P#m_I(yrLz-Vxj5C?qur)G>hqhb
zf6?<B)u+2hy(MYLWV2Z<6bc&0afAN(&*a92wU8dvI5VPKi&IURfnuAEmQzjo=e)k=
ze)MXYy_xf0{q=O0RwsHj9_iNHP^V`4J9K}h?`vif&mLb(X}X%y>FpMs+iBC;!`8ZA
HI|1GSN|hQH

diff --git a/assets/voxygen/voxel/armor/shoulder/leather_iron_right-0.vox b/assets/voxygen/voxel/armor/shoulder/leather_iron_right-0.vox
deleted file mode 100644
index 80123efb3d7aa99fe60abc84d74023256b2c2914..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1228
zcmeH{Pf7z(491f$uboOo5f_51ihnjmq@q%+mDZt3863evsVxX@L{}c8p1`wsg_&7R
zr?+ttGX>qWdV&UigqJVjg^>69cZ13Y5#6@Cp*i|=M7{2?vzi~wN=Cu3Fby7t-FNf3
z?HEEdbxfH9r3KKW2#TCgCXS{cPK7xWaO#W#IP$=;2xo9S0U=?=1dNn`lnoeSI3V$W
zn8kFlxI+S#m?04ifh0u(BJusrReRQ)^`mA%5G+~FV7UVecA(j8s_*+6hT+2bw2ltc
zukC4Auj=FV*<8+Ur>uv8Hy8hTbNbc#Q_FK+8smTUer-cXCtDg;H?_6DuJy{AzBaah
cYfkO%<DRFrk*DWRCB1wu>&4s3Owa$MZvoT*H2?qr

diff --git a/assets/voxygen/voxel/armor/shoulder/leather_iron_right-1.vox b/assets/voxygen/voxel/armor/shoulder/leather_iron_right-1.vox
deleted file mode 100644
index ea897cd492d7082799387a27a429ebf6dfe571c2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1236
zcmeH{ze)o^5XR@vo~J|<u@I~RQJWwVQ3=MAi%0ar;RyypOhB*^t$d8M0l}BC5v*c&
zcWDH{Qn0eHQyAw05kfEzAQ|{E?Dx&Gv&-(*Pa4@f05~pJLrw5t0BY4{Wi}mX*ovj7
z42`p9wWB$WoWcN!>OF&ySc)NtEP{B7plet)hM0}&26_Y-F<{Jyi9yYTkx?wdgjqGl
zh>X@4j1eg&q==CcAc{~Sg%v~8MOL46%&E^^QcjN!%Kav_uh;uq34&n4<P84h9q@gB
z?7rmVTjc3e+K(ddFK_Y;JXG&Ej(DCYVHghSgE!-Dtch1xk+7JT^TVBynp`C#>w!I@
z59Z64`=^)IT$S2m{d!?RT3bsJ<`>0XotI*EPOeMKzjL;A?ai7kg_bS57t^wTnUTGl
JnZBR?O+VHc2y6fV

diff --git a/assets/voxygen/voxel/armor/shoulder/leather_iron_right-2.vox b/assets/voxygen/voxel/armor/shoulder/leather_iron_right-2.vox
deleted file mode 100644
index cd6b536cf47d80c584ddc42219a68cf55c0b58b9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1240
zcmeH{O-chn5QXcf$5A4RxDZ?gjBbL+h)OU<5{D?m;0OjnOh9lWy7CxaAb27-NmiX4
z$3^)jpqoTbFa;k)zj{qKMRj-YdgTuyx@{#H5`8+NPSS6$=L<v#0sxtM5B+3_oJR#H
z(G0qGOtXNIg?u11T@ji%g{I`y!Q;pavDX~tnPZ-+F#HTZk5!>5dvVYmduEvm3%ue<
z#4`|}z=@1lQCF-1i;hHetfG_qo2%CRqPUwO(ljk7dQi;3k{M_;8WzW~Wm&egKh2{9
zi=&EVwW>W{pDlRy+9f+o!v+24&DmG;&sy$zslWeQ??ziTIN7nRx^2z<O{<kR?6to8
dyXO>VA9q5F2BDolt=i>t$u8d3=Jou4`Udyx0{H*{

diff --git a/assets/voxygen/voxel/armor/shoulder/leather_iron_right-3.vox b/assets/voxygen/voxel/armor/shoulder/leather_iron_right-3.vox
deleted file mode 100644
index 33ddedf5a99848c421e2d9e1e2834ac02e8f1371..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1216
zcmeH`yGjF55QgV+Vw8v?7J`KYyfi^1q7sZN8<%Lp;tB>rOhB*^t$YFdJb>U+_y(3%
z*;Kn*34*0yWnrf<&JiPoU>-m+@G+NvhI8SZ`cWf$3jl|uYM>783_z{gEKk}*ZA?l1
z&^T#UuWeCnK}ivW1~D;&QHro*7!v}D7$|0>#Grbj$SBO3GsR>yHtK=9h#V7g#K;K{
zN2rj(HfGgWW9EbmcL_~MWIDtqJU-Yff$r1V^ZkwZzCU7g2mkU7R4SFB=aRQik?>vG
z4<fHmFY*Z7*Y7xvc%COg5cJi1f5u%~5ih?aK_Mrn`&$D&i{*^0`ssmsZ(cs!KQ-HP
zQEU&@>-iaJZOloKn-zC?S_;`Ixh&5A&TQ)1>$SAxTWQ%o8<*YljO<)ZeCziAe*r`v
B1P1^B

diff --git a/assets/voxygen/voxel/armor/shoulder/leather_left-0.vox b/assets/voxygen/voxel/armor/shoulder/leather_left-0.vox
deleted file mode 100644
index 52b86cb40177da39f5014b61938e29ecaadad064..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1416
zcmb`Ge`wTY9LGQ3@Au9|tC;R~b2r<r{m9)dwEbv5a@noz(wj}4tEHz631vGDNe&r0
zj)h)HYpm8B(;!`UGDe6?#~MX{tRX`L5m^#J3=xU`?T?85d-ZwF{{k0854`w1pXc*=
zzn|y%{^;4W-#;lLovo4G8svmqq&pG~KV=dfn#vQ3qwGHrjkH@j(Xm&tU3SK{?TpK<
z(QRd%b&_@|wxYtc<(7<PdNev&%v@P#>AIyl({FTEMqJwO(th=^HQHJi#WJ48TXC7(
zu`^CKYM;(s>hG969Mvk0YW1*baZKH4RIkwyMWbbFv?b#*K8me#%j9|wu_f(j-Bw(p
z9+qm&+(h+sX<f24<E1)Fb(WsNQeT5=9L;Tm*-t$!#nGCry^dm=9>vzReLG%j)q7`0
zQ&SVkWReHt!p@7!lzaZ-508hXrB2Ma8u?~T@<LvU4*T&BRTG$MM#63+{v?v#fGm5-
z>l6x)37f`*7p@68apCEdkgvJ-icsH~OUJQ1qNnruc;Q*vlS0>o@b0W|>aJ?Le3Zn>
zs7MBBm=95$@K84DBRE}3&CSge9ug`}tM{bPvM9)#y8mDfGVu&D=V5sBdS+fM;NC06
z(D57-A}lCBDZeTcCxzK_!qSXz>$>J4AsrUJ-6yQ}2~o{Y_6TD~bbUZ*3kbbU!a%!l
zLD#$LeZ<0L40cs9d9;?~Ta8Tix3Tom+x#{iqq^KnOKmB;UajJ2Pb2XTA@z<hbwXJD
zRA?yi5eZgss9_6<_GWs5USjpdjP9spzIQ9py{*I#?<RTtAR|M4489j-?87+oGiO=3
zagp5ITsG#f$M5%36DXr$%k#Wk8z9_L!=Bfh8T()pvtO3+^Q|DOcdGe9_ne;=ZhtR4
z{81Q;RdFFz$MV%Se*dML#7G{aUwOEGw}@3r|MUGHUh4Z_?q63|$7hXGY^_PNZTJjD
zsUmJ>gnI{tD^*nl0s;EV2Y6%W9FiKOAW^`=`A6??$fw^<NeS;)POyF3I7dd#vaz?2
zJ6~6_5G`U{pV>d3zv(kx2fA;Q=!aA1XGmS1=aab`eE!1<FC8Cd`<W?rU0S63+6tji
shzA0aqwpurig5qCN9Vh*-`Bs@^(V~!XOD}f__&%`U#pfiURy7J196R1H2?qr

diff --git a/assets/voxygen/voxel/armor/shoulder/leather_left-1.vox b/assets/voxygen/voxel/armor/shoulder/leather_left-1.vox
deleted file mode 100644
index 46dbe0b9b7060a4627cb54e971b0449e34161d54..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1472
zcmbu8?@yam6vxkVpZk<5Y8Vt~3j#6_3UkO0K?G+R)U7C+3?ZXKG-eOa8hoN@3|UFD
zWL8NgK^Y@#CQd{{>Y_tNuwwQCQ3)<VGI1s*hAf1Cz!%0C-+Vo{_`(=7UwD&G&bjBu
zz2}_!JUvH`7flgSM@#Ss3;M($>I#Me_oxjo2XhxAnd7~oU`%6$S3jd0!qRnN84h9U
z4$YEjWEzaFq$W(^U|ndI?jTF15SHY4$u?nVoTuV7Q>JN_W{@civUI^H$$rVY6zY7|
z8G~&?a(+tkxvU$8Fr}(P68kuwb2Uk(CY4|1@Et6r#;_DROPwr3avtaFtP8c*g{kRe
zO7`oFp{d%0X((N&GZ^;k%C2$E>ON%`9K-!cwo513(y7@pP1w?*+tOepqceih*iIZn
zn#}`cG+UFx);UHfR38q(v*0?pU!CWobN_;8rg0rY&64{#cIaSB>OuGoz$+GuVS9pb
z`0^_Dx_-y6E*Dl-I+P1ngP+}z41W%q`W`{xr33IyH-Z8NXz*^(OeSbG2N@lNT$@lC
zD8s&af^(2?Z=8@dPRRL~P}h-;b~^*1vsrjEc|Y1>gw9FAi*tnNP0sD~q99z1l2`@m
z7yZbKxKKRiMa66(s@KYp+eaulOV~F>XkI4JvwZ)s6Et}rXu*YZWqXi#I2*Sf&jZ>Y
zKohqdWNaqNOr9ppT_CI^2sf_r-cOhb5SES+wk$%3_osUZ<0siZL}>L9`X40>wGsYU
zyNu2{FT#Oh40o1e%B(@Gy8%<DS}|d^0P8cT+?#{unnFDFL^;f!1`M_n;?EJLUnMNR
zO{g#MB3My^zWV)$v^AoqA_w8RJd7PG#bSRILeI2d@P#9Yy>bGhXDkfA9Kw&^yobfa
z2)4if2<hqRaA)m7QBe`9eZ{EX{~#W#@gdM$jiXOCV*K@d%)MWXpKerOYoikH@|}yb
zg!Su$ogWCp;c{Gx*JAZ*D}MR83z5+bj9qcz+D#9(P<Y4wFY#Rdt$!rrz_-)DcUS&*
z|FyNXINvahs_GduoqG+QxCd(=5N@5|Pj_|}KA#UmLqmA_@B%14jO<7@k{5U1@Qjzg
zoq__Ke`68{nkH~^bOi4HTx@(=ie$)x37*+M=ik|}jNa}|^meTyaterEOd$T@BHmi~
z8t;6$iTtJ@eBI#`UGtmp`~BGFQpm~RH|U#$+h6R~cbmVj|MII}aARWwO786Jq~y}l
zQcB|bZ0a9WzWL9;LT085Znp<zr4PaD%}>Sr^$Vx;k&zJ$3=AL|jUt&$B9TZS|DX+b
R<MYU?n%g~-PyAaB{RucoLwW!J

diff --git a/assets/voxygen/voxel/armor/shoulder/leather_right-2.vox b/assets/voxygen/voxel/armor/shoulder/leather_right-2.vox
deleted file mode 100644
index ac86b23b713331517b1d78f53c306cef7acf1948..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1368
zcmbu8e@NVA9LGP;kFOK0aP!ourRH4T>Dcmgnt9oop4++HbT*kclL%!Kn~fvH$uXGM
z2BwxXxh-hv_s+v+%r?2C7-$lr0~_la5u^->{M$bw!hha<Zu=)9)*n6a;{AO-&+~kK
zeV?cK*vXs#5!F|@kFrpWLDb~-xSonlc*HR~7&g<%7LVH^_=86cBT1MtPMBJVpfq%d
zgbqnY8)OQpL&{JgB^9r!pkTCAlZGNw3KdjZPbxzO1%De_1hrO^N~<8n&IuWmT89Mt
zQbL7@eT$fXwi%Lrvnr)04aw&W5mZE`mXd88L&=a<97l5;#kmMFiB+;+!K$R5)LMoN
zC4$5`5yzK8n$nQ$gKN=@5~ea3!S%69RzcFFIEGcQsyJeJPpk)QlWaSF=(Q@+kJ>}v
z;q&>hF-kameF=Lkf8uwG1&fRIu_fGefAvI?oT;d2JqXu3m9UMMgIorvD*<Hg0xhK?
zsh*H_mQd)*$G%&H_%6cJenRpHA@vJFNqr*f&L+WgF&Q7sJ%<_}p>d4x_6*_teLmZm
zfvnD4<oOCv8gU}iYeDXC1`5L2C|b@(S}P&%B4J;E;8-Bg8yvqc9yIn0Xx4&({GFJ3
zF$E7^$pq@2M+Fhw%umd3%vdjB=3~O*6yfe|o;wMqi}3Yv!un}~hv&V`gpqc(_YkUW
zgtnImJvD^w<?CoH$v~$o7k!OZ1Ul^SohU=#Of^P3s(@7!g?m!ruxI1Qt5$S0m!YeU
z;D3`a{vKiBBSL9b2HXXCXf53jZ%sLx3sTWpl8NC%dl6|n08c{|y52ep-?>v5yl@(Q
z?|LwDsSA;*%h>qgb0j7vVt4XR<mBX_$d-%J{V(8UyA3W!5suZCW90p3F*A{ipYIl6
z{aztH<(QE$Vf7B-*B=ReomO1)7h~yWHMV|ff_E?p!#6CreLo%R$bMq|*SIhLRzK$a
zz{)uA{f+-!e{pd!u9S`AK#_@xfqta>)3F>RJUGQyHynn|W<yU;4_-e!3-b3N#hZe;
ztB?QTg$%wsSy{MpX$+MWqi7$zjNNT%xcB8=%z4r=%02sM{~PNU&~hS*mZnvB&j9DI
zPQf3F;KSMP@X5DP96UFG%KmX2`D_7Ax1w-5o!H=1D4xL|P*K9eZyx9Oknh)jt;h1S
z@Ow*0;5Wnj{|@eiv9+~@?d|PH_J)QA)YjI*;c&oix5H|+Vq#(f)6>(4L?W1<pU29|
p3Zl^{*4Earxw#3C$Ak9vc64`lqqnyg{r&wI8X7_%5QzDtzW|V5O)~%h

diff --git a/assets/voxygen/voxel/armor/shoulder/leather_strips_right.vox b/assets/voxygen/voxel/armor/shoulder/leather_strips_right.vox
deleted file mode 100644
index 66aad3d0337414b4ddee43bd0ab1553f1999696c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1172
zcmWIZk5HJ#z`)?^=;;Tf7#dg@7=k^cTzNnoAYetp5s^`z0bo%E24Nu0#K3Tcg^A$`
z6AKVCFap_(mzh`?fo!JBEKE$7m{^!DGchn<VrF6nvY9V2GO%1?WMsL>z{GNq5r~;U
zG&2yhuv`jqcXDI^+6@B#fxz3_dlZj`!Dt#FBMms{tNnL2RQc~`q5VJ3%?u+9m0h|2
z>w2?eh{N*S|KAQc<v?mOtlRO*hZzd~k2Vqi@24&N-$9lCzl8$d|4eHsxE@oW-A2Le
Z{|%$r|63(;{I^Tv{%@1d36=-te*ltG^mPCL

diff --git a/assets/voxygen/voxel/armor/shoulder/plate_leather_right-0.vox b/assets/voxygen/voxel/armor/shoulder/plate_leather_right-0.vox
deleted file mode 100644
index 3f612c23b4c4f76341250fe082ca4648e6b986c0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1392
zcmbW0e@LBW6vxl|-g`~7!sS(`mYQ?vRoUi`X{MPrubVD6olWMQjR<8E+Zqz$<T9AI
z4NNWP<Zfw8EyQNbHn~YL&?H0$Hr8!KkTN9lZ~ur05k8&Q{Sy%jdf>}>&U3!!d(L^@
z=dC+@EXgk-Rizb&)JTIvq_)E2e$sMusVh$?Y>H#`o{CIEH@YenhRwt<%ptp71`WHh
zspLUD9WvC~^vtwiGdB&jvIXVa6%J$5v>8J-hcRS2%pp<VX0y0fj<IQ|HLSQzd8%b<
z4Y6B%-J9m7Xv{RVj%i|ssJ7LIX~nF))>dmXRYy7E(E3`#(7r@{)6hN*<vNT((R{<&
zD<nkqEvs=uVYhTd`%rx|M7e71mad^1cJ0Bcw-whs?b#INs4s@rQ)^c(yLAtmcVz#o
zr8@uCLYLR;Wwl>8aDAQ~&OiCx>11xM$_jC_;;Y9Zq9mHahP}AoF2*%nfVdq<OBgcx
z3^E^0M3oS8TF7vxl6gxAZ4sXG36Xt5^cO;IRXCNWBk){^<o)UADDw(61HxOA!nymJ
zTN6h@b22I3bn*fv#J4(0?u{dTERn2*RAL&0lnX+pUnrUt<aMpz5sC~vjZ8V|O5Miz
zo+uu?91oSxQz$}(;wQy#ih*`v@`^AwF5JDXeu*&Z7QQ|rteg})>bKVkeT{nFChT(w
zCteiV%7l%D>(u1N(d<s9qb3c1Q#RhC`S?%mqra&XmPX0g5lvBcA_redqp2>RmP*0*
zhA{lDF#Dm9mk>uqdI}AByJ#&dpe{X{=G=IC_wOWdVmF@ZQd-_Tg!k-my3e1a;~fuu
z7h4F7Ut;x#&j}9?XM5x}l9H0hawU_u>jhrQcHu6{;&6EZeeXTX<VZ3<-%V%bUIrg)
z&A^zjbVvC0N1>xRjcdLf=5Ov}{g+x=yCdkm;pF!HSXM}U?EKgCUjA)<rhTwD4By|_
zn!j*Q!vCH>Cntx?`NQna8l|wSlUQFY3!e%Pjth*9;c~fXYir}R15=2vgQ(UhrmsHw
zhUeq-?Ia{{`QiY@h5a;kUt;@-818+!lW9*Z{d#Bry#Jc2S?Z4lsjpq4^%R`DI*#wN
z03S?!$4B1=*?YE&;?7|Xelkn#tso^OC9G;I5~|=2Y(e4SH;?*zsPF5);#Pl7{olgE
z^q*1w-@%<R*4NkB*x1-Qudc49yu6&Eq9U@hvq?)!V`OB6iHQjUfdDfzGb}DH5)1}e
jUS4KxZ4HmdLt|qjXU?3Vy}g~z&Q5xIdhq-GmZtm#&Kg#G

diff --git a/assets/voxygen/voxel/armor/shoulder/plate_left-0.vox b/assets/voxygen/voxel/armor/shoulder/plate_left-0.vox
deleted file mode 100644
index 314bba5ffb8a7ac23618919aa77d8aecb4ed081a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1460
zcmah|ZAhJE7`~t9eO@QILi4EeSVuF(&t>Y=%*~D+Pup?1<!rKZG>MpOq9c=#?Qj@u
zrwvRjXW|xA?wk-CG26r>*$<PDHL$VSh#+K0^gkp5_vh+*-Je)nd*I@J?$7JK-jBBZ
zhjPY6q`4umk47%qBCUatf2-s0BoJE&i#QYv1^N^(Jne)sdP8ZwVcE2{+RzCSw+Q7}
zEpe^%1{>p|)Ver6>%?~Q^o?4#c(-`hgvB~bvDW5Y)VeZi-qLDb7_)3OuL+AWF`VOA
zi!~OxjlQP|OEFJArMQRI_mnfka(dWLtLbZ6(X`^k*hf$f_jI^8!?}}F5r(r&f{Gi~
z80HLjH{>zYVuW##nBi`Qx(s(W<T2D^5*R0k;eLi14fWVc$8DqHwneK6+wlp-m`#w^
z<}91DY|gSd%jPVb&(YRSpNb#Y{b~cXZ=M_%5Q#*vHY(Wj`4ZeIxAB+Dg~i2YIOlTU
z+y6zfHyw2yRq*%LqiCWQ;<q6^Pe5W%LzdE!+$_jACMfY2p!A9$u}AP^RFFC%NdH=}
zqd5sp$C42`m5LANo<(Cs&@v`?XIgOL7JFOV@O0-QFH(%^Sue8sUC14Fqj)kK<<|?4
z(ILn?B`6&i>|7AYo8%8CLdKqg%(yUEkb<cf({N{37SQw@>O>GAej)xK#*Pc7KM^cW
z32t1a?-j)Sg6|FpR*wim^z&cNN2z~1VgmwSk)ZP>!FyXZf?E_?cDT{)&qcVU5aV4H
zh#aiJ_)#B5yBdJy7)qW`$Igmu?0uyWU2Qe!X%a-=5=^`=SooN;T`Aa}nTC$)7tr5W
zi?-r)bnnQ*@a}xfc9tRZMgw}@-iJtEJBCgkLHOMeM$YtLcIqtFZhwWOq$IdfQ{c(k
zhQd4#%1iT6S5*T4t_tjbtrjC6JcH?rx%l-)F;;Ju;4^a0P70Q<34Z@s5biF-g=i&~
zF8lE3Z>{JbO2+Ud7p~sQ#455k^&f8&j2z~3`Ir8IM!^NfAEqC3QQ*f3;HOKE)nDy#
zBT$_8Nd1+Sl{i;3fwJ-#>IP3EGn$F(alxH-0VXF=R8)k4fdRa}X9f}tBdtFTbLa2B
z!;@})J01_tof$)Y-6#$ZoyE4!4BY%CA9JBhjOOIvLH?HJ1q2VSAlSN${-eN&^HYd^
zIg5{Ge!!>Sub`@L5cQ`gu=k4vv|d?(*XzX^SCK>lf5Tc4+?~I_-(7xRkIVBX-2BfT
mYOhT`I>(ID6AT97^Z7RKPVs|tdV6~j4u_FdHvOL*YvmtC*k{H7

diff --git a/assets/voxygen/voxel/armor/shoulder/steel_right-0.vox b/assets/voxygen/voxel/armor/shoulder/steel_right-0.vox
deleted file mode 100644
index 7f1f21731e4825039ac1d805e6e53e81fa54456f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1488
zcmbu8e@NVA9LGQ3ALmRfT%J0$)SSyZ9b2AGGcP;Sb32!t&L;C_5<}U<W<x@p9D{jn
zU}`y&+k%$5AvR;S$tA@?lMo%)Sl5UkWk}@T{t*%P$Gv+$w|^pH{m}z2-k;C&`SJYt
zKHtW}$Fc$<Qd{9UM3HYSA`Kp|`$^?+#E>V5NscvnJ%btzjuS+;=n>t}BN9W6(IVP5
z2@BDQ86#msp>n8N6lIfbTEwtutW)`_PK%fpm8)vBh)&fRH;JKos@_DDZ|V^(s?4J;
z?60XcOx6;OwI<axRb17uo~mhtY8X^Q&9RQ?v<>C+941v`TqmNjhpy&nD`ih%+>FLl
zFV?AfoqN#PSHT*MzOGQ~v8O>a#&qUtL{~XP=bRWuL`-5am`iADv~}7#ZJoBnat&b(
zl~*6usXEodb6L0_3-@tk|7#V|55z=p_<TNWj0g@~UBXW5pZMKs#o}VE3gM>b%g2)7
zN=8}pKDgg5hkdLR;<i9K;vf^xK$en`P%B6|Ey#E0V)rdUY=__}zaVi~ko>uzs5Txo
zrxV~kpNRM8o<o&SP(La-F(Wv8pSAUA$Y{?-jxP_zK^M}ytjHcpL*8U23YK$`(k#e1
zFW4OrI2Q!+2G{S6g^WH8nYE%ncRQwDOu~a#(t(=iQN|;C$WP=qGTI}U`AD!hCAfQ=
zzDqFS7JPL?uzphDrQg#i7;fc!x1iE4Xn9G{T_p%FUqyXU8rt32=&iRQ(B^>eXbA$R
zDlyVl0jy3Se`hkBj!YbU)rPjl5_HrE{BH`z-W4o-C@9WIgC{Qs&Bc4rRaJ_{ykxW&
zrDJISE(BZl!dq8?j<*iMcjh<-&YeW>J6;T5=s<AlA~t^b4Ds>t*pav$Sy@>quxF!q
z&kK0jVTapUfWy_L7=G_r%#3H_=ev1Wzn70sxMpxtuzE-E>yLuob{nqv3$b*w5?jAC
zplcujLpQ9reLofJ$b9Viukc>}?fjVY11n>|_c#9c`3nmRaj9esdkZE|*58Lze=3%*
z2_78h)191z-EK#BcQ;-?FbnbbBB?70bC(}|!*gkTI~f_cbYT?bWg}=ExQHDsDY*B=
zF3fpTF~U3h=l$2$E}-dX2u%&E=sE?Qy*vf~^&mc&{SF_08^XRb{V4An!@*A%&~PgR
zm&=6>Zbf1V{(un@JpB66{vPsu{a0M=&&vNTE{^{U^ZyR+Ok!(m3*m4$I$u{;hwAET
zIGs*791hrQHjIytV|scT!C(;c^Yd6)SwSci!rIyzHa9on^?K3T+KSH3PW1Hjps%kF
NgM)(z1Olq3`~}q}gg*cP

diff --git a/assets/voxygen/voxel/armor/shoulder/tarasque_left.vox b/assets/voxygen/voxel/armor/shoulder/tarasque_left.vox
deleted file mode 100644
index 2b3cb92c101ce763e1686d1c1ff1b9ae1ea40f7e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 55999
zcmeI*cYM@j7zgm=O|GCQsDPqkJpsi<&9yyBRnWU0Vkygl3OHhVmtG@xmos+-s<;R4
zE#k(#_uhN&z4zW*ah}if=6anUgg^Mh-^Y}f<bB`gecpWYCIMO~yG)%KT%;(<<VgJ#
z+9_AQp(xYqXOCZvE3^fu^eL8^vu4*{rgE#II8-!6sTEXIRjn0NsH>KmYju@MfQn8<
zqar9y*XuNn(bQT+P~m+U#Z#L`dqG9hsh^K&FQ{LmIF0s#_9~CzekzJ0BC61+PsCJJ
zqkJ08BO;nc$GWIfH4)W>h^i{@sg2r&jH5P9uTugV<<n!D&hdIg5md@(oFbwM=cIO_
z=~0#X1RqllmHM@ShzVUpbecn<W0eclg(B(%jT1uD=~NV&OI1{AS7U0K8da!>GPO<*
zs1YqdChnuXN=2cft19KBIBM608r3*f;~1WU=I2sI7MfQ`Bju;PDnv|CMNFe2R1s0=
zoCR5g7KjS1jI4oZW=7+bp}b(7HeSL)aVsvTl9|vrZH;0~dmHa*eHG5JMX`_TywTdr
z9DK}i?XhN_?-(O!1gkRBcbqne`)T8F-r7_1@ubMC#`XB1xN#p3HZxY*=8D1R*g1+D
zdqjo0NAW54h^p)!#b?wbs;YaG-dj|4_b5K=9=XEZqsn@V8r?mLAGRL3YB;KKLNucA
z3DL&&hK7bx89r!f>9}+IvW~aeJzN-{8n?pZmX&jP`xY)p6plNnrLg$eeR`cgwArv;
z+uQRG8MtO)=-Pt|LkABm3>whCutlh{Fl~Bcp}t{aAu>L;%(3k`{@-`pKP!4IMwhQw
zsNa0VO1sYG<>f0a_ljDVH@^EbxxC|6G>)JD$&ne89^eDo_-(<zT+4T7zAbC_rHYww
znwwj5Hos2HdA5^m$#YzYUqYtmwkBKn1!z=+<fvTMj{Ehn9KdxmTWsN1j_J6bU#*f=
zD=*U-+-4>XZX0D(g#BvBj~wII=J~Z6IZ<<}bv~bm9ATyso~(4%@Y@?l!*(1EFEfsY
zZ%7;sKiD`LehcAf_=Sw4Sp`b7DwL)ll!l)foabhBC{2GT%>XD3e<BCxxmgoRvlf(Q
zAe4qbTZ!}B42III4W(HJN;3pXvo4f|zrup^PFo*J!(W)gS(^=@H04m54WTqaD9uJt
znqg3y;ZT|pP@0XQG@C$aMnY*eh0<&WrP&-x!+*^V=T8J%LTN@pX)2&JTR~|IC`|}T
zQwgQ1g3?q&X~IyN(NLNiD9sos4gVV?oZmxl4W-!zO0zALW-OFu9F%4|D9!dznh2C8
z3Z<!o(!`)N<DoP=KxrmGX?BFt)I(_|LTMVHG?Sn-lc6;H-CA%y%P|#7GYv|!6O^VA
zN;4fwGXqMqGn8f*D9x@=nwe0VSx}nUP@3JKG`mA-_JGpt38gWiG<!j5EGSJAlqL?P
zNkD0AC`~hzCJCi!fzt4|&c^x7?cPwDIZ&DulqL<O$v|mbC`}ehvk#QUgVN-nG<hgZ
zE0ks~lx7~3W<Hdr4N9{wlx9CD%>pRR{!p3&pfm?UX%2$Y91Nv71WI!#l;$uf&EZg*
zBcL=3p)^NAX^w)@91W#821;`*l;$`n&GAs06QDFFLTOHd(wq#XIR#2{DwO6lD9s`$
z&FN5@#Za0vpfqPfY0iSuoDHQp2TF4;l;%7r%@Qch`B0h*pfndkX)c1&TnweT1WI!$
zl;$!h&E-&<E1)!2LTRpo(p(LtxduveEtKXuD9!aynj4@rH$rJ{g3{a!rMU%4b1RhQ
zHYm;QP?|fSG<QO2?t;?X4W+pUN^>ui<~}IR{ZN_*pfnFcX&!>oJPf6I1WNNLl;$xg
z&Ers-C!jP>LTR3Y(mV~Nc?L@JER^OsD9!UwnirrnFG6Wvg3`PUrFjKP^D30)H7L#N
zP?|TOG;cy_-h$G+4W)SpO7kw1<~=CQ`%sz>pfn#sX+DC|d<>=e1WNNMl;$%i&F4^>
zFQ7DELTSE&(tHi2`36e!EtKXvD9!g!njfGvKSF7Kg3|m9rTGO)^DC5QDU{|nD9!Is
znm?d4e?n>gg3|mAr71vZ6!pLUKQMb!qZ5bIn(!v51gMz#wydr5ft{Hv8`5sVCaPj^
zxI+iLl~L&$?qr%dhv{havr$naD|7l$r7|2277GtEtxPgy^Wd-%3>z|w<=GZbYE&3C
zvLWH*=9DI_p&s5ibJs~*GtR$H%I7^wCg?4N)0Fa4@N^+5_uPDG?j^;6eQDoyZY!Ub
z9M5Vq6F$1S)G%jNimwg_Lq;{*WqaDOy9RPYuUCjWlK%A=6PB~ORc1n-Q+rL03mN{E
z4Ta?5#ER$2BTMJXCvG;oNwfW0`FVO>9@&^I*?V1VnK)%<a`GVSxqHiadEuJfxtyXp
zyb4chWo<9t>dCvwsHhCfGigd$3ERxbF`XK`(xg*pC~us;gpdc#PAV-A?D<)j<Nei|
z>-c9ZyR5jK>*z{aX<nGhib}o*X3`;V94LeNR+lT&lycp)6r`Q`{!;o&mWx{{|K{&Q
zgG?)zwd4N1!Ru@0TRc10;-=&!4e=afshPJfx2hbQ^xW1=LQWTVQ?AGOF-B1SkW;s~
zo<FrrG*YJN_FQtm*_7-^!VDuwA3XQg#UWkhmQXv9^r3R*(jb{<o|DM8_!G;kv_~-u
zN6Eo_mE=Lvb2^=WDT`diT-J&^8MzRlj<oEeN4ipm&?B8qS#70-KBPDica|pdliB$^
sCF^wA<dT+7LZ*;4hIQ1Ml4iV1&5|{FK5`{_Oejbna&X*Er8pq;4@|t}?EnA(

diff --git a/assets/voxygen/voxel/armor/shoulder/twigs_right.vox b/assets/voxygen/voxel/armor/shoulder/twigs_right.vox
deleted file mode 100644
index 75caca5c5dca7d1ed55ca0e8a2c9712df60fa1a8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1492
zcmeH{&uSDw5QnSkS3Q#uQN)AbDIlK2LqtK0ghU8oS&U#H#N;G`=*h?M>dEKvHFn=(
z|AMm#?Kcs;#hbTn_~@>$>FT1pXHMUqZT~Q{HwS}bI{R77P6p?PxB7tAz$PS|y+0p(
zcLubNf4U{%ILtb88@b!B0J*KwZEArF90)ROWx@#uf|Om7eB_A(K|)DeTEQ1Q2(qxg
z!8JG#WWzo!uBDEa`3;+x`BdhY=1xsM3inR#6AR*S>T&Av&O|I?5Ttxn<V#C@;z5v5
zl6(bU@Sx(<LJZLmH{@@9rncWV7Va?*kC{cVXN)3ZY+|hFLNOM7Dy}SX5E-2yGp1H>
z5QQ}jxf*gceJ;&STDUZqG_lkoQZp->zdL$;aD7SKOQj8m!!_$OSigb)@CF_pZq+Bl
z_QtcVtNk12`tS1d?zex=pYGhP7tik3<Hz^v{-Znf#rEy`W%t3~HP6}m=}B96F53F?
T!$#fvv{hey-MpUff6KoC_{v2D

diff --git a/assets/voxygen/voxel/armor/shoulder/twigsflowers_shoulder_right.vox b/assets/voxygen/voxel/armor/shoulder/twigsflowers_shoulder_right.vox
deleted file mode 100644
index dbca675225e5e867fa83923ada0dd18c9a0bf7f7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1564
zcmeH{F-u%Q6ov1-=iZqO27{y!tb~v%q%cGbQGyDREK3YT5Tlh%NGdB^Q~D452l-F#
zc3bY-N_Q>vtvfl-B2_HY?ZC&(Iq%*(^JeC~{Vxa07b5a`tG&xkT1jNDeYo?q5p0>X
z2yHp|cG$jD4%kjfxKt)uiR!hg-WmaMYBBAp(IX&kS_`zRphrL)S_hc#daJ|;h?8*b
zORz@JCm<e-4;@P4e2G2*@kVE@ENiV|T$A-7HW0NdRpYv-ITo`!HEIHm1=dqg6A*`S
zJ@nnW>huYSlW^7x<_CR(u!$trPu90Y&9P(~YNpOsAzN*Np$jIW7^z}x?8Q*4p=*Yo
z0C!4^fFv;1!M#AwoE}MzT7o&joM293t;AYQpE2-^iHqNh`B>mL3LhJs@8eeiXFb0$
z_ffb{d0=DDeh-N$EGk0`f#^G;g2w<kre8m9Z;3w~u@tsWr!!-=2eUiyAMU`5ow@S5
zlONsNQg1%`tobf~te=<TwO{4z)9-)A?XN79qqmD?_to>V`SMwLw>)2dt}p$KUFF<w
a_HtP{%H{oWt9<xAS2j+bJUnmy0Dl0YTUg`(

diff --git a/assets/voxygen/voxel/armor/shoulder/twigsleaves_shoulder_right.vox b/assets/voxygen/voxel/armor/shoulder/twigsleaves_shoulder_right.vox
deleted file mode 100644
index b7a5b2c41b967f4b0a78e3d0d764b5c29239d891..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1516
zcmeIy&1zIJ7{>AUE6LG{A}$K93gSv!R20ODv_dJvU<C`MwktPcS6+s9;5B$j&bf;j
zr$Tc&6aUkNySj5Xf#3OflDrAw%pAWz+4?Rb@AgKA+~j8xIU1er-&wuT3T}f~PClNF
zekc#L^VLPAs>;MvdNJwM<kH{>li%WGP6kInf-K13h>%M0i6$~QBFP|`ahVK`0Gp{=
z$l!>=8XXx7qB?WcK}@TfvKOsxIuqARg~6Tv(1`}`a0F6lFNtw5I07kYm8|TA9G;n9
z7zZoVFVyc?x6>iiuEcDvX1~mADsENXCg#>l*q~w6!g}YP!xoarlChpuM^0p!Ihi?`
zIfYt<TE(W(8TEZ3?sEyhP<Z$>g<nbX3rjvr$(NFS9-S{-W9eNiKODT><IJyHqm9So
zwe=aSzk&bo4LsW4XivxG#<Ok1?u~t`-{qH`Z~yE+-oD??o^Q6pClA{0<9qGp*4=i#
h^YHJS7p(p4sI={~(q4V)+MCZC?e*7N*Zr$MfIkL+O@jac

diff --git a/assets/voxygen/voxel/armor/shoulder/warlock_right.vox b/assets/voxygen/voxel/armor/shoulder/warlock_right.vox
deleted file mode 100644
index 63a6464bfb1beaed5b706b25580f46297ce42c23..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1564
zcmbu8?@!fL9LGQBd(QX9q8i3;FeJp_f=T?4AAxicZhA2^q?lfbT9YXwmSe@_?#@kb
z_j@I0AraaZ5jDnxCK)4E^8qo($c?#1uKC0<*ZL1yYdv}QKG=hDW)C{s>wC`Ue9q_R
zIp59$hw{foq^&8mpOYl{L^?v@;3HPxpePR!mmE4A4&72*aJ+3lJ~=C*5=vB)BPy;5
zch4%NJcnqDIG#}|?l@c%nkTfYJ?-PHd5*Gi9nUe;6W5W1a=A}55g+~g=-)^GM8sh{
zC+^U%D92O8A(|L%JmpX(nz&kfN>kp5W%J;9V`EWIgmIOPO*9c7ef#L!XMO90QabJ^
z?TJG_#39=1HvCfNtce)vi9@tK@6y(#E$bA=B$Q)VzhO>>wv;tx=IR<rh@osK8|sN+
zj|}@_*bBoN4D&b4)iAbUEW;SCQE^ujN5ze6*R0jnYtOmtA8i%=h^>+PLcQ2t@;-#V
zg?h1fVf$kHuO#7WdmqL-xMz2h7<;)Q;D|<}xHBr)JF$$dX}{ywv@|R&wOJJ|hrWIw
zDS-^sckM**jYjw<>mWfF()TcA>T$?&22$Dtnf-#&U=g-o5hV2q9*qf7M+6yP2&&qW
z(b}Ja@aa^%yYK{BqJs7@!Rxbvp&w}5o`byJ0u)9|P(2?&?m!v}&gY<HdJD=|ijdhQ
zC_F9LJ}zij6v#`AA4!6YJqDRe!*J0i%si8ho4ay>)+bTVl0)Pt@(UR|DVY60urwpM
z{uSkbU@9p1=AhvAF+rH}$xgw@QSJ{4n*D<ATESq8;E$CFv{&VzH&}p3dojj)DiD3S
z2II$@G1}7vtWKeHYX%xBwqW0L#pvm*L0_vN_KINgEy3dZg6g~+gh~q0RlNfPEp_ND
z$v|&aF3#`ShWYL?gkNkz-)s93J#hr*P8~z!%`kS=K8^Vq4{O&Zker;1tkg}&&(BA>
zzW~)cp2D*gegqrJap3tnjJ&fMv!52=*7XwHzEO&g8FPMGuzFSS^N)f^Z!s>#DzSXI
z8JSXnJPDvwx=<@a2+D^Ktp5`G@^AIy`$=GZ`G416Sy_n-HIpbSpF;ic8Dz(@vGSSV
z<`F*K>1p`=ehdx{;)T6)kXQui1L;_}c=rxZ<?!v~<>5kn42|`pIC{=QR(B?De7Ow^
z;cSeuXZQBsp0mCVcdTOII52c^2C>iQ@!s4ueDvKKcAgkU<C#h9`(zOvSJn^+1aOC`
zND{$s&})MAZ|~-}&iD0S`oDfb*f|o3Y|Qq*+t|N4ZI}PtyGQ=J{r%2v-rbL^x>u1~
JHhVum@+WhmTDbrK

diff --git a/assets/voxygen/voxel/armor/shoulder/warlord_left.vox b/assets/voxygen/voxel/armor/shoulder/warlord_left.vox
deleted file mode 100644
index c6983cc0b7ca09c000926d08d01c83942f3e1565..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1668
zcmbu8?N8NZ7{{;s;rD~08pfkwNT|U9lX#GaKspE~1w%uM>5-^4oibtpYfR40+?2!b
zjGT!`Xj?|q7%!S+j9kqZ#2hm><{G)y8^>JhKWMG>=G*s&z9?t*qO*O@b-wrYa9{Uz
z-=}@wf!qlZX{m48OC!CmNLy1l^n@??d5k37=fJ^mQ&9V>B4_<CS3D8rDN*%WRLqEq
zbJbHy#WXQW4IAV1Szl{vqKp$aj)`kSO*FN2bWB@n;%MeOTqnj+!{V~O%la<0>(|%Z
zkMTs5jwzyvQ95po^^~S2hB(G}%1{$StRHW6Tw7`)+*di&w1!q()^-_BL@`$x);2NG
zCZ>ochKQjiniwLMnrLE(ILvjZX+`@zSx;*lH?-pSXe@Irb1ieJiMI69TF%IFE|#;f
zJcIT7X0KKo&vGwojptYucNpVn#o5s^#?d<N@NA0fin)q)#6Kfz2>rr1;XMfbLch@O
z8u1d0@*HD1JEzaFChlkxx7H3@ZHHaPy394o#1-#a6GIg5n9sm7#5zO?dlJtzrZ2&0
zV)_!-u(S@fZ{0rQ>bMdAp4`6uyLQ%#^&gQ4_=!fNxH~4;eQ61sQvbkjsi|08Z1G*V
z-1PM$Ne-r?reixo@6;hMSq%v}knYDJQ%^&d(vjRE$mkIih4QiWiXgFD@Z^vnWmJ&<
zg`m783C%sp2%k*B`&XYqV^q*OE_i!ZF!%#=TeFbUm50sILR8ELk=>t)yfaxSoZg6%
z8~MoS5Ntjv*g7GoT@c7?+&_{C8Gi~gmx_`6b(nb}4Yzk>1I^E(hDUB9KapR__;JDP
zdBNh0;O1A<LBUi=@Xda~ouh&<_3?JW=wYr82pR%{&MLt`qu|dQm(W_Cg|1K@BCQ3O
zI8ut}>y?-|)_}1i^}zBJiZ-RAwsa%*yi|ZA?Um?m77V>1n0!yLa8^)}lZB?j&FHAu
zhW^HCv=^qMt2`TLc5T6YXEDOB)}#Bay@>W6!s!!75qUR^9aYa`e#XPf^-D-fN<wDJ
zI^^c&q9l-qifzx~#nJ#mwI$g1ay3R{8!-E69)7-Ah&#86@G<wCpB5}%6a4a{AktNU
zi$i5ty4-*aDMgM1Q6wFxl0k&z!$+R~BIojN=g0Sx!0OWfK7UzR8O~KsqPS!VH6y36
zerP>zd?vVkh);KV8i7Cn0|NtiW%nFpD1x;9G+e!K?+#C7@$KZ~;N0*y>T1St__T-2
z&J5i8atp48*JF$`dvN}KoL}o;+cNr(0fQH2F!cF6KA5|XkG@;M_TCZHotng+PZrR2
zWd*@t5O>*%Boh1%vm#ji_FjLhd|&_NzyBA6ZzGY&n)Uy8YwOph{h$9_dqDp^|6#Ek
RcJ?5%`b}gP&pxb<`~~4_XZipD

diff --git a/assets/voxygen/voxel/armor/belt/steel-0.vox b/assets/voxygen/voxel/armor/steel/belt.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/belt/steel-0.vox
rename to assets/voxygen/voxel/armor/steel/belt.vox
diff --git a/assets/voxygen/voxel/armor/chest/steel-0.vox b/assets/voxygen/voxel/armor/steel/chest.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/chest/steel-0.vox
rename to assets/voxygen/voxel/armor/steel/chest.vox
diff --git a/assets/voxygen/voxel/armor/foot/steel-0.vox b/assets/voxygen/voxel/armor/steel/foot.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/foot/steel-0.vox
rename to assets/voxygen/voxel/armor/steel/foot.vox
diff --git a/assets/voxygen/voxel/armor/hand/steel_left-0.vox b/assets/voxygen/voxel/armor/steel/hand.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/hand/steel_left-0.vox
rename to assets/voxygen/voxel/armor/steel/hand.vox
diff --git a/assets/voxygen/voxel/armor/pants/steel-0.vox b/assets/voxygen/voxel/armor/steel/pants.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/pants/steel-0.vox
rename to assets/voxygen/voxel/armor/steel/pants.vox
diff --git a/assets/voxygen/voxel/armor/shoulder/steel_left-0.vox b/assets/voxygen/voxel/armor/steel/shoulder.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/shoulder/steel_left-0.vox
rename to assets/voxygen/voxel/armor/steel/shoulder.vox
diff --git a/assets/voxygen/voxel/armor/belt/leather-0.vox b/assets/voxygen/voxel/armor/swift/belt.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/belt/leather-0.vox
rename to assets/voxygen/voxel/armor/swift/belt.vox
diff --git a/assets/voxygen/voxel/armor/chest/leather-0.vox b/assets/voxygen/voxel/armor/swift/chest.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/chest/leather-0.vox
rename to assets/voxygen/voxel/armor/swift/chest.vox
diff --git a/assets/voxygen/voxel/armor/foot/leather-0.vox b/assets/voxygen/voxel/armor/swift/foot.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/foot/leather-0.vox
rename to assets/voxygen/voxel/armor/swift/foot.vox
diff --git a/assets/voxygen/voxel/armor/hand/leather_right-0.vox b/assets/voxygen/voxel/armor/swift/hand.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/hand/leather_right-0.vox
rename to assets/voxygen/voxel/armor/swift/hand.vox
diff --git a/assets/voxygen/voxel/armor/pants/leather-0.vox b/assets/voxygen/voxel/armor/swift/pants.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/pants/leather-0.vox
rename to assets/voxygen/voxel/armor/swift/pants.vox
diff --git a/assets/voxygen/voxel/armor/shoulder/leather_right-0.vox b/assets/voxygen/voxel/armor/swift/shoulder.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/shoulder/leather_right-0.vox
rename to assets/voxygen/voxel/armor/swift/shoulder.vox
diff --git a/assets/voxygen/voxel/armor/belt/tarasque.vox b/assets/voxygen/voxel/armor/tarasque/belt.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/belt/tarasque.vox
rename to assets/voxygen/voxel/armor/tarasque/belt.vox
diff --git a/assets/voxygen/voxel/armor/chest/tarasque.vox b/assets/voxygen/voxel/armor/tarasque/chest.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/chest/tarasque.vox
rename to assets/voxygen/voxel/armor/tarasque/chest.vox
diff --git a/assets/voxygen/voxel/armor/foot/tarasque.vox b/assets/voxygen/voxel/armor/tarasque/foot.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/foot/tarasque.vox
rename to assets/voxygen/voxel/armor/tarasque/foot.vox
diff --git a/assets/voxygen/voxel/armor/hand/tarasque_right.vox b/assets/voxygen/voxel/armor/tarasque/hand.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/hand/tarasque_right.vox
rename to assets/voxygen/voxel/armor/tarasque/hand.vox
diff --git a/assets/voxygen/voxel/armor/pants/tarasque.vox b/assets/voxygen/voxel/armor/tarasque/pants.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/pants/tarasque.vox
rename to assets/voxygen/voxel/armor/tarasque/pants.vox
diff --git a/assets/voxygen/voxel/armor/shoulder/tarasque_right.vox b/assets/voxygen/voxel/armor/tarasque/shoulder.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/shoulder/tarasque_right.vox
rename to assets/voxygen/voxel/armor/tarasque/shoulder.vox
diff --git a/assets/voxygen/voxel/armor/belt/twigs_belt.vox b/assets/voxygen/voxel/armor/twigs/belt.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/belt/twigs_belt.vox
rename to assets/voxygen/voxel/armor/twigs/belt.vox
diff --git a/assets/voxygen/voxel/armor/chest/twigs_chest.vox b/assets/voxygen/voxel/armor/twigs/chest.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/chest/twigs_chest.vox
rename to assets/voxygen/voxel/armor/twigs/chest.vox
diff --git a/assets/voxygen/voxel/armor/foot/twigs_foot.vox b/assets/voxygen/voxel/armor/twigs/foot.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/foot/twigs_foot.vox
rename to assets/voxygen/voxel/armor/twigs/foot.vox
diff --git a/assets/voxygen/voxel/armor/hand/twigs_glove_left.vox b/assets/voxygen/voxel/armor/twigs/hand.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/hand/twigs_glove_left.vox
rename to assets/voxygen/voxel/armor/twigs/hand.vox
diff --git a/assets/voxygen/voxel/armor/pants/twigs_pants.vox b/assets/voxygen/voxel/armor/twigs/pants.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/pants/twigs_pants.vox
rename to assets/voxygen/voxel/armor/twigs/pants.vox
diff --git a/assets/voxygen/voxel/armor/shoulder/twigs_left.vox b/assets/voxygen/voxel/armor/twigs/shoulder.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/shoulder/twigs_left.vox
rename to assets/voxygen/voxel/armor/twigs/shoulder.vox
diff --git a/assets/voxygen/voxel/armor/belt/twigsflowers_belt.vox b/assets/voxygen/voxel/armor/twigsflowers/belt.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/belt/twigsflowers_belt.vox
rename to assets/voxygen/voxel/armor/twigsflowers/belt.vox
diff --git a/assets/voxygen/voxel/armor/chest/twigsflowers_chest.vox b/assets/voxygen/voxel/armor/twigsflowers/chest.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/chest/twigsflowers_chest.vox
rename to assets/voxygen/voxel/armor/twigsflowers/chest.vox
diff --git a/assets/voxygen/voxel/armor/foot/twigsflowers_foot.vox b/assets/voxygen/voxel/armor/twigsflowers/foot.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/foot/twigsflowers_foot.vox
rename to assets/voxygen/voxel/armor/twigsflowers/foot.vox
diff --git a/assets/voxygen/voxel/armor/hand/twigsflowers_glove_left.vox b/assets/voxygen/voxel/armor/twigsflowers/hand.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/hand/twigsflowers_glove_left.vox
rename to assets/voxygen/voxel/armor/twigsflowers/hand.vox
diff --git a/assets/voxygen/voxel/armor/pants/twigsflowers_pants.vox b/assets/voxygen/voxel/armor/twigsflowers/pants.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/pants/twigsflowers_pants.vox
rename to assets/voxygen/voxel/armor/twigsflowers/pants.vox
diff --git a/assets/voxygen/voxel/armor/shoulder/twigsflowers_shoulder_left.vox b/assets/voxygen/voxel/armor/twigsflowers/shoulder.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/shoulder/twigsflowers_shoulder_left.vox
rename to assets/voxygen/voxel/armor/twigsflowers/shoulder.vox
diff --git a/assets/voxygen/voxel/armor/belt/twigsleaves_belt.vox b/assets/voxygen/voxel/armor/twigsleaves/belt.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/belt/twigsleaves_belt.vox
rename to assets/voxygen/voxel/armor/twigsleaves/belt.vox
diff --git a/assets/voxygen/voxel/armor/chest/twigsleaves_chest.vox b/assets/voxygen/voxel/armor/twigsleaves/chest.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/chest/twigsleaves_chest.vox
rename to assets/voxygen/voxel/armor/twigsleaves/chest.vox
diff --git a/assets/voxygen/voxel/armor/foot/twigsleaves_foot.vox b/assets/voxygen/voxel/armor/twigsleaves/foot.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/foot/twigsleaves_foot.vox
rename to assets/voxygen/voxel/armor/twigsleaves/foot.vox
diff --git a/assets/voxygen/voxel/armor/hand/twigsleaves_glove_left.vox b/assets/voxygen/voxel/armor/twigsleaves/hand.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/hand/twigsleaves_glove_left.vox
rename to assets/voxygen/voxel/armor/twigsleaves/hand.vox
diff --git a/assets/voxygen/voxel/armor/pants/twigsleaves_pants.vox b/assets/voxygen/voxel/armor/twigsleaves/pants.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/pants/twigsleaves_pants.vox
rename to assets/voxygen/voxel/armor/twigsleaves/pants.vox
diff --git a/assets/voxygen/voxel/armor/shoulder/twigsleaves_shoulder_left.vox b/assets/voxygen/voxel/armor/twigsleaves/shoulder.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/shoulder/twigsleaves_shoulder_left.vox
rename to assets/voxygen/voxel/armor/twigsleaves/shoulder.vox
diff --git a/assets/voxygen/voxel/armor/back/velorite_battlemage.vox b/assets/voxygen/voxel/armor/velorite_battlemage/back.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/back/velorite_battlemage.vox
rename to assets/voxygen/voxel/armor/velorite_battlemage/back.vox
diff --git a/assets/voxygen/voxel/armor/belt/velorite_battlemage.vox b/assets/voxygen/voxel/armor/velorite_battlemage/belt.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/belt/velorite_battlemage.vox
rename to assets/voxygen/voxel/armor/velorite_battlemage/belt.vox
diff --git a/assets/voxygen/voxel/armor/chest/velorite_battlemage.vox b/assets/voxygen/voxel/armor/velorite_battlemage/chest.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/chest/velorite_battlemage.vox
rename to assets/voxygen/voxel/armor/velorite_battlemage/chest.vox
diff --git a/assets/voxygen/voxel/armor/foot/velorite_battlemage.vox b/assets/voxygen/voxel/armor/velorite_battlemage/foot.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/foot/velorite_battlemage.vox
rename to assets/voxygen/voxel/armor/velorite_battlemage/foot.vox
diff --git a/assets/voxygen/voxel/armor/hand/velorite_battlemage_right.vox b/assets/voxygen/voxel/armor/velorite_battlemage/hand.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/hand/velorite_battlemage_right.vox
rename to assets/voxygen/voxel/armor/velorite_battlemage/hand.vox
diff --git a/assets/voxygen/voxel/armor/pants/velorite_battlemage.vox b/assets/voxygen/voxel/armor/velorite_battlemage/pants.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/pants/velorite_battlemage.vox
rename to assets/voxygen/voxel/armor/velorite_battlemage/pants.vox
diff --git a/assets/voxygen/voxel/armor/shoulder/velorite_battlemage_left.vox b/assets/voxygen/voxel/armor/velorite_battlemage/shoulder.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/shoulder/velorite_battlemage_left.vox
rename to assets/voxygen/voxel/armor/velorite_battlemage/shoulder.vox
diff --git a/assets/voxygen/voxel/armor/back/warlock.vox b/assets/voxygen/voxel/armor/warlock/back.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/back/warlock.vox
rename to assets/voxygen/voxel/armor/warlock/back.vox
diff --git a/assets/voxygen/voxel/armor/belt/warlock.vox b/assets/voxygen/voxel/armor/warlock/belt.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/belt/warlock.vox
rename to assets/voxygen/voxel/armor/warlock/belt.vox
diff --git a/assets/voxygen/voxel/armor/chest/warlock.vox b/assets/voxygen/voxel/armor/warlock/chest.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/chest/warlock.vox
rename to assets/voxygen/voxel/armor/warlock/chest.vox
diff --git a/assets/voxygen/voxel/armor/foot/warlock.vox b/assets/voxygen/voxel/armor/warlock/foot.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/foot/warlock.vox
rename to assets/voxygen/voxel/armor/warlock/foot.vox
diff --git a/assets/voxygen/voxel/armor/hand/warlock_left.vox b/assets/voxygen/voxel/armor/warlock/hand.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/hand/warlock_left.vox
rename to assets/voxygen/voxel/armor/warlock/hand.vox
diff --git a/assets/voxygen/voxel/armor/pants/warlock.vox b/assets/voxygen/voxel/armor/warlock/pants.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/pants/warlock.vox
rename to assets/voxygen/voxel/armor/warlock/pants.vox
diff --git a/assets/voxygen/voxel/armor/shoulder/warlock_left.vox b/assets/voxygen/voxel/armor/warlock/shoulder.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/shoulder/warlock_left.vox
rename to assets/voxygen/voxel/armor/warlock/shoulder.vox
diff --git a/assets/voxygen/voxel/armor/back/warlord.vox b/assets/voxygen/voxel/armor/warlord/back.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/back/warlord.vox
rename to assets/voxygen/voxel/armor/warlord/back.vox
diff --git a/assets/voxygen/voxel/armor/belt/warlord.vox b/assets/voxygen/voxel/armor/warlord/belt.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/belt/warlord.vox
rename to assets/voxygen/voxel/armor/warlord/belt.vox
diff --git a/assets/voxygen/voxel/armor/chest/warlord.vox b/assets/voxygen/voxel/armor/warlord/chest.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/chest/warlord.vox
rename to assets/voxygen/voxel/armor/warlord/chest.vox
diff --git a/assets/voxygen/voxel/armor/foot/warlord.vox b/assets/voxygen/voxel/armor/warlord/foot.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/foot/warlord.vox
rename to assets/voxygen/voxel/armor/warlord/foot.vox
diff --git a/assets/voxygen/voxel/armor/hand/warlord_right.vox b/assets/voxygen/voxel/armor/warlord/hand.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/hand/warlord_right.vox
rename to assets/voxygen/voxel/armor/warlord/hand.vox
diff --git a/assets/voxygen/voxel/armor/pants/warlord.vox b/assets/voxygen/voxel/armor/warlord/pants.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/pants/warlord.vox
rename to assets/voxygen/voxel/armor/warlord/pants.vox
diff --git a/assets/voxygen/voxel/armor/shoulder/warlord_right.vox b/assets/voxygen/voxel/armor/warlord/shoulder.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/shoulder/warlord_right.vox
rename to assets/voxygen/voxel/armor/warlord/shoulder.vox
diff --git a/assets/voxygen/voxel/humanoid_armor_back_manifest.ron b/assets/voxygen/voxel/humanoid_armor_back_manifest.ron
index 933113d6cd..81e30417f8 100644
--- a/assets/voxygen/voxel/humanoid_armor_back_manifest.ron
+++ b/assets/voxygen/voxel/humanoid_armor_back_manifest.ron
@@ -5,47 +5,47 @@
     ),
     map: {
         "Short0": (
-            vox_spec: ("armor.back.short-0", (-5.0, -1.0, -11.0)),
+            vox_spec: ("armor.misc.back.short-0", (-5.0, -1.0, -11.0)),
             color: None
         ),
         "Admin": (
-            vox_spec: ("armor.back.admin", (-5.0, -1.0, -11.0)),
+            vox_spec: ("armor.misc.back.admin", (-5.0, -1.0, -11.0)),
             color: None
         ),
-        "DungPurp0": (
-            vox_spec: ("armor.back.dung_purp-0", (-5.0, -1.0, -14.0)),
+        "DungeonPurple": (
+            vox_spec: ("armor.misc.back.dungeon_purple", (-5.0, -1.0, -14.0)),
             color: None
         ),
         "Short1": (
-            vox_spec: ("armor.back.short-1", (-5.0, -1.0, -11.0)),
+            vox_spec: ("armor.misc.back.short-1", (-5.0, -1.0, -11.0)),
             color: None
         ),
-        "Short2": (
-            vox_spec: ("armor.back.short-2", (-5.0, -1.0, -11.0)),
+        "Agile": (
+            vox_spec: ("armor.agile.back", (-5.0, -1.0, -11.0)),
             color: None
         ),
-        "Backpack0": (
-            vox_spec: ("armor.back.backpack-0", (-7.0, -5.0, -10.0)),
+        "Backpack": (
+            vox_spec: ("armor.misc.back.backpack", (-7.0, -5.0, -10.0)),
             color: None
         ),
-        "BackpackBlue0": (
-            vox_spec: ("armor.back.backpack-grey", (-7.0, -5.0, -10.0)),
+        "BackpackBlue": (
+            vox_spec: ("armor.misc.back.backpack-grey", (-7.0, -5.0, -10.0)),
             color: Some((76, 72, 178))
         ),
-        "VeloriteMage0": (
-            vox_spec: ("armor.back.velorite_battlemage", (-5.0, -1.0, -14.0)),
+        "VeloriteMage": (
+            vox_spec: ("armor.velorite_battlemage.back", (-5.0, -1.0, -14.0)),
             color: None
         ),
-        "LeatherBlue0": (
-            vox_spec: ("armor.back.leather_blue-0", (-5.0, -1.0, -11.0)),
+        "LeatherBlue": (
+            vox_spec: ("armor.leather_blue.back", (-5.0, -1.0, -11.0)),
             color: None
         ),
         "Warlord": (
-            vox_spec: ("armor.back.warlord", (-5.0, -1.0, -14.0)),
+            vox_spec: ("armor.warlord.back", (-5.0, -1.0, -14.0)),
             color: None
         ),
         "Warlock": (
-            vox_spec: ("armor.back.warlock", (-5.0, -1.5, -15.5)),
+            vox_spec: ("armor.warlock.back", (-5.0, -1.5, -15.5)),
             color: None
         ),
     },
diff --git a/assets/voxygen/voxel/humanoid_armor_belt_manifest.ron b/assets/voxygen/voxel/humanoid_armor_belt_manifest.ron
index 109a2e2b0b..d9be59fe73 100644
--- a/assets/voxygen/voxel/humanoid_armor_belt_manifest.ron
+++ b/assets/voxygen/voxel/humanoid_armor_belt_manifest.ron
@@ -1,103 +1,99 @@
 ((
     default: (
-        vox_spec: ("armor.belt.belt_none", (-5.0, -3.5, 2.0)),
+        vox_spec: ("armor.misc.belt.none", (-5.0, -3.5, 2.0)),
         color: None
     ),
     map: {
         "Dark": (
-            vox_spec: ("armor.belt.dark", (-4.0, -3.5, 2.0)),
+            vox_spec: ("armor.misc.belt.dark", (-4.0, -3.5, 2.0)),
             color: None
         ),
         "TurqCloth": (
-            vox_spec: ("armor.belt.cloth_turq", (-4.0, -3.5, -6.0)),
+            vox_spec: ("armor.misc.belt.cloth_turq", (-4.0, -3.5, -6.0)),
             color: None
         ),
         "BloodCloth": (
-            vox_spec: ("armor.belt.cloth_blood", (-4.0, -3.5, -6.0)),
+            vox_spec: ("armor.misc.belt.cloth_blood", (-4.0, -3.5, -6.0)),
             color: Some((29, 26, 33))
         ),
         "BlackCloth": (
-            vox_spec: ("armor.belt.cloth_black", (-4.0, -3.5, -6.0)),
+            vox_spec: ("armor.misc.belt.cloth_black", (-4.0, -3.5, -6.0)),
             color: Some((29, 26, 33))
         ),
         "Assassin": (
-            vox_spec: ("armor.belt.assa", (-5.0, -3.5, 2.0)),
+            vox_spec: ("armor.assassin.belt", (-5.0, -3.5, 2.0)),
             color: None
         ),
-        "Dark": (
-            vox_spec: ("armor.belt.dark", (-4.0, -3.5, 2.0)),
+        "Plate": (
+            vox_spec: ("armor.plate.belt", (-5.0, -3.5, 2.0)),
             color: None
         ),
-        "Plate0": (
-            vox_spec: ("armor.belt.plate-0", (-5.0, -3.5, 2.0)),
+        "Swift": (
+            vox_spec: ("armor.swift.belt", (-5.0, -3.5, 2.0)),
             color: None
         ),
-        "Leather0": (
-            vox_spec: ("armor.belt.leather-0", (-5.0, -3.5, 2.0)),
+        "ClothPurple": (
+            vox_spec: ("armor.cloth_purple.belt", (-5.0, -3.5, 2.0)),
             color: None
         ),
-        "ClothPurple0": (
-            vox_spec: ("armor.belt.cloth_purple-0", (-5.0, -3.5, 2.0)),
+        "ClothBlue": (
+            vox_spec: ("armor.cloth_blue.belt", (-5.0, -3.5, 2.0)),
             color: None
         ),
-        "ClothBlue0": (
-            vox_spec: ("armor.belt.cloth_blue-0", (-5.0, -3.5, 2.0)),
-            color: None
-        ),
-        "ClothGreen0": (
-            vox_spec: ("armor.belt.cloth_green-0", (-5.0, -3.5, 2.0)),
+        "ClothGreen": (
+            vox_spec: ("armor.cloth_green.belt", (-5.0, -3.5, 2.0)),
             color: None
         ),
         "Cultist": (
-            vox_spec: ("armor.belt.cultist", (-5.0, -3.5, 1.0)),
+            vox_spec: ("armor.cultist.belt", (-5.0, -3.5, 1.0)),
             color: None
         ),
-        "Leather2": (
-            vox_spec: ("armor.belt.leather-2", (-5.0, -3.5, 2.0)),
+        "Agile": (
+            vox_spec: ("armor.agile.belt", (-5.0, -3.5, 2.0)),
             color: None
         ),
-        "Steel0": (
-            vox_spec: ("armor.belt.steel-0", (-5.0, -4.5, 2.0)),
+        "Steel": (
+            vox_spec: ("armor.steel.belt", (-5.0, -4.5, 2.0)),
             color: None
         ),
-        "PlateLeather": (
-            vox_spec: ("armor.belt.plate_leather-0", (-4.0, -4.5, 2.0)),
+        "LeatherPlate": (
+            vox_spec: ("armor.leather_plate.belt", (-4.0, -4.5, 2.0)),
             color: None
         ),
         "Druid": (
-            vox_spec: ("armor.belt.druid", (-4.0, -3.5, -1.0)),
+            vox_spec: ("armor.druid.belt", (-4.0, -3.5, -1.0)),
             color: None
         ),
-        "Twig": (
-            vox_spec: ("armor.belt.twigs_belt", (-4.0, -3.5, -1.0)),
+        "Twigs": (
+            vox_spec: ("armor.twigs.belt", (-4.0, -3.5, -1.0)),
             color: None
         ),
-        "Twigsleaves": (
-            vox_spec: ("armor.belt.twigsleaves_belt", (-4.0, -3.5, -1.0)),
+        "TwigsLeaves": (
+            vox_spec: ("armor.twigsleaves.belt", (-4.0, -3.5, -1.0)),
             color: None
         ),
-        "Twigsflowers": (
-            vox_spec: ("armor.belt.twigsflowers_belt", (-4.0, -3.5, -1.0)),
+        "TwigsFlowers": (
+            vox_spec: ("armor.twigsflowers.belt", (-4.0, -3.5, -1.0)),
             color: None
         ),
         "Tarasque":(
-            vox_spec: ("armor.belt.tarasque", (-5.0, -3.5, 2.0)),
+            vox_spec: ("armor.tarasque.belt", (-5.0, -3.5, 2.0)),
             color: None
         ),
         "Bonerattler":(
-            vox_spec: ("armor.belt.bonerattler", (-5.0, -4.5, 2.0)),
+            vox_spec: ("armor.bonerattler.belt", (-5.0, -4.5, 2.0)),
             color: None
         ),
-        "VeloriteMage0": (
-          vox_spec: ("armor.belt.velorite_battlemage", (-5.0, -3.5, 2.0)),
+        "VeloriteMage": (
+          vox_spec: ("armor.velorite_battlemage.belt", (-5.0, -3.5, 2.0)),
           color: None
         ),
         "Warlord":(
-            vox_spec: ("armor.belt.warlord", (-4.0, -3.5, 1.0)),
+            vox_spec: ("armor.warlord.belt", (-4.0, -3.5, 1.0)),
             color: None
         ),
         "Warlock":(
-            vox_spec: ("armor.belt.warlock", (-4.0, -3.0, 2.0)),
+            vox_spec: ("armor.warlock.belt", (-4.0, -3.0, 2.0)),
             color: None
         ),
     },
diff --git a/assets/voxygen/voxel/humanoid_armor_chest_manifest.ron b/assets/voxygen/voxel/humanoid_armor_chest_manifest.ron
index 73f5a91db1..12e8be4961 100644
--- a/assets/voxygen/voxel/humanoid_armor_chest_manifest.ron
+++ b/assets/voxygen/voxel/humanoid_armor_chest_manifest.ron
@@ -1,169 +1,165 @@
 ((
     default: (
-        vox_spec: ("armor.chest.chest_none", (-7.0, -3.5, 2.0)),
+        vox_spec: ("armor.misc.chest.none", (-7.0, -3.5, 2.0)),
         color: None
     ),
     map: {
         "Blue": (
-            vox_spec: ("armor.chest.grayscale", (-7.0, -3.5, 2.0)),
+            vox_spec: ("armor.misc.chest.grayscale", (-7.0, -3.5, 2.0)),
             color: Some((44, 74, 109))
         ),
         "Brown": (
-            vox_spec: ("armor.chest.grayscale", (-7.0, -3.5, 2.0)),
+            vox_spec: ("armor.misc.chest.grayscale", (-7.0, -3.5, 2.0)),
             color: Some((90, 49, 43))
         ),
         "Dark": (
-            vox_spec: ("armor.chest.grayscale", (-7.0, -3.5, 2.0)),
+            vox_spec: ("armor.misc.chest.grayscale", (-7.0, -3.5, 2.0)),
             color: Some((73, 63, 59))
         ),
         "Green": (
-            vox_spec: ("armor.chest.grayscale", (-7.0, -3.5, 2.0)),
+            vox_spec: ("armor.misc.chest.grayscale", (-7.0, -3.5, 2.0)),
             color: Some((59, 95, 67))
         ),
         "Orange": (
-            vox_spec: ("armor.chest.grayscale", (-7.0, -3.5, 2.0)),
+            vox_spec: ("armor.misc.chest.grayscale", (-7.0, -3.5, 2.0)),
             color: Some((109, 58, 58))
         ),
         "Midnight": (
-            vox_spec: ("armor.chest.grayscale", (-7.0, -3.5, 2.0)),
+            vox_spec: ("armor.misc.chest.grayscale", (-7.0, -3.5, 2.0)),
             color: Some((29, 26, 33))
         ),
         "Assassin": (
-            vox_spec: ("armor.chest.assa", (-7.0, -3.5, 2.0)),
+            vox_spec: ("armor.assassin.chest", (-7.0, -3.5, 2.0)),
             color: None
         ),
         "Kimono": (
-            vox_spec: ("armor.chest.cloth_red_kimono", (-7.0, -3.5, 2.0)),
+            vox_spec: ("armor.misc.chest.cloth_red_kimono", (-7.0, -3.5, 2.0)),
             color: None
         ),
-        "PlateGreen0": (
-            vox_spec: ("armor.chest.plate_green-0", (-7.0, -3.5, 2.0)),
+        "Plate": (
+            vox_spec: ("armor.plate.chest", (-7.0, -3.5, 2.0)),
             color: None
         ),
-        "PlateRed0": (
-            vox_spec: ("armor.chest.plate_grey-0", (-7.0, -3.5, 2.0)),
+        "PlateRed": (
+            vox_spec: ("armor.misc.chest.plate_grey", (-7.0, -3.5, 2.0)),
             color: Some((124, 38, 46))
         ),
-        "Leather0": (
-            vox_spec: ("armor.chest.leather-0", (-7.0, -3.5, 2.0)),
+        "Swift": (
+            vox_spec: ("armor.swift.chest", (-7.0, -3.5, 2.0)),
             color: None
         ),
-        "LeatherBlue0": (
-            vox_spec: ("armor.chest.leather_blue-0", (-7.0, -3.5, 2.0)),
+        "LeatherBlue": (
+            vox_spec: ("armor.leather_blue.chest", (-7.0, -3.5, 2.0)),
             color: None
         ),
-        "ClothPurple0": (
-            vox_spec: ("armor.chest.cloth_purple-0", (-7.0, -3.5, 1.0)),
+        "ClothPurple": (
+            vox_spec: ("armor.cloth_purple.chest", (-7.0, -3.5, 1.0)),
             color: None
         ),
-        "ClothBlue0": (
-            vox_spec: ("armor.chest.cloth_blue-0", (-7.0, -3.5, 1.0)),
+        "ClothBlue": (
+            vox_spec: ("armor.cloth_blue.chest", (-7.0, -3.5, 1.0)),
             color: None
         ),
-        "ClothGreen0": (
-            vox_spec: ("armor.chest.cloth_green-0", (-7.0, -3.5, 1.0)),
+        "ClothGreen": (
+            vox_spec: ("armor.cloth_green.chest", (-7.0, -3.5, 1.0)),
             color: None
         ),
-        "Rugged0": (
-            vox_spec: ("armor.chest.rugged-0", (-7.0, -3.5, 2.0)),
+        "Rugged": (
+            vox_spec: ("armor.rugged.chest", (-7.0, -3.5, 2.0)),
             color: None
         ),
         // Villagers
         "WorkerGreen0": (
-            vox_spec: ("armor.chest.worker_white-0", (-7.0, -3.5, 2.0)),
+            vox_spec: ("armor.misc.chest.worker_white", (-7.0, -3.5, 2.0)),
             color: Some((88, 108, 65))
         ),
         "WorkerGreen1": (
-            vox_spec: ("armor.chest.shirt_white-0", (-7.0, -3.5, 2.0)),
+            vox_spec: ("armor.misc.chest.shirt_white", (-7.0, -3.5, 2.0)),
             color: Some((88, 108, 65))
         ),
         "WorkerRed0": (
-            vox_spec: ("armor.chest.worker_white-0", (-7.0, -3.5, 2.0)),
+            vox_spec: ("armor.misc.chest.worker_white", (-7.0, -3.5, 2.0)),
             color: Some((124, 38, 46))
         ),
         "WorkerRed1": (
-            vox_spec: ("armor.chest.shirt_white-0", (-7.0, -3.5, 2.0)),
+            vox_spec: ("armor.misc.chest.shirt_white", (-7.0, -3.5, 2.0)),
             color: Some((124, 38, 46))
         ),
         "WorkerPurple0": (
-            vox_spec: ("armor.chest.worker_white-0", (-7.0, -3.5, 2.0)),
+            vox_spec: ("armor.misc.chest.worker_white", (-7.0, -3.5, 2.0)),
             color: Some((64, 47, 56))
         ),
         "WorkerPurple1": (
-            vox_spec: ("armor.chest.shirt_white-0", (-7.0, -3.5, 2.0)),
+            vox_spec: ("armor.misc.chest.shirt_white", (-7.0, -3.5, 2.0)),
             color: Some((64, 47, 56))
         ),
         "WorkerYellow0": (
-            vox_spec: ("armor.chest.worker_white-0", (-7.0, -3.5, 2.0)),
+            vox_spec: ("armor.misc.chest.worker_white", (-7.0, -3.5, 2.0)),
             color: Some((184, 132, 40))
         ),
         "WorkerYellow1": (
-            vox_spec: ("armor.chest.shirt_white-0", (-7.0, -3.5, 2.0)),
+            vox_spec: ("armor.misc.chest.shirt_white", (-7.0, -3.5, 2.0)),
             color: Some((184, 132, 40))
         ),
         "WorkerOrange0": (
-            vox_spec: ("armor.chest.worker_white-0", (-7.0, -3.5, 2.0)),
+            vox_spec: ("armor.misc.chest.worker_white", (-7.0, -3.5, 2.0)),
             color: Some((135, 82, 67))
         ),
         "WorkerOrange1": (
-            vox_spec: ("armor.chest.shirt_white-0", (-7.0, -3.5, 2.0)),
+            vox_spec: ("armor.misc.chest.shirt_white", (-7.0, -3.5, 2.0)),
             color: Some((135, 82, 67))
         ),
         "Druid": (
-            vox_spec: ("armor.chest.druid", (-7.0, -3.5, 2.0)),
+            vox_spec: ("armor.druid.chest", (-7.0, -3.5, 2.0)),
             color: None
         ),
-        "Twig": (
-            vox_spec: ("armor.chest.twigs_chest", (-7.0, -3.5, 2.0)),
+        "Twigs": (
+            vox_spec: ("armor.twigs.chest", (-7.0, -3.5, 2.0)),
             color: None
         ),
-        "Twigsleaves": (
-            vox_spec: ("armor.chest.twigsleaves_chest", (-7.0, -3.5, 2.0)),
+        "TwigsLeaves": (
+            vox_spec: ("armor.twigsleaves.chest", (-7.0, -3.5, 2.0)),
             color: None
         ),
-        "Twigsflowers": (
-            vox_spec: ("armor.chest.twigsflowers_chest", (-7.0, -3.5, 2.0)),
+        "TwigsFlowers": (
+            vox_spec: ("armor.twigsflowers.chest", (-7.0, -3.5, 2.0)),
             color: None
         ),
         // Cultists
-        "CultistPurple": (
-            vox_spec: ("armor.chest.cultist", (-7.0, -3.5, 2.0)),
+        "Cultist": (
+            vox_spec: ("armor.cultist.chest", (-7.0, -3.5, 2.0)),
             color: Some((30, 0, 64))
         ),
-        "VeloriteMage0": (
-            vox_spec: ("armor.chest.cultist", (-7.0, -3.5, 2.0)),
-            color: Some((57, 81, 132))
-        ),
-        "Steel0": (
-            vox_spec: ("armor.chest.steel-0", (-8.0, -4.5, 2.0)),
+        "Steel": (
+            vox_spec: ("armor.steel.chest", (-8.0, -4.5, 2.0)),
             color: None
         ),
-        "PlateLeather": (
-            vox_spec: ("armor.chest.plate_leather", (-8.0, -5.5, 2.0)),
+        "LeatherPlate": (
+            vox_spec: ("armor.leather_plate.chest", (-8.0, -5.5, 2.0)),
             color: None
         ),
-        "Leather2": (
-            vox_spec: ("armor.chest.leather-2", (-7.0, -3.5, 2.0)),
+        "Agile": (
+            vox_spec: ("armor.agile.chest", (-7.0, -3.5, 2.0)),
             color: None
         ),
         "Tarasque":(
-            vox_spec: ("armor.chest.tarasque", (-8.0, -4.5, 2.0)),
+            vox_spec: ("armor.tarasque.chest", (-8.0, -4.5, 2.0)),
             color: None
         ),
         "Bonerattler":(
-            vox_spec: ("armor.chest.bonerattler", (-7.0, -4.5, 2.0)),
+            vox_spec: ("armor.bonerattler.chest", (-7.0, -4.5, 2.0)),
             color: None
         ),
-        "VeloriteMage0": (
-          vox_spec: ("armor.chest.velorite_battlemage", (-7.0, -3.5, 0.5)),
+        "VeloriteMage": (
+          vox_spec: ("armor.velorite_battlemage.chest", (-7.0, -3.5, 0.5)),
           color: None
         ),
         "Warlord": (
-          vox_spec: ("armor.chest.warlord", (-7.0, -3.5, -0.5)),
+          vox_spec: ("armor.warlord.chest", (-7.0, -3.5, -0.5)),
           color: None
         ),
         "Warlock": (
-          vox_spec: ("armor.chest.warlock", (-7.0, -3.5, 0.5)),
+          vox_spec: ("armor.warlock.chest", (-7.0, -3.5, 0.5)),
           color: None
         ),
     },
diff --git a/assets/voxygen/voxel/humanoid_armor_foot_manifest.ron b/assets/voxygen/voxel/humanoid_armor_foot_manifest.ron
index 86ff26fb20..43235c8e94 100644
--- a/assets/voxygen/voxel/humanoid_armor_foot_manifest.ron
+++ b/assets/voxygen/voxel/humanoid_armor_foot_manifest.ron
@@ -1,99 +1,99 @@
 ((
     default: (
-        vox_spec: ("armor.foot.foot_none", (-2.5, -3.5, -2.0)),
+        vox_spec: ("armor.misc.foot.none", (-2.5, -3.5, -2.0)),
         color: None
     ),
     map: {
         "Dark": (
-            vox_spec: ("armor.foot.dark-0", (-2.5, -3.5, -2.0)),
+            vox_spec: ("armor.misc.foot.dark", (-2.5, -3.5, -2.0)),
             color: None
         ),
         "Assassin": (
-            vox_spec: ("armor.foot.assa", (-2.5, -3.5, -2.0)),
+            vox_spec: ("armor.assassin.foot", (-2.5, -3.5, -2.0)),
             color: None
         ),
         "Jester": (
-            vox_spec: ("armor.foot.dark_jester-elf_shoe", (-2.5, -3.0, -2.0)),
+            vox_spec: ("armor.misc.foot.dark_jester_elf", (-2.5, -3.0, -2.0)),
             color: None
         ),
-        "Plate0": (
-            vox_spec: ("armor.foot.plate-0", (-2.5, -3.5, -2.0)),
+        "Plate": (
+            vox_spec: ("armor.plate.foot", (-2.5, -3.5, -2.0)),
             color: None
         ),
-        "Leather0": (
-            vox_spec: ("armor.foot.leather-0", (-2.5, -3.5, -2.0)),
+        "Swift": (
+            vox_spec: ("armor.swift.foot", (-2.5, -3.5, -2.0)),
             color: None
         ),
-        "ClothPurple0": (
-            vox_spec: ("armor.foot.cloth_purple-0", (-2.5, -3.5, -2.0)),
+        "ClothPurple": (
+            vox_spec: ("armor.cloth_purple.foot", (-2.5, -3.5, -2.0)),
             color: None
         ),
-        "ClothBlue0": (
-            vox_spec: ("armor.foot.cloth_blue-0", (-2.5, -3.5, -2.0)),
+        "ClothBlue": (
+            vox_spec: ("armor.cloth_blue.foot", (-2.5, -3.5, -2.0)),
             color: None
         ),
-        "ClothGreen0": (
-            vox_spec: ("armor.foot.cloth_green-0", (-2.5, -3.5, -2.0)),
+        "ClothGreen": (
+            vox_spec: ("armor.cloth_green.foot", (-2.5, -3.5, -2.0)),
             color: None
         ),
-        "Sandal0": (
-            vox_spec: ("armor.foot.cloth_sandals", (-2.5, -3.5, -2.0)),
+        "Sandal": (
+            vox_spec: ("armor.misc.foot.cloth_sandal", (-2.5, -3.5, -2.0)),
             color: None
         ),
         "Cultist": (
-            vox_spec: ("armor.foot.cultist", (-2.5, -3.5, -2.0)),
+            vox_spec: ("armor.cultist.foot", (-2.5, -3.5, -2.0)),
             color: None
         ),
-        "Steel0": (
-            vox_spec: ("armor.foot.steel-0", (-2.5, -3.5, -2.0)),
+        "Steel": (
+            vox_spec: ("armor.steel.foot", (-2.5, -3.5, -2.0)),
             color: None
         ),
-        "PlateLeather": (
-            vox_spec: ("armor.foot.plate_leather", (-2.5, -3.5, -2.0)),
+        "LeatherPlate": (
+            vox_spec: ("armor.leather_plate.foot", (-2.5, -3.5, -2.0)),
             color: None
         ),
-        "Leather2": (
-            vox_spec: ("armor.foot.leather-2", (-2.5, -3.5, -2.0)),
+        "Agile": (
+            vox_spec: ("armor.agile.foot", (-2.5, -3.5, -2.0)),
             color: None
         ),
-        "JackalopeSlips": (
-            vox_spec: ("armor.foot.jackalope_slippers", (-2.5, -3.5, -2.0)),
+        "Jackalope": (
+            vox_spec: ("armor.misc.foot.jackalope", (-2.5, -3.5, -2.0)),
             color: None
         ),
         "Druid": (
-            vox_spec: ("armor.foot.druid", (-2.5, -3.5, -2.0)),
+            vox_spec: ("armor.druid.foot", (-2.5, -3.5, -2.0)),
             color: None
         ),
-        "Twig": (
-            vox_spec: ("armor.foot.twigs_foot", (-2.5, -3.5, -2.0)),
+        "Twigs": (
+            vox_spec: ("armor.twigs.foot", (-2.5, -3.5, -2.0)),
             color: None
         ),
-        "Twigsleaves": (
-            vox_spec: ("armor.foot.twigsleaves_foot", (-2.5, -3.5, -2.0)),
+        "TwigsLeaves": (
+            vox_spec: ("armor.twigsleaves.foot", (-2.5, -3.5, -2.0)),
             color: None
         ),
-        "Twigsflowers": (
-            vox_spec: ("armor.foot.twigsflowers_foot", (-2.5, -3.5, -2.0)),
+        "TwigsFlowers": (
+            vox_spec: ("armor.twigsflowers.foot", (-2.5, -3.5, -2.0)),
             color: None
         ),
         "Tarasque":(
-            vox_spec: ("armor.foot.tarasque", (-2.5, -3.5, -2.0)),
+            vox_spec: ("armor.tarasque.foot", (-2.5, -3.5, -2.0)),
             color: None
         ),
         "Bonerattler":(
-            vox_spec: ("armor.foot.bonerattler", (-2.5, -3.5, -2.0)),
+            vox_spec: ("armor.bonerattler.foot", (-2.5, -3.5, -2.0)),
             color: None
         ),
-        "VeloriteMage0": (
-          vox_spec: ("armor.foot.velorite_battlemage", (-2.5, -3.5, -2.0)),
+        "VeloriteMage": (
+          vox_spec: ("armor.velorite_battlemage.foot", (-2.5, -3.5, -2.0)),
           color: None
         ),
         "Warlord": (
-          vox_spec: ("armor.foot.warlord", (-2.5, -3.5, -2.0)),
+          vox_spec: ("armor.warlord.foot", (-2.5, -3.5, -2.0)),
           color: None
         ),
         "Warlock": (
-          vox_spec: ("armor.foot.warlock", (-2.5, -3.5, -2.0)),
+          vox_spec: ("armor.warlock.foot", (-2.5, -3.5, -2.0)),
           color: None
         ),
     },
diff --git a/assets/voxygen/voxel/humanoid_armor_hand_manifest.ron b/assets/voxygen/voxel/humanoid_armor_hand_manifest.ron
index 4fe3176e98..1bf311f527 100644
--- a/assets/voxygen/voxel/humanoid_armor_hand_manifest.ron
+++ b/assets/voxygen/voxel/humanoid_armor_hand_manifest.ron
@@ -1,222 +1,212 @@
 ((
     default: (
         left: (
-            vox_spec: ("armor.hand.hand_right_none", (-1.5, -1.5, -2.5)),
+            vox_spec: ("armor.misc.hand.none", (-1.5, -1.5, -2.5)),
             color: None
         ),
         right: (
-            vox_spec: ("armor.hand.hand_right_none", (-1.5, -1.5, -2.5)),
+            vox_spec: ("armor.misc.hand.none", (-1.5, -1.5, -2.5)),
             color: None
         )
     ),
     map: {
         "Assassin": (
             left: (
-                vox_spec: ("armor.hand.assa_right", (-1.5, -1.5, -2.5)),
+                vox_spec: ("armor.assassin.hand", (-1.5, -1.5, -2.5)),
                 color: None
             ),
             right: (
-                vox_spec: ("armor.hand.assa_right", (-1.5, -1.5, -2.5)),
+                vox_spec: ("armor.assassin.hand", (-1.5, -1.5, -2.5)),
                 color: None
             )
         ),
         "Cloth": (
             left: (
-                vox_spec: ("armor.hand.cloth_basic_right", (-1.5, -1.5, -2.5)),
+                vox_spec: ("armor.misc.hand.cloth_basic", (-1.5, -1.5, -2.5)),
                 color: None
             ),
             right: (
-                vox_spec: ("armor.hand.cloth_basic_right", (-1.5, -1.5, -2.5)),
+                vox_spec: ("armor.misc.hand.cloth_basic", (-1.5, -1.5, -2.5)),
                 color: None
             )
         ),
-        "Plate0": (
+        "Plate": (
             left: (
-                vox_spec: ("armor.hand.plate_right-0", (-1.5, -1.5, -2.5)),
+                vox_spec: ("armor.plate.hand", (-1.5, -1.5, -2.5)),
                 color: None
             ),
             right: (
-                vox_spec: ("armor.hand.plate_right-0", (-1.5, -1.5, -2.5)),
+                vox_spec: ("armor.plate.hand", (-1.5, -1.5, -2.5)),
                 color: None
             )
         ),
-        "Leather0": (
+        "Swift": (
             left: (
-                vox_spec: ("armor.hand.leather_right-0", (-1.5, -1.5, -2.5)),
+                vox_spec: ("armor.swift.hand", (-1.5, -1.5, -2.5)),
                 color: None
             ),
             right: (
-                vox_spec: ("armor.hand.leather_right-0", (-1.5, -1.5, -2.5)),
+                vox_spec: ("armor.swift.hand", (-1.5, -1.5, -2.5)),
                 color: None
             )
         ),
-        "ClothPurple0": (
+        "ClothPurple": (
             left: (
-                vox_spec: ("armor.hand.cloth_purple_right-0", (-1.5, -1.5, -2.5)),
+                vox_spec: ("armor.cloth_purple.hand", (-1.5, -1.5, -2.5)),
                 color: None
             ),
             right: (
-                vox_spec: ("armor.hand.cloth_purple_right-0", (-1.5, -1.5, -2.5)),
+                vox_spec: ("armor.cloth_purple.hand", (-1.5, -1.5, -2.5)),
                 color: None
             )
         ),
-        "ClothBlue0": (
+        "ClothBlue": (
             left: (
-                vox_spec: ("armor.hand.cloth_blue_right-0", (-1.5, -1.5, -2.5)),
+                vox_spec: ("armor.cloth_blue.hand", (-1.5, -1.5, -2.5)),
                 color: None
             ),
             right: (
-                vox_spec: ("armor.hand.cloth_blue_right-0", (-1.5, -1.5, -2.5)),
+                vox_spec: ("armor.cloth_blue.hand", (-1.5, -1.5, -2.5)),
                 color: None
             )
         ),
-        "ClothGreen0": (
+        "ClothGreen": (
             left: (
-                vox_spec: ("armor.hand.cloth_green_right-0", (-1.5, -1.5, -2.5)),
+                vox_spec: ("armor.cloth_green.hand", (-1.5, -1.5, -2.5)),
                 color: None
             ),
             right: (
-                vox_spec: ("armor.hand.cloth_green_right-0", (-1.5, -1.5, -2.5)),
+                vox_spec: ("armor.cloth_green.hand", (-1.5, -1.5, -2.5)),
                 color: None
             )
         ),
-        "CultistPurple": (
+        "Cultist": (
             left: (
-                vox_spec: ("armor.hand.cultist_right", (-3.0, -1.5, -2.5)),
+                vox_spec: ("armor.cultist.hand", (-3.0, -1.5, -2.5)),
                 color: Some((30, 0, 64))
             ),
             right: (
-                 vox_spec: ("armor.hand.cultist_right", (-2.0, -1.5, -2.5)),
+                 vox_spec: ("armor.cultist.hand", (-2.0, -1.5, -2.5)),
                 color: Some((30, 0, 64))
             )
         ),
-        "VeloriteMage0": (
+        "Steel": (
             left: (
-                vox_spec: ("armor.hand.cultist_right", (-3.0, -1.5, -2.5)),
-                color: Some((57, 81, 132))
-            ),
-            right: (
-                 vox_spec: ("armor.hand.cultist_right", (-2.0, -1.5, -2.5)),
-                color: Some((57, 81, 132))
-            )
-        ),
-        "Steel0": (
-            left: (
-                vox_spec: ("armor.hand.steel_left-0", (-1.5, -1.5, -2.5)),
+                vox_spec: ("armor.steel.hand", (-1.5, -1.5, -2.5)),
                 color: None
             ),
             right: (
-                vox_spec: ("armor.hand.steel_right-0", (-1.5, -1.5, -2.5)),
+                vox_spec: ("armor.steel.hand", (-1.5, -1.5, -2.5)),
                 color: None
             )
         ),
-        "PlateLeather": (
+        "LeatherPlate": (
             left: (
-                vox_spec: ("armor.hand.plate_leather_left-0", (-1.5, -1.5, -2.5)),
+                vox_spec: ("armor.leather_plate.hand", (-1.5, -1.5, -2.5)),
                 color: None
             ),
             right: (
-                vox_spec: ("armor.hand.plate_leather_right-0", (-1.5, -1.5, -2.5)),
+                vox_spec: ("armor.leather_plate.hand", (-1.5, -1.5, -2.5)),
                 color: None
             )
         ),
-        "Leather2": (
+        "Agile": (
             left: (
-                vox_spec: ("armor.hand.leather_left-2", (-1.5, -1.5, -2.5)),
+                vox_spec: ("armor.agile.hand", (-1.5, -1.5, -2.5)),
                 color: None
             ),
             right: (
-                vox_spec: ("armor.hand.leather_right-2", (-1.5, -1.5, -2.5)),
+                vox_spec: ("armor.agile.hand", (-1.5, -1.5, -2.5)),
                 color: None
             )
         ),
         "Druid": (
             left: (
-                vox_spec: ("armor.hand.druid_left", (-1.5, -1.5, -2.5)),
+                vox_spec: ("armor.druid.hand", (-1.5, -1.5, -2.5)),
                 color: None
             ),
             right: (
-                vox_spec: ("armor.hand.druid_right", (-1.5, -1.5, -2.5)),
+                vox_spec: ("armor.druid.hand", (-1.5, -1.5, -2.5)),
                 color: None
             )
         ),
-        "Twig": (
+        "Twigs": (
             left: (
-                vox_spec: ("armor.hand.twigs_glove_left", (-1.5, -1.5, -2.5)),
+                vox_spec: ("armor.twigs.hand", (-1.5, -1.5, -2.5)),
                 color: None
             ),
             right: (
-                vox_spec: ("armor.hand.twigs_glove_right", (-1.5, -1.5, -2.5)),
+                vox_spec: ("armor.twigs.hand", (-1.5, -1.5, -2.5)),
                 color: None
             )
         ),
-        "Twigsleaves": (
+        "TwigsLeaves": (
             left: (
-                vox_spec: ("armor.hand.twigsleaves_glove_left", (-1.5, -1.5, -2.5)),
+                vox_spec: ("armor.twigsleaves.hand", (-1.5, -1.5, -2.5)),
                 color: None
             ),
             right: (
-                vox_spec: ("armor.hand.twigsleaves_glove_right", (-1.5, -1.5, -2.5)),
+                vox_spec: ("armor.twigsleaves.hand", (-1.5, -1.5, -2.5)),
                 color: None
             )
         ),
-        "Twigsflowers": (
+        "TwigsFlowers": (
             left: (
-                vox_spec: ("armor.hand.twigsflowers_glove_left", (-1.5, -1.5, -2.5)),
+                vox_spec: ("armor.twigsflowers.hand", (-1.5, -1.5, -2.5)),
                 color: None
             ),
             right: (
-                vox_spec: ("armor.hand.twigsflowers_glove_right", (-1.5, -1.5, -2.5)),
+                vox_spec: ("armor.twigsflowers.hand", (-1.5, -1.5, -2.5)),
                 color: None
             )
         ),
         "Tarasque": (
             left: (
-                vox_spec: ("armor.hand.tarasque_left", (-2.5, -2.5, -2.5)),
+                vox_spec: ("armor.tarasque.hand", (-2.5, -2.5, -2.5)),
                 color: None
             ),
             right: (
-                vox_spec: ("armor.hand.tarasque_right", (-2.5, -2.5, -2.5)),
+                vox_spec: ("armor.tarasque.hand", (-2.5, -2.5, -2.5)),
                 color: None
             )
         ),
         "Bonerattler": (
             left: (
-                vox_spec: ("armor.hand.bonerattler_left", (-1.5, -1.5, -2.5)),
+                vox_spec: ("armor.bonerattler.hand", (-1.5, -1.5, -2.5)),
                 color: None
             ),
             right: (
-                vox_spec: ("armor.hand.bonerattler_right", (-1.5, -1.5, -2.5)),
+                vox_spec: ("armor.bonerattler.hand", (-1.5, -1.5, -2.5)),
                 color: None
             )
         ),
-        "VeloriteMage0": (
+        "VeloriteMage": (
             left: (
-                vox_spec: ("armor.hand.velorite_battlemage_left", (-2.5, -1.5, -2.5)),
+                vox_spec: ("armor.velorite_battlemage.hand", (-2.5, -1.5, -2.5)),
                 color: None
             ),
             right: (
-                vox_spec: ("armor.hand.velorite_battlemage_left", (-2.5, -1.5, -2.5)),
+                vox_spec: ("armor.velorite_battlemage.hand", (-2.5, -1.5, -2.5)),
                 color: None
             )
         ),
         "Warlord": (
             left: (
-                vox_spec: ("armor.hand.warlord_left", (-3.0, -2.0, -5.0)),
+                vox_spec: ("armor.warlord.hand", (-3.0, -2.0, -5.0)),
                 color: None
             ),
             right: (
-                vox_spec: ("armor.hand.warlord_right", (-2.0, -2.0, -5.0)),
+                vox_spec: ("armor.warlord.hand", (-2.0, -2.0, -5.0)),
                 color: None
             )
         ),
         "Warlock": (
             left: (
-                vox_spec: ("armor.hand.warlock_left", (-4.5, -3.5, -5.0)),
+                vox_spec: ("armor.warlock.hand", (-4.5, -3.5, -5.0)),
                 color: None
             ),
             right: (
-                vox_spec: ("armor.hand.warlock_right", (-2.5, -3.5, -5.0)),
+                vox_spec: ("armor.warlock.hand", (-2.5, -3.5, -5.0)),
                 color: None
             )
         ),
diff --git a/assets/voxygen/voxel/humanoid_armor_pants_manifest.ron b/assets/voxygen/voxel/humanoid_armor_pants_manifest.ron
index 6e42a21601..e5239b2e04 100644
--- a/assets/voxygen/voxel/humanoid_armor_pants_manifest.ron
+++ b/assets/voxygen/voxel/humanoid_armor_pants_manifest.ron
@@ -1,123 +1,123 @@
 ((
     default: (
-        vox_spec: ("armor.pants.pants_none", (-5.0, -3.5, 1.0)),
+        vox_spec: ("armor.misc.pants.none", (-5.0, -3.5, 1.0)),
         color: Some((28, 66, 109))
     ),
     map: {
         "Blue": (
-            vox_spec: ("armor.pants.grayscale", (-5.0, -3.5, 1.0)),
+            vox_spec: ("armor.misc.pants.grayscale", (-5.0, -3.5, 1.0)),
             color: Some((28, 66, 109))
         ),
         "Brown": (
-            vox_spec: ("armor.pants.grayscale", (-5.0, -3.5, 1.0)),
+            vox_spec: ("armor.misc.pants.grayscale", (-5.0, -3.5, 1.0)),
             color: Some((54, 30, 26))
         ),
         "Dark": (
-            vox_spec: ("armor.pants.grayscale", (-5.0, -3.5, 1.0)),
+            vox_spec: ("armor.misc.pants.grayscale", (-5.0, -3.5, 1.0)),
             color: Some((24, 19, 17))
         ),
         "Hunting": (
-            vox_spec: ("armor.pants.grayscale", (-5.0, -3.5, 1.0)),
+            vox_spec: ("armor.misc.pants.grayscale", (-5.0, -3.5, 1.0)),
             color: Some((49, 95, 59))
         ),
         "Orange": (
-            vox_spec: ("armor.pants.grayscale", (-5.0, -3.5, 1.0)),
+            vox_spec: ("armor.misc.pants.grayscale", (-5.0, -3.5, 1.0)),
             color: Some((148, 52, 33))
         ),
         "Assassin": (
-            vox_spec: ("armor.pants.assa", (-5.0, -3.5, 1.0)),
+            vox_spec: ("armor.assassin.pants", (-5.0, -3.5, 1.0)),
             color: None
         ),
         "Kimono": (
-            vox_spec: ("armor.pants.cloth_red_kimono", (-5.0, -3.5, 0.0)),
+            vox_spec: ("armor.misc.pants.cloth_red_kimono", (-5.0, -3.5, 0.0)),
             color: None
         ),
-        "PlateGreen0": (
-            vox_spec: ("armor.pants.plate_green-0", (-5.0, -3.5, 1.0)),
+        "Plate": (
+            vox_spec: ("armor.plate.pants", (-5.0, -3.5, 1.0)),
             color: None
         ),
-        "PlateRed0": (
-            vox_spec: ("armor.pants.plate_grey-0", (-5.0, -3.5, 1.0)),
+        "PlateRed": (
+            vox_spec: ("armor.misc.pants.plate_grey", (-5.0, -3.5, 1.0)),
             color: Some((124, 38, 46))
         ),
-        "Leather0": (
-            vox_spec: ("armor.pants.leather-0", (-5.0, -3.5, 1.0)),
+        "Swift": (
+            vox_spec: ("armor.swift.pants", (-5.0, -3.5, 1.0)),
             color: None
         ),
-        "ClothPurple0": (
-            vox_spec: ("armor.pants.cloth_purple-0", (-5.0, -3.5, 0.0)),
+        "ClothPurple": (
+            vox_spec: ("armor.cloth_purple.pants", (-5.0, -3.5, 0.0)),
             color: None
         ),
-        "ClothBlue0": (
-            vox_spec: ("armor.pants.cloth_blue-0", (-5.0, -3.5, 0.0)),
+        "ClothBlue": (
+            vox_spec: ("armor.cloth_blue.pants", (-5.0, -3.5, 0.0)),
             color: None
         ),
-        "ClothGreen0": (
-            vox_spec: ("armor.pants.cloth_green-0", (-5.0, -3.5, 0.0)),
+        "ClothGreen": (
+            vox_spec: ("armor.cloth_green.pants", (-5.0, -3.5, 0.0)),
             color: None
         ),
-        "Rugged0": (
-            vox_spec: ("armor.pants.rugged-0", (-5.0, -3.5, 1.0)),
+        "Rugged": (
+            vox_spec: ("armor.rugged.pants", (-5.0, -3.5, 1.0)),
             color: None
         ),
-        "WorkerBlue0": (
-            vox_spec: ("armor.pants.worker_blue-0", (-5.0, -3.5, 1.0)),
+        "WorkerBlue": (
+            vox_spec: ("armor.misc.pants.worker_blue", (-5.0, -3.5, 1.0)),
             color: None
         ),
-        "CultistPurple": (
-            vox_spec: ("armor.pants.cultist", (-5.0, -3.5, 1.0)),
+        "Cultist": (
+            vox_spec: ("armor.cultist.pants", (-5.0, -3.5, 1.0)),
             color: Some((30, 0, 64))
         ),
-        "Steel0": (
-            vox_spec: ("armor.pants.steel-0", (-6.0, -4.5, 1.0)),
+        "Steel": (
+            vox_spec: ("armor.steel.pants", (-6.0, -4.5, 1.0)),
             color: None
         ),
-        "PlateLeather": (
-            vox_spec: ("armor.pants.plate_leather-0", (-5.0, -4.5, 1.0)),
+        "LeatherPlate": (
+            vox_spec: ("armor.leather_plate.pants", (-5.0, -4.5, 1.0)),
             color: None
         ),
-        "Leather2": (
-            vox_spec: ("armor.pants.leather-2", (-5.0, -3.5, 1.0)),
+        "Agile": (
+            vox_spec: ("armor.agile.pants", (-5.0, -3.5, 1.0)),
             color: None
         ),
         "Druid": (
-            vox_spec: ("armor.pants.druid", (-5.0, -3.5, -1.0)),
+            vox_spec: ("armor.druid.pants", (-5.0, -3.5, -1.0)),
             color: None
         ),
-        "Twig": (
-            vox_spec: ("armor.pants.twigs_pants", (-5.0, -3.5, 0.0)),
+        "Twigs": (
+            vox_spec: ("armor.twigs.pants", (-5.0, -3.5, 0.0)),
             color: None
         ),
-        "Twigsleaves": (
-            vox_spec: ("armor.pants.twigsleaves_pants", (-5.0, -3.5, 0.0)),
+        "TwigsLeaves": (
+            vox_spec: ("armor.twigsleaves.pants", (-5.0, -3.5, 0.0)),
             color: None
         ),
-        "Twigsflowers": (
-            vox_spec: ("armor.pants.twigsflowers_pants", (-6.0, -3.5, 0.0)),
+        "TwigsFlowers": (
+            vox_spec: ("armor.twigsflowers.pants", (-6.0, -3.5, 0.0)),
             color: None
         ),
         "Tarasque":(
-            vox_spec: ("armor.pants.tarasque", (-6.0, -4.5, 1.0)),
+            vox_spec: ("armor.tarasque.pants", (-6.0, -4.5, 1.0)),
             color: None
         ),
         "Bonerattler":(
-            vox_spec: ("armor.pants.bonerattler", (-5.0, -3.5, 1.0)),
+            vox_spec: ("armor.bonerattler.pants", (-5.0, -3.5, 1.0)),
             color: None
         ),
-        "VeloriteMage0": (
-            vox_spec: ("armor.pants.velorite_battlemage", (-6.0, -3.5, -2.0)),
+        "VeloriteMage": (
+            vox_spec: ("armor.velorite_battlemage.pants", (-6.0, -3.5, -2.0)),
             color: None
         ),
-        "LeatherBlue0": (
-            vox_spec: ("armor.pants.leather_blue-0", (-5.0, -3.5, 1.0)),
+        "LeatherBlue": (
+            vox_spec: ("armor.leather_blue.pants", (-5.0, -3.5, 1.0)),
             color: None
         ),
         "Warlord": (
-            vox_spec: ("armor.pants.warlord", (-6.0, -4.5, -2.0)),
+            vox_spec: ("armor.warlord.pants", (-6.0, -4.5, -2.0)),
             color: None
         ),
         "Warlock": (
-            vox_spec: ("armor.pants.warlock", (-5.0, -4.0, -2.0)),
+            vox_spec: ("armor.warlock.pants", (-5.0, -4.0, -2.0)),
             color: None
         ),
     },
diff --git a/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron b/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron
index 9a394e488c..b6d950c856 100644
--- a/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron
+++ b/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron
@@ -23,291 +23,281 @@
         ),
         "Assassin": (
             left: (
-                vox_spec: ("armor.shoulder.assa_right", (-4.0, -3.5, 1.0)),
+                vox_spec: ("armor.assassin.shoulder", (-4.0, -3.5, 1.0)),
                 color: None
             ),
             right: (
-                vox_spec: ("armor.shoulder.assa_right", (-2.0, -3.5, 1.0)),
+                vox_spec: ("armor.assassin.shoulder", (-2.0, -3.5, 1.0)),
                 color: None
             )
         ),
         "Chain": (
             left: (
-                vox_spec: ("armor.shoulder.chain_right-1", (-4.0, -3.5, 1.0)),
+                vox_spec: ("armor.shoulder.chain", (-4.0, -3.5, 1.0)),
                 color: None
             ),
             right: (
-                vox_spec: ("armor.shoulder.chain_right-1", (-2.0, -3.5, 1.0)),
+                vox_spec: ("armor.misc.shoulder.chain", (-2.0, -3.5, 1.0)),
                 color: None
             )
         ),
-        "Plate0": (
+        "Plate": (
             left: (
-                vox_spec: ("armor.shoulder.plate_right-0", (-3.6, -3.5, -0.0)),
+                vox_spec: ("armor.plate.shoulder", (-3.6, -3.5, -0.0)),
                 color: None
             ),
             right: (
-                vox_spec: ("armor.shoulder.plate_right-0", (-2.6, -3.5, 0.0)),
+                vox_spec: ("armor.plate.shoulder", (-2.6, -3.5, 0.0)),
                 color: None
             )
         ),
-        "Leather0": (
+        "Swift": (
             left: (
-                vox_spec: ("armor.shoulder.leather_right-0", (-3.2, -3.5, 0.0)),
+                vox_spec: ("armor.swift.shoulder", (-3.2, -3.5, 0.0)),
                 color: None
             ),
             right: (
-                vox_spec: ("armor.shoulder.leather_right-0", (-1.8, -3.5, 0.0)),
+                vox_spec: ("armor.swift.shoulder", (-1.4, -3.5, 0.0)),
                 color: None
             )
         ),
-        "Leather1": (
+        "Leather": (
             left: (
-                vox_spec: ("armor.shoulder.leather_right-1", (-3.6, -4.5, 0.0)),
+                vox_spec: ("armor.leather.shoulder", (-3.6, -4.5, 0.0)),
                 color: None
             ),
             right: (
-                vox_spec: ("armor.shoulder.leather_right-1", (-2.6, -4.5, 0.0)),
+                vox_spec: ("armor.leather.shoulder", (-2.6, -4.5, 0.0)),
                 color: None
             )
         ),
-        "ClothPurple0": (
+        "ClothPurple": (
             left: (
-                vox_spec: ("armor.shoulder.cloth_purple_right-0", (-3.2, -3.5, 0.0)),
+                vox_spec: ("armor.cloth_purple.shoulder", (-3.2, -3.5, 0.0)),
                 color: None
             ),
             right: (
-                vox_spec: ("armor.shoulder.cloth_purple_right-0", (-1.8, -3.5, 0.0)),
+                vox_spec: ("armor.cloth_purple.shoulder", (-1.8, -3.5, 0.0)),
                 color: None
             )
         ),
         "ClothBlue0": (
             left: (
-                vox_spec: ("armor.shoulder.cloth_blue_left-0", (-3.2, -3.5, 0.0)),
+                vox_spec: ("armor.cloth_blue.shoulder_0", (-3.2, -3.5, 0.0)),
                 color: None
             ),
             right: (
-                vox_spec: ("armor.shoulder.cloth_blue_right-0", (-1.8, -3.5, 0.0)),
+                vox_spec: ("armor.cloth_blue.shoulder_0", (-1.8, -3.5, 0.0)),
                 color: None
             )
         ),
-        "ClothGreen0": (
+        "ClothGreen": (
             left: (
-                vox_spec: ("armor.shoulder.cloth_green_left-0", (-3.2, -3.5, 0.0)),
+                vox_spec: ("armor.cloth_green.shoulder", (-3.2, -3.5, 0.0)),
                 color: None
             ),
             right: (
-                vox_spec: ("armor.shoulder.cloth_green_right-0", (-1.8, -3.5, 0.0)),
+                vox_spec: ("armor.cloth_green.shoulder", (-1.8, -3.5, 0.0)),
                 color: None
             )
         ),
-        "CultistPurple": (
+        "Cultist": (
             left: (
-                vox_spec: ("armor.shoulder.cultist_right", (-2.0, -3.5, 0.0)),
+                vox_spec: ("armor.cultist.shoulder", (-2.0, -3.5, 0.0)),
                 color: Some((30, 0, 64))
             ),
             right: (
-                 vox_spec: ("armor.shoulder.cultist_right", (-2.9, -3.5, 0.0)),
+                 vox_spec: ("armor.cultist.shoulder", (-2.9, -3.5, 0.0)),
                 color: Some((30, 0, 64))
             )
         ),
-        "VeloriteMage0": (
+        "Steel": (
             left: (
-                vox_spec: ("armor.shoulder.cultist_right", (-2.0, -3.5, 0.0)),
-                color: Some((57, 81, 132))
-            ),
-            right: (
-                 vox_spec: ("armor.shoulder.cultist_right", (-2.9, -3.5, 0.0)),
-                color: Some((57, 81, 132))
-            )
-        ),
-        "Steel0": (
-            left: (
-                vox_spec: ("armor.shoulder.steel_left-0", (-5.0, -4.5 , 0.0)),
+                vox_spec: ("armor.steel.shoulder", (-5.0, -4.5 , 0.0)),
                 color: None
             ),
             right: (
-                vox_spec: ("armor.shoulder.steel_right-0", (-1.0, -4.5, 0.0)),
+                vox_spec: ("armor.steel.shoulder", (-1.0, -4.5, 0.0)),
                 color: None
             )
         ),
-        "PlateLeather": (
+        "LeatherPlate": (
             left: (
-                vox_spec: ("armor.shoulder.plate_leather_left-0", (-4.0, -4.5 , 0.0)),
+                vox_spec: ("armor.leather_plate.shoulder", (-4.0, -4.5 , 0.0)),
                 color: None
             ),
             right: (
-                vox_spec: ("armor.shoulder.plate_leather_right-0", (-0.9, -4.5, 0.0)),
+                vox_spec: ("armor.leather_plate.shoulder", (-0.9, -4.5, 0.0)),
                 color: None
             )
         ),
-        "Leather2": (
+        "Agile": (
             left: (
-                vox_spec: ("armor.shoulder.leather_left-2", (-5.0, -3.8, -0.9)),
+                vox_spec: ("armor.agile.shoulder", (-5.0, -3.8, -0.9)),
                 color: None
             ),
             right: (
-                vox_spec: ("armor.shoulder.leather_right-2", (-1.0, -3.8, -0.9)),
+                vox_spec: ("armor.agile.shoulder", (-1.0, -3.8, -0.9)),
                 color: None
             )
         ),
-        "TwiggyShoulder": (
+        "Twigs": (
             left: (
-                vox_spec: ("armor.shoulder.twigs_left", (-5.0, -4.5 , -1.0)),
+                vox_spec: ("armor.twigs.shoulder", (-5.0, -4.5 , -1.0)),
                 color: None
             ),
             right: (
-                vox_spec: ("armor.shoulder.twigs_right", (-1.0, -4.5, -1.0)),
+                vox_spec: ("armor.twigs.shoulder", (-1.0, -4.5, -1.0)),
                 color: None
             )
         ),
-        "LeafyShoulder": (
+        "TwigsLeaves": (
             left: (
-                vox_spec: ("armor.shoulder.twigsleaves_shoulder_left", (-5.5, -5.0 , 0.0)),
+                vox_spec: ("armor.twigsleaves.shoulder", (-5.5, -5.0 , 0.0)),
                 color: None
             ),
             right: (
-                vox_spec: ("armor.shoulder.twigsleaves_shoulder_right", (-1.5, -5.0, 0.0)),
+                vox_spec: ("armor.twigsleaves.shoulder", (-1.5, -5.0, 0.0)),
                 color: None
             )
         ),
-        "FlowerShoulder": (
+        "TwigsFlowers": (
             left: (
-                vox_spec: ("armor.shoulder.twigsflowers_shoulder_left", (-5.5, -5.0 , 0.0)),
+                vox_spec: ("armor.twigsflowers.shoulder", (-5.5, -5.0 , 0.0)),
                 color: None
             ),
             right: (
-                vox_spec: ("armor.shoulder.twigsflowers_shoulder_right", (-1.5, -5.0, 0.0)),
+                vox_spec: ("armor.twigsflowers.shoulder", (-1.5, -5.0, 0.0)),
                 color: None
             ),
         ),
         "ClothBlue1": (
             left: (
-                vox_spec: ("armor.shoulder.cloth_blue_left-1", (-4.0, -2.5, -0.5)),
+                vox_spec: ("armor.cloth_blue.shoulder_1", (-4.0, -2.5, -0.5)),
                 color: None
             ),
             right: (
-                vox_spec: ("armor.shoulder.cloth_blue_right-1", (-1.0, -2.5, -0.5)),
+                vox_spec: ("armor.cloth_blue.shoulder_1", (-1.0, -2.5, -0.5)),
                 color: None
             )
         ),
         "IronSpikes": (
             left: (
-                vox_spec: ("armor.shoulder.iron_spikes_left", (-5.5, -3.8, -2.0)),
+                vox_spec: ("armor.misc.shoulder.iron_spikes", (-5.5, -3.8, -2.0)),
                 color: None
             ),
             right: (
-                vox_spec: ("armor.shoulder.iron_spikes_right", (-1.5, -3.8, -2.0)),
+                vox_spec: ("armor.misc.shoulder.iron_spikes", (-1.5, -3.8, -2.0)),
                 color: None
             )
         ),
         "IronLeather3": (
             left: (
-                vox_spec: ("armor.shoulder.leather_iron_left-3", (-4.0, -2.5, -1.0)),
+                vox_spec: ("armor.misc.shoulder.leather_iron_3", (-4.0, -2.5, -1.0)),
                 color: None
             ),
             right: (
-                vox_spec: ("armor.shoulder.leather_iron_right-3", (-2.0, -2.5, -1.0)),
+                vox_spec: ("armor.misc.shoulder.leather_iron_3", (-2.0, -2.5, -1.0)),
                 color: None
             )
         ),
         "IronLeather2": (
             left: (
-                vox_spec: ("armor.shoulder.leather_iron_left-2", (-5.0, -2.5, -0.5)),
+                vox_spec: ("armor.misc.shoulder.leather_iron_2", (-5.0, -2.5, -0.5)),
                 color: None
             ),
             right: (
-                vox_spec: ("armor.shoulder.leather_iron_right-2", (-2.0, -2.5, -0.5)),
+                vox_spec: ("armor.misc.shoulder.leather_iron_2", (-2.0, -2.5, -0.5)),
                 color: None
             )
         ),
         "IronLeather1": (
             left: (
-                vox_spec: ("armor.shoulder.leather_iron_left-1", (-5.0, -2.5, -0.5)),
+                vox_spec: ("armor.misc.shoulder.leather_iron_1", (-5.0, -2.5, -0.5)),
                 color: None
             ),
             right: (
-                vox_spec: ("armor.shoulder.leather_iron_right-1", (-2.0, -2.5, -0.5)),
+                vox_spec: ("armor.misc.shoulder.leather_iron_1", (-2.0, -2.5, -0.5)),
                 color: None
             )
         ),
         "IronLeather0": (
             left: (
-                vox_spec: ("armor.shoulder.leather_iron_left-0", (-6.0, -2.5, -0.5)),
+                vox_spec: ("armor.misc.shoulder.leather_iron_0", (-6.0, -2.5, -0.5)),
                 color: None
             ),
             right: (
-                vox_spec: ("armor.shoulder.leather_iron_right-0", (-2.0, -2.5, -0.5)),
+                vox_spec: ("armor.misc.shoulder.leather_iron_0", (-2.0, -2.5, -0.5)),
                 color: None
             )
         ),
-        "LeatherStrips": (
+        "LeatherStrip": (
             left: (
-                vox_spec: ("armor.shoulder.leather_strips_left", (-3.0, -2.5, -2.0)),
+                vox_spec: ("armor.misc.shoulder.leather_strip", (-3.0, -2.5, -2.0)),
                 color: None
             ),
             right: (
-                vox_spec: ("armor.shoulder.leather_strips_right", (-2.0, -2.5, -2.0)),
+                vox_spec: ("armor.misc.shoulder.leather_strip", (-2.0, -2.5, -2.0)),
                 color: None
             )
         ),
-        "DruidShoulder": (
+        "Druid": (
             left: (
-                vox_spec: ("armor.shoulder.druid_left", (-4.0, -4.5 , -3.0)),
+                vox_spec: ("armor.druid.shoulder", (-4.0, -4.5 , -3.0)),
                 color: None
             ),
             right: (
-                vox_spec: ("armor.shoulder.druid_right", (-2.0, -4.5, -3.0)),
+                vox_spec: ("armor.druid.shoulder", (-2.0, -4.5, -3.0)),
                 color: None
             )
         ),
         "Tarasque": (
             left: (
-                vox_spec: ("armor.shoulder.tarasque_left", (-5.0, -3.5 , 0.0)),
+                vox_spec: ("armor.tarsque.shoulder", (-5.0, -3.5 , 0.0)),
                 color: None
             ),
             right: (
-                vox_spec: ("armor.shoulder.tarasque_right", (-0.0, -3.5, 0.0)),
+                vox_spec: ("armor.tarsque.shoulder", (-0.0, -3.5, 0.0)),
                 color: None
             )
         ),
         "Bonerattler": (
             left: (
-                vox_spec: ("armor.shoulder.bonerattler_left", (-4.0, -3.5 , 1.0)),
+                vox_spec: ("armor.bonerattler.shoulder", (-4.0, -3.5 , 1.0)),
                 color: None
             ),
             right: (
-                vox_spec: ("armor.shoulder.bonerattler_right", (-1.0, -3.5, 1.0)),
+                vox_spec: ("armor.bonerattler.shoulder", (-1.0, -3.5, 1.0)),
                 color: None
             )
         ),
-        "VeloriteMage0": (
+        "VeloriteMage": (
             left: (
-                vox_spec: ("armor.shoulder.velorite_battlemage_left", (-6.0, -4.0 , 0.0)),
+                vox_spec: ("armor.velorite_battlemage.shoulder", (-6.0, -4.0 , 0.0)),
                 color: None
             ),
             right: (
-                vox_spec: ("armor.shoulder.velorite_battlemage_left", (-1.0, -4.0, 0.0)),
+                vox_spec: ("armor.velorite_battlemage.shoulder", (-1.0, -4.0, 0.0)),
                 color: None
             )
         ),
         "Warlord": (
             left: (
-                vox_spec: ("armor.shoulder.warlord_left", (-8.0, -3.5 , -2.5)),
+                vox_spec: ("armor.warlord.shoulder", (-8.0, -3.5 , -2.5)),
                 color: None
             ),
             right: (
-                vox_spec: ("armor.shoulder.warlord_right", (-1.0, -3.5 , -2.5)),
+                vox_spec: ("armor.warlord.shoulder", (-1.0, -3.5 , -2.5)),
                 color: None
             )
         ),
         "Warlock": (
             left: (
-                vox_spec: ("armor.shoulder.warlock_left", (-6.0, -4.0 , -2.0)),
+                vox_spec: ("armor.warlock.shoulder", (-6.0, -4.0 , -2.0)),
                 color: None
             ),
             right: (
-                vox_spec: ("armor.shoulder.warlock_left", (0.0, -4.0, -2.0)),
+                vox_spec: ("armor.warlock.shoulder", (0.0, -4.0, -2.0)),
                 color: None
             )
         ),
diff --git a/assets/voxygen/voxel/humanoid_lantern_manifest.ron b/assets/voxygen/voxel/humanoid_lantern_manifest.ron
index 3b3dbf5fe1..599a711559 100644
--- a/assets/voxygen/voxel/humanoid_lantern_manifest.ron
+++ b/assets/voxygen/voxel/humanoid_lantern_manifest.ron
@@ -5,19 +5,19 @@
     ),
     map: {
       "Green0": (
-          vox_spec: ("armor.lantern.green-0", (-2.0, -2.0, -7.0)),
+          vox_spec: ("armor.misc.lantern.green-0", (-2.0, -2.0, -7.0)),
           color: None
       ),
       "Black0": (
-          vox_spec: ("armor.lantern.black-0", (-2.0, -2.0, -7.0)),
+          vox_spec: ("armor.misc.lantern.black-0", (-2.0, -2.0, -7.0)),
           color: None
       ),
       "Red0": (
-          vox_spec: ("armor.lantern.red-0", (-2.0, -2.0, -7.0)),
+          vox_spec: ("armor.misc.lantern.red-0", (-2.0, -2.0, -7.0)),
           color: None
       ),
       "Blue0": (
-          vox_spec: ("armor.lantern.blue-0", (-2.0, -2.0, -7.0)),
+          vox_spec: ("armor.misc.lantern.blue-0", (-2.0, -2.0, -7.0)),
           color: None
       ),
     },
diff --git a/common/src/comp/inventory/loadout_builder.rs b/common/src/comp/inventory/loadout_builder.rs
index 242f696139..0abb9f4562 100644
--- a/common/src/comp/inventory/loadout_builder.rs
+++ b/common/src/comp/inventory/loadout_builder.rs
@@ -56,13 +56,13 @@ impl LoadoutBuilder {
     /// updates, but should be safe defaults for a new character.
     pub fn defaults(self) -> Self {
         self.chest(Some(Item::new_from_asset_expect(
-            "common.items.armor.chest.rugged",
+            "common.items.armor.rugged.chest",
         )))
         .pants(Some(Item::new_from_asset_expect(
-            "common.items.armor.pants.rugged",
+            "common.items.armor.rugged.pants",
         )))
         .feet(Some(Item::new_from_asset_expect(
-            "common.items.armor.foot.sandals_0",
+            "common.items.armor.misc.foot.sandals",
         )))
         .lantern(Some(Item::new_from_asset_expect(
             "common.items.lantern.black_0",
@@ -478,22 +478,22 @@ impl LoadoutBuilder {
                 Guard => LoadoutBuilder::new()
                     .active_item(active_item)
                     .shoulder(Some(Item::new_from_asset_expect(
-                        "common.items.armor.shoulder.plate_leather_0",
+                        "common.items.armor.leather_plate.shoulder",
                     )))
                     .chest(Some(Item::new_from_asset_expect(
-                        "common.items.armor.chest.plate_leather_0",
+                        "common.items.armor.leather_plate.chest",
                     )))
                     .belt(Some(Item::new_from_asset_expect(
-                        "common.items.armor.belt.plate_leather_0",
+                        "common.items.armor.leather_plate.belt",
                     )))
                     .hands(Some(Item::new_from_asset_expect(
-                        "common.items.armor.hand.plate_leather_0",
+                        "common.items.armor.leather_plate.hand",
                     )))
                     .pants(Some(Item::new_from_asset_expect(
-                        "common.items.armor.pants.plate_leather_0",
+                        "common.items.armor.leather_plate.pants",
                     )))
                     .feet(Some(Item::new_from_asset_expect(
-                        "common.items.armor.foot.plate_leather_0",
+                        "common.items.armor.leather_plate.foot",
                     )))
                     .lantern(match rand::thread_rng().gen_range(0..3) {
                         0 => Some(Item::new_from_asset_expect("common.items.lantern.black_0")),
@@ -503,22 +503,22 @@ impl LoadoutBuilder {
                 Outcast => LoadoutBuilder::new()
                     .active_item(active_item)
                     .shoulder(Some(Item::new_from_asset_expect(
-                        "common.items.armor.shoulder.cloth_purple_0",
+                        "common.items.armor.cloth_purple.shoulder",
                     )))
                     .chest(Some(Item::new_from_asset_expect(
-                        "common.items.armor.chest.cloth_purple_0",
+                        "common.items.armor.cloth_purple.chest",
                     )))
                     .belt(Some(Item::new_from_asset_expect(
-                        "common.items.armor.belt.cloth_purple_0",
+                        "common.items.armor.cloth_purple.belt",
                     )))
                     .hands(Some(Item::new_from_asset_expect(
-                        "common.items.armor.hand.cloth_purple_0",
+                        "common.items.armor.cloth_purple.hand",
                     )))
                     .pants(Some(Item::new_from_asset_expect(
-                        "common.items.armor.pants.cloth_purple_0",
+                        "common.items.armor.pacloth_purplents.pants",
                     )))
                     .feet(Some(Item::new_from_asset_expect(
-                        "common.items.armor.foot.cloth_purple_0",
+                        "common.items.armor.cloth_purple.foot",
                     )))
                     .lantern(match rand::thread_rng().gen_range(0..3) {
                         0 => Some(Item::new_from_asset_expect("common.items.lantern.black_0")),
@@ -528,22 +528,22 @@ impl LoadoutBuilder {
                 Highwayman => LoadoutBuilder::new()
                     .active_item(active_item)
                     .shoulder(Some(Item::new_from_asset_expect(
-                        "common.items.armor.shoulder.leather_0",
+                        "common.items.armor.swift.shoulder",
                     )))
                     .chest(Some(Item::new_from_asset_expect(
-                        "common.items.armor.chest.leather_0",
+                        "common.items.armor.swift.chest",
                     )))
                     .belt(Some(Item::new_from_asset_expect(
-                        "common.items.armor.belt.leather_0",
+                        "common.items.armor.swift.belt",
                     )))
                     .hands(Some(Item::new_from_asset_expect(
-                        "common.items.armor.hand.leather_0",
+                        "common.items.armor.swift.hand",
                     )))
                     .pants(Some(Item::new_from_asset_expect(
-                        "common.items.armor.pants.leather_0",
+                        "common.items.armor.swift.pants",
                     )))
                     .feet(Some(Item::new_from_asset_expect(
-                        "common.items.armor.foot.leather_0",
+                        "common.items.armor.swift.foot",
                     )))
                     .lantern(match rand::thread_rng().gen_range(0..3) {
                         0 => Some(Item::new_from_asset_expect("common.items.lantern.black_0")),
@@ -556,22 +556,22 @@ impl LoadoutBuilder {
                 Bandit => LoadoutBuilder::new()
                     .active_item(active_item)
                     .shoulder(Some(Item::new_from_asset_expect(
-                        "common.items.armor.shoulder.assassin",
+                        "common.items.armor.assassin.shoulder",
                     )))
                     .chest(Some(Item::new_from_asset_expect(
-                        "common.items.armor.chest.assassin",
+                        "common.items.armor.assassin.chest",
                     )))
                     .belt(Some(Item::new_from_asset_expect(
-                        "common.items.armor.belt.assassin",
+                        "common.items.armor.assassin.belt",
                     )))
                     .hands(Some(Item::new_from_asset_expect(
-                        "common.items.armor.hand.assassin",
+                        "common.items.armor.assassin.hand",
                     )))
                     .pants(Some(Item::new_from_asset_expect(
-                        "common.items.armor.pants.assassin",
+                        "common.items.armor.assassin.pants",
                     )))
                     .feet(Some(Item::new_from_asset_expect(
-                        "common.items.armor.foot.assassin",
+                        "common.items.armor.assassin.foot",
                     )))
                     .lantern(match rand::thread_rng().gen_range(0..3) {
                         0 => Some(Item::new_from_asset_expect("common.items.lantern.black_0")),
@@ -584,25 +584,25 @@ impl LoadoutBuilder {
                 CultistNovice => LoadoutBuilder::new()
                     .active_item(active_item)
                     .shoulder(Some(Item::new_from_asset_expect(
-                        "common.items.armor.shoulder.steel_0",
+                        "common.items.armor.steel.shoulder",
                     )))
                     .chest(Some(Item::new_from_asset_expect(
-                        "common.items.armor.chest.steel_0",
+                        "common.items.armor.steel.chest",
                     )))
                     .belt(Some(Item::new_from_asset_expect(
-                        "common.items.armor.belt.steel_0",
+                        "common.items.armor.steel.belt",
                     )))
                     .hands(Some(Item::new_from_asset_expect(
-                        "common.items.armor.hand.steel_0",
+                        "common.items.armor.steel.hand",
                     )))
                     .pants(Some(Item::new_from_asset_expect(
-                        "common.items.armor.pants.steel_0",
+                        "common.items.armor.steel.pants",
                     )))
                     .feet(Some(Item::new_from_asset_expect(
-                        "common.items.armor.foot.steel_0",
+                        "common.items.armor.steel.foot",
                     )))
                     .back(Some(Item::new_from_asset_expect(
-                        "common.items.armor.back.dungeon_purple-0",
+                        "common.items.armor.misc.back.dungeon_purple",
                     )))
                     .lantern(match rand::thread_rng().gen_range(0..3) {
                         0 => Some(Item::new_from_asset_expect("common.items.lantern.black_0")),
@@ -615,25 +615,25 @@ impl LoadoutBuilder {
                 CultistAcolyte => LoadoutBuilder::new()
                     .active_item(active_item)
                     .shoulder(Some(Item::new_from_asset_expect(
-                        "common.items.armor.shoulder.cultist_shoulder_purple",
+                        "common.items.armor.cultist.shoulder",
                     )))
                     .chest(Some(Item::new_from_asset_expect(
-                        "common.items.armor.chest.cultist_chest_purple",
+                        "common.items.armor.cultist.chest",
                     )))
                     .belt(Some(Item::new_from_asset_expect(
-                        "common.items.armor.belt.cultist_belt",
+                        "common.items.armor.cultist.belt",
                     )))
                     .hands(Some(Item::new_from_asset_expect(
-                        "common.items.armor.hand.cultist_hands_purple",
+                        "common.items.armor.cultist.hand",
                     )))
                     .pants(Some(Item::new_from_asset_expect(
-                        "common.items.armor.pants.cultist_legs_purple",
+                        "common.items.armor.cultist.pants",
                     )))
                     .feet(Some(Item::new_from_asset_expect(
-                        "common.items.armor.foot.cultist_boots",
+                        "common.items.armor.cultist.foot",
                     )))
                     .back(Some(Item::new_from_asset_expect(
-                        "common.items.armor.back.dungeon_purple-0",
+                        "common.items.armor.misc.back.dungeon_purple",
                     )))
                     .lantern(match rand::thread_rng().gen_range(0..3) {
                         0 => Some(Item::new_from_asset_expect("common.items.lantern.black_0")),
@@ -646,25 +646,25 @@ impl LoadoutBuilder {
                 Warlord => LoadoutBuilder::new()
                     .active_item(active_item)
                     .shoulder(Some(Item::new_from_asset_expect(
-                        "common.items.armor.shoulder.warlord",
+                        "common.items.armor.warlord.shoulder",
                     )))
                     .chest(Some(Item::new_from_asset_expect(
-                        "common.items.armor.chest.warlord",
+                        "common.items.armor.warlord.chest",
                     )))
                     .belt(Some(Item::new_from_asset_expect(
-                        "common.items.armor.belt.warlord",
+                        "common.items.armor.warlord.belt",
                     )))
                     .hands(Some(Item::new_from_asset_expect(
-                        "common.items.armor.hand.warlord",
+                        "common.items.armor.warlord.hand",
                     )))
                     .pants(Some(Item::new_from_asset_expect(
-                        "common.items.armor.pants.warlord",
+                        "common.items.armor.warlord.pants",
                     )))
                     .feet(Some(Item::new_from_asset_expect(
-                        "common.items.armor.foot.warlord",
+                        "common.items.armor.warlord.foot",
                     )))
                     .back(Some(Item::new_from_asset_expect(
-                        "common.items.armor.back.warlord",
+                        "common.items.armor.warlord.back",
                     )))
                     .lantern(match rand::thread_rng().gen_range(0..3) {
                         0 => Some(Item::new_from_asset_expect("common.items.lantern.black_0")),
@@ -677,25 +677,25 @@ impl LoadoutBuilder {
                 Warlock => LoadoutBuilder::new()
                     .active_item(active_item)
                     .shoulder(Some(Item::new_from_asset_expect(
-                        "common.items.armor.shoulder.warlock",
+                        "common.items.armor.warlock.shoulder",
                     )))
                     .chest(Some(Item::new_from_asset_expect(
-                        "common.items.armor.chest.warlock",
+                        "common.items.armor.warlock.chest",
                     )))
                     .belt(Some(Item::new_from_asset_expect(
-                        "common.items.armor.belt.warlock",
+                        "common.items.armor.warlock.belt",
                     )))
                     .hands(Some(Item::new_from_asset_expect(
-                        "common.items.armor.hand.warlock",
+                        "common.items.armor.warlock.hand",
                     )))
                     .pants(Some(Item::new_from_asset_expect(
-                        "common.items.armor.pants.warlock",
+                        "common.items.armor.warlock.pants",
                     )))
                     .feet(Some(Item::new_from_asset_expect(
-                        "common.items.armor.foot.warlock",
+                        "common.items.armor.warlock.foot",
                     )))
                     .back(Some(Item::new_from_asset_expect(
-                        "common.items.armor.back.warlock",
+                        "common.items.armor.warlock.back",
                     )))
                     .lantern(match rand::thread_rng().gen_range(0..3) {
                         0 => Some(Item::new_from_asset_expect("common.items.lantern.black_0")),
@@ -709,28 +709,28 @@ impl LoadoutBuilder {
                     .active_item(active_item)
                     .chest(Some(Item::new_from_asset_expect(
                         match rand::thread_rng().gen_range(0..10) {
-                            0 => "common.items.armor.chest.worker_green_0",
-                            1 => "common.items.armor.chest.worker_green_1",
-                            2 => "common.items.armor.chest.worker_red_0",
-                            3 => "common.items.armor.chest.worker_red_1",
-                            4 => "common.items.armor.chest.worker_purple_0",
-                            5 => "common.items.armor.chest.worker_purple_1",
-                            6 => "common.items.armor.chest.worker_yellow_0",
-                            7 => "common.items.armor.chest.worker_yellow_1",
-                            8 => "common.items.armor.chest.worker_orange_0",
-                            _ => "common.items.armor.chest.worker_orange_1",
+                            0 => "common.items.armor.misc.chest.worker_green_0",
+                            1 => "common.items.armor.misc.chest.worker_green_1",
+                            2 => "common.items.armor.misc.chest.worker_red_0",
+                            3 => "common.items.armor.misc.chest.worker_red_1",
+                            4 => "common.items.armor.misc.chest.worker_purple_0",
+                            5 => "common.items.armor.misc.chest.worker_purple_1",
+                            6 => "common.items.armor.misc.chest.worker_yellow_0",
+                            7 => "common.items.armor.misc.chest.worker_yellow_1",
+                            8 => "common.items.armor.misc.chest.worker_orange_0",
+                            _ => "common.items.armor.misc.chest.worker_orange_1",
                         },
                     )))
                     .belt(Some(Item::new_from_asset_expect(
-                        "common.items.armor.belt.leather_0",
+                        "common.items.armor.swift.belt",
                     )))
                     .pants(Some(Item::new_from_asset_expect(
-                        "common.items.armor.pants.worker_blue_0",
+                        "common.items.armor.misc.pants.worker_blue",
                     )))
                     .feet(Some(Item::new_from_asset_expect(
                         match rand::thread_rng().gen_range(0..2) {
-                            0 => "common.items.armor.foot.leather_0",
-                            _ => "common.items.armor.foot.sandals_0",
+                            0 => "common.items.armor.swift.foot",
+                            _ => "common.items.armor.misc.foot.sandals",
                         },
                     )))
                     .build(),
diff --git a/server/src/rtsim/entity.rs b/server/src/rtsim/entity.rs
index 9020e67c8f..cfd29f9a3e 100644
--- a/server/src/rtsim/entity.rs
+++ b/server/src/rtsim/entity.rs
@@ -78,16 +78,16 @@ impl Entity {
 
         let back = match rng.gen_range(0..5) {
             0 => Some(comp::Item::new_from_asset_expect(
-                "common.items.armor.back.leather_adventurer",
+                "common.items.armor.agile.back",
             )),
             1 => Some(comp::Item::new_from_asset_expect(
-                "common.items.npc_armor.back.backpack_0",
+                "common.items.npc_armor.back.backpack",
             )),
             2 => Some(comp::Item::new_from_asset_expect(
-                "common.items.npc_armor.back.backpack_blue_0",
+                "common.items.npc_armor.back.backpack_blue",
             )),
             3 => Some(comp::Item::new_from_asset_expect(
-                "common.items.npc_armor.back.leather_blue_0",
+                "common.items.npc_armor.back.leather_blue",
             )),
             _ => None,
         };
@@ -105,13 +105,13 @@ impl Entity {
         };
 
         let chest = Some(comp::Item::new_from_asset_expect(
-            "common.items.npc_armor.chest.leather_blue_0",
+            "common.items.npc_armor.chest.leather_blue",
         ));
         let pants = Some(comp::Item::new_from_asset_expect(
-            "common.items.npc_armor.pants.leather_blue_0",
+            "common.items.npc_armor.pants.leather_blue",
         ));
         let shoulder = Some(comp::Item::new_from_asset_expect(
-            "common.items.armor.shoulder.leather_0",
+            "common.items.armor.swift.shoulder",
         ));
 
         LoadoutBuilder::build_loadout(self.get_body(), Some(main_tool), None)

From 0ec709bf17aca6d91fd608e467afa020b6dfd09f Mon Sep 17 00:00:00 2001
From: Sam <samuelkeiffer@gmail.com>
Date: Mon, 1 Mar 2021 00:42:35 -0500
Subject: [PATCH 09/16] Migration for armor re-organization.

---
 .../armor/druid/{druid.ron => pants.ron}      |   0
 common/src/bin/csv_export/main.rs             |  23 +-
 .../down.sql                                  |   1 +
 .../up.sql                                    | 336 ++++++++++++++++++
 4 files changed, 350 insertions(+), 10 deletions(-)
 rename assets/common/items/armor/druid/{druid.ron => pants.ron} (100%)
 create mode 100644 server/src/migrations/2021-03-01-053817_armor-reorganization/down.sql
 create mode 100644 server/src/migrations/2021-03-01-053817_armor-reorganization/up.sql

diff --git a/assets/common/items/armor/druid/druid.ron b/assets/common/items/armor/druid/pants.ron
similarity index 100%
rename from assets/common/items/armor/druid/druid.ron
rename to assets/common/items/armor/druid/pants.ron
diff --git a/common/src/bin/csv_export/main.rs b/common/src/bin/csv_export/main.rs
index 828a59bae4..232e828758 100644
--- a/common/src/bin/csv_export/main.rs
+++ b/common/src/bin/csv_export/main.rs
@@ -5,7 +5,7 @@ use structopt::StructOpt;
 
 use comp::item::{
     armor::{ArmorKind, Protection},
-    tool::{Hands, Tool, ToolKind},
+    tool::{Hands, MaterialStatManifest, Tool, ToolKind},
     ItemKind,
 };
 use veloren_common::comp;
@@ -80,15 +80,17 @@ fn weapon_stats() -> Result<(), Box<dyn Error>> {
         "Description",
     ])?;
 
+    let msm = MaterialStatManifest::default();
+
     for item in comp::item::Item::new_from_asset_glob("common.items.weapons.*")
         .expect("Failed to iterate over item folders!")
     {
         match item.kind() {
             comp::item::ItemKind::Tool(tool) => {
-                let power = tool.base_power(&[]).to_string();
-                let poise_strength = tool.base_poise_strength(&[]).to_string();
-                let speed = tool.base_speed(&[]).to_string();
-                let equip_time = tool.equip_time(&[]).subsec_millis().to_string();
+                let power = tool.base_power(&msm, &[]).to_string();
+                let poise_strength = tool.base_poise_strength(&msm, &[]).to_string();
+                let speed = tool.base_speed(&msm, &[]).to_string();
+                let equip_time = tool.equip_time(&msm, &[]).subsec_millis().to_string();
                 let kind = get_tool_kind(&tool.kind);
                 let hands = get_tool_hands(&tool);
 
@@ -115,14 +117,15 @@ fn weapon_stats() -> Result<(), Box<dyn Error>> {
 
 fn get_tool_kind(kind: &ToolKind) -> String {
     match kind {
-        ToolKind::Sword => "Sword".to_string(),
-        ToolKind::Axe => "Axe".to_string(),
-        ToolKind::Hammer => "Hammer".to_string(),
-        ToolKind::Bow => "Bow".to_string(),
+        ToolKind::Sword | ToolKind::SwordSimple => "Sword".to_string(),
+        ToolKind::Axe | ToolKind::AxeSimple => "Axe".to_string(),
+        ToolKind::Hammer | ToolKind::HammerSimple => "Hammer".to_string(),
+        ToolKind::Bow | ToolKind::BowSimple => "Bow".to_string(),
         ToolKind::Dagger => "Dagger".to_string(),
-        ToolKind::Staff => "Staff".to_string(),
+        ToolKind::Staff | ToolKind::StaffSimple => "Staff".to_string(),
         ToolKind::Sceptre => "Sceptre".to_string(),
         ToolKind::Shield => "Shield".to_string(),
+        ToolKind::Spear => "Spear".to_string(),
         ToolKind::Debug => "Debug".to_string(),
         ToolKind::Farming => "Farming".to_string(),
         ToolKind::Unique(_) => "Unique".to_string(),
diff --git a/server/src/migrations/2021-03-01-053817_armor-reorganization/down.sql b/server/src/migrations/2021-03-01-053817_armor-reorganization/down.sql
new file mode 100644
index 0000000000..291a97c5ce
--- /dev/null
+++ b/server/src/migrations/2021-03-01-053817_armor-reorganization/down.sql
@@ -0,0 +1 @@
+-- This file should undo anything in `up.sql`
\ No newline at end of file
diff --git a/server/src/migrations/2021-03-01-053817_armor-reorganization/up.sql b/server/src/migrations/2021-03-01-053817_armor-reorganization/up.sql
new file mode 100644
index 0000000000..d829868d03
--- /dev/null
+++ b/server/src/migrations/2021-03-01-053817_armor-reorganization/up.sql
@@ -0,0 +1,336 @@
+UPDATE item
+SET item_definition_id = 'common.items.armor.misc.back.admin' WHERE item_definition_id = 'common.items.armor.back.admin';
+UPDATE item
+SET item_definition_id = 'common.items.armor.misc.back.backpack' WHERE item_definition_id = 'common.items.armor.back.backpack_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.misc.back.dungeon_purple' WHERE item_definition_id = 'common.items.armor.back.dungeon_purple-0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.agile.back' WHERE item_definition_id = 'common.items.armor.back.leather_adventurer';
+UPDATE item
+SET item_definition_id = 'common.items.armor.misc.back.short_0' WHERE item_definition_id = 'common.items.armor.back.short_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.misc.back.short_1' WHERE item_definition_id = 'common.items.armor.back.short_1';
+UPDATE item
+SET item_definition_id = 'common.items.armor.velorite_mage.back' WHERE item_definition_id = 'common.items.armor.back.velorite_mage_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.warlock.back' WHERE item_definition_id = 'common.items.armor.back.warlock';
+UPDATE item
+SET item_definition_id = 'common.items.armor.warlord.back' WHERE item_definition_id = 'common.items.armor.back.warlord';
+UPDATE item
+SET item_definition_id = 'common.items.armor.assassin.belt' WHERE item_definition_id = 'common.items.armor.belt.assassin';
+UPDATE item
+SET item_definition_id = 'common.items.armor.bonerattler.belt' WHERE item_definition_id = 'common.items.armor.belt.bonerattler';
+UPDATE item
+SET item_definition_id = 'common.items.armor.cloth_blue.belt' WHERE item_definition_id = 'common.items.armor.belt.cloth_blue_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.cloth_green.belt' WHERE item_definition_id = 'common.items.armor.belt.cloth_green_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.cloth_purple.belt' WHERE item_definition_id = 'common.items.armor.belt.cloth_purple_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.cultist.belt' WHERE item_definition_id = 'common.items.armor.belt.cultist_belt';
+UPDATE item
+SET item_definition_id = 'common.items.armor.druid.belt' WHERE item_definition_id = 'common.items.armor.belt.druid';
+UPDATE item
+SET item_definition_id = 'common.items.armor.swift.belt' WHERE item_definition_id = 'common.items.armor.belt.leather_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.leather.belt' WHERE item_definition_id = 'common.items.armor.belt.leather_2';
+UPDATE item
+SET item_definition_id = 'common.items.armor.agile.belt' WHERE item_definition_id = 'common.items.armor.belt.leather_adventurer';
+UPDATE item
+SET item_definition_id = 'common.items.armor.plate.belt' WHERE item_definition_id = 'common.items.armor.belt.plate_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.leather_plate.belt' WHERE item_definition_id = 'common.items.armor.belt.plate_leather_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.steel.belt' WHERE item_definition_id = 'common.items.armor.belt.steel_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.tarasque.belt' WHERE item_definition_id = 'common.items.armor.belt.tarasque';
+UPDATE item
+SET item_definition_id = 'common.items.armor.twigs.belt' WHERE item_definition_id = 'common.items.armor.belt.twig';
+UPDATE item
+SET item_definition_id = 'common.items.armor.twigflowers.belt' WHERE item_definition_id = 'common.items.armor.belt.twigsflowers';
+UPDATE item
+SET item_definition_id = 'common.items.armor.twigsleaves.belt' WHERE item_definition_id = 'common.items.armor.belt.twigsleaves';
+UPDATE item
+SET item_definition_id = 'common.items.armor.velorite_mage.belt' WHERE item_definition_id = 'common.items.armor.belt.velorite_mage_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.warlock.belt' WHERE item_definition_id = 'common.items.armor.belt.warlock';
+UPDATE item
+SET item_definition_id = 'common.items.armor.warlord.belt' WHERE item_definition_id = 'common.items.armor.belt.warlord';
+UPDATE item
+SET item_definition_id = 'common.items.armor.assassin.chest' WHERE item_definition_id = 'common.items.armor.chest.assassin';
+UPDATE item
+SET item_definition_id = 'common.items.armor.bonerattler.chest' WHERE item_definition_id = 'common.items.armor.chest.bonerattler';
+UPDATE item
+SET item_definition_id = 'common.items.armor.cloth_blue.chest' WHERE item_definition_id = 'common.items.armor.chest.cloth_blue_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.cloth_green.chest' WHERE item_definition_id = 'common.items.armor.chest.cloth_green_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.cloth_purple.chest' WHERE item_definition_id = 'common.items.armor.chest.cloth_purple_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.cultist.chest' WHERE item_definition_id = 'common.items.armor.chest.cultist_chest_blue';
+UPDATE item
+SET item_definition_id = 'common.items.armor.cultist.chest' WHERE item_definition_id = 'common.items.armor.chest.cultist_chest_purple';
+UPDATE item
+SET item_definition_id = 'common.items.armor.druid.chest' WHERE item_definition_id = 'common.items.armor.chest.druid';
+UPDATE item
+SET item_definition_id = 'common.items.armor.swift.chest' WHERE item_definition_id = 'common.items.armor.chest.leather_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.leather.chest' WHERE item_definition_id = 'common.items.armor.chest.leather_2';
+UPDATE item
+SET item_definition_id = 'common.items.armor.agile.chest' WHERE item_definition_id = 'common.items.armor.chest.leather_adventurer';
+UPDATE item
+SET item_definition_id = 'common.items.armor.plate.chest' WHERE item_definition_id = 'common.items.armor.chest.plate_green_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.leather_plate.chest' WHERE item_definition_id = 'common.items.armor.chest.plate_leather_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.rugged.chest' WHERE item_definition_id = 'common.items.armor.chest.rugged';
+UPDATE item
+SET item_definition_id = 'common.items.armor.steel.chest' WHERE item_definition_id = 'common.items.armor.chest.steel_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.tarasque.chest' WHERE item_definition_id = 'common.items.armor.chest.tarasque';
+UPDATE item
+SET item_definition_id = 'common.items.armor.twigs.chest' WHERE item_definition_id = 'common.items.armor.chest.twig';
+UPDATE item
+SET item_definition_id = 'common.items.armor.twigflowers.chest' WHERE item_definition_id = 'common.items.armor.chest.twigsflowers';
+UPDATE item
+SET item_definition_id = 'common.items.armor.twigsleaves.chest' WHERE item_definition_id = 'common.items.armor.chest.twigsleaves';
+UPDATE item
+SET item_definition_id = 'common.items.armor.velorite_mage.chest' WHERE item_definition_id = 'common.items.armor.chest.velorite_mage_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.warlock.chest' WHERE item_definition_id = 'common.items.armor.chest.warlock';
+UPDATE item
+SET item_definition_id = 'common.items.armor.warlord.chest' WHERE item_definition_id = 'common.items.armor.chest.warlord';
+UPDATE item
+SET item_definition_id = 'common.items.armor.misc.chest.worker_green_0' WHERE item_definition_id = 'common.items.armor.chest.worker_green_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.misc.chest.worker_green_1' WHERE item_definition_id = 'common.items.armor.chest.worker_green_1';
+UPDATE item
+SET item_definition_id = 'common.items.armor.misc.chest.worker_orange_0' WHERE item_definition_id = 'common.items.armor.chest.worker_orange_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.misc.chest.worker_orange_1' WHERE item_definition_id = 'common.items.armor.chest.worker_orange_1';
+UPDATE item
+SET item_definition_id = 'common.items.armor.misc.chest.worker_purple_0' WHERE item_definition_id = 'common.items.armor.chest.worker_purple_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.misc.chest.worker_purple_1' WHERE item_definition_id = 'common.items.armor.chest.worker_purple_1';
+UPDATE item
+SET item_definition_id = 'common.items.armor.misc.chest.worker_red_0' WHERE item_definition_id = 'common.items.armor.chest.worker_red_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.misc.chest.worker_red_1' WHERE item_definition_id = 'common.items.armor.chest.worker_red_1';
+UPDATE item
+SET item_definition_id = 'common.items.armor.misc.chest.worker_yellow_0' WHERE item_definition_id = 'common.items.armor.chest.worker_yellow_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.misc.chest.worker_yellow_1' WHERE item_definition_id = 'common.items.armor.chest.worker_yellow_1';
+UPDATE item
+SET item_definition_id = 'common.items.armor.assassin.foot' WHERE item_definition_id = 'common.items.armor.foot.assassin';
+UPDATE item
+SET item_definition_id = 'common.items.armor.bonerattler.foot' WHERE item_definition_id = 'common.items.armor.foot.bonerattler';
+UPDATE item
+SET item_definition_id = 'common.items.armor.cloth_blue.foot' WHERE item_definition_id = 'common.items.armor.foot.cloth_blue_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.cloth_green.foot' WHERE item_definition_id = 'common.items.armor.foot.cloth_green_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.cloth_purple.foot' WHERE item_definition_id = 'common.items.armor.foot.cloth_purple_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.cultist.foot' WHERE item_definition_id = 'common.items.armor.foot.cultist_boots';
+UPDATE item
+SET item_definition_id = 'common.items.armor.druid.foot' WHERE item_definition_id = 'common.items.armor.foot.druid';
+UPDATE item
+SET item_definition_id = 'common.items.armor.misc.foot.jackalope_slippers' WHERE item_definition_id = 'common.items.armor.foot.jackalope_slippers';
+UPDATE item
+SET item_definition_id = 'common.items.armor.swift.foot' WHERE item_definition_id = 'common.items.armor.foot.leather_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.leather.foot' WHERE item_definition_id = 'common.items.armor.foot.leather_2';
+UPDATE item
+SET item_definition_id = 'common.items.armor.agile.foot' WHERE item_definition_id = 'common.items.armor.foot.leather_adventurer';
+UPDATE item
+SET item_definition_id = 'common.items.armor.plate.foot' WHERE item_definition_id = 'common.items.armor.foot.plate_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.leather_plate.foot' WHERE item_definition_id = 'common.items.armor.foot.plate_leather_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.misc.foot.sandals' WHERE item_definition_id = 'common.items.armor.foot.sandals_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.steel.foot' WHERE item_definition_id = 'common.items.armor.foot.steel_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.tarasque.foot' WHERE item_definition_id = 'common.items.armor.foot.tarasque';
+UPDATE item
+SET item_definition_id = 'common.items.armor.twigs.foot' WHERE item_definition_id = 'common.items.armor.foot.twig';
+UPDATE item
+SET item_definition_id = 'common.items.armor.twigflowers.foot' WHERE item_definition_id = 'common.items.armor.foot.twigsflowers';
+UPDATE item
+SET item_definition_id = 'common.items.armor.twigsleaves.foot' WHERE item_definition_id = 'common.items.armor.foot.twigsleaves';
+UPDATE item
+SET item_definition_id = 'common.items.armor.velorite_mage.foot' WHERE item_definition_id = 'common.items.armor.foot.velorite_mage_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.warlock.foot' WHERE item_definition_id = 'common.items.armor.foot.warlock';
+UPDATE item
+SET item_definition_id = 'common.items.armor.warlord.foot' WHERE item_definition_id = 'common.items.armor.foot.warlord';
+UPDATE item
+SET item_definition_id = 'common.items.armor.assassin.hand' WHERE item_definition_id = 'common.items.armor.hand.assassin';
+UPDATE item
+SET item_definition_id = 'common.items.armor.bonerattler.hand' WHERE item_definition_id = 'common.items.armor.hand.bonerattler';
+UPDATE item
+SET item_definition_id = 'common.items.armor.cloth_blue.hand' WHERE item_definition_id = 'common.items.armor.hand.cloth_blue_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.cloth_green.hand' WHERE item_definition_id = 'common.items.armor.hand.cloth_green_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.cloth_purple.hand' WHERE item_definition_id = 'common.items.armor.hand.cloth_purple_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.cultist.hand' WHERE item_definition_id = 'common.items.armor.hand.cultist_hands_blue';
+UPDATE item
+SET item_definition_id = 'common.items.armor.cultist.hand' WHERE item_definition_id = 'common.items.armor.hand.cultist_hands_purple';
+UPDATE item
+SET item_definition_id = 'common.items.armor.druid.hand' WHERE item_definition_id = 'common.items.armor.hand.druid';
+UPDATE item
+SET item_definition_id = 'common.items.armor.swift.hand' WHERE item_definition_id = 'common.items.armor.hand.leather_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.leather.hand' WHERE item_definition_id = 'common.items.armor.hand.leather_2';
+UPDATE item
+SET item_definition_id = 'common.items.armor.agile.hand' WHERE item_definition_id = 'common.items.armor.hand.leather_adventurer';
+UPDATE item
+SET item_definition_id = 'common.items.armor.plate.hand' WHERE item_definition_id = 'common.items.armor.hand.plate_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.leather_plate.hand' WHERE item_definition_id = 'common.items.armor.hand.plate_leather_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.steel.hand' WHERE item_definition_id = 'common.items.armor.hand.steel_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.tarasque.hand' WHERE item_definition_id = 'common.items.armor.hand.tarasque';
+UPDATE item
+SET item_definition_id = 'common.items.armor.twigs.hand' WHERE item_definition_id = 'common.items.armor.hand.twig';
+UPDATE item
+SET item_definition_id = 'common.items.armor.twigflowers.hand' WHERE item_definition_id = 'common.items.armor.hand.twigsflowers';
+UPDATE item
+SET item_definition_id = 'common.items.armor.twigsleaves.hand' WHERE item_definition_id = 'common.items.armor.hand.twigsleaves';
+UPDATE item
+SET item_definition_id = 'common.items.armor.velorite_mage.hand' WHERE item_definition_id = 'common.items.armor.hand.velorite_mage_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.warlock.hand' WHERE item_definition_id = 'common.items.armor.hand.warlock';
+UPDATE item
+SET item_definition_id = 'common.items.armor.warlord.hand' WHERE item_definition_id = 'common.items.armor.hand.warlord';
+UPDATE item
+SET item_definition_id = 'common.items.armor.assassin.head' WHERE item_definition_id = 'common.items.armor.head.assa_mask_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.swift.head' WHERE item_definition_id = 'common.items.armor.head.leather_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.warlock.head' WHERE item_definition_id = 'common.items.armor.head.warlock';
+UPDATE item
+SET item_definition_id = 'common.items.armor.warlord.head' WHERE item_definition_id = 'common.items.armor.head.warlord';
+UPDATE item
+SET item_definition_id = 'common.items.armor.misc.neck.plain_0' WHERE item_definition_id = 'common.items.armor.neck.neck_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.misc.neck.plain_1' WHERE item_definition_id = 'common.items.armor.neck.neck_1';
+UPDATE item
+SET item_definition_id = 'common.items.armor.misc.neck.shell' WHERE item_definition_id = 'common.items.armor.neck.neck_2';
+UPDATE item
+SET item_definition_id = 'common.items.armor.assassin.pants' WHERE item_definition_id = 'common.items.armor.pants.assassin';
+UPDATE item
+SET item_definition_id = 'common.items.armor.bonerattler.pants' WHERE item_definition_id = 'common.items.armor.pants.bonerattler';
+UPDATE item
+SET item_definition_id = 'common.items.armor.cloth_blue.pants' WHERE item_definition_id = 'common.items.armor.pants.cloth_blue_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.cloth_green.pants' WHERE item_definition_id = 'common.items.armor.pants.cloth_green_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.cloth_purple.pants' WHERE item_definition_id = 'common.items.armor.pants.cloth_purple_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.cultist.pants' WHERE item_definition_id = 'common.items.armor.pants.cultist_legs_blue';
+UPDATE item
+SET item_definition_id = 'common.items.armor.cultist.pants' WHERE item_definition_id = 'common.items.armor.pants.cultist_legs_purple';
+UPDATE item
+SET item_definition_id = 'common.items.armor.druid.pants' WHERE item_definition_id = 'common.items.armor.pants.druid';
+UPDATE item
+SET item_definition_id = 'common.items.armor.misc.pants.hunting' WHERE item_definition_id = 'common.items.armor.pants.hunting';
+UPDATE item
+SET item_definition_id = 'common.items.armor.swift.pants' WHERE item_definition_id = 'common.items.armor.pants.leather_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.leather.pants' WHERE item_definition_id = 'common.items.armor.pants.leather_2';
+UPDATE item
+SET item_definition_id = 'common.items.armor.agile.pants' WHERE item_definition_id = 'common.items.armor.pants.leather_adventurer';
+UPDATE item
+SET item_definition_id = 'common.items.armor.plate.pants' WHERE item_definition_id = 'common.items.armor.pants.plate_green_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.leather_plate.pants' WHERE item_definition_id = 'common.items.armor.pants.plate_leather_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.rugged.pants' WHERE item_definition_id = 'common.items.armor.pants.rugged';
+UPDATE item
+SET item_definition_id = 'common.items.armor.steel.pants' WHERE item_definition_id = 'common.items.armor.pants.steel_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.tarasque.pants' WHERE item_definition_id = 'common.items.armor.pants.tarasque';
+UPDATE item
+SET item_definition_id = 'common.items.armor.twigs.pants' WHERE item_definition_id = 'common.items.armor.pants.twig';
+UPDATE item
+SET item_definition_id = 'common.items.armor.twigflowers.pants' WHERE item_definition_id = 'common.items.armor.pants.twigsflowers';
+UPDATE item
+SET item_definition_id = 'common.items.armor.twigsleaves.pants' WHERE item_definition_id = 'common.items.armor.pants.twigsleaves';
+UPDATE item
+SET item_definition_id = 'common.items.armor.velorite_mage.pants' WHERE item_definition_id = 'common.items.armor.pants.velorite_mage_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.warlock.pants' WHERE item_definition_id = 'common.items.armor.pants.warlock';
+UPDATE item
+SET item_definition_id = 'common.items.armor.warlord.pants' WHERE item_definition_id = 'common.items.armor.pants.warlord';
+UPDATE item
+SET item_definition_id = 'common.items.armor.misc.pants.worker_blue' WHERE item_definition_id = 'common.items.armor.pants.worker_blue_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.misc.ring.scratched' WHERE item_definition_id = 'common.items.armor.ring.ring_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.misc.ring.gold' WHERE item_definition_id = 'common.items.armor.ring.ring_gold_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.misc.ring.skull' WHERE item_definition_id = 'common.items.armor.ring.ring_purp_high_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.assassin.shoulder' WHERE item_definition_id = 'common.items.armor.shoulder.assassin';
+UPDATE item
+SET item_definition_id = 'common.items.armor.bonerattler.shoulder' WHERE item_definition_id = 'common.items.armor.shoulder.bonerattler';
+UPDATE item
+SET item_definition_id = 'common.items.armor.cloth_blue.shoulder_0' WHERE item_definition_id = 'common.items.armor.shoulder.cloth_blue_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.cloth_blue.shoulder_1' WHERE item_definition_id = 'common.items.armor.shoulder.cloth_blue_1';
+UPDATE item
+SET item_definition_id = 'common.items.armor.cloth_green.shoulder' WHERE item_definition_id = 'common.items.armor.shoulder.cloth_green_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.cloth_purple.shoulder' WHERE item_definition_id = 'common.items.armor.shoulder.cloth_purple_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.cultist.shoulder' WHERE item_definition_id = 'common.items.armor.shoulder.cultist_shoulder_blue';
+UPDATE item
+SET item_definition_id = 'common.items.armor.cultist.shoulder' WHERE item_definition_id = 'common.items.armor.shoulder.cultist_shoulder_purple';
+UPDATE item
+SET item_definition_id = 'common.items.armor.druid.shoulder' WHERE item_definition_id = 'common.items.armor.shoulder.druidshoulder';
+UPDATE item
+SET item_definition_id = 'common.items.armor.misc.shoulder.iron_spikes' WHERE item_definition_id = 'common.items.armor.shoulder.iron_spikes';
+UPDATE item
+SET item_definition_id = 'common.items.armor.misc.shoulder.leather_3' WHERE item_definition_id = 'common.items.armor.shoulder.leather_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.swift.shoulder' WHERE item_definition_id = 'common.items.armor.shoulder.leather_1';
+UPDATE item
+SET item_definition_id = 'common.items.armor.leather.shoulder' WHERE item_definition_id = 'common.items.armor.shoulder.leather_2';
+UPDATE item
+SET item_definition_id = 'common.items.armor.agile.shoulder' WHERE item_definition_id = 'common.items.armor.shoulder.leather_adventurer';
+UPDATE item
+SET item_definition_id = 'common.items.armor.misc.shoulder.leather_iron_0' WHERE item_definition_id = 'common.items.armor.shoulder.leather_iron_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.misc.shoulder.leather_iron_1' WHERE item_definition_id = 'common.items.armor.shoulder.leather_iron_1';
+UPDATE item
+SET item_definition_id = 'common.items.armor.misc.shoulder.leather_iron_2' WHERE item_definition_id = 'common.items.armor.shoulder.leather_iron_2';
+UPDATE item
+SET item_definition_id = 'common.items.armor.misc.shoulder.leather_iron_3' WHERE item_definition_id = 'common.items.armor.shoulder.leather_iron_3';
+UPDATE item
+SET item_definition_id = 'common.items.armor.misc.shoulder.leather_strip' WHERE item_definition_id = 'common.items.armor.shoulder.leather_strips';
+UPDATE item
+SET item_definition_id = 'common.items.armor.plate.shoulder' WHERE item_definition_id = 'common.items.armor.shoulder.plate_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.leather_plate.shoulder' WHERE item_definition_id = 'common.items.armor.shoulder.plate_leather_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.steel.shoulder' WHERE item_definition_id = 'common.items.armor.shoulder.steel_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.tarasque.shoulder' WHERE item_definition_id = 'common.items.armor.shoulder.tarasque';
+UPDATE item
+SET item_definition_id = 'common.items.armor.twigs.shoulder' WHERE item_definition_id = 'common.items.armor.shoulder.twigs';
+UPDATE item
+SET item_definition_id = 'common.items.armor.twigflowers.shoulder' WHERE item_definition_id = 'common.items.armor.shoulder.twigsflowers';
+UPDATE item
+SET item_definition_id = 'common.items.armor.twigsleaves.shoulder' WHERE item_definition_id = 'common.items.armor.shoulder.twigsleaves';
+UPDATE item
+SET item_definition_id = 'common.items.armor.velorite_mage.shoulder' WHERE item_definition_id = 'common.items.armor.shoulder.velorite_mage_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.warlock.shoulder' WHERE item_definition_id = 'common.items.armor.shoulder.warlock';
+UPDATE item
+SET item_definition_id = 'common.items.armor.warlord.shoulder' WHERE item_definition_id = 'common.items.armor.shoulder.warlord';
+UPDATE item
+SET item_definition_id = 'common.items.armor.misc.tabard.admin' WHERE item_definition_id = 'common.items.armor.tabard.admin';
\ No newline at end of file

From 803c7d81dc334c43bbcca898afa2b43a0334fb21 Mon Sep 17 00:00:00 2001
From: Sam <samuelkeiffer@gmail.com>
Date: Mon, 1 Mar 2021 00:58:43 -0500
Subject: [PATCH 10/16] Fix a few asset paths for armors.

---
 assets/common/loot_tables/loot_table_cave_large.ron | 4 ++--
 common/src/comp/inventory/loadout_builder.rs        | 2 +-
 common/src/comp/inventory/test.rs                   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/assets/common/loot_tables/loot_table_cave_large.ron b/assets/common/loot_tables/loot_table_cave_large.ron
index 11077acb9c..cdda48b38b 100644
--- a/assets/common/loot_tables/loot_table_cave_large.ron
+++ b/assets/common/loot_tables/loot_table_cave_large.ron
@@ -1,13 +1,13 @@
 [
     // Misc
-    (0.25, "common.items.armor.neck.neck_1"),
+    (0.25, "common.items.armor.misc.neck.plain_1"),
     (2.0, "common.items.crafting_ing.cloth_scraps"),
     (1.0, "common.items.crafting_ing.empty_vial"),  
     (0.1, "common.items.glider.glider_blue"),
     (0.05, "common.items.glider.glider_morpho"),
     (0.05, "common.items.glider.glider_monarch"),
     (0.05, "common.items.glider.glider_moth"),
-    (0.05, "common.items.armor.ring.ring_gold_0"),   
+    (0.05, "common.items.armor.misc.ring.gold"),   
     // swords
     (0.03, "common.items.weapons.sword.steel-0"),
     (0.03, "common.items.weapons.sword.steel-1"),
diff --git a/common/src/comp/inventory/loadout_builder.rs b/common/src/comp/inventory/loadout_builder.rs
index 0abb9f4562..fb603fd8cc 100644
--- a/common/src/comp/inventory/loadout_builder.rs
+++ b/common/src/comp/inventory/loadout_builder.rs
@@ -515,7 +515,7 @@ impl LoadoutBuilder {
                         "common.items.armor.cloth_purple.hand",
                     )))
                     .pants(Some(Item::new_from_asset_expect(
-                        "common.items.armor.pacloth_purplents.pants",
+                        "common.items.armor.cloth_purple.pants",
                     )))
                     .feet(Some(Item::new_from_asset_expect(
                         "common.items.armor.cloth_purple.foot",
diff --git a/common/src/comp/inventory/test.rs b/common/src/comp/inventory/test.rs
index d35aefadea..3b15c8dfee 100644
--- a/common/src/comp/inventory/test.rs
+++ b/common/src/comp/inventory/test.rs
@@ -203,7 +203,7 @@ fn equip_replace_already_equipped_item() {
     let boots = Item::new_from_asset_expect("common.items.testing.test_boots");
 
     let starting_sandles = Some(Item::new_from_asset_expect(
-        "common.items.armor.foot.sandals_0",
+        "common.items.armor.misc.foot.sandals",
     ));
 
     let mut inv = Inventory::new_empty();

From 839f599c4938d822c1fac3bd4921285ca0527c69 Mon Sep 17 00:00:00 2001
From: heydabop <heydabop@gmail.com>
Date: Mon, 1 Mar 2021 15:06:39 -0600
Subject: [PATCH 11/16] Fixes #974 - convert tool/weapon equip time to floating
 point seconds

---
 .../modular/damage/sword/metal_blade.ron      |  2 +-
 assets/common/items/debug/admin_stick.ron     |  2 +-
 assets/common/items/debug/admin_sword.ron     |  2 +-
 .../items/npc_weapons/axe/minotaur_axe.ron    |  2 +-
 .../biped_small/adlet/adlet_bow.ron           |  2 +-
 .../biped_small/adlet/gnoll_staff.ron         |  2 +-
 .../biped_small/adlet/wooden_spear.ron        |  2 +-
 .../biped_small/gnarling/adlet_bow.ron        |  2 +-
 .../biped_small/gnarling/gnoll_staff.ron      |  2 +-
 .../biped_small/gnarling/wooden_spear.ron     |  2 +-
 .../biped_small/haniwa/adlet_bow.ron          |  2 +-
 .../biped_small/haniwa/gnoll_staff.ron        |  2 +-
 .../biped_small/haniwa/wooden_spear.ron       |  2 +-
 .../biped_small/myrmidon/adlet_bow.ron        |  2 +-
 .../biped_small/myrmidon/gnoll_staff.ron      |  2 +-
 .../biped_small/myrmidon/wooden_spear.ron     |  2 +-
 .../biped_small/sahagin/adlet_bow.ron         |  2 +-
 .../biped_small/sahagin/gnoll_staff.ron       |  2 +-
 .../biped_small/sahagin/wooden_spear.ron      |  2 +-
 .../items/npc_weapons/bow/saurok_bow.ron      |  2 +-
 .../npc_weapons/hammer/cyclops_hammer.ron     |  2 +-
 .../npc_weapons/hammer/harvester_scythe.ron   |  2 +-
 .../items/npc_weapons/hammer/ogre_hammer.ron  |  2 +-
 .../items/npc_weapons/hammer/troll_hammer.ron |  2 +-
 .../npc_weapons/hammer/wendigo_hammer.ron     |  2 +-
 .../items/npc_weapons/hammer/yeti_hammer.ron  |  2 +-
 .../npc_weapons/staff/mindflayer_staff.ron    |  2 +-
 .../items/npc_weapons/staff/ogre_staff.ron    |  2 +-
 .../items/npc_weapons/staff/saurok_staff.ron  |  2 +-
 .../npc_weapons/sword/dullahan_sword.ron      |  2 +-
 .../items/npc_weapons/sword/saurok_sword.ron  |  2 +-
 .../items/npc_weapons/unique/beast_claws.ron  |  2 +-
 .../items/npc_weapons/unique/quadlowbasic.ron |  2 +-
 .../items/npc_weapons/unique/quadlowbeam.ron  |  2 +-
 .../npc_weapons/unique/quadlowbreathe.ron     |  2 +-
 .../items/npc_weapons/unique/quadlowquick.ron |  2 +-
 .../npc_weapons/unique/quadlowranged.ron      |  2 +-
 .../items/npc_weapons/unique/quadlowtail.ron  |  2 +-
 .../items/npc_weapons/unique/quadmedbasic.ron |  2 +-
 .../npc_weapons/unique/quadmedcharge.ron      |  2 +-
 .../items/npc_weapons/unique/quadmedhoof.ron  |  2 +-
 .../items/npc_weapons/unique/quadmedjump.ron  |  2 +-
 .../items/npc_weapons/unique/quadmedquick.ron |  2 +-
 .../npc_weapons/unique/quadsmallbasic.ron     |  2 +-
 .../npc_weapons/unique/stone_golems_fist.ron  |  2 +-
 .../npc_weapons/unique/theropodbasic.ron      |  2 +-
 .../items/npc_weapons/unique/theropodbird.ron |  2 +-
 .../items/npc_weapons/unique/tidal_claws.ron  |  2 +-
 .../items/npc_weapons/unique/turret.ron       |  2 +-
 .../npc_weapons/unique/wendigo_magic.ron      |  2 +-
 .../items/weapons/axe/bloodsteel_axe-0.ron    |  2 +-
 .../items/weapons/axe/bloodsteel_axe-1.ron    |  2 +-
 .../items/weapons/axe/bloodsteel_axe-2.ron    |  2 +-
 .../common/items/weapons/axe/bronze_axe-0.ron |  2 +-
 .../common/items/weapons/axe/bronze_axe-1.ron |  2 +-
 .../common/items/weapons/axe/bronze_axe-2.ron |  2 +-
 .../common/items/weapons/axe/cobalt_axe-0.ron |  2 +-
 .../common/items/weapons/axe/cobalt_axe-1.ron |  2 +-
 .../common/items/weapons/axe/iron_axe-0.ron   |  2 +-
 .../common/items/weapons/axe/iron_axe-1.ron   |  2 +-
 .../common/items/weapons/axe/iron_axe-2.ron   |  2 +-
 .../common/items/weapons/axe/iron_axe-3.ron   |  2 +-
 .../common/items/weapons/axe/iron_axe-4.ron   |  2 +-
 .../common/items/weapons/axe/iron_axe-5.ron   |  2 +-
 .../common/items/weapons/axe/iron_axe-6.ron   |  2 +-
 .../common/items/weapons/axe/iron_axe-7.ron   |  2 +-
 .../common/items/weapons/axe/iron_axe-8.ron   |  2 +-
 .../common/items/weapons/axe/iron_axe-9.ron   |  2 +-
 .../items/weapons/axe/malachite_axe-0.ron     |  2 +-
 assets/common/items/weapons/axe/orc_axe-0.ron |  2 +-
 assets/common/items/weapons/axe/parashu.ron   |  2 +-
 .../common/items/weapons/axe/starter_axe.ron  |  2 +-
 .../common/items/weapons/axe/steel_axe-0.ron  |  2 +-
 .../common/items/weapons/axe/steel_axe-1.ron  |  2 +-
 .../common/items/weapons/axe/steel_axe-2.ron  |  2 +-
 .../common/items/weapons/axe/steel_axe-3.ron  |  2 +-
 .../common/items/weapons/axe/steel_axe-4.ron  |  2 +-
 .../common/items/weapons/axe/steel_axe-5.ron  |  2 +-
 .../common/items/weapons/axe/steel_axe-6.ron  |  2 +-
 .../items/weapons/axe/worn_iron_axe-0.ron     |  2 +-
 .../items/weapons/axe/worn_iron_axe-1.ron     |  2 +-
 .../items/weapons/axe/worn_iron_axe-2.ron     |  2 +-
 .../items/weapons/axe/worn_iron_axe-3.ron     |  2 +-
 .../items/weapons/axe/worn_iron_axe-4.ron     |  2 +-
 .../items/weapons/axe_1h/bloodsteel-0.ron     |  2 +-
 .../items/weapons/axe_1h/bloodsteel-1.ron     |  2 +-
 .../common/items/weapons/axe_1h/bronze-0.ron  |  2 +-
 .../common/items/weapons/axe_1h/bronze-1.ron  |  2 +-
 .../common/items/weapons/axe_1h/cobalt-0.ron  |  2 +-
 .../common/items/weapons/axe_1h/cobalt-1.ron  |  2 +-
 assets/common/items/weapons/axe_1h/iron-0.ron |  2 +-
 assets/common/items/weapons/axe_1h/iron-1.ron |  2 +-
 assets/common/items/weapons/axe_1h/iron-2.ron |  2 +-
 assets/common/items/weapons/axe_1h/iron-3.ron |  2 +-
 .../items/weapons/axe_1h/orichalcum-0.ron     |  2 +-
 .../common/items/weapons/axe_1h/steel-0.ron   |  2 +-
 .../common/items/weapons/axe_1h/steel-1.ron   |  2 +-
 .../common/items/weapons/axe_1h/steel-2.ron   |  2 +-
 .../common/items/weapons/axe_1h/stone-0.ron   |  2 +-
 .../common/items/weapons/axe_1h/stone-1.ron   |  2 +-
 assets/common/items/weapons/axe_1h/wood-0.ron |  2 +-
 assets/common/items/weapons/axe_1h/wood-1.ron |  2 +-
 assets/common/items/weapons/bow/bone-0.ron    |  2 +-
 assets/common/items/weapons/bow/bone-1.ron    |  2 +-
 assets/common/items/weapons/bow/bone-2.ron    |  2 +-
 assets/common/items/weapons/bow/bone-3.ron    |  2 +-
 assets/common/items/weapons/bow/eldwood-0.ron |  2 +-
 assets/common/items/weapons/bow/eldwood-1.ron |  2 +-
 assets/common/items/weapons/bow/eldwood-2.ron |  2 +-
 .../common/items/weapons/bow/frostwood-0.ron  |  2 +-
 .../common/items/weapons/bow/frostwood-1.ron  |  2 +-
 .../common/items/weapons/bow/frostwood-2.ron  |  2 +-
 .../common/items/weapons/bow/hardwood-0.ron   |  2 +-
 .../common/items/weapons/bow/hardwood-1.ron   |  2 +-
 .../common/items/weapons/bow/hardwood-2.ron   |  2 +-
 .../common/items/weapons/bow/hardwood-3.ron   |  2 +-
 .../common/items/weapons/bow/hardwood-4.ron   |  2 +-
 .../common/items/weapons/bow/hardwood-5.ron   |  2 +-
 assets/common/items/weapons/bow/metal-0.ron   |  2 +-
 assets/common/items/weapons/bow/metal-1.ron   |  2 +-
 assets/common/items/weapons/bow/metal-2.ron   |  2 +-
 assets/common/items/weapons/bow/metal-3.ron   |  2 +-
 assets/common/items/weapons/bow/metal-4.ron   |  2 +-
 assets/common/items/weapons/bow/rawwood-0.ron |  2 +-
 assets/common/items/weapons/bow/rawwood-1.ron |  2 +-
 assets/common/items/weapons/bow/sagitta.ron   |  2 +-
 assets/common/items/weapons/bow/starter.ron   |  2 +-
 assets/common/items/weapons/bow/velorite.ron  |  2 +-
 assets/common/items/weapons/bow/wood-0.ron    |  2 +-
 assets/common/items/weapons/bow/wood-1.ron    |  2 +-
 assets/common/items/weapons/bow/wood-2.ron    |  2 +-
 assets/common/items/weapons/bow/wood-3.ron    |  2 +-
 assets/common/items/weapons/bow/wood-4.ron    |  2 +-
 .../common/items/weapons/dagger/basic_0.ron   |  2 +-
 .../common/items/weapons/dagger/cultist_0.ron |  2 +-
 .../items/weapons/dagger/starter_dagger.ron   |  2 +-
 assets/common/items/weapons/empty/empty.ron   |  2 +-
 .../items/weapons/hammer/bronze_hammer-0.ron  |  2 +-
 .../items/weapons/hammer/bronze_hammer-1.ron  |  2 +-
 .../items/weapons/hammer/cobalt_hammer-0.ron  |  2 +-
 .../items/weapons/hammer/cobalt_hammer-1.ron  |  2 +-
 .../weapons/hammer/cultist_purp_2h-0.ron      |  2 +-
 .../items/weapons/hammer/flimsy_hammer.ron    |  2 +-
 .../common/items/weapons/hammer/hammer_1.ron  |  2 +-
 .../items/weapons/hammer/iron_hammer-0.ron    |  2 +-
 .../items/weapons/hammer/iron_hammer-1.ron    |  2 +-
 .../items/weapons/hammer/iron_hammer-2.ron    |  2 +-
 .../items/weapons/hammer/iron_hammer-3.ron    |  2 +-
 .../items/weapons/hammer/iron_hammer-4.ron    |  2 +-
 .../items/weapons/hammer/iron_hammer-5.ron    |  2 +-
 .../items/weapons/hammer/iron_hammer-6.ron    |  2 +-
 .../items/weapons/hammer/iron_hammer-7.ron    |  2 +-
 .../items/weapons/hammer/iron_hammer-8.ron    |  2 +-
 .../common/items/weapons/hammer/mjolnir.ron   |  2 +-
 .../items/weapons/hammer/ramshead_hammer.ron  |  2 +-
 .../items/weapons/hammer/runic_hammer.ron     |  2 +-
 .../items/weapons/hammer/starter_hammer.ron   |  2 +-
 .../items/weapons/hammer/steel_hammer-0.ron   |  2 +-
 .../items/weapons/hammer/steel_hammer-1.ron   |  2 +-
 .../items/weapons/hammer/steel_hammer-2.ron   |  2 +-
 .../items/weapons/hammer/steel_hammer-3.ron   |  2 +-
 .../items/weapons/hammer/steel_hammer-4.ron   |  2 +-
 .../items/weapons/hammer/steel_hammer-5.ron   |  2 +-
 .../items/weapons/hammer/stone_hammer-0.ron   |  2 +-
 .../items/weapons/hammer/stone_hammer-1.ron   |  2 +-
 .../items/weapons/hammer/stone_hammer-2.ron   |  2 +-
 .../items/weapons/hammer/stone_hammer-3.ron   |  2 +-
 .../items/weapons/hammer/wood_hammer-0.ron    |  2 +-
 .../weapons/hammer/worn_iron_hammer-0.ron     |  2 +-
 .../weapons/hammer/worn_iron_hammer-1.ron     |  2 +-
 .../weapons/hammer/worn_iron_hammer-2.ron     |  2 +-
 .../weapons/hammer/worn_iron_hammer-3.ron     |  2 +-
 .../items/weapons/hammer_1h/bloodsteel-0.ron  |  2 +-
 .../items/weapons/hammer_1h/bloodsteel-1.ron  |  2 +-
 .../items/weapons/hammer_1h/bronze-0.ron      |  2 +-
 .../items/weapons/hammer_1h/bronze-1.ron      |  2 +-
 .../items/weapons/hammer_1h/cobalt-0.ron      |  2 +-
 .../items/weapons/hammer_1h/cobalt-1.ron      |  2 +-
 .../common/items/weapons/hammer_1h/iron-0.ron |  2 +-
 .../common/items/weapons/hammer_1h/iron-1.ron |  2 +-
 .../common/items/weapons/hammer_1h/iron-2.ron |  2 +-
 .../items/weapons/hammer_1h/orichalcum-0.ron  |  2 +-
 .../items/weapons/hammer_1h/steel-0.ron       |  2 +-
 .../items/weapons/hammer_1h/steel-1.ron       |  2 +-
 .../items/weapons/hammer_1h/steel-2.ron       |  2 +-
 .../items/weapons/hammer_1h/stone-0.ron       |  2 +-
 .../items/weapons/hammer_1h/stone-1.ron       |  2 +-
 .../common/items/weapons/hammer_1h/wood-0.ron |  2 +-
 .../common/items/weapons/hammer_1h/wood-1.ron |  2 +-
 assets/common/items/weapons/sceptre/fork0.ron |  2 +-
 .../common/items/weapons/sceptre/loops0.ron   |  2 +-
 assets/common/items/weapons/sceptre/moon0.ron |  2 +-
 .../items/weapons/sceptre/root_evil.ron       |  2 +-
 .../items/weapons/sceptre/root_green0.ron     |  2 +-
 .../weapons/sceptre/sceptre_velorite_0.ron    |  2 +-
 .../items/weapons/sceptre/staff_nature.ron    |  2 +-
 .../items/weapons/sceptre/starter_sceptre.ron |  2 +-
 .../items/weapons/sceptre/totem_green.ron     |  2 +-
 .../common/items/weapons/shield/shield_1.ron  |  2 +-
 .../items/weapons/staff/amethyst_staff.ron    |  2 +-
 .../common/items/weapons/staff/bone_staff.ron |  2 +-
 .../items/weapons/staff/cultist_staff.ron     |  2 +-
 assets/common/items/weapons/staff/staff_1.ron |  2 +-
 .../items/weapons/staff/starter_staff.ron     |  2 +-
 .../items/weapons/sword/bloodsteel-0.ron      |  2 +-
 .../items/weapons/sword/bloodsteel-1.ron      |  2 +-
 .../items/weapons/sword/bloodsteel-2.ron      |  2 +-
 .../common/items/weapons/sword/bronze-0.ron   |  2 +-
 .../common/items/weapons/sword/bronze-1.ron   |  2 +-
 .../common/items/weapons/sword/bronze-2.ron   |  2 +-
 .../common/items/weapons/sword/caladbolg.ron  |  2 +-
 .../common/items/weapons/sword/cobalt-0.ron   |  2 +-
 .../common/items/weapons/sword/cobalt-1.ron   |  2 +-
 .../common/items/weapons/sword/cobalt-2.ron   |  2 +-
 .../common/items/weapons/sword/cobalt-3.ron   |  2 +-
 assets/common/items/weapons/sword/cultist.ron |  2 +-
 assets/common/items/weapons/sword/frost-0.ron |  2 +-
 assets/common/items/weapons/sword/frost-1.ron |  2 +-
 assets/common/items/weapons/sword/iron-0.ron  |  2 +-
 assets/common/items/weapons/sword/iron-1.ron  |  2 +-
 assets/common/items/weapons/sword/iron-10.ron |  2 +-
 assets/common/items/weapons/sword/iron-2.ron  |  2 +-
 assets/common/items/weapons/sword/iron-3.ron  |  2 +-
 assets/common/items/weapons/sword/iron-4.ron  |  2 +-
 assets/common/items/weapons/sword/iron-5.ron  |  2 +-
 assets/common/items/weapons/sword/iron-6.ron  |  2 +-
 assets/common/items/weapons/sword/iron-7.ron  |  2 +-
 assets/common/items/weapons/sword/iron-8.ron  |  2 +-
 assets/common/items/weapons/sword/iron-9.ron  |  2 +-
 assets/common/items/weapons/sword/starter.ron |  2 +-
 assets/common/items/weapons/sword/steel-0.ron |  2 +-
 assets/common/items/weapons/sword/steel-1.ron |  2 +-
 assets/common/items/weapons/sword/steel-2.ron |  2 +-
 assets/common/items/weapons/sword/steel-3.ron |  2 +-
 assets/common/items/weapons/sword/steel-4.ron |  2 +-
 assets/common/items/weapons/sword/steel-5.ron |  2 +-
 assets/common/items/weapons/sword/steel-6.ron |  2 +-
 assets/common/items/weapons/sword/steel-7.ron |  2 +-
 assets/common/items/weapons/sword/steel-8.ron |  2 +-
 assets/common/items/weapons/sword/stone-0.ron |  2 +-
 assets/common/items/weapons/sword/stone-1.ron |  2 +-
 assets/common/items/weapons/sword/stone-2.ron |  2 +-
 assets/common/items/weapons/sword/wood-0.ron  |  2 +-
 assets/common/items/weapons/sword/wood-1.ron  |  2 +-
 assets/common/items/weapons/sword/wood-2.ron  |  2 +-
 .../items/weapons/sword_1h/bloodsteel-0.ron   |  2 +-
 .../items/weapons/sword_1h/bloodsteel-1.ron   |  2 +-
 .../items/weapons/sword_1h/bloodsteel-2.ron   |  2 +-
 .../items/weapons/sword_1h/bronze-0.ron       |  2 +-
 .../items/weapons/sword_1h/bronze-1.ron       |  2 +-
 .../items/weapons/sword_1h/bronze-2.ron       |  2 +-
 .../items/weapons/sword_1h/cobalt-0.ron       |  2 +-
 .../items/weapons/sword_1h/cobalt-1.ron       |  2 +-
 .../items/weapons/sword_1h/cobalt-2.ron       |  2 +-
 .../items/weapons/sword_1h/cobalt-3.ron       |  2 +-
 .../common/items/weapons/sword_1h/iron-0.ron  |  2 +-
 .../common/items/weapons/sword_1h/iron-1.ron  |  2 +-
 .../common/items/weapons/sword_1h/iron-2.ron  |  2 +-
 .../common/items/weapons/sword_1h/iron-3.ron  |  2 +-
 .../common/items/weapons/sword_1h/iron-4.ron  |  2 +-
 .../items/weapons/sword_1h/obsidian-0.ron     |  2 +-
 .../items/weapons/sword_1h/orichalcum-0.ron   |  2 +-
 .../items/weapons/sword_1h/orichalcum-1.ron   |  2 +-
 .../common/items/weapons/sword_1h/steel-0.ron |  2 +-
 .../common/items/weapons/sword_1h/steel-1.ron |  2 +-
 .../common/items/weapons/sword_1h/steel-2.ron |  2 +-
 .../common/items/weapons/sword_1h/steel-3.ron |  2 +-
 assets/common/items/weapons/tool/broom.ron    |  2 +-
 .../common/items/weapons/tool/fishing_rod.ron |  2 +-
 assets/common/items/weapons/tool/hoe.ron      |  2 +-
 assets/common/items/weapons/tool/pickaxe.ron  |  2 +-
 .../common/items/weapons/tool/pitchfork.ron   |  2 +-
 assets/common/items/weapons/tool/rake.ron     |  2 +-
 assets/common/items/weapons/tool/shovel-0.ron |  2 +-
 assets/common/items/weapons/tool/shovel-1.ron |  2 +-
 assets/common/material_stats_manifest.ron     | 16 +++++------
 common/src/bin/csv_import/main.rs             |  4 +--
 common/src/comp/inventory/item/modular.rs     |  2 +-
 common/src/comp/inventory/item/tool.rs        | 27 +++++++++----------
 voxygen/src/hud/util.rs                       |  2 +-
 280 files changed, 299 insertions(+), 302 deletions(-)

diff --git a/assets/common/items/crafting_ing/modular/damage/sword/metal_blade.ron b/assets/common/items/crafting_ing/modular/damage/sword/metal_blade.ron
index 5f28c9e674..72354697ca 100644
--- a/assets/common/items/crafting_ing/modular/damage/sword/metal_blade.ron
+++ b/assets/common/items/crafting_ing/modular/damage/sword/metal_blade.ron
@@ -5,7 +5,7 @@ ItemDef(
         toolkind: Sword,
         modkind: Damage,
         stats: (
-            equip_time_millis: 250,
+            equip_time_secs: 0.25,
             power: 1.0,
             poise_strength: 0.75,
             speed: 0.0,
diff --git a/assets/common/items/debug/admin_stick.ron b/assets/common/items/debug/admin_stick.ron
index dc8f57c976..b2b941c85f 100644
--- a/assets/common/items/debug/admin_stick.ron
+++ b/assets/common/items/debug/admin_stick.ron
@@ -6,7 +6,7 @@ ItemDef(
             kind: Debug,
             hands: Two,
             stats: Direct((
-                equip_time_millis: 0,
+                equip_time_secs: 0.0,
                 power: 1.00,
                 poise_strength: 1.00,
                 speed: 1.0
diff --git a/assets/common/items/debug/admin_sword.ron b/assets/common/items/debug/admin_sword.ron
index 0d59c59107..dfe65e228f 100644
--- a/assets/common/items/debug/admin_sword.ron
+++ b/assets/common/items/debug/admin_sword.ron
@@ -6,7 +6,7 @@ ItemDef(
             kind: Sword,    
             hands: Two,
             stats: Direct((
-                equip_time_millis: 0,
+                equip_time_secs: 0.0,
                 power: 1000.0,
                 poise_strength: 1000.0,
                 speed: 1.0
diff --git a/assets/common/items/npc_weapons/axe/minotaur_axe.ron b/assets/common/items/npc_weapons/axe/minotaur_axe.ron
index 81fc250ae6..77cbccee25 100644
--- a/assets/common/items/npc_weapons/axe/minotaur_axe.ron
+++ b/assets/common/items/npc_weapons/axe/minotaur_axe.ron
@@ -6,7 +6,7 @@ ItemDef(
             kind: AxeSimple,    
             hands: Two,
             stats: Direct((
-                equip_time_millis: 500,
+                equip_time_secs: 0.5,
                 power: 1.8,
                 poise_strength: 1.00,
                 speed: 1.0
diff --git a/assets/common/items/npc_weapons/biped_small/adlet/adlet_bow.ron b/assets/common/items/npc_weapons/biped_small/adlet/adlet_bow.ron
index 4e0dc79778..e2f537f4b0 100644
--- a/assets/common/items/npc_weapons/biped_small/adlet/adlet_bow.ron
+++ b/assets/common/items/npc_weapons/biped_small/adlet/adlet_bow.ron
@@ -6,7 +6,7 @@ ItemDef(
             kind: Bow, 
             hands: Two,   
             stats: Direct((
-                equip_time_millis: 0,
+                equip_time_secs: 0.0,
                 power: 0.7,
                 poise_strength: 0.8,
                 speed: 0.3
diff --git a/assets/common/items/npc_weapons/biped_small/adlet/gnoll_staff.ron b/assets/common/items/npc_weapons/biped_small/adlet/gnoll_staff.ron
index 181c5d8382..be0e40f4b9 100644
--- a/assets/common/items/npc_weapons/biped_small/adlet/gnoll_staff.ron
+++ b/assets/common/items/npc_weapons/biped_small/adlet/gnoll_staff.ron
@@ -6,7 +6,7 @@ ItemDef(
             kind: StaffSimple,   
             hands: Two, 
             stats: Direct((
-                equip_time_millis: 0,
+                equip_time_secs: 0.0,
                 power: 0.7,
                 poise_strength: 0.8,
                 speed: 0.5
diff --git a/assets/common/items/npc_weapons/biped_small/adlet/wooden_spear.ron b/assets/common/items/npc_weapons/biped_small/adlet/wooden_spear.ron
index a78f795b25..c78851f595 100644
--- a/assets/common/items/npc_weapons/biped_small/adlet/wooden_spear.ron
+++ b/assets/common/items/npc_weapons/biped_small/adlet/wooden_spear.ron
@@ -6,7 +6,7 @@ ItemDef(
             kind: Spear,   
             hands: Two, 
             stats: Direct((
-                equip_time_millis: 0,
+                equip_time_secs: 0.0,
                 power: 0.7,
                 poise_strength: 0.8,
                 speed: 1.0
diff --git a/assets/common/items/npc_weapons/biped_small/gnarling/adlet_bow.ron b/assets/common/items/npc_weapons/biped_small/gnarling/adlet_bow.ron
index d7c6609b52..3df2fb30dd 100644
--- a/assets/common/items/npc_weapons/biped_small/gnarling/adlet_bow.ron
+++ b/assets/common/items/npc_weapons/biped_small/gnarling/adlet_bow.ron
@@ -6,7 +6,7 @@ ItemDef(
             kind: Bow,  
             hands: Two,  
             stats: Direct((
-                equip_time_millis: 0,
+                equip_time_secs: 0.0,
                 power: 0.3,
                 poise_strength: 0.8,
                 speed: 0.7
diff --git a/assets/common/items/npc_weapons/biped_small/gnarling/gnoll_staff.ron b/assets/common/items/npc_weapons/biped_small/gnarling/gnoll_staff.ron
index f3fdc1f4da..08a3b00d26 100644
--- a/assets/common/items/npc_weapons/biped_small/gnarling/gnoll_staff.ron
+++ b/assets/common/items/npc_weapons/biped_small/gnarling/gnoll_staff.ron
@@ -6,7 +6,7 @@ ItemDef(
             kind: StaffSimple,   
             hands: Two, 
             stats: Direct((
-                equip_time_millis: 0,
+                equip_time_secs: 0.0,
                 power: 0.3,
                 poise_strength: 0.8,
                 speed: 0.8
diff --git a/assets/common/items/npc_weapons/biped_small/gnarling/wooden_spear.ron b/assets/common/items/npc_weapons/biped_small/gnarling/wooden_spear.ron
index 82f65af672..158f71e428 100644
--- a/assets/common/items/npc_weapons/biped_small/gnarling/wooden_spear.ron
+++ b/assets/common/items/npc_weapons/biped_small/gnarling/wooden_spear.ron
@@ -6,7 +6,7 @@ ItemDef(
             kind: Spear, 
             hands: Two,   
             stats: Direct((
-                equip_time_millis: 0,
+                equip_time_secs: 0.0,
                 power: 0.3,
                 poise_strength: 0.8,
                 speed: 1.0
diff --git a/assets/common/items/npc_weapons/biped_small/haniwa/adlet_bow.ron b/assets/common/items/npc_weapons/biped_small/haniwa/adlet_bow.ron
index 02abadbeb0..67754213a2 100644
--- a/assets/common/items/npc_weapons/biped_small/haniwa/adlet_bow.ron
+++ b/assets/common/items/npc_weapons/biped_small/haniwa/adlet_bow.ron
@@ -5,7 +5,7 @@ ItemDef(
             kind: Bow,   
             hands: Two, 
             stats: Direct((
-                equip_time_millis: 0,
+                equip_time_secs: 0.0,
                 power: 1.6,
                 poise_strength: 0.8,
                 speed: 0.3
diff --git a/assets/common/items/npc_weapons/biped_small/haniwa/gnoll_staff.ron b/assets/common/items/npc_weapons/biped_small/haniwa/gnoll_staff.ron
index 1dcbea0401..df4b020848 100644
--- a/assets/common/items/npc_weapons/biped_small/haniwa/gnoll_staff.ron
+++ b/assets/common/items/npc_weapons/biped_small/haniwa/gnoll_staff.ron
@@ -5,7 +5,7 @@ ItemDef(
             kind: StaffSimple,   
             hands: Two, 
             stats: Direct((
-                equip_time_millis: 0,
+                equip_time_secs: 0.0,
                 power: 1.8,
                 poise_strength: 0.8,
                 speed: 0.6
diff --git a/assets/common/items/npc_weapons/biped_small/haniwa/wooden_spear.ron b/assets/common/items/npc_weapons/biped_small/haniwa/wooden_spear.ron
index 6b8c622c64..73d2c47314 100644
--- a/assets/common/items/npc_weapons/biped_small/haniwa/wooden_spear.ron
+++ b/assets/common/items/npc_weapons/biped_small/haniwa/wooden_spear.ron
@@ -5,7 +5,7 @@ ItemDef(
             kind: Spear,    
             hands: Two,
             stats: Direct((
-                equip_time_millis: 0,
+                equip_time_secs: 0.0,
                 power: 1.4,
                 poise_strength: 0.8,
                 speed: 1.0
diff --git a/assets/common/items/npc_weapons/biped_small/myrmidon/adlet_bow.ron b/assets/common/items/npc_weapons/biped_small/myrmidon/adlet_bow.ron
index a0d0238b80..fa41ece35a 100644
--- a/assets/common/items/npc_weapons/biped_small/myrmidon/adlet_bow.ron
+++ b/assets/common/items/npc_weapons/biped_small/myrmidon/adlet_bow.ron
@@ -6,7 +6,7 @@ ItemDef(
             kind: Bow,    
             hands: Two,
             stats: Direct((
-                equip_time_millis: 0,
+                equip_time_secs: 0.0,
                 power: 1.1,
                 poise_strength: 0.8,
                 speed: 0.5
diff --git a/assets/common/items/npc_weapons/biped_small/myrmidon/gnoll_staff.ron b/assets/common/items/npc_weapons/biped_small/myrmidon/gnoll_staff.ron
index ce0a8d0dea..68beef20b4 100644
--- a/assets/common/items/npc_weapons/biped_small/myrmidon/gnoll_staff.ron
+++ b/assets/common/items/npc_weapons/biped_small/myrmidon/gnoll_staff.ron
@@ -6,7 +6,7 @@ ItemDef(
             kind: StaffSimple,    
             hands: Two,
             stats: Direct((
-                equip_time_millis: 0,
+                equip_time_secs: 0.0,
                 power: 1.7,
                 poise_strength: 0.8,
                 speed: 0.7
diff --git a/assets/common/items/npc_weapons/biped_small/myrmidon/wooden_spear.ron b/assets/common/items/npc_weapons/biped_small/myrmidon/wooden_spear.ron
index 2894c9f361..06463a5231 100644
--- a/assets/common/items/npc_weapons/biped_small/myrmidon/wooden_spear.ron
+++ b/assets/common/items/npc_weapons/biped_small/myrmidon/wooden_spear.ron
@@ -6,7 +6,7 @@ ItemDef(
             kind: Spear,
             hands: Two,    
             stats: Direct((
-                equip_time_millis: 0,
+                equip_time_secs: 0.0,
                 power: 1.7,
                 poise_strength: 0.8,
                 speed: 1.0
diff --git a/assets/common/items/npc_weapons/biped_small/sahagin/adlet_bow.ron b/assets/common/items/npc_weapons/biped_small/sahagin/adlet_bow.ron
index ce348f0f10..38ba184f05 100644
--- a/assets/common/items/npc_weapons/biped_small/sahagin/adlet_bow.ron
+++ b/assets/common/items/npc_weapons/biped_small/sahagin/adlet_bow.ron
@@ -6,7 +6,7 @@ ItemDef(
             kind: Bow,    
             hands: Two,
             stats: Direct((
-                equip_time_millis: 0,
+                equip_time_secs: 0.0,
                 power: 1.1,
                 poise_strength: 0.8,
                 speed: 0.3
diff --git a/assets/common/items/npc_weapons/biped_small/sahagin/gnoll_staff.ron b/assets/common/items/npc_weapons/biped_small/sahagin/gnoll_staff.ron
index 435ac291ff..766a9ee68f 100644
--- a/assets/common/items/npc_weapons/biped_small/sahagin/gnoll_staff.ron
+++ b/assets/common/items/npc_weapons/biped_small/sahagin/gnoll_staff.ron
@@ -6,7 +6,7 @@ ItemDef(
             kind: StaffSimple,  
             hands: Two,  
             stats: Direct((
-                equip_time_millis: 0,
+                equip_time_secs: 0.0,
                 power: 1.1,
                 poise_strength: 0.8,
                 speed: 0.8
diff --git a/assets/common/items/npc_weapons/biped_small/sahagin/wooden_spear.ron b/assets/common/items/npc_weapons/biped_small/sahagin/wooden_spear.ron
index b346ba2068..af201c4dba 100644
--- a/assets/common/items/npc_weapons/biped_small/sahagin/wooden_spear.ron
+++ b/assets/common/items/npc_weapons/biped_small/sahagin/wooden_spear.ron
@@ -6,7 +6,7 @@ ItemDef(
             kind: Spear,   
             hands: Two, 
             stats: Direct((
-                equip_time_millis: 0,
+                equip_time_secs: 0.0,
                 power: 1.1,
                 poise_strength: 0.8,
                 speed: 1.0
diff --git a/assets/common/items/npc_weapons/bow/saurok_bow.ron b/assets/common/items/npc_weapons/bow/saurok_bow.ron
index 37e3f8bea8..77c81426bd 100644
--- a/assets/common/items/npc_weapons/bow/saurok_bow.ron
+++ b/assets/common/items/npc_weapons/bow/saurok_bow.ron
@@ -6,7 +6,7 @@ ItemDef(
             kind: BowSimple,
             hands: Two,
             stats: Direct((
-                equip_time_millis: 500,
+                equip_time_secs: 0.5,
                 power: 1.00,
                 poise_strength: 1.00,
                 speed: 1.0
diff --git a/assets/common/items/npc_weapons/hammer/cyclops_hammer.ron b/assets/common/items/npc_weapons/hammer/cyclops_hammer.ron
index 7c10458ed1..8ef9112c84 100644
--- a/assets/common/items/npc_weapons/hammer/cyclops_hammer.ron
+++ b/assets/common/items/npc_weapons/hammer/cyclops_hammer.ron
@@ -6,7 +6,7 @@ ItemDef(
             kind: HammerSimple,    
             hands: Two,
             stats: Direct((
-                equip_time_millis: 500,
+                equip_time_secs: 0.5,
                 power: 1.00,
                 poise_strength: 1.00,
                 speed: 1.0
diff --git a/assets/common/items/npc_weapons/hammer/harvester_scythe.ron b/assets/common/items/npc_weapons/hammer/harvester_scythe.ron
index cd37197f19..8c90236706 100644
--- a/assets/common/items/npc_weapons/hammer/harvester_scythe.ron
+++ b/assets/common/items/npc_weapons/hammer/harvester_scythe.ron
@@ -6,7 +6,7 @@ ItemDef(
             kind: HammerSimple,    
             hands: Two,
             stats: Direct((
-                equip_time_millis: 1,
+                equip_time_secs: 0.001,
                 power: 1.6,
                 poise_strength: 1.00,
                 speed: 1.0
diff --git a/assets/common/items/npc_weapons/hammer/ogre_hammer.ron b/assets/common/items/npc_weapons/hammer/ogre_hammer.ron
index 0ab8068dff..e868ef4be5 100644
--- a/assets/common/items/npc_weapons/hammer/ogre_hammer.ron
+++ b/assets/common/items/npc_weapons/hammer/ogre_hammer.ron
@@ -6,7 +6,7 @@ ItemDef(
             kind: HammerSimple,    
             hands: Two,
             stats: Direct((
-                equip_time_millis: 500,
+                equip_time_secs: 0.5,
                 power: 1.00,
                 poise_strength: 1.00,
                 speed: 1.0
diff --git a/assets/common/items/npc_weapons/hammer/troll_hammer.ron b/assets/common/items/npc_weapons/hammer/troll_hammer.ron
index 1f04179292..96c885dac1 100644
--- a/assets/common/items/npc_weapons/hammer/troll_hammer.ron
+++ b/assets/common/items/npc_weapons/hammer/troll_hammer.ron
@@ -6,7 +6,7 @@ ItemDef(
             kind: HammerSimple,    
             hands: Two,
             stats: Direct((
-                equip_time_millis: 500,
+                equip_time_secs: 0.5,
                 power: 1.00,
                 poise_strength: 1.00,
                 speed: 1.0
diff --git a/assets/common/items/npc_weapons/hammer/wendigo_hammer.ron b/assets/common/items/npc_weapons/hammer/wendigo_hammer.ron
index 4078c0db3d..fce40ec088 100644
--- a/assets/common/items/npc_weapons/hammer/wendigo_hammer.ron
+++ b/assets/common/items/npc_weapons/hammer/wendigo_hammer.ron
@@ -6,7 +6,7 @@ ItemDef(
             kind: Hammer,    
             hands: Two,
             stats: Direct((
-                equip_time_millis: 500,
+                equip_time_secs: 0.5,
                 power: 1.00,
                 poise_strength: 1.00,
                 speed: 1.0
diff --git a/assets/common/items/npc_weapons/hammer/yeti_hammer.ron b/assets/common/items/npc_weapons/hammer/yeti_hammer.ron
index bc8bdd9f16..4a877e41ba 100644
--- a/assets/common/items/npc_weapons/hammer/yeti_hammer.ron
+++ b/assets/common/items/npc_weapons/hammer/yeti_hammer.ron
@@ -6,7 +6,7 @@ ItemDef(
             kind: HammerSimple,              
             hands: Two,
             stats: Direct((
-                equip_time_millis: 0,
+                equip_time_secs: 0.0,
                 power: 2.0,
                 poise_strength: 1.00,
                 speed: 1.0
diff --git a/assets/common/items/npc_weapons/staff/mindflayer_staff.ron b/assets/common/items/npc_weapons/staff/mindflayer_staff.ron
index d371f99043..4ba9ac21f2 100644
--- a/assets/common/items/npc_weapons/staff/mindflayer_staff.ron
+++ b/assets/common/items/npc_weapons/staff/mindflayer_staff.ron
@@ -6,7 +6,7 @@ ItemDef(
             kind: StaffSimple,
             hands: Two,
             stats: Direct((
-                equip_time_millis: 1,
+                equip_time_secs: 0.001,
                 power: 3.0,
                 poise_strength: 1.00,
                 speed: 1.5,
diff --git a/assets/common/items/npc_weapons/staff/ogre_staff.ron b/assets/common/items/npc_weapons/staff/ogre_staff.ron
index c4cca908ff..4c67432d3a 100644
--- a/assets/common/items/npc_weapons/staff/ogre_staff.ron
+++ b/assets/common/items/npc_weapons/staff/ogre_staff.ron
@@ -6,7 +6,7 @@ ItemDef(
             kind: StaffSimple,    
             hands: Two,
             stats: Direct((
-                equip_time_millis: 500,
+                equip_time_secs: 0.5,
                 power: 1.00,
                 poise_strength: 1.00,
                 speed: 1.0
diff --git a/assets/common/items/npc_weapons/staff/saurok_staff.ron b/assets/common/items/npc_weapons/staff/saurok_staff.ron
index 8ee0b015e4..71550581e1 100644
--- a/assets/common/items/npc_weapons/staff/saurok_staff.ron
+++ b/assets/common/items/npc_weapons/staff/saurok_staff.ron
@@ -6,7 +6,7 @@ ItemDef(
             kind: StaffSimple,
             hands: Two,
             stats: Direct((
-                equip_time_millis: 500,
+                equip_time_secs: 0.5,
                 power: 1.00,
                 poise_strength: 1.00,
                 speed: 1.0
diff --git a/assets/common/items/npc_weapons/sword/dullahan_sword.ron b/assets/common/items/npc_weapons/sword/dullahan_sword.ron
index d3b3ba1b8e..68b6215c32 100644
--- a/assets/common/items/npc_weapons/sword/dullahan_sword.ron
+++ b/assets/common/items/npc_weapons/sword/dullahan_sword.ron
@@ -6,7 +6,7 @@ ItemDef(
             kind: SwordSimple,    
             hands: Two,
             stats: Direct((
-                equip_time_millis: 500,
+                equip_time_secs: 0.5,
                 power: 1.00,
                 poise_strength: 1.00,
                 speed: 1.0
diff --git a/assets/common/items/npc_weapons/sword/saurok_sword.ron b/assets/common/items/npc_weapons/sword/saurok_sword.ron
index 722280e1c3..66357e54ff 100644
--- a/assets/common/items/npc_weapons/sword/saurok_sword.ron
+++ b/assets/common/items/npc_weapons/sword/saurok_sword.ron
@@ -6,7 +6,7 @@ ItemDef(
             kind: SwordSimple,    
             hands: Two,
             stats: Direct((
-                equip_time_millis: 500,
+                equip_time_secs: 0.5,
                 power: 1.00,
                 poise_strength: 1.00,
                 speed: 1.0
diff --git a/assets/common/items/npc_weapons/unique/beast_claws.ron b/assets/common/items/npc_weapons/unique/beast_claws.ron
index 3b2ca645d4..4caf610525 100644
--- a/assets/common/items/npc_weapons/unique/beast_claws.ron
+++ b/assets/common/items/npc_weapons/unique/beast_claws.ron
@@ -6,7 +6,7 @@ ItemDef(
             kind: Unique(BeastClaws),
             hands: Two,
             stats: Direct((
-                equip_time_millis: 500,
+                equip_time_secs: 0.5,
                 power: 1.00,
                 poise_strength: 1.00,
                 speed: 1.0,
diff --git a/assets/common/items/npc_weapons/unique/quadlowbasic.ron b/assets/common/items/npc_weapons/unique/quadlowbasic.ron
index 0ab936cb0d..768e0918bf 100644
--- a/assets/common/items/npc_weapons/unique/quadlowbasic.ron
+++ b/assets/common/items/npc_weapons/unique/quadlowbasic.ron
@@ -6,7 +6,7 @@ ItemDef(
             kind: Unique(QuadLowBasic),
             hands: Two,
             stats: Direct((
-                equip_time_millis: 10,
+                equip_time_secs: 0.01,
                 power: 1.00,
                 poise_strength: 1.00,
                 speed: 1.00,
diff --git a/assets/common/items/npc_weapons/unique/quadlowbeam.ron b/assets/common/items/npc_weapons/unique/quadlowbeam.ron
index 1fd8921aad..eadd6b0c51 100644
--- a/assets/common/items/npc_weapons/unique/quadlowbeam.ron
+++ b/assets/common/items/npc_weapons/unique/quadlowbeam.ron
@@ -6,7 +6,7 @@ ItemDef(
             kind: Unique(QuadLowBeam),
             hands: Two,
             stats: Direct((
-                equip_time_millis: 10,
+                equip_time_secs: 0.01,
                 power: 1.00,
                 poise_strength: 1.00,
                 speed: 1.00,
diff --git a/assets/common/items/npc_weapons/unique/quadlowbreathe.ron b/assets/common/items/npc_weapons/unique/quadlowbreathe.ron
index bbaedc1882..e74df8d23e 100644
--- a/assets/common/items/npc_weapons/unique/quadlowbreathe.ron
+++ b/assets/common/items/npc_weapons/unique/quadlowbreathe.ron
@@ -6,7 +6,7 @@ ItemDef(
             kind: Unique(QuadLowBreathe),
             hands: Two,
             stats: Direct((
-                equip_time_millis: 10,
+                equip_time_secs: 0.01,
                 power: 1.00,
                 poise_strength: 1.00,
                 speed: 1.00,
diff --git a/assets/common/items/npc_weapons/unique/quadlowquick.ron b/assets/common/items/npc_weapons/unique/quadlowquick.ron
index f9b6c922c9..7b53cfd239 100644
--- a/assets/common/items/npc_weapons/unique/quadlowquick.ron
+++ b/assets/common/items/npc_weapons/unique/quadlowquick.ron
@@ -6,7 +6,7 @@ ItemDef(
             kind: Unique(QuadLowQuick),
             hands: Two,
             stats: Direct((
-                equip_time_millis: 10,
+                equip_time_secs: 0.01,
                 power: 1.00,
                 poise_strength: 1.00,
                 speed: 1.00,
diff --git a/assets/common/items/npc_weapons/unique/quadlowranged.ron b/assets/common/items/npc_weapons/unique/quadlowranged.ron
index b4a03cf800..5aeb436b71 100644
--- a/assets/common/items/npc_weapons/unique/quadlowranged.ron
+++ b/assets/common/items/npc_weapons/unique/quadlowranged.ron
@@ -6,7 +6,7 @@ ItemDef(
             kind: Unique(QuadLowRanged),
             hands: Two,
             stats: Direct((
-                equip_time_millis: 10,
+                equip_time_secs: 0.01,
                 power: 1.00,
                 poise_strength: 1.00,
                 speed: 1.00,
diff --git a/assets/common/items/npc_weapons/unique/quadlowtail.ron b/assets/common/items/npc_weapons/unique/quadlowtail.ron
index 66c3b04260..d15f0bc5cd 100644
--- a/assets/common/items/npc_weapons/unique/quadlowtail.ron
+++ b/assets/common/items/npc_weapons/unique/quadlowtail.ron
@@ -6,7 +6,7 @@ ItemDef(
             kind: Unique(QuadLowTail),
             hands: Two,
             stats: Direct((
-                equip_time_millis: 10,
+                equip_time_secs: 0.01,
                 power: 1.00,
                 poise_strength: 1.00,
                 speed: 1.00,
diff --git a/assets/common/items/npc_weapons/unique/quadmedbasic.ron b/assets/common/items/npc_weapons/unique/quadmedbasic.ron
index 685acf28c7..ab8e4a663c 100644
--- a/assets/common/items/npc_weapons/unique/quadmedbasic.ron
+++ b/assets/common/items/npc_weapons/unique/quadmedbasic.ron
@@ -6,7 +6,7 @@ ItemDef(
             kind: Unique(QuadMedBasic),
             hands: Two,
             stats: Direct((
-                equip_time_millis: 10,
+                equip_time_secs: 0.01,
                 power: 1.00,
                 poise_strength: 1.00,
                 speed: 1.00,
diff --git a/assets/common/items/npc_weapons/unique/quadmedcharge.ron b/assets/common/items/npc_weapons/unique/quadmedcharge.ron
index d5a2cdc78b..924680916d 100644
--- a/assets/common/items/npc_weapons/unique/quadmedcharge.ron
+++ b/assets/common/items/npc_weapons/unique/quadmedcharge.ron
@@ -6,7 +6,7 @@ ItemDef(
             kind: Unique(QuadMedCharge),
             hands: Two,
             stats: Direct((
-                equip_time_millis: 10,
+                equip_time_secs: 0.01,
                 power: 1.00,
                 poise_strength: 1.00,
                 speed: 1.00,
diff --git a/assets/common/items/npc_weapons/unique/quadmedhoof.ron b/assets/common/items/npc_weapons/unique/quadmedhoof.ron
index 0317efe916..acabf52056 100644
--- a/assets/common/items/npc_weapons/unique/quadmedhoof.ron
+++ b/assets/common/items/npc_weapons/unique/quadmedhoof.ron
@@ -6,7 +6,7 @@ ItemDef(
             kind: Unique(QuadMedHoof),
             hands: Two,
             stats: Direct((
-                equip_time_millis: 10,
+                equip_time_secs: 0.01,
                 power: 1.00,
                 poise_strength: 1.00,
                 speed: 1.00,
diff --git a/assets/common/items/npc_weapons/unique/quadmedjump.ron b/assets/common/items/npc_weapons/unique/quadmedjump.ron
index e3d4fa0c8f..e03942f132 100644
--- a/assets/common/items/npc_weapons/unique/quadmedjump.ron
+++ b/assets/common/items/npc_weapons/unique/quadmedjump.ron
@@ -6,7 +6,7 @@ ItemDef(
             kind: Unique(QuadMedJump),
             hands: Two,
             stats: Direct((
-                equip_time_millis: 10,
+                equip_time_secs: 0.01,
                 power: 1.00,
                 poise_strength: 1.00,
                 speed: 1.0,
diff --git a/assets/common/items/npc_weapons/unique/quadmedquick.ron b/assets/common/items/npc_weapons/unique/quadmedquick.ron
index 22feaa6aa8..b900cebbbd 100644
--- a/assets/common/items/npc_weapons/unique/quadmedquick.ron
+++ b/assets/common/items/npc_weapons/unique/quadmedquick.ron
@@ -6,7 +6,7 @@ ItemDef(
             kind: Unique(QuadMedQuick),
             hands: Two,
             stats: Direct((
-                equip_time_millis: 10,
+                equip_time_secs: 0.01,
                 power: 1.00,
                 poise_strength: 1.00,
                 speed: 1.0,
diff --git a/assets/common/items/npc_weapons/unique/quadsmallbasic.ron b/assets/common/items/npc_weapons/unique/quadsmallbasic.ron
index 336ed47645..180578c447 100644
--- a/assets/common/items/npc_weapons/unique/quadsmallbasic.ron
+++ b/assets/common/items/npc_weapons/unique/quadsmallbasic.ron
@@ -6,7 +6,7 @@ ItemDef(
             kind: Unique(QuadSmallBasic),
             hands: Two,
             stats: Direct((
-                equip_time_millis: 10,
+                equip_time_secs: 0.01,
                 power: 1.00,
                 poise_strength: 1.00,
                 speed: 1.00,
diff --git a/assets/common/items/npc_weapons/unique/stone_golems_fist.ron b/assets/common/items/npc_weapons/unique/stone_golems_fist.ron
index 1f811801a9..bedb130b8b 100644
--- a/assets/common/items/npc_weapons/unique/stone_golems_fist.ron
+++ b/assets/common/items/npc_weapons/unique/stone_golems_fist.ron
@@ -6,7 +6,7 @@ ItemDef(
             kind: Unique(StoneGolemFist),    
             hands: Two,
             stats: Direct((
-                equip_time_millis: 1,
+                equip_time_secs: 0.001,
                 power: 1.00,
                 poise_strength: 1.00,
                 speed: 1.0
diff --git a/assets/common/items/npc_weapons/unique/theropodbasic.ron b/assets/common/items/npc_weapons/unique/theropodbasic.ron
index fcfaea939c..7dc980852a 100644
--- a/assets/common/items/npc_weapons/unique/theropodbasic.ron
+++ b/assets/common/items/npc_weapons/unique/theropodbasic.ron
@@ -6,7 +6,7 @@ ItemDef(
             kind: Unique(TheropodBasic),
             hands: Two,
             stats: Direct((
-                equip_time_millis: 10,
+                equip_time_secs: 0.01,
                 power: 1.00,
                 poise_strength: 1.00,
                 speed: 1.00,
diff --git a/assets/common/items/npc_weapons/unique/theropodbird.ron b/assets/common/items/npc_weapons/unique/theropodbird.ron
index 205b916b54..f51fe4ac09 100644
--- a/assets/common/items/npc_weapons/unique/theropodbird.ron
+++ b/assets/common/items/npc_weapons/unique/theropodbird.ron
@@ -6,7 +6,7 @@ ItemDef(
             kind: Unique(TheropodBird),
             hands: Two,
             stats: Direct((
-                equip_time_millis: 10,
+                equip_time_secs: 0.01,
                 power: 1.00,
                 poise_strength: 1.00,
                 speed: 1.00,
diff --git a/assets/common/items/npc_weapons/unique/tidal_claws.ron b/assets/common/items/npc_weapons/unique/tidal_claws.ron
index 4d8bf64ec5..08343ecaa9 100644
--- a/assets/common/items/npc_weapons/unique/tidal_claws.ron
+++ b/assets/common/items/npc_weapons/unique/tidal_claws.ron
@@ -6,7 +6,7 @@ ItemDef(
             kind: Unique(TidalClaws),
             hands: Two,
             stats: Direct((
-                equip_time_millis: 500,
+                equip_time_secs: 0.5,
                 power: 1.00,
                 poise_strength: 1.00,
                 speed: 1.0,
diff --git a/assets/common/items/npc_weapons/unique/turret.ron b/assets/common/items/npc_weapons/unique/turret.ron
index fcca6452c1..6e3ba66261 100644
--- a/assets/common/items/npc_weapons/unique/turret.ron
+++ b/assets/common/items/npc_weapons/unique/turret.ron
@@ -6,7 +6,7 @@ ItemDef(
             kind: Unique(ObjectTurret),
             hands: Two,
             stats: Direct((
-                equip_time_millis: 10,
+                equip_time_secs: 0.01,
                 power: 1.00,
                 poise_strength: 1.00,
                 speed: 1.00,
diff --git a/assets/common/items/npc_weapons/unique/wendigo_magic.ron b/assets/common/items/npc_weapons/unique/wendigo_magic.ron
index 3892f757d0..e957eb5e5a 100644
--- a/assets/common/items/npc_weapons/unique/wendigo_magic.ron
+++ b/assets/common/items/npc_weapons/unique/wendigo_magic.ron
@@ -6,7 +6,7 @@ ItemDef(
             kind: Unique(WendigoMagic),
             hands: Two,
             stats: Direct((
-                equip_time_millis: 500,
+                equip_time_secs: 0.5,
                 power: 1.00,
                 poise_strength: 1.00,
                 speed: 1.0,
diff --git a/assets/common/items/weapons/axe/bloodsteel_axe-0.ron b/assets/common/items/weapons/axe/bloodsteel_axe-0.ron
index ae77701cc3..d3b190e36b 100644
--- a/assets/common/items/weapons/axe/bloodsteel_axe-0.ron
+++ b/assets/common/items/weapons/axe/bloodsteel_axe-0.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Axe,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 1.6,
             poise_strength: 1.4,
             speed: 1.0,
diff --git a/assets/common/items/weapons/axe/bloodsteel_axe-1.ron b/assets/common/items/weapons/axe/bloodsteel_axe-1.ron
index 06163034c5..238cc66874 100644
--- a/assets/common/items/weapons/axe/bloodsteel_axe-1.ron
+++ b/assets/common/items/weapons/axe/bloodsteel_axe-1.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Axe,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 1.6,
             poise_strength: 1.8,
             speed: 1.0,
diff --git a/assets/common/items/weapons/axe/bloodsteel_axe-2.ron b/assets/common/items/weapons/axe/bloodsteel_axe-2.ron
index ca005ed334..ca5e855ab6 100644
--- a/assets/common/items/weapons/axe/bloodsteel_axe-2.ron
+++ b/assets/common/items/weapons/axe/bloodsteel_axe-2.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Axe,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 1.6,
             poise_strength: 1.8,
             speed: 1.0,
diff --git a/assets/common/items/weapons/axe/bronze_axe-0.ron b/assets/common/items/weapons/axe/bronze_axe-0.ron
index 5a013aa046..71967f169c 100644
--- a/assets/common/items/weapons/axe/bronze_axe-0.ron
+++ b/assets/common/items/weapons/axe/bronze_axe-0.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Axe,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 1.0,
             poise_strength: 0.9,
             speed: 1.0,
diff --git a/assets/common/items/weapons/axe/bronze_axe-1.ron b/assets/common/items/weapons/axe/bronze_axe-1.ron
index 551d6ebcc0..de8bbd4ffd 100644
--- a/assets/common/items/weapons/axe/bronze_axe-1.ron
+++ b/assets/common/items/weapons/axe/bronze_axe-1.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Axe,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 1.0,
             poise_strength: 1.5,
             speed: 1.0,
diff --git a/assets/common/items/weapons/axe/bronze_axe-2.ron b/assets/common/items/weapons/axe/bronze_axe-2.ron
index 673ab08b7f..29668fee4b 100644
--- a/assets/common/items/weapons/axe/bronze_axe-2.ron
+++ b/assets/common/items/weapons/axe/bronze_axe-2.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Axe,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 1.0,
             poise_strength: 1.4,
             speed: 1.0,
diff --git a/assets/common/items/weapons/axe/cobalt_axe-0.ron b/assets/common/items/weapons/axe/cobalt_axe-0.ron
index c50fb8d418..078ad75ea9 100644
--- a/assets/common/items/weapons/axe/cobalt_axe-0.ron
+++ b/assets/common/items/weapons/axe/cobalt_axe-0.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Axe,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 1.8,
             poise_strength: 1.0,
             speed: 1.0,
diff --git a/assets/common/items/weapons/axe/cobalt_axe-1.ron b/assets/common/items/weapons/axe/cobalt_axe-1.ron
index 8607fcf969..400b24fbc5 100644
--- a/assets/common/items/weapons/axe/cobalt_axe-1.ron
+++ b/assets/common/items/weapons/axe/cobalt_axe-1.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Axe,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 1.8,
             poise_strength: 1.0,
             speed: 1.0,
diff --git a/assets/common/items/weapons/axe/iron_axe-0.ron b/assets/common/items/weapons/axe/iron_axe-0.ron
index d9911dc030..6f2b392951 100644
--- a/assets/common/items/weapons/axe/iron_axe-0.ron
+++ b/assets/common/items/weapons/axe/iron_axe-0.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Axe,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 1.2,
             poise_strength: 1.7,
             speed: 1.0,
diff --git a/assets/common/items/weapons/axe/iron_axe-1.ron b/assets/common/items/weapons/axe/iron_axe-1.ron
index 4aca7f736e..30a2a3e3ff 100644
--- a/assets/common/items/weapons/axe/iron_axe-1.ron
+++ b/assets/common/items/weapons/axe/iron_axe-1.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Axe,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 1.2,
             poise_strength: 1.4,
             speed: 1.0,
diff --git a/assets/common/items/weapons/axe/iron_axe-2.ron b/assets/common/items/weapons/axe/iron_axe-2.ron
index 383782454a..1bada4e0d2 100644
--- a/assets/common/items/weapons/axe/iron_axe-2.ron
+++ b/assets/common/items/weapons/axe/iron_axe-2.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Axe,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 1.2,
             poise_strength: 1.1,
             speed: 1.0,
diff --git a/assets/common/items/weapons/axe/iron_axe-3.ron b/assets/common/items/weapons/axe/iron_axe-3.ron
index 1406ad3e9f..058a44168f 100644
--- a/assets/common/items/weapons/axe/iron_axe-3.ron
+++ b/assets/common/items/weapons/axe/iron_axe-3.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Axe,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 1.2,
             poise_strength: 1.6,
             speed: 1.0,
diff --git a/assets/common/items/weapons/axe/iron_axe-4.ron b/assets/common/items/weapons/axe/iron_axe-4.ron
index c46fdae2fa..3047c53e7b 100644
--- a/assets/common/items/weapons/axe/iron_axe-4.ron
+++ b/assets/common/items/weapons/axe/iron_axe-4.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Axe,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 1.2,
             poise_strength: 1.4,
             speed: 1.0,
diff --git a/assets/common/items/weapons/axe/iron_axe-5.ron b/assets/common/items/weapons/axe/iron_axe-5.ron
index 00379b0a61..c6ce58abc0 100644
--- a/assets/common/items/weapons/axe/iron_axe-5.ron
+++ b/assets/common/items/weapons/axe/iron_axe-5.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Axe,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 1.2,
             poise_strength: 1.8,
             speed: 1.0,
diff --git a/assets/common/items/weapons/axe/iron_axe-6.ron b/assets/common/items/weapons/axe/iron_axe-6.ron
index 219ce1b923..1b5d841ba8 100644
--- a/assets/common/items/weapons/axe/iron_axe-6.ron
+++ b/assets/common/items/weapons/axe/iron_axe-6.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Axe,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 1.2,
             poise_strength: 1.3,
             speed: 1.0,
diff --git a/assets/common/items/weapons/axe/iron_axe-7.ron b/assets/common/items/weapons/axe/iron_axe-7.ron
index 31b889c726..98647e199d 100644
--- a/assets/common/items/weapons/axe/iron_axe-7.ron
+++ b/assets/common/items/weapons/axe/iron_axe-7.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Axe,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 1.2,
             poise_strength: 1.6,
             speed: 1.0,
diff --git a/assets/common/items/weapons/axe/iron_axe-8.ron b/assets/common/items/weapons/axe/iron_axe-8.ron
index cbaad7165b..a27df5896e 100644
--- a/assets/common/items/weapons/axe/iron_axe-8.ron
+++ b/assets/common/items/weapons/axe/iron_axe-8.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Axe,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 1.2,
             poise_strength: 0.6,
             speed: 1.0,
diff --git a/assets/common/items/weapons/axe/iron_axe-9.ron b/assets/common/items/weapons/axe/iron_axe-9.ron
index c65a01804c..d3557a3ccc 100644
--- a/assets/common/items/weapons/axe/iron_axe-9.ron
+++ b/assets/common/items/weapons/axe/iron_axe-9.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Axe,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 1.2,
             poise_strength: 0.3,
             speed: 1.0,
diff --git a/assets/common/items/weapons/axe/malachite_axe-0.ron b/assets/common/items/weapons/axe/malachite_axe-0.ron
index bc08b5d4c0..84d3d61484 100644
--- a/assets/common/items/weapons/axe/malachite_axe-0.ron
+++ b/assets/common/items/weapons/axe/malachite_axe-0.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Axe,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 2.0,
             poise_strength: 1.1,
             speed: 1.0,
diff --git a/assets/common/items/weapons/axe/orc_axe-0.ron b/assets/common/items/weapons/axe/orc_axe-0.ron
index ebef7c0bb9..bfeb68447f 100644
--- a/assets/common/items/weapons/axe/orc_axe-0.ron
+++ b/assets/common/items/weapons/axe/orc_axe-0.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Axe,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 0.6,
             poise_strength: 1.5,
             speed: 1.0,
diff --git a/assets/common/items/weapons/axe/parashu.ron b/assets/common/items/weapons/axe/parashu.ron
index 932c189188..1cf59e80ea 100644
--- a/assets/common/items/weapons/axe/parashu.ron
+++ b/assets/common/items/weapons/axe/parashu.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Axe,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 2.5,
             poise_strength: 1.8,
             speed: 0.8,
diff --git a/assets/common/items/weapons/axe/starter_axe.ron b/assets/common/items/weapons/axe/starter_axe.ron
index 7adeb6c8f3..e4a4673db3 100644
--- a/assets/common/items/weapons/axe/starter_axe.ron
+++ b/assets/common/items/weapons/axe/starter_axe.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Axe,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 0.5,
             poise_strength: 2.0,
             speed: 1.0,
diff --git a/assets/common/items/weapons/axe/steel_axe-0.ron b/assets/common/items/weapons/axe/steel_axe-0.ron
index baa203d0cb..87344996cf 100644
--- a/assets/common/items/weapons/axe/steel_axe-0.ron
+++ b/assets/common/items/weapons/axe/steel_axe-0.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Axe,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 1.4,
             poise_strength: 1.2,
             speed: 1.0,
diff --git a/assets/common/items/weapons/axe/steel_axe-1.ron b/assets/common/items/weapons/axe/steel_axe-1.ron
index d5f009e54f..8f1cca27f9 100644
--- a/assets/common/items/weapons/axe/steel_axe-1.ron
+++ b/assets/common/items/weapons/axe/steel_axe-1.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Axe,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 1.4,
             poise_strength: 1.2,
             speed: 1.0,
diff --git a/assets/common/items/weapons/axe/steel_axe-2.ron b/assets/common/items/weapons/axe/steel_axe-2.ron
index 3d4ab8a1ad..0348a9e350 100644
--- a/assets/common/items/weapons/axe/steel_axe-2.ron
+++ b/assets/common/items/weapons/axe/steel_axe-2.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Axe,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 1.4,
             poise_strength: 1.2,
             speed: 1.0,
diff --git a/assets/common/items/weapons/axe/steel_axe-3.ron b/assets/common/items/weapons/axe/steel_axe-3.ron
index 6ff278dfbe..7e8a341104 100644
--- a/assets/common/items/weapons/axe/steel_axe-3.ron
+++ b/assets/common/items/weapons/axe/steel_axe-3.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Axe,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 1.4,
             poise_strength: 1.1,
             speed: 1.0,
diff --git a/assets/common/items/weapons/axe/steel_axe-4.ron b/assets/common/items/weapons/axe/steel_axe-4.ron
index 090cb5e936..3e5136d64a 100644
--- a/assets/common/items/weapons/axe/steel_axe-4.ron
+++ b/assets/common/items/weapons/axe/steel_axe-4.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Axe,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 1.4,
             poise_strength: 1.2,
             speed: 1.0,
diff --git a/assets/common/items/weapons/axe/steel_axe-5.ron b/assets/common/items/weapons/axe/steel_axe-5.ron
index 3e6fb5d55e..2d7566f456 100644
--- a/assets/common/items/weapons/axe/steel_axe-5.ron
+++ b/assets/common/items/weapons/axe/steel_axe-5.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Axe,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 1.4,
             poise_strength: 1.5,
             speed: 1.0,
diff --git a/assets/common/items/weapons/axe/steel_axe-6.ron b/assets/common/items/weapons/axe/steel_axe-6.ron
index e07fe8da15..34c0fc31bc 100644
--- a/assets/common/items/weapons/axe/steel_axe-6.ron
+++ b/assets/common/items/weapons/axe/steel_axe-6.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Axe,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 1.4,
             poise_strength: 1.0,
             speed: 1.0,
diff --git a/assets/common/items/weapons/axe/worn_iron_axe-0.ron b/assets/common/items/weapons/axe/worn_iron_axe-0.ron
index 141a072b26..9e027c662f 100644
--- a/assets/common/items/weapons/axe/worn_iron_axe-0.ron
+++ b/assets/common/items/weapons/axe/worn_iron_axe-0.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Axe,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 0.8,
             poise_strength: 0.4,
             speed: 1.0,
diff --git a/assets/common/items/weapons/axe/worn_iron_axe-1.ron b/assets/common/items/weapons/axe/worn_iron_axe-1.ron
index 49a1011180..17d519780c 100644
--- a/assets/common/items/weapons/axe/worn_iron_axe-1.ron
+++ b/assets/common/items/weapons/axe/worn_iron_axe-1.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Axe,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 0.8,
             poise_strength: 0.4,
             speed: 1.0,
diff --git a/assets/common/items/weapons/axe/worn_iron_axe-2.ron b/assets/common/items/weapons/axe/worn_iron_axe-2.ron
index e29a215ce9..0e8e1144c3 100644
--- a/assets/common/items/weapons/axe/worn_iron_axe-2.ron
+++ b/assets/common/items/weapons/axe/worn_iron_axe-2.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Axe,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 0.8,
             poise_strength: 0.7,
             speed: 1.0,
diff --git a/assets/common/items/weapons/axe/worn_iron_axe-3.ron b/assets/common/items/weapons/axe/worn_iron_axe-3.ron
index 839a008de9..43fb5038f8 100644
--- a/assets/common/items/weapons/axe/worn_iron_axe-3.ron
+++ b/assets/common/items/weapons/axe/worn_iron_axe-3.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Axe,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 0.8,
             poise_strength: 1.1,
             speed: 1.0,
diff --git a/assets/common/items/weapons/axe/worn_iron_axe-4.ron b/assets/common/items/weapons/axe/worn_iron_axe-4.ron
index fbc053bc68..dfacdeb712 100644
--- a/assets/common/items/weapons/axe/worn_iron_axe-4.ron
+++ b/assets/common/items/weapons/axe/worn_iron_axe-4.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Axe,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 0.8,
             poise_strength: 0.5,
             speed: 1.0,
diff --git a/assets/common/items/weapons/axe_1h/bloodsteel-0.ron b/assets/common/items/weapons/axe_1h/bloodsteel-0.ron
index 9e59d2e0e8..70ff3a9b5d 100644
--- a/assets/common/items/weapons/axe_1h/bloodsteel-0.ron
+++ b/assets/common/items/weapons/axe_1h/bloodsteel-0.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Axe,
         hands: One,
         stats: Direct((
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 1.5,
             poise_strength: 1.0,
             speed: 1.3,
diff --git a/assets/common/items/weapons/axe_1h/bloodsteel-1.ron b/assets/common/items/weapons/axe_1h/bloodsteel-1.ron
index 473c843d3f..b706746c75 100644
--- a/assets/common/items/weapons/axe_1h/bloodsteel-1.ron
+++ b/assets/common/items/weapons/axe_1h/bloodsteel-1.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Axe,
         hands: One,
         stats: (
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 2.0,
             poise_strength: 1.0,
             speed: 0.8,
diff --git a/assets/common/items/weapons/axe_1h/bronze-0.ron b/assets/common/items/weapons/axe_1h/bronze-0.ron
index 003273bd53..db727cd4c6 100644
--- a/assets/common/items/weapons/axe_1h/bronze-0.ron
+++ b/assets/common/items/weapons/axe_1h/bronze-0.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Axe,
         hands: One,
         stats: (
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 1.0,
             poise_strength: 1.0,
             speed: 1.1,
diff --git a/assets/common/items/weapons/axe_1h/bronze-1.ron b/assets/common/items/weapons/axe_1h/bronze-1.ron
index c8c3d0e763..b5c0ec0af9 100644
--- a/assets/common/items/weapons/axe_1h/bronze-1.ron
+++ b/assets/common/items/weapons/axe_1h/bronze-1.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Axe,
         hands: One,
         stats: (
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 1.1,
             poise_strength: 1.0,
             speed: 1.0,
diff --git a/assets/common/items/weapons/axe_1h/cobalt-0.ron b/assets/common/items/weapons/axe_1h/cobalt-0.ron
index 3b33d948c7..e98e19ad22 100644
--- a/assets/common/items/weapons/axe_1h/cobalt-0.ron
+++ b/assets/common/items/weapons/axe_1h/cobalt-0.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Axe,
         hands: One,
         stats: (
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 1.6,
             poise_strength: 1.0,
             speed: 1.0,
diff --git a/assets/common/items/weapons/axe_1h/cobalt-1.ron b/assets/common/items/weapons/axe_1h/cobalt-1.ron
index 25d6847031..2fe42ea912 100644
--- a/assets/common/items/weapons/axe_1h/cobalt-1.ron
+++ b/assets/common/items/weapons/axe_1h/cobalt-1.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Axe,
         hands: One,
         stats: (
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 1.75,
             poise_strength: 1.0,
             speed: 0.85,
diff --git a/assets/common/items/weapons/axe_1h/iron-0.ron b/assets/common/items/weapons/axe_1h/iron-0.ron
index 75e37781ee..88fe64b8c8 100644
--- a/assets/common/items/weapons/axe_1h/iron-0.ron
+++ b/assets/common/items/weapons/axe_1h/iron-0.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Axe,
         hands: One,
         stats: (
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 1.1,
             poise_strength: 1.0,
             speed: 1.1,
diff --git a/assets/common/items/weapons/axe_1h/iron-1.ron b/assets/common/items/weapons/axe_1h/iron-1.ron
index ae5a84dd21..3438dbd5c4 100644
--- a/assets/common/items/weapons/axe_1h/iron-1.ron
+++ b/assets/common/items/weapons/axe_1h/iron-1.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Axe,
         hands: One,
         stats: (
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 1.3,
             poise_strength: 1.0,
             speed: 0.9,
diff --git a/assets/common/items/weapons/axe_1h/iron-2.ron b/assets/common/items/weapons/axe_1h/iron-2.ron
index 5b442e5e5d..d062ed6746 100644
--- a/assets/common/items/weapons/axe_1h/iron-2.ron
+++ b/assets/common/items/weapons/axe_1h/iron-2.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Axe,
         hands: One,
         stats: (
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 1.0,
             poise_strength: 1.0,
             speed: 1.2,
diff --git a/assets/common/items/weapons/axe_1h/iron-3.ron b/assets/common/items/weapons/axe_1h/iron-3.ron
index a5bb837ecc..e91bfe9830 100644
--- a/assets/common/items/weapons/axe_1h/iron-3.ron
+++ b/assets/common/items/weapons/axe_1h/iron-3.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Axe,
         hands: One,
         stats: (
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 1.2,
             poise_strength: 1.0,
             speed: 1.0,
diff --git a/assets/common/items/weapons/axe_1h/orichalcum-0.ron b/assets/common/items/weapons/axe_1h/orichalcum-0.ron
index cfd64ef1a2..ebfa2d84c2 100644
--- a/assets/common/items/weapons/axe_1h/orichalcum-0.ron
+++ b/assets/common/items/weapons/axe_1h/orichalcum-0.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Axe,
         hands: One,
         stats: (
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 2.0,
             poise_strength: 1.0,
             speed: 1.0,
diff --git a/assets/common/items/weapons/axe_1h/steel-0.ron b/assets/common/items/weapons/axe_1h/steel-0.ron
index 578aa0c691..1225ac4021 100644
--- a/assets/common/items/weapons/axe_1h/steel-0.ron
+++ b/assets/common/items/weapons/axe_1h/steel-0.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Axe,
         hands: One,
         stats: (
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 1.5,
             poise_strength: 1.0,
             speed: 0.9,
diff --git a/assets/common/items/weapons/axe_1h/steel-1.ron b/assets/common/items/weapons/axe_1h/steel-1.ron
index d5b9f4d1d5..9fe5d8834a 100644
--- a/assets/common/items/weapons/axe_1h/steel-1.ron
+++ b/assets/common/items/weapons/axe_1h/steel-1.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Axe,
         hands: One,
         stats: (
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 1.4,
             poise_strength: 1.0,
             speed: 1.0,
diff --git a/assets/common/items/weapons/axe_1h/steel-2.ron b/assets/common/items/weapons/axe_1h/steel-2.ron
index 4dc66c5165..c5d72f5c49 100644
--- a/assets/common/items/weapons/axe_1h/steel-2.ron
+++ b/assets/common/items/weapons/axe_1h/steel-2.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Axe,
         hands: One,
         stats: (
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 1.3,
             poise_strength: 1.0,
             speed: 1.1,
diff --git a/assets/common/items/weapons/axe_1h/stone-0.ron b/assets/common/items/weapons/axe_1h/stone-0.ron
index dc0b887530..e030d7bb0e 100644
--- a/assets/common/items/weapons/axe_1h/stone-0.ron
+++ b/assets/common/items/weapons/axe_1h/stone-0.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Axe,
         hands: One,
         stats: (
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 0.8,
             poise_strength: 1.0,
             speed: 1.0,
diff --git a/assets/common/items/weapons/axe_1h/stone-1.ron b/assets/common/items/weapons/axe_1h/stone-1.ron
index 46675a54ab..ea6ac1b1e9 100644
--- a/assets/common/items/weapons/axe_1h/stone-1.ron
+++ b/assets/common/items/weapons/axe_1h/stone-1.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Axe,
         hands: One,
         stats: (
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 0.7,
             poise_strength: 1.0,
             speed: 1.1,
diff --git a/assets/common/items/weapons/axe_1h/wood-0.ron b/assets/common/items/weapons/axe_1h/wood-0.ron
index b979a83cc2..7028a83aea 100644
--- a/assets/common/items/weapons/axe_1h/wood-0.ron
+++ b/assets/common/items/weapons/axe_1h/wood-0.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Axe,
         hands: One,
         stats: (
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 0.8,
             poise_strength: 1.0,
             speed: 0.8,
diff --git a/assets/common/items/weapons/axe_1h/wood-1.ron b/assets/common/items/weapons/axe_1h/wood-1.ron
index 91983a4eb1..2f42c72aee 100644
--- a/assets/common/items/weapons/axe_1h/wood-1.ron
+++ b/assets/common/items/weapons/axe_1h/wood-1.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Axe,
         hands: One,
         stats: (
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 0.5,
             poise_strength: 1.0,
             speed: 1.1,
diff --git a/assets/common/items/weapons/bow/bone-0.ron b/assets/common/items/weapons/bow/bone-0.ron
index 4e8f9ba91e..df7cb62bf0 100644
--- a/assets/common/items/weapons/bow/bone-0.ron
+++ b/assets/common/items/weapons/bow/bone-0.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Bow,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 0.9,
             poise_strength: 0.8,
             speed: 1.1,
diff --git a/assets/common/items/weapons/bow/bone-1.ron b/assets/common/items/weapons/bow/bone-1.ron
index 74d1066e7a..62a89315fb 100644
--- a/assets/common/items/weapons/bow/bone-1.ron
+++ b/assets/common/items/weapons/bow/bone-1.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Bow,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 1.2,
             poise_strength: 0.8,
             speed: 0.8,
diff --git a/assets/common/items/weapons/bow/bone-2.ron b/assets/common/items/weapons/bow/bone-2.ron
index e648d6477a..6d93079bb1 100644
--- a/assets/common/items/weapons/bow/bone-2.ron
+++ b/assets/common/items/weapons/bow/bone-2.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Bow,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 1.0,
             poise_strength: 0.8,
             speed: 1.0,
diff --git a/assets/common/items/weapons/bow/bone-3.ron b/assets/common/items/weapons/bow/bone-3.ron
index 27ac25aa26..aa2d2a5144 100644
--- a/assets/common/items/weapons/bow/bone-3.ron
+++ b/assets/common/items/weapons/bow/bone-3.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Bow,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 1.1,
             poise_strength: 0.8,
             speed: 0.9,
diff --git a/assets/common/items/weapons/bow/eldwood-0.ron b/assets/common/items/weapons/bow/eldwood-0.ron
index 9aaf8790f7..a13aade1e3 100644
--- a/assets/common/items/weapons/bow/eldwood-0.ron
+++ b/assets/common/items/weapons/bow/eldwood-0.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Bow,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 1.8,
             poise_strength: 0.8,
             speed: 1.0,
diff --git a/assets/common/items/weapons/bow/eldwood-1.ron b/assets/common/items/weapons/bow/eldwood-1.ron
index 863d37da3d..4a8e7953f2 100644
--- a/assets/common/items/weapons/bow/eldwood-1.ron
+++ b/assets/common/items/weapons/bow/eldwood-1.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Bow,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 1.6,
             poise_strength: 0.8,
             speed: 1.2,
diff --git a/assets/common/items/weapons/bow/eldwood-2.ron b/assets/common/items/weapons/bow/eldwood-2.ron
index faffd799b2..de2ff7677e 100644
--- a/assets/common/items/weapons/bow/eldwood-2.ron
+++ b/assets/common/items/weapons/bow/eldwood-2.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Bow,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 2.0,
             poise_strength: 0.8,
             speed: 0.8,
diff --git a/assets/common/items/weapons/bow/frostwood-0.ron b/assets/common/items/weapons/bow/frostwood-0.ron
index fc2eeda6af..a1d997137f 100644
--- a/assets/common/items/weapons/bow/frostwood-0.ron
+++ b/assets/common/items/weapons/bow/frostwood-0.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Bow,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 1.4,
             poise_strength: 0.8,
             speed: 1.2,
diff --git a/assets/common/items/weapons/bow/frostwood-1.ron b/assets/common/items/weapons/bow/frostwood-1.ron
index 46f8045f1c..0cc1eb609b 100644
--- a/assets/common/items/weapons/bow/frostwood-1.ron
+++ b/assets/common/items/weapons/bow/frostwood-1.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Bow,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 1.6,
             poise_strength: 0.8,
             speed: 1.0,
diff --git a/assets/common/items/weapons/bow/frostwood-2.ron b/assets/common/items/weapons/bow/frostwood-2.ron
index e45c34fcd3..4dd74f9966 100644
--- a/assets/common/items/weapons/bow/frostwood-2.ron
+++ b/assets/common/items/weapons/bow/frostwood-2.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Bow,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 1.7,
             poise_strength: 0.8,
             speed: 0.9,
diff --git a/assets/common/items/weapons/bow/hardwood-0.ron b/assets/common/items/weapons/bow/hardwood-0.ron
index 7614564428..14a40af6ef 100644
--- a/assets/common/items/weapons/bow/hardwood-0.ron
+++ b/assets/common/items/weapons/bow/hardwood-0.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Bow,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 1.2,
             poise_strength: 0.8,
             speed: 1.0,
diff --git a/assets/common/items/weapons/bow/hardwood-1.ron b/assets/common/items/weapons/bow/hardwood-1.ron
index 6cb1c52721..ebe5d42ce8 100644
--- a/assets/common/items/weapons/bow/hardwood-1.ron
+++ b/assets/common/items/weapons/bow/hardwood-1.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Bow,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 1.4,
             poise_strength: 0.8,
             speed: 0.8,
diff --git a/assets/common/items/weapons/bow/hardwood-2.ron b/assets/common/items/weapons/bow/hardwood-2.ron
index 0453c0d035..5835ad1c44 100644
--- a/assets/common/items/weapons/bow/hardwood-2.ron
+++ b/assets/common/items/weapons/bow/hardwood-2.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Bow,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 1.1,
             poise_strength: 0.8,
             speed: 1.1,
diff --git a/assets/common/items/weapons/bow/hardwood-3.ron b/assets/common/items/weapons/bow/hardwood-3.ron
index b915905350..e0f0487fe4 100644
--- a/assets/common/items/weapons/bow/hardwood-3.ron
+++ b/assets/common/items/weapons/bow/hardwood-3.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Bow,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 0.9,
             poise_strength: 0.8,
             speed: 1.3,
diff --git a/assets/common/items/weapons/bow/hardwood-4.ron b/assets/common/items/weapons/bow/hardwood-4.ron
index 573acf778a..27c029e941 100644
--- a/assets/common/items/weapons/bow/hardwood-4.ron
+++ b/assets/common/items/weapons/bow/hardwood-4.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Bow,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 1.0,
             poise_strength: 0.8,
             speed: 1.2,
diff --git a/assets/common/items/weapons/bow/hardwood-5.ron b/assets/common/items/weapons/bow/hardwood-5.ron
index 9a60c8a114..860b179983 100644
--- a/assets/common/items/weapons/bow/hardwood-5.ron
+++ b/assets/common/items/weapons/bow/hardwood-5.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Bow,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 1.3,
             poise_strength: 0.8,
             speed: 0.9,
diff --git a/assets/common/items/weapons/bow/metal-0.ron b/assets/common/items/weapons/bow/metal-0.ron
index 69e5c5a6d9..5c607e3e2e 100644
--- a/assets/common/items/weapons/bow/metal-0.ron
+++ b/assets/common/items/weapons/bow/metal-0.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Bow,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 1.4,
             poise_strength: 0.8,
             speed: 1.0,
diff --git a/assets/common/items/weapons/bow/metal-1.ron b/assets/common/items/weapons/bow/metal-1.ron
index bb917d2f90..a85a4b20f6 100644
--- a/assets/common/items/weapons/bow/metal-1.ron
+++ b/assets/common/items/weapons/bow/metal-1.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Bow,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 1.2,
             poise_strength: 0.8,
             speed: 1.2,
diff --git a/assets/common/items/weapons/bow/metal-2.ron b/assets/common/items/weapons/bow/metal-2.ron
index da08553c8a..7d6bffb67c 100644
--- a/assets/common/items/weapons/bow/metal-2.ron
+++ b/assets/common/items/weapons/bow/metal-2.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Bow,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 1.3,
             poise_strength: 0.8,
             speed: 1.1,
diff --git a/assets/common/items/weapons/bow/metal-3.ron b/assets/common/items/weapons/bow/metal-3.ron
index 8ef8934379..4f09dd7d61 100644
--- a/assets/common/items/weapons/bow/metal-3.ron
+++ b/assets/common/items/weapons/bow/metal-3.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Bow,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 1.5,
             poise_strength: 0.8,
             speed: 0.9,
diff --git a/assets/common/items/weapons/bow/metal-4.ron b/assets/common/items/weapons/bow/metal-4.ron
index 858bd7b5cf..7c9a30a1f6 100644
--- a/assets/common/items/weapons/bow/metal-4.ron
+++ b/assets/common/items/weapons/bow/metal-4.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Bow,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 1.6,
             poise_strength: 0.8,
             speed: 0.8,
diff --git a/assets/common/items/weapons/bow/rawwood-0.ron b/assets/common/items/weapons/bow/rawwood-0.ron
index bd7f5162f8..f7f610e953 100644
--- a/assets/common/items/weapons/bow/rawwood-0.ron
+++ b/assets/common/items/weapons/bow/rawwood-0.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Bow,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 0.7,
             poise_strength: 0.8,
             speed: 0.9,
diff --git a/assets/common/items/weapons/bow/rawwood-1.ron b/assets/common/items/weapons/bow/rawwood-1.ron
index 2ccb1a8cba..515a0ddc68 100644
--- a/assets/common/items/weapons/bow/rawwood-1.ron
+++ b/assets/common/items/weapons/bow/rawwood-1.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Bow,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 0.6,
             poise_strength: 0.8,
             speed: 1.0,
diff --git a/assets/common/items/weapons/bow/sagitta.ron b/assets/common/items/weapons/bow/sagitta.ron
index 88a9e6ad6e..3ad0f8e0ed 100644
--- a/assets/common/items/weapons/bow/sagitta.ron
+++ b/assets/common/items/weapons/bow/sagitta.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Bow,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 2.5,
             poise_strength: 0.8,
             speed: 0.8,
diff --git a/assets/common/items/weapons/bow/starter.ron b/assets/common/items/weapons/bow/starter.ron
index cea23874db..d46f8276a2 100644
--- a/assets/common/items/weapons/bow/starter.ron
+++ b/assets/common/items/weapons/bow/starter.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Bow,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 0.5,
             poise_strength: 0.3,
             speed: 1.0,
diff --git a/assets/common/items/weapons/bow/velorite.ron b/assets/common/items/weapons/bow/velorite.ron
index da913eeb5a..5a69837f7e 100644
--- a/assets/common/items/weapons/bow/velorite.ron
+++ b/assets/common/items/weapons/bow/velorite.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Bow,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 2.0,
             poise_strength: 1.1,
             speed: 1.0,
diff --git a/assets/common/items/weapons/bow/wood-0.ron b/assets/common/items/weapons/bow/wood-0.ron
index 5bb641a6b8..75435263ef 100644
--- a/assets/common/items/weapons/bow/wood-0.ron
+++ b/assets/common/items/weapons/bow/wood-0.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Bow,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 0.9,
             poise_strength: 0.8,
             speed: 0.9,
diff --git a/assets/common/items/weapons/bow/wood-1.ron b/assets/common/items/weapons/bow/wood-1.ron
index 0654451dc9..f356d0e402 100644
--- a/assets/common/items/weapons/bow/wood-1.ron
+++ b/assets/common/items/weapons/bow/wood-1.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Bow,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 0.7,
             poise_strength: 0.8,
             speed: 1.1,
diff --git a/assets/common/items/weapons/bow/wood-2.ron b/assets/common/items/weapons/bow/wood-2.ron
index 812d4d062c..10c65a3a40 100644
--- a/assets/common/items/weapons/bow/wood-2.ron
+++ b/assets/common/items/weapons/bow/wood-2.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Bow,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 0.8,
             poise_strength: 0.8,
             speed: 1.0,
diff --git a/assets/common/items/weapons/bow/wood-3.ron b/assets/common/items/weapons/bow/wood-3.ron
index e041a1a2aa..85a000bbef 100644
--- a/assets/common/items/weapons/bow/wood-3.ron
+++ b/assets/common/items/weapons/bow/wood-3.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Bow,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 1.0,
             poise_strength: 0.8,
             speed: 0.8,
diff --git a/assets/common/items/weapons/bow/wood-4.ron b/assets/common/items/weapons/bow/wood-4.ron
index d18abce394..fc026b0b31 100644
--- a/assets/common/items/weapons/bow/wood-4.ron
+++ b/assets/common/items/weapons/bow/wood-4.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Bow,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 0.6,
             poise_strength: 0.8,
             speed: 1.2,
diff --git a/assets/common/items/weapons/dagger/basic_0.ron b/assets/common/items/weapons/dagger/basic_0.ron
index 2798ee2162..04b28e71bb 100644
--- a/assets/common/items/weapons/dagger/basic_0.ron
+++ b/assets/common/items/weapons/dagger/basic_0.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Dagger,
         hands: One,
         stats: Direct((
-            equip_time_millis: 0,
+            equip_time_secs: 0.0,
             power: 1.8,
             poise_strength: 2.0,
             speed: 1.0,
diff --git a/assets/common/items/weapons/dagger/cultist_0.ron b/assets/common/items/weapons/dagger/cultist_0.ron
index 62ae319739..e7f72999a1 100644
--- a/assets/common/items/weapons/dagger/cultist_0.ron
+++ b/assets/common/items/weapons/dagger/cultist_0.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Dagger,
         hands: One,
         stats: Direct((
-            equip_time_millis: 0,
+            equip_time_secs: 0.0,
             power: 2.0,
             poise_strength: 1.0,
             speed: 1.0,
diff --git a/assets/common/items/weapons/dagger/starter_dagger.ron b/assets/common/items/weapons/dagger/starter_dagger.ron
index ea66b26fe3..8e96415a3c 100644
--- a/assets/common/items/weapons/dagger/starter_dagger.ron
+++ b/assets/common/items/weapons/dagger/starter_dagger.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Dagger,
         hands: One,
         stats: Direct((
-            equip_time_millis: 300,
+            equip_time_secs: 0.3,
             power: 1.0,
             poise_strength: 0.5,
             speed: 1.0,
diff --git a/assets/common/items/weapons/empty/empty.ron b/assets/common/items/weapons/empty/empty.ron
index 2788925af7..5a2e6c9c07 100644
--- a/assets/common/items/weapons/empty/empty.ron
+++ b/assets/common/items/weapons/empty/empty.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Empty,
         hands: One,
         stats: Direct((
-            equip_time_millis: 200,
+            equip_time_secs: 0.2,
             power: 1.0,
             poise_strength: 1.0,
             speed: 1.0,
diff --git a/assets/common/items/weapons/hammer/bronze_hammer-0.ron b/assets/common/items/weapons/hammer/bronze_hammer-0.ron
index 4ecd533128..d409ebb89a 100644
--- a/assets/common/items/weapons/hammer/bronze_hammer-0.ron
+++ b/assets/common/items/weapons/hammer/bronze_hammer-0.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Hammer,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 500,
+            equip_time_secs: 0.5,
             power: 1.0,
             poise_strength: 0.9,
             speed: 1.0,
diff --git a/assets/common/items/weapons/hammer/bronze_hammer-1.ron b/assets/common/items/weapons/hammer/bronze_hammer-1.ron
index 5035e5d154..12bb129388 100644
--- a/assets/common/items/weapons/hammer/bronze_hammer-1.ron
+++ b/assets/common/items/weapons/hammer/bronze_hammer-1.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Hammer,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 500,
+            equip_time_secs: 0.5,
             power: 1.0,
             poise_strength: 1.0,
             speed: 1.0,
diff --git a/assets/common/items/weapons/hammer/cobalt_hammer-0.ron b/assets/common/items/weapons/hammer/cobalt_hammer-0.ron
index e60c583534..585b3b4a27 100644
--- a/assets/common/items/weapons/hammer/cobalt_hammer-0.ron
+++ b/assets/common/items/weapons/hammer/cobalt_hammer-0.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Hammer,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 500,
+            equip_time_secs: 0.5,
             power: 1.6,
             poise_strength: 1.5,
             speed: 1.0,
diff --git a/assets/common/items/weapons/hammer/cobalt_hammer-1.ron b/assets/common/items/weapons/hammer/cobalt_hammer-1.ron
index 7c4a7162f0..33942bf553 100644
--- a/assets/common/items/weapons/hammer/cobalt_hammer-1.ron
+++ b/assets/common/items/weapons/hammer/cobalt_hammer-1.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Hammer,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 500,
+            equip_time_secs: 0.5,
             power: 1.6,
             poise_strength: 1.4,
             speed: 1.0,
diff --git a/assets/common/items/weapons/hammer/cultist_purp_2h-0.ron b/assets/common/items/weapons/hammer/cultist_purp_2h-0.ron
index f3538a28a8..b6ab771652 100644
--- a/assets/common/items/weapons/hammer/cultist_purp_2h-0.ron
+++ b/assets/common/items/weapons/hammer/cultist_purp_2h-0.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Hammer,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 500,
+            equip_time_secs: 0.5,
             power: 2.0,
             poise_strength: 1.0,
             speed: 1.0,
diff --git a/assets/common/items/weapons/hammer/flimsy_hammer.ron b/assets/common/items/weapons/hammer/flimsy_hammer.ron
index c28ac25674..ceb02aad51 100644
--- a/assets/common/items/weapons/hammer/flimsy_hammer.ron
+++ b/assets/common/items/weapons/hammer/flimsy_hammer.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Hammer,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 500,
+            equip_time_secs: 0.5,
             power: 0.5,
             poise_strength: 0.4,
             speed: 1.0,
diff --git a/assets/common/items/weapons/hammer/hammer_1.ron b/assets/common/items/weapons/hammer/hammer_1.ron
index 36c761e3cc..283ef91e14 100644
--- a/assets/common/items/weapons/hammer/hammer_1.ron
+++ b/assets/common/items/weapons/hammer/hammer_1.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Hammer,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 500,
+            equip_time_secs: 0.5,
             power: 0.5,
             poise_strength: 0.8,
             speed: 1.0,
diff --git a/assets/common/items/weapons/hammer/iron_hammer-0.ron b/assets/common/items/weapons/hammer/iron_hammer-0.ron
index 2f4e6e19e6..0899c43251 100644
--- a/assets/common/items/weapons/hammer/iron_hammer-0.ron
+++ b/assets/common/items/weapons/hammer/iron_hammer-0.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Hammer,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 500,
+            equip_time_secs: 0.5,
             power: 1.2,
             poise_strength: 1.4,
             speed: 1.0,
diff --git a/assets/common/items/weapons/hammer/iron_hammer-1.ron b/assets/common/items/weapons/hammer/iron_hammer-1.ron
index efb1b9e40c..77e7a05685 100644
--- a/assets/common/items/weapons/hammer/iron_hammer-1.ron
+++ b/assets/common/items/weapons/hammer/iron_hammer-1.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Hammer,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 500,
+            equip_time_secs: 0.5,
             power: 1.2,
             poise_strength: 0.9,
             speed: 1.0,
diff --git a/assets/common/items/weapons/hammer/iron_hammer-2.ron b/assets/common/items/weapons/hammer/iron_hammer-2.ron
index 0e2358dfd0..d7ea0770d6 100644
--- a/assets/common/items/weapons/hammer/iron_hammer-2.ron
+++ b/assets/common/items/weapons/hammer/iron_hammer-2.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Hammer,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 500,
+            equip_time_secs: 0.5,
             power: 1.2,
             poise_strength: 1.4,
             speed: 1.0,
diff --git a/assets/common/items/weapons/hammer/iron_hammer-3.ron b/assets/common/items/weapons/hammer/iron_hammer-3.ron
index fc524992ce..a1ed65f483 100644
--- a/assets/common/items/weapons/hammer/iron_hammer-3.ron
+++ b/assets/common/items/weapons/hammer/iron_hammer-3.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Hammer,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 500,
+            equip_time_secs: 0.5,
             power: 1.2,
             poise_strength: 1.0,
             speed: 1.0,
diff --git a/assets/common/items/weapons/hammer/iron_hammer-4.ron b/assets/common/items/weapons/hammer/iron_hammer-4.ron
index ffc556a078..bec365f66c 100644
--- a/assets/common/items/weapons/hammer/iron_hammer-4.ron
+++ b/assets/common/items/weapons/hammer/iron_hammer-4.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Hammer,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 500,
+            equip_time_secs: 0.5,
             power: 1.2,
             poise_strength: 1.0,
             speed: 1.0,
diff --git a/assets/common/items/weapons/hammer/iron_hammer-5.ron b/assets/common/items/weapons/hammer/iron_hammer-5.ron
index 14b02b048b..e2fbd4521c 100644
--- a/assets/common/items/weapons/hammer/iron_hammer-5.ron
+++ b/assets/common/items/weapons/hammer/iron_hammer-5.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Hammer,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 500,
+            equip_time_secs: 0.5,
             power: 1.2,
             poise_strength: 0.8,
             speed: 1.0,
diff --git a/assets/common/items/weapons/hammer/iron_hammer-6.ron b/assets/common/items/weapons/hammer/iron_hammer-6.ron
index 0f4c85beeb..3e98b77ad5 100644
--- a/assets/common/items/weapons/hammer/iron_hammer-6.ron
+++ b/assets/common/items/weapons/hammer/iron_hammer-6.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Hammer,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 500,
+            equip_time_secs: 0.5,
             power: 1.2,
             poise_strength: 1.4,
             speed: 1.0,
diff --git a/assets/common/items/weapons/hammer/iron_hammer-7.ron b/assets/common/items/weapons/hammer/iron_hammer-7.ron
index 4ff94bd769..8112bbc51f 100644
--- a/assets/common/items/weapons/hammer/iron_hammer-7.ron
+++ b/assets/common/items/weapons/hammer/iron_hammer-7.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Hammer,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 500,
+            equip_time_secs: 0.5,
             power: 1.2,
             poise_strength: 1.1,
             speed: 1.0,
diff --git a/assets/common/items/weapons/hammer/iron_hammer-8.ron b/assets/common/items/weapons/hammer/iron_hammer-8.ron
index 14bc9cd770..de68d17fe3 100644
--- a/assets/common/items/weapons/hammer/iron_hammer-8.ron
+++ b/assets/common/items/weapons/hammer/iron_hammer-8.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Hammer,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 500,
+            equip_time_secs: 0.5,
             power: 1.2,
             poise_strength: 0.8,
             speed: 1.0,
diff --git a/assets/common/items/weapons/hammer/mjolnir.ron b/assets/common/items/weapons/hammer/mjolnir.ron
index 534be5da25..09ba718eb9 100644
--- a/assets/common/items/weapons/hammer/mjolnir.ron
+++ b/assets/common/items/weapons/hammer/mjolnir.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Hammer,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 500,
+            equip_time_secs: 0.5,
             power: 4.0,
             poise_strength: 2.0,
             speed: 0.5,
diff --git a/assets/common/items/weapons/hammer/ramshead_hammer.ron b/assets/common/items/weapons/hammer/ramshead_hammer.ron
index e58b18f747..d0a4230b4c 100644
--- a/assets/common/items/weapons/hammer/ramshead_hammer.ron
+++ b/assets/common/items/weapons/hammer/ramshead_hammer.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Hammer,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 500,
+            equip_time_secs: 0.5,
             power: 1.8,
             poise_strength: 1.7,
             speed: 1.0,
diff --git a/assets/common/items/weapons/hammer/runic_hammer.ron b/assets/common/items/weapons/hammer/runic_hammer.ron
index fdd2b0b04b..ee33512ade 100644
--- a/assets/common/items/weapons/hammer/runic_hammer.ron
+++ b/assets/common/items/weapons/hammer/runic_hammer.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Hammer,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 500,
+            equip_time_secs: 0.5,
             power: 1.8,
             poise_strength: 1.8,
             speed: 1.0,
diff --git a/assets/common/items/weapons/hammer/starter_hammer.ron b/assets/common/items/weapons/hammer/starter_hammer.ron
index 832af40a99..2321b7fb5f 100644
--- a/assets/common/items/weapons/hammer/starter_hammer.ron
+++ b/assets/common/items/weapons/hammer/starter_hammer.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Hammer,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 500,
+            equip_time_secs: 0.5,
             power: 0.5,
             poise_strength: 0.9,
             speed: 1.0,
diff --git a/assets/common/items/weapons/hammer/steel_hammer-0.ron b/assets/common/items/weapons/hammer/steel_hammer-0.ron
index cf2a27e242..a3a14b0815 100644
--- a/assets/common/items/weapons/hammer/steel_hammer-0.ron
+++ b/assets/common/items/weapons/hammer/steel_hammer-0.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Hammer,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 500,
+            equip_time_secs: 0.5,
             power: 1.4,
             poise_strength: 1.5,
             speed: 1.0,
diff --git a/assets/common/items/weapons/hammer/steel_hammer-1.ron b/assets/common/items/weapons/hammer/steel_hammer-1.ron
index df94e11f3d..5bab87a4ab 100644
--- a/assets/common/items/weapons/hammer/steel_hammer-1.ron
+++ b/assets/common/items/weapons/hammer/steel_hammer-1.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Hammer,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 500,
+            equip_time_secs: 0.5,
             power: 1.4,
             poise_strength: 1.3,
             speed: 1.0,
diff --git a/assets/common/items/weapons/hammer/steel_hammer-2.ron b/assets/common/items/weapons/hammer/steel_hammer-2.ron
index 96b6da84d9..9d3a3f1e56 100644
--- a/assets/common/items/weapons/hammer/steel_hammer-2.ron
+++ b/assets/common/items/weapons/hammer/steel_hammer-2.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Hammer,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 500,
+            equip_time_secs: 0.5,
             power: 1.4,
             poise_strength: 1.0,
             speed: 1.0,
diff --git a/assets/common/items/weapons/hammer/steel_hammer-3.ron b/assets/common/items/weapons/hammer/steel_hammer-3.ron
index dd1abc559d..9d99a52cd3 100644
--- a/assets/common/items/weapons/hammer/steel_hammer-3.ron
+++ b/assets/common/items/weapons/hammer/steel_hammer-3.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Hammer,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 500,
+            equip_time_secs: 0.5,
             power: 1.4,
             poise_strength: 1.7,
             speed: 1.0,
diff --git a/assets/common/items/weapons/hammer/steel_hammer-4.ron b/assets/common/items/weapons/hammer/steel_hammer-4.ron
index 819ec8c602..bb72a635a9 100644
--- a/assets/common/items/weapons/hammer/steel_hammer-4.ron
+++ b/assets/common/items/weapons/hammer/steel_hammer-4.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Hammer,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 500,
+            equip_time_secs: 0.5,
             power: 1.4,
             poise_strength: 1.5,
             speed: 1.0,
diff --git a/assets/common/items/weapons/hammer/steel_hammer-5.ron b/assets/common/items/weapons/hammer/steel_hammer-5.ron
index 698ccd3a68..2b9fb74138 100644
--- a/assets/common/items/weapons/hammer/steel_hammer-5.ron
+++ b/assets/common/items/weapons/hammer/steel_hammer-5.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Hammer,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 500,
+            equip_time_secs: 0.5,
             power: 1.4,
             poise_strength: 1.3,
             speed: 1.0,
diff --git a/assets/common/items/weapons/hammer/stone_hammer-0.ron b/assets/common/items/weapons/hammer/stone_hammer-0.ron
index 96fb10c470..4a2ba70f0d 100644
--- a/assets/common/items/weapons/hammer/stone_hammer-0.ron
+++ b/assets/common/items/weapons/hammer/stone_hammer-0.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Hammer,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 500,
+            equip_time_secs: 0.5,
             power: 0.7,
             poise_strength: 1.7,
             speed: 1.0,
diff --git a/assets/common/items/weapons/hammer/stone_hammer-1.ron b/assets/common/items/weapons/hammer/stone_hammer-1.ron
index a481c4a072..d9a804116a 100644
--- a/assets/common/items/weapons/hammer/stone_hammer-1.ron
+++ b/assets/common/items/weapons/hammer/stone_hammer-1.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Hammer,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 500,
+            equip_time_secs: 0.5,
             power: 0.7,
             poise_strength: 1.8,
             speed: 1.0,
diff --git a/assets/common/items/weapons/hammer/stone_hammer-2.ron b/assets/common/items/weapons/hammer/stone_hammer-2.ron
index d458b1043f..d875268bf1 100644
--- a/assets/common/items/weapons/hammer/stone_hammer-2.ron
+++ b/assets/common/items/weapons/hammer/stone_hammer-2.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Hammer,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 500,
+            equip_time_secs: 0.5,
             power: 0.7,
             poise_strength: 1.0,
             speed: 1.0,
diff --git a/assets/common/items/weapons/hammer/stone_hammer-3.ron b/assets/common/items/weapons/hammer/stone_hammer-3.ron
index fc84849c95..64833684b4 100644
--- a/assets/common/items/weapons/hammer/stone_hammer-3.ron
+++ b/assets/common/items/weapons/hammer/stone_hammer-3.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Hammer,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 500,
+            equip_time_secs: 0.5,
             power: 0.7,
             poise_strength: 1.8,
             speed: 1.0,
diff --git a/assets/common/items/weapons/hammer/wood_hammer-0.ron b/assets/common/items/weapons/hammer/wood_hammer-0.ron
index 8cfdc8b40e..efd328c442 100644
--- a/assets/common/items/weapons/hammer/wood_hammer-0.ron
+++ b/assets/common/items/weapons/hammer/wood_hammer-0.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Hammer,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 500,
+            equip_time_secs: 0.5,
             power: 0.6,
             poise_strength: 0.8,
             speed: 1.0,
diff --git a/assets/common/items/weapons/hammer/worn_iron_hammer-0.ron b/assets/common/items/weapons/hammer/worn_iron_hammer-0.ron
index dd1ef660a4..df1a583494 100644
--- a/assets/common/items/weapons/hammer/worn_iron_hammer-0.ron
+++ b/assets/common/items/weapons/hammer/worn_iron_hammer-0.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Hammer,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 500,
+            equip_time_secs: 0.5,
             power: 0.85,
             poise_strength: 1.0,
             speed: 1.0,
diff --git a/assets/common/items/weapons/hammer/worn_iron_hammer-1.ron b/assets/common/items/weapons/hammer/worn_iron_hammer-1.ron
index 39df706cfe..53fbc285c2 100644
--- a/assets/common/items/weapons/hammer/worn_iron_hammer-1.ron
+++ b/assets/common/items/weapons/hammer/worn_iron_hammer-1.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Hammer,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 500,
+            equip_time_secs: 0.5,
             power: 0.85,
             poise_strength: 0.6,
             speed: 1.0,
diff --git a/assets/common/items/weapons/hammer/worn_iron_hammer-2.ron b/assets/common/items/weapons/hammer/worn_iron_hammer-2.ron
index af15f236ca..56ff8638b4 100644
--- a/assets/common/items/weapons/hammer/worn_iron_hammer-2.ron
+++ b/assets/common/items/weapons/hammer/worn_iron_hammer-2.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Hammer,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 500,
+            equip_time_secs: 0.5,
             power: 0.85,
             poise_strength: 0.7,
             speed: 1.0,
diff --git a/assets/common/items/weapons/hammer/worn_iron_hammer-3.ron b/assets/common/items/weapons/hammer/worn_iron_hammer-3.ron
index f28e076dc5..fe5c028cca 100644
--- a/assets/common/items/weapons/hammer/worn_iron_hammer-3.ron
+++ b/assets/common/items/weapons/hammer/worn_iron_hammer-3.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Hammer,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 500,
+            equip_time_secs: 0.5,
             power: 0.85,
             poise_strength: 1.1,
             speed: 1.0,
diff --git a/assets/common/items/weapons/hammer_1h/bloodsteel-0.ron b/assets/common/items/weapons/hammer_1h/bloodsteel-0.ron
index 9ed34579a8..d7f08795cc 100644
--- a/assets/common/items/weapons/hammer_1h/bloodsteel-0.ron
+++ b/assets/common/items/weapons/hammer_1h/bloodsteel-0.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Hammer,
         hands: One,
         stats: (
-            equip_time_millis: 500,
+            equip_time_secs: 0.5,
             power: 1.6,
             poise_strength: 1.0,
             speed: 1.2,
diff --git a/assets/common/items/weapons/hammer_1h/bloodsteel-1.ron b/assets/common/items/weapons/hammer_1h/bloodsteel-1.ron
index 5379cb2279..80b3a5c0dd 100644
--- a/assets/common/items/weapons/hammer_1h/bloodsteel-1.ron
+++ b/assets/common/items/weapons/hammer_1h/bloodsteel-1.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Hammer,
         hands: One,
         stats: (
-            equip_time_millis: 500,
+            equip_time_secs: 0.5,
             power: 1.8,
             poise_strength: 1.0,
             speed: 1.0,
diff --git a/assets/common/items/weapons/hammer_1h/bronze-0.ron b/assets/common/items/weapons/hammer_1h/bronze-0.ron
index 1090cde1de..067607bb5e 100644
--- a/assets/common/items/weapons/hammer_1h/bronze-0.ron
+++ b/assets/common/items/weapons/hammer_1h/bronze-0.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Hammer,
         hands: One,
         stats: (
-            equip_time_millis: 500,
+            equip_time_secs: 0.5,
             power: 1.2,
             poise_strength: 1.0,
             speed: 0.8,
diff --git a/assets/common/items/weapons/hammer_1h/bronze-1.ron b/assets/common/items/weapons/hammer_1h/bronze-1.ron
index 589e53b27a..7647b4b6dc 100644
--- a/assets/common/items/weapons/hammer_1h/bronze-1.ron
+++ b/assets/common/items/weapons/hammer_1h/bronze-1.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Hammer,
         hands: One,
         stats: (
-            equip_time_millis: 500,
+            equip_time_secs: 0.5,
             power: 1.0,
             poise_strength: 1.0,
             speed: 1.0,
diff --git a/assets/common/items/weapons/hammer_1h/cobalt-0.ron b/assets/common/items/weapons/hammer_1h/cobalt-0.ron
index a0c1099bcc..05471d14c3 100644
--- a/assets/common/items/weapons/hammer_1h/cobalt-0.ron
+++ b/assets/common/items/weapons/hammer_1h/cobalt-0.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Hammer,
         hands: One,
         stats: (
-            equip_time_millis: 500,
+            equip_time_secs: 0.5,
             power: 1.6,
             poise_strength: 1.0,
             speed: 1.0,
diff --git a/assets/common/items/weapons/hammer_1h/cobalt-1.ron b/assets/common/items/weapons/hammer_1h/cobalt-1.ron
index d93c1cf2c4..f58b3d9901 100644
--- a/assets/common/items/weapons/hammer_1h/cobalt-1.ron
+++ b/assets/common/items/weapons/hammer_1h/cobalt-1.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Hammer,
         hands: One,
         stats: (
-            equip_time_millis: 500,
+            equip_time_secs: 0.5,
             power: 1.5,
             poise_strength: 1.0,
             speed: 1.1,
diff --git a/assets/common/items/weapons/hammer_1h/iron-0.ron b/assets/common/items/weapons/hammer_1h/iron-0.ron
index 63df955a76..b5ba278597 100644
--- a/assets/common/items/weapons/hammer_1h/iron-0.ron
+++ b/assets/common/items/weapons/hammer_1h/iron-0.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Hammer,
         hands: One,
         stats: (
-            equip_time_millis: 500,
+            equip_time_secs: 0.5,
             power: 1.4,
             poise_strength: 1.0,
             speed: 0.8,
diff --git a/assets/common/items/weapons/hammer_1h/iron-1.ron b/assets/common/items/weapons/hammer_1h/iron-1.ron
index 87d7151a75..f9d8a6bff6 100644
--- a/assets/common/items/weapons/hammer_1h/iron-1.ron
+++ b/assets/common/items/weapons/hammer_1h/iron-1.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Hammer,
         hands: One,
         stats: (
-            equip_time_millis: 500,
+            equip_time_secs: 0.5,
             power: 1.3,
             poise_strength: 1.0,
             speed: 0.9,
diff --git a/assets/common/items/weapons/hammer_1h/iron-2.ron b/assets/common/items/weapons/hammer_1h/iron-2.ron
index f439868139..68991cd50c 100644
--- a/assets/common/items/weapons/hammer_1h/iron-2.ron
+++ b/assets/common/items/weapons/hammer_1h/iron-2.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Hammer,
         hands: One,
         stats: (
-            equip_time_millis: 500,
+            equip_time_secs: 0.5,
             power: 1.1,
             poise_strength: 1.0,
             speed: 1.1,
diff --git a/assets/common/items/weapons/hammer_1h/orichalcum-0.ron b/assets/common/items/weapons/hammer_1h/orichalcum-0.ron
index a5c6c7009b..76a5c5db2a 100644
--- a/assets/common/items/weapons/hammer_1h/orichalcum-0.ron
+++ b/assets/common/items/weapons/hammer_1h/orichalcum-0.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Axe,
         hands: One,
         stats: (
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 2.0,
             poise_strength: 1.0,
             speed: 1.0,
diff --git a/assets/common/items/weapons/hammer_1h/steel-0.ron b/assets/common/items/weapons/hammer_1h/steel-0.ron
index 446cd92b5b..93829715b5 100644
--- a/assets/common/items/weapons/hammer_1h/steel-0.ron
+++ b/assets/common/items/weapons/hammer_1h/steel-0.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Hammer,
         hands: One,
         stats: (
-            equip_time_millis: 500,
+            equip_time_secs: 0.5,
             power: 1.5,
             poise_strength: 1.0,
             speed: 0.9,
diff --git a/assets/common/items/weapons/hammer_1h/steel-1.ron b/assets/common/items/weapons/hammer_1h/steel-1.ron
index 2675db788d..82a525bd8a 100644
--- a/assets/common/items/weapons/hammer_1h/steel-1.ron
+++ b/assets/common/items/weapons/hammer_1h/steel-1.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Hammer,
         hands: One,
         stats: (
-            equip_time_millis: 500,
+            equip_time_secs: 0.5,
             power: 1.4,
             poise_strength: 1.0,
             speed: 1.0,
diff --git a/assets/common/items/weapons/hammer_1h/steel-2.ron b/assets/common/items/weapons/hammer_1h/steel-2.ron
index 2364628d7f..c6afbf9858 100644
--- a/assets/common/items/weapons/hammer_1h/steel-2.ron
+++ b/assets/common/items/weapons/hammer_1h/steel-2.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Hammer,
         hands: One,
         stats: (
-            equip_time_millis: 500,
+            equip_time_secs: 0.5,
             power: 1.2,
             poise_strength: 1.0,
             speed: 1.2,
diff --git a/assets/common/items/weapons/hammer_1h/stone-0.ron b/assets/common/items/weapons/hammer_1h/stone-0.ron
index 5e70888a6a..a4daef28fb 100644
--- a/assets/common/items/weapons/hammer_1h/stone-0.ron
+++ b/assets/common/items/weapons/hammer_1h/stone-0.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Hammer,
         hands: One,
         stats: (
-            equip_time_millis: 500,
+            equip_time_secs: 0.5,
             power: 0.7,
             poise_strength: 1.0,
             speed: 1.1,
diff --git a/assets/common/items/weapons/hammer_1h/stone-1.ron b/assets/common/items/weapons/hammer_1h/stone-1.ron
index 8430318b44..5f0c25640c 100644
--- a/assets/common/items/weapons/hammer_1h/stone-1.ron
+++ b/assets/common/items/weapons/hammer_1h/stone-1.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Hammer,
         hands: One,
         stats: (
-            equip_time_millis: 500,
+            equip_time_secs: 0.5,
             power: 1.0,
             poise_strength: 1.0,
             speed: 0.8,
diff --git a/assets/common/items/weapons/hammer_1h/wood-0.ron b/assets/common/items/weapons/hammer_1h/wood-0.ron
index e75be1d533..f5b9151d05 100644
--- a/assets/common/items/weapons/hammer_1h/wood-0.ron
+++ b/assets/common/items/weapons/hammer_1h/wood-0.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Hammer,
         hands: One,
         stats: (
-            equip_time_millis: 500,
+            equip_time_secs: 0.5,
             power: 0.8,
             poise_strength: 1.0,
             speed: 0.8,
diff --git a/assets/common/items/weapons/hammer_1h/wood-1.ron b/assets/common/items/weapons/hammer_1h/wood-1.ron
index d7fcc49fe8..7e7e7e6410 100644
--- a/assets/common/items/weapons/hammer_1h/wood-1.ron
+++ b/assets/common/items/weapons/hammer_1h/wood-1.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Hammer,
         hands: One,
         stats: (
-            equip_time_millis: 500,
+            equip_time_secs: 0.5,
             power: 0.5,
             poise_strength: 1.0,
             speed: 1.1,
diff --git a/assets/common/items/weapons/sceptre/fork0.ron b/assets/common/items/weapons/sceptre/fork0.ron
index febd87ee8f..5d709b19a1 100644
--- a/assets/common/items/weapons/sceptre/fork0.ron
+++ b/assets/common/items/weapons/sceptre/fork0.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Sceptre,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 2.0,
             poise_strength: 1.5,
             speed: 0.8,
diff --git a/assets/common/items/weapons/sceptre/loops0.ron b/assets/common/items/weapons/sceptre/loops0.ron
index e384f280d3..0199f08c80 100644
--- a/assets/common/items/weapons/sceptre/loops0.ron
+++ b/assets/common/items/weapons/sceptre/loops0.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Sceptre,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 1.2,
             poise_strength: 1.5,
             speed: 1.5,
diff --git a/assets/common/items/weapons/sceptre/moon0.ron b/assets/common/items/weapons/sceptre/moon0.ron
index f6dfd2db6c..f051a251e7 100644
--- a/assets/common/items/weapons/sceptre/moon0.ron
+++ b/assets/common/items/weapons/sceptre/moon0.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Sceptre,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 1.6,
             poise_strength: 1.5,
             speed: 0.5,
diff --git a/assets/common/items/weapons/sceptre/root_evil.ron b/assets/common/items/weapons/sceptre/root_evil.ron
index 50783cdd53..0e7f3cc38a 100644
--- a/assets/common/items/weapons/sceptre/root_evil.ron
+++ b/assets/common/items/weapons/sceptre/root_evil.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Sceptre,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 4.0,
             poise_strength: 1.5,
             speed: 0.5,
diff --git a/assets/common/items/weapons/sceptre/root_green0.ron b/assets/common/items/weapons/sceptre/root_green0.ron
index c8bfbec7d7..e55b68e017 100644
--- a/assets/common/items/weapons/sceptre/root_green0.ron
+++ b/assets/common/items/weapons/sceptre/root_green0.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Sceptre,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 3.5,
             poise_strength: 1.5,
             speed: 0.4,
diff --git a/assets/common/items/weapons/sceptre/sceptre_velorite_0.ron b/assets/common/items/weapons/sceptre/sceptre_velorite_0.ron
index 48ed1e72d4..c1717c9d73 100644
--- a/assets/common/items/weapons/sceptre/sceptre_velorite_0.ron
+++ b/assets/common/items/weapons/sceptre/sceptre_velorite_0.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Sceptre,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 1.2,
             poise_strength: 1.5,
             speed: 1.6,
diff --git a/assets/common/items/weapons/sceptre/staff_nature.ron b/assets/common/items/weapons/sceptre/staff_nature.ron
index 8594ea00d0..a15600f3d7 100644
--- a/assets/common/items/weapons/sceptre/staff_nature.ron
+++ b/assets/common/items/weapons/sceptre/staff_nature.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Sceptre,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 0.91,
             poise_strength: 0.5,
             speed: 1.1,
diff --git a/assets/common/items/weapons/sceptre/starter_sceptre.ron b/assets/common/items/weapons/sceptre/starter_sceptre.ron
index 787b186f79..bf94d16927 100644
--- a/assets/common/items/weapons/sceptre/starter_sceptre.ron
+++ b/assets/common/items/weapons/sceptre/starter_sceptre.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Sceptre,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 0.5,
             poise_strength: 0.1,
             speed: 1.0,
diff --git a/assets/common/items/weapons/sceptre/totem_green.ron b/assets/common/items/weapons/sceptre/totem_green.ron
index 8df58e4a30..c5a2fd15fd 100644
--- a/assets/common/items/weapons/sceptre/totem_green.ron
+++ b/assets/common/items/weapons/sceptre/totem_green.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Sceptre,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 1.0,
             poise_strength: 1.5,
             speed: 1.2,
diff --git a/assets/common/items/weapons/shield/shield_1.ron b/assets/common/items/weapons/shield/shield_1.ron
index a66f321e58..1a896f6877 100644
--- a/assets/common/items/weapons/shield/shield_1.ron
+++ b/assets/common/items/weapons/shield/shield_1.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Shield,
         hands: One,
         stats: Direct((
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 1.0,
             poise_strength: 1.0,
             speed: 1.0,
diff --git a/assets/common/items/weapons/staff/amethyst_staff.ron b/assets/common/items/weapons/staff/amethyst_staff.ron
index e6e2a39be6..bbe428fc0e 100644
--- a/assets/common/items/weapons/staff/amethyst_staff.ron
+++ b/assets/common/items/weapons/staff/amethyst_staff.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Staff,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 300,
+            equip_time_secs: 0.3,
             power: 1.5,
             poise_strength: 1.4,
             speed: 1.0,
diff --git a/assets/common/items/weapons/staff/bone_staff.ron b/assets/common/items/weapons/staff/bone_staff.ron
index 041ff07276..359f6c865b 100644
--- a/assets/common/items/weapons/staff/bone_staff.ron
+++ b/assets/common/items/weapons/staff/bone_staff.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Staff,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 300,
+            equip_time_secs: 0.3,
             power: 1.0,
             poise_strength: 1.5,
             speed: 1.0,
diff --git a/assets/common/items/weapons/staff/cultist_staff.ron b/assets/common/items/weapons/staff/cultist_staff.ron
index df99316d5c..3e35706f60 100644
--- a/assets/common/items/weapons/staff/cultist_staff.ron
+++ b/assets/common/items/weapons/staff/cultist_staff.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Staff,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 300,
+            equip_time_secs: 0.3,
             power: 2.0,
             poise_strength: 1.5,
             speed: 1.0,
diff --git a/assets/common/items/weapons/staff/staff_1.ron b/assets/common/items/weapons/staff/staff_1.ron
index ab4db158f4..c26f6dc265 100644
--- a/assets/common/items/weapons/staff/staff_1.ron
+++ b/assets/common/items/weapons/staff/staff_1.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Staff,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 200,
+            equip_time_secs: 0.2,
             power: 0.5,
             poise_strength: 1.0,
             speed: 1.0,
diff --git a/assets/common/items/weapons/staff/starter_staff.ron b/assets/common/items/weapons/staff/starter_staff.ron
index f793ba581b..cd21db9db4 100644
--- a/assets/common/items/weapons/staff/starter_staff.ron
+++ b/assets/common/items/weapons/staff/starter_staff.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Staff,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 300,
+            equip_time_secs: 0.3,
             power: 0.5,
             poise_strength: 1.0,
             speed: 1.0,
diff --git a/assets/common/items/weapons/sword/bloodsteel-0.ron b/assets/common/items/weapons/sword/bloodsteel-0.ron
index 428ca6b41c..32b0ee20d7 100644
--- a/assets/common/items/weapons/sword/bloodsteel-0.ron
+++ b/assets/common/items/weapons/sword/bloodsteel-0.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Sword,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 300,
+            equip_time_secs: 0.3,
             power: 1.8,
             poise_strength: 0.4,
             speed: 1.0,
diff --git a/assets/common/items/weapons/sword/bloodsteel-1.ron b/assets/common/items/weapons/sword/bloodsteel-1.ron
index dd939deac9..b63554b64b 100644
--- a/assets/common/items/weapons/sword/bloodsteel-1.ron
+++ b/assets/common/items/weapons/sword/bloodsteel-1.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Sword,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 300,
+            equip_time_secs: 0.3,
             power: 1.6,
             poise_strength: 0.4,
             speed: 1.2,
diff --git a/assets/common/items/weapons/sword/bloodsteel-2.ron b/assets/common/items/weapons/sword/bloodsteel-2.ron
index b99e7bea1d..c9d4254652 100644
--- a/assets/common/items/weapons/sword/bloodsteel-2.ron
+++ b/assets/common/items/weapons/sword/bloodsteel-2.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Sword,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 300,
+            equip_time_secs: 0.3,
             power: 2.0,
             poise_strength: 0.4,
             speed: 0.8,
diff --git a/assets/common/items/weapons/sword/bronze-0.ron b/assets/common/items/weapons/sword/bronze-0.ron
index 62cf323676..07cb6e9a53 100644
--- a/assets/common/items/weapons/sword/bronze-0.ron
+++ b/assets/common/items/weapons/sword/bronze-0.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Sword,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 300,
+            equip_time_secs: 0.3,
             power: 1.1,
             poise_strength: 0.4,
             speed: 0.9,
diff --git a/assets/common/items/weapons/sword/bronze-1.ron b/assets/common/items/weapons/sword/bronze-1.ron
index 33ff213600..e3fa20d076 100644
--- a/assets/common/items/weapons/sword/bronze-1.ron
+++ b/assets/common/items/weapons/sword/bronze-1.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Sword,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 300,
+            equip_time_secs: 0.3,
             power: 0.9,
             poise_strength: 0.4,
             speed: 1.1,
diff --git a/assets/common/items/weapons/sword/bronze-2.ron b/assets/common/items/weapons/sword/bronze-2.ron
index fef68bd678..e70a7b10ad 100644
--- a/assets/common/items/weapons/sword/bronze-2.ron
+++ b/assets/common/items/weapons/sword/bronze-2.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Sword,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 300,
+            equip_time_secs: 0.3,
             power: 1.0,
             poise_strength: 0.4,
             speed: 1.0,
diff --git a/assets/common/items/weapons/sword/caladbolg.ron b/assets/common/items/weapons/sword/caladbolg.ron
index 39c8b13bb2..be2e3edc54 100644
--- a/assets/common/items/weapons/sword/caladbolg.ron
+++ b/assets/common/items/weapons/sword/caladbolg.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Sword,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 300,
+            equip_time_secs: 0.3,
             power: 2.5,
             poise_strength: 0.4,
             speed: 0.8,
diff --git a/assets/common/items/weapons/sword/cobalt-0.ron b/assets/common/items/weapons/sword/cobalt-0.ron
index d09631b9f3..a30b3a8720 100644
--- a/assets/common/items/weapons/sword/cobalt-0.ron
+++ b/assets/common/items/weapons/sword/cobalt-0.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Sword,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 300,
+            equip_time_secs: 0.3,
             power: 1.5,
             poise_strength: 0.4,
             speed: 1.1,
diff --git a/assets/common/items/weapons/sword/cobalt-1.ron b/assets/common/items/weapons/sword/cobalt-1.ron
index e5806380a5..ba08a15ef5 100644
--- a/assets/common/items/weapons/sword/cobalt-1.ron
+++ b/assets/common/items/weapons/sword/cobalt-1.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Sword,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 300,
+            equip_time_secs: 0.3,
             power: 1.8,
             poise_strength: 0.4,
             speed: 0.8,
diff --git a/assets/common/items/weapons/sword/cobalt-2.ron b/assets/common/items/weapons/sword/cobalt-2.ron
index e4847fa2cc..0f21a06154 100644
--- a/assets/common/items/weapons/sword/cobalt-2.ron
+++ b/assets/common/items/weapons/sword/cobalt-2.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Sword,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 300,
+            equip_time_secs: 0.3,
             power: 1.6,
             poise_strength: 0.4,
             speed: 1.0,
diff --git a/assets/common/items/weapons/sword/cobalt-3.ron b/assets/common/items/weapons/sword/cobalt-3.ron
index bd836c2f85..56b08b8191 100644
--- a/assets/common/items/weapons/sword/cobalt-3.ron
+++ b/assets/common/items/weapons/sword/cobalt-3.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Sword,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 300,
+            equip_time_secs: 0.3,
             power: 1.7,
             poise_strength: 0.4,
             speed: 0.9,
diff --git a/assets/common/items/weapons/sword/cultist.ron b/assets/common/items/weapons/sword/cultist.ron
index 391573e0d4..77febbe9d7 100644
--- a/assets/common/items/weapons/sword/cultist.ron
+++ b/assets/common/items/weapons/sword/cultist.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Sword,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 500,
+            equip_time_secs: 0.5,
             power: 2.0,
             poise_strength: 1.5,
             speed: 1.0,
diff --git a/assets/common/items/weapons/sword/frost-0.ron b/assets/common/items/weapons/sword/frost-0.ron
index cd8b2b0ea6..127fb8ec10 100644
--- a/assets/common/items/weapons/sword/frost-0.ron
+++ b/assets/common/items/weapons/sword/frost-0.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Sword,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 500,
+            equip_time_secs: 0.5,
             power: 1.7,
             poise_strength: 2.0,
             speed: 1.0,
diff --git a/assets/common/items/weapons/sword/frost-1.ron b/assets/common/items/weapons/sword/frost-1.ron
index dbf1d464e3..36c2b2a877 100644
--- a/assets/common/items/weapons/sword/frost-1.ron
+++ b/assets/common/items/weapons/sword/frost-1.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Sword,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 500,
+            equip_time_secs: 0.5,
             power: 1.95,
             poise_strength: 1.7,
             speed: 1.0,
diff --git a/assets/common/items/weapons/sword/iron-0.ron b/assets/common/items/weapons/sword/iron-0.ron
index e7a856c3a6..2f3ce8bb85 100644
--- a/assets/common/items/weapons/sword/iron-0.ron
+++ b/assets/common/items/weapons/sword/iron-0.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Sword,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 300,
+            equip_time_secs: 0.3,
             power: 1.25,
             poise_strength: 0.4,
             speed: 0.95,
diff --git a/assets/common/items/weapons/sword/iron-1.ron b/assets/common/items/weapons/sword/iron-1.ron
index 5ded191f68..3b27d45527 100644
--- a/assets/common/items/weapons/sword/iron-1.ron
+++ b/assets/common/items/weapons/sword/iron-1.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Sword,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 300,
+            equip_time_secs: 0.3,
             power: 1.45,
             poise_strength: 0.4,
             speed: 0.75,
diff --git a/assets/common/items/weapons/sword/iron-10.ron b/assets/common/items/weapons/sword/iron-10.ron
index 4ac727086d..1d64973648 100644
--- a/assets/common/items/weapons/sword/iron-10.ron
+++ b/assets/common/items/weapons/sword/iron-10.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Sword,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 300,
+            equip_time_secs: 0.3,
             power: 1.35,
             poise_strength: 0.4,
             speed: 0.85,
diff --git a/assets/common/items/weapons/sword/iron-2.ron b/assets/common/items/weapons/sword/iron-2.ron
index 418dee3cb5..6701c53eb9 100644
--- a/assets/common/items/weapons/sword/iron-2.ron
+++ b/assets/common/items/weapons/sword/iron-2.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Sword,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 300,
+            equip_time_secs: 0.3,
             power: 1.1,
             poise_strength: 0.4,
             speed: 1.1,
diff --git a/assets/common/items/weapons/sword/iron-3.ron b/assets/common/items/weapons/sword/iron-3.ron
index 2514580b95..f6bbd9bb18 100644
--- a/assets/common/items/weapons/sword/iron-3.ron
+++ b/assets/common/items/weapons/sword/iron-3.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Sword,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 300,
+            equip_time_secs: 0.3,
             power: 1.15,
             poise_strength: 0.4,
             speed: 1.05,
diff --git a/assets/common/items/weapons/sword/iron-4.ron b/assets/common/items/weapons/sword/iron-4.ron
index 3ece8d76a1..efe18b2897 100644
--- a/assets/common/items/weapons/sword/iron-4.ron
+++ b/assets/common/items/weapons/sword/iron-4.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Sword,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 300,
+            equip_time_secs: 0.3,
             power: 1.3,
             poise_strength: 0.4,
             speed: 0.9,
diff --git a/assets/common/items/weapons/sword/iron-5.ron b/assets/common/items/weapons/sword/iron-5.ron
index 1c4e6c48c5..a0c5d806a0 100644
--- a/assets/common/items/weapons/sword/iron-5.ron
+++ b/assets/common/items/weapons/sword/iron-5.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Sword,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 300,
+            equip_time_secs: 0.3,
             power: 1.05,
             poise_strength: 0.4,
             speed: 1.15,
diff --git a/assets/common/items/weapons/sword/iron-6.ron b/assets/common/items/weapons/sword/iron-6.ron
index 22bac342b5..6b66bb48d8 100644
--- a/assets/common/items/weapons/sword/iron-6.ron
+++ b/assets/common/items/weapons/sword/iron-6.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Sword,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 300,
+            equip_time_secs: 0.3,
             power: 1.2,
             poise_strength: 0.4,
             speed: 1.0,
diff --git a/assets/common/items/weapons/sword/iron-7.ron b/assets/common/items/weapons/sword/iron-7.ron
index 8fa2ad1022..a2fa0d307c 100644
--- a/assets/common/items/weapons/sword/iron-7.ron
+++ b/assets/common/items/weapons/sword/iron-7.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Sword,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 300,
+            equip_time_secs: 0.3,
             power: 1.4,
             poise_strength: 0.4,
             speed: 0.8,
diff --git a/assets/common/items/weapons/sword/iron-8.ron b/assets/common/items/weapons/sword/iron-8.ron
index 0f88d130dc..f4ce93492a 100644
--- a/assets/common/items/weapons/sword/iron-8.ron
+++ b/assets/common/items/weapons/sword/iron-8.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Sword,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 300,
+            equip_time_secs: 0.3,
             power: 1.0,
             poise_strength: 0.4,
             speed: 1.2,
diff --git a/assets/common/items/weapons/sword/iron-9.ron b/assets/common/items/weapons/sword/iron-9.ron
index 2bb8b84033..8560c8042c 100644
--- a/assets/common/items/weapons/sword/iron-9.ron
+++ b/assets/common/items/weapons/sword/iron-9.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Sword,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 300,
+            equip_time_secs: 0.3,
             power: 0.95,
             poise_strength: 0.4,
             speed: 1.25,
diff --git a/assets/common/items/weapons/sword/starter.ron b/assets/common/items/weapons/sword/starter.ron
index aebc6711c7..a2a93b74ef 100644
--- a/assets/common/items/weapons/sword/starter.ron
+++ b/assets/common/items/weapons/sword/starter.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Sword,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 300,
+            equip_time_secs: 0.3,
             power: 0.5,
             poise_strength: 0.4,
             speed: 1.0,
diff --git a/assets/common/items/weapons/sword/steel-0.ron b/assets/common/items/weapons/sword/steel-0.ron
index 9916779b2e..ad91eb5b3b 100644
--- a/assets/common/items/weapons/sword/steel-0.ron
+++ b/assets/common/items/weapons/sword/steel-0.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Sword,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 300,
+            equip_time_secs: 0.3,
             power: 1.4,
             poise_strength: 0.4,
             speed: 1.0,
diff --git a/assets/common/items/weapons/sword/steel-1.ron b/assets/common/items/weapons/sword/steel-1.ron
index d5900b53e9..a06595be06 100644
--- a/assets/common/items/weapons/sword/steel-1.ron
+++ b/assets/common/items/weapons/sword/steel-1.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Sword,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 300,
+            equip_time_secs: 0.3,
             power: 1.45,
             poise_strength: 0.4,
             speed: 0.95,
diff --git a/assets/common/items/weapons/sword/steel-2.ron b/assets/common/items/weapons/sword/steel-2.ron
index 45b4c63880..6dde404fc0 100644
--- a/assets/common/items/weapons/sword/steel-2.ron
+++ b/assets/common/items/weapons/sword/steel-2.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Sword,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 300,
+            equip_time_secs: 0.3,
             power: 1.25,
             poise_strength: 0.4,
             speed: 1.15,
diff --git a/assets/common/items/weapons/sword/steel-3.ron b/assets/common/items/weapons/sword/steel-3.ron
index 0e831d6528..d0e7887d59 100644
--- a/assets/common/items/weapons/sword/steel-3.ron
+++ b/assets/common/items/weapons/sword/steel-3.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Sword,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 300,
+            equip_time_secs: 0.3,
             power: 1.5,
             poise_strength: 0.4,
             speed: 0.9,
diff --git a/assets/common/items/weapons/sword/steel-4.ron b/assets/common/items/weapons/sword/steel-4.ron
index a790d74d81..662bf2a863 100644
--- a/assets/common/items/weapons/sword/steel-4.ron
+++ b/assets/common/items/weapons/sword/steel-4.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Sword,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 300,
+            equip_time_secs: 0.3,
             power: 1.55,
             poise_strength: 0.4,
             speed: 0.85,
diff --git a/assets/common/items/weapons/sword/steel-5.ron b/assets/common/items/weapons/sword/steel-5.ron
index b1124aecfe..6559479d09 100644
--- a/assets/common/items/weapons/sword/steel-5.ron
+++ b/assets/common/items/weapons/sword/steel-5.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Sword,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 300,
+            equip_time_secs: 0.3,
             power: 1.2,
             poise_strength: 0.4,
             speed: 1.2,
diff --git a/assets/common/items/weapons/sword/steel-6.ron b/assets/common/items/weapons/sword/steel-6.ron
index c47ebf7fc1..c134123b51 100644
--- a/assets/common/items/weapons/sword/steel-6.ron
+++ b/assets/common/items/weapons/sword/steel-6.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Sword,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 300,
+            equip_time_secs: 0.3,
             power: 1.3,
             poise_strength: 0.4,
             speed: 1.1,
diff --git a/assets/common/items/weapons/sword/steel-7.ron b/assets/common/items/weapons/sword/steel-7.ron
index 69f6d04cef..3044bb2f1e 100644
--- a/assets/common/items/weapons/sword/steel-7.ron
+++ b/assets/common/items/weapons/sword/steel-7.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Sword,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 300,
+            equip_time_secs: 0.3,
             power: 1.6,
             poise_strength: 0.4,
             speed: 0.8,
diff --git a/assets/common/items/weapons/sword/steel-8.ron b/assets/common/items/weapons/sword/steel-8.ron
index 5e6b1f0c3d..6a25595c56 100644
--- a/assets/common/items/weapons/sword/steel-8.ron
+++ b/assets/common/items/weapons/sword/steel-8.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Sword,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 300,
+            equip_time_secs: 0.3,
             power: 1.35,
             poise_strength: 0.4,
             speed: 1.05,
diff --git a/assets/common/items/weapons/sword/stone-0.ron b/assets/common/items/weapons/sword/stone-0.ron
index 882f171508..7acceea5c5 100644
--- a/assets/common/items/weapons/sword/stone-0.ron
+++ b/assets/common/items/weapons/sword/stone-0.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Sword,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 300,
+            equip_time_secs: 0.3,
             power: 1.0,
             poise_strength: 0.4,
             speed: 0.8,
diff --git a/assets/common/items/weapons/sword/stone-1.ron b/assets/common/items/weapons/sword/stone-1.ron
index 34a451e84b..238db6f571 100644
--- a/assets/common/items/weapons/sword/stone-1.ron
+++ b/assets/common/items/weapons/sword/stone-1.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Sword,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 300,
+            equip_time_secs: 0.3,
             power: 0.8,
             poise_strength: 0.4,
             speed: 1.0,
diff --git a/assets/common/items/weapons/sword/stone-2.ron b/assets/common/items/weapons/sword/stone-2.ron
index 439590f4c0..6651ac3936 100644
--- a/assets/common/items/weapons/sword/stone-2.ron
+++ b/assets/common/items/weapons/sword/stone-2.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Sword,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 300,
+            equip_time_secs: 0.3,
             power: 0.9,
             poise_strength: 0.4,
             speed: 0.9,
diff --git a/assets/common/items/weapons/sword/wood-0.ron b/assets/common/items/weapons/sword/wood-0.ron
index 25b3896332..2cd0c30425 100644
--- a/assets/common/items/weapons/sword/wood-0.ron
+++ b/assets/common/items/weapons/sword/wood-0.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Sword,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 300,
+            equip_time_secs: 0.3,
             power: 0.6,
             poise_strength: 0.4,
             speed: 1.0,
diff --git a/assets/common/items/weapons/sword/wood-1.ron b/assets/common/items/weapons/sword/wood-1.ron
index 8a575e4de7..74eb98a5a6 100644
--- a/assets/common/items/weapons/sword/wood-1.ron
+++ b/assets/common/items/weapons/sword/wood-1.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Sword,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 300,
+            equip_time_secs: 0.3,
             power: 0.8,
             poise_strength: 0.4,
             speed: 0.8,
diff --git a/assets/common/items/weapons/sword/wood-2.ron b/assets/common/items/weapons/sword/wood-2.ron
index d8b33e4728..e229ed4967 100644
--- a/assets/common/items/weapons/sword/wood-2.ron
+++ b/assets/common/items/weapons/sword/wood-2.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Sword,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 0.5,
             poise_strength: 0.5,
             speed: 1.1,
diff --git a/assets/common/items/weapons/sword_1h/bloodsteel-0.ron b/assets/common/items/weapons/sword_1h/bloodsteel-0.ron
index 0186f5b007..eaac0ee44a 100644
--- a/assets/common/items/weapons/sword_1h/bloodsteel-0.ron
+++ b/assets/common/items/weapons/sword_1h/bloodsteel-0.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Sword,
         hands: One,
         stats: (
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 1.45,
             poise_strength: 1.0,
             speed: 1.3,
diff --git a/assets/common/items/weapons/sword_1h/bloodsteel-1.ron b/assets/common/items/weapons/sword_1h/bloodsteel-1.ron
index acc31f3549..2d8a74b0a0 100644
--- a/assets/common/items/weapons/sword_1h/bloodsteel-1.ron
+++ b/assets/common/items/weapons/sword_1h/bloodsteel-1.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Sword,
         hands: One,
         stats: (
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 2.0,
             poise_strength: 1.0,
             speed: 0.75,
diff --git a/assets/common/items/weapons/sword_1h/bloodsteel-2.ron b/assets/common/items/weapons/sword_1h/bloodsteel-2.ron
index b72acb86b8..aa4916aa8e 100644
--- a/assets/common/items/weapons/sword_1h/bloodsteel-2.ron
+++ b/assets/common/items/weapons/sword_1h/bloodsteel-2.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Sword,
         hands: One,
         stats: (
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 1.75,
             poise_strength: 1.0,
             speed: 1.0,
diff --git a/assets/common/items/weapons/sword_1h/bronze-0.ron b/assets/common/items/weapons/sword_1h/bronze-0.ron
index 72650414ea..fb01404bd2 100644
--- a/assets/common/items/weapons/sword_1h/bronze-0.ron
+++ b/assets/common/items/weapons/sword_1h/bronze-0.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Sword,
         hands: One,
         stats: (
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 0.65,
             poise_strength: 1.0,
             speed: 1.1,
diff --git a/assets/common/items/weapons/sword_1h/bronze-1.ron b/assets/common/items/weapons/sword_1h/bronze-1.ron
index b87e296ab9..8037ff8605 100644
--- a/assets/common/items/weapons/sword_1h/bronze-1.ron
+++ b/assets/common/items/weapons/sword_1h/bronze-1.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Sword,
         hands: One,
         stats: (
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 0.75,
             poise_strength: 1.0,
             speed: 1.0,
diff --git a/assets/common/items/weapons/sword_1h/bronze-2.ron b/assets/common/items/weapons/sword_1h/bronze-2.ron
index 13905573ca..bc8c5b65da 100644
--- a/assets/common/items/weapons/sword_1h/bronze-2.ron
+++ b/assets/common/items/weapons/sword_1h/bronze-2.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Sword,
         hands: One,
         stats: (
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 0.85,
             poise_strength: 1.0,
             speed: 0.9,
diff --git a/assets/common/items/weapons/sword_1h/cobalt-0.ron b/assets/common/items/weapons/sword_1h/cobalt-0.ron
index 22b53da46f..2a3cb87e55 100644
--- a/assets/common/items/weapons/sword_1h/cobalt-0.ron
+++ b/assets/common/items/weapons/sword_1h/cobalt-0.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Sword,
         hands: One,
         stats: (
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 1.3,
             poise_strength: 1.0,
             speed: 1.2,
diff --git a/assets/common/items/weapons/sword_1h/cobalt-1.ron b/assets/common/items/weapons/sword_1h/cobalt-1.ron
index 8a5e1f9fc7..70b67c0060 100644
--- a/assets/common/items/weapons/sword_1h/cobalt-1.ron
+++ b/assets/common/items/weapons/sword_1h/cobalt-1.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Sword,
         hands: One,
         stats: (
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 1.7,
             poise_strength: 1.0,
             speed: 0.8,
diff --git a/assets/common/items/weapons/sword_1h/cobalt-2.ron b/assets/common/items/weapons/sword_1h/cobalt-2.ron
index 1e6251d382..1977007700 100644
--- a/assets/common/items/weapons/sword_1h/cobalt-2.ron
+++ b/assets/common/items/weapons/sword_1h/cobalt-2.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Sword,
         hands: One,
         stats: (
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 1.4,
             poise_strength: 1.0,
             speed: 1.1,
diff --git a/assets/common/items/weapons/sword_1h/cobalt-3.ron b/assets/common/items/weapons/sword_1h/cobalt-3.ron
index 3cdbe8ba81..bc6c007feb 100644
--- a/assets/common/items/weapons/sword_1h/cobalt-3.ron
+++ b/assets/common/items/weapons/sword_1h/cobalt-3.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Sword,
         hands: One,
         stats: (
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 1.6,
             poise_strength: 1.0,
             speed: 0.9,
diff --git a/assets/common/items/weapons/sword_1h/iron-0.ron b/assets/common/items/weapons/sword_1h/iron-0.ron
index 11b89e69fc..53c13be6d9 100644
--- a/assets/common/items/weapons/sword_1h/iron-0.ron
+++ b/assets/common/items/weapons/sword_1h/iron-0.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Sword,
         hands: One,
         stats: (
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 1.0,
             poise_strength: 1.0,
             speed: 1.0,
diff --git a/assets/common/items/weapons/sword_1h/iron-1.ron b/assets/common/items/weapons/sword_1h/iron-1.ron
index f4335f3740..db2466d8a7 100644
--- a/assets/common/items/weapons/sword_1h/iron-1.ron
+++ b/assets/common/items/weapons/sword_1h/iron-1.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Sword,
         hands: One,
         stats: (
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 0.9,
             poise_strength: 1.0,
             speed: 1.1,
diff --git a/assets/common/items/weapons/sword_1h/iron-2.ron b/assets/common/items/weapons/sword_1h/iron-2.ron
index 479d5a0b80..87730a7112 100644
--- a/assets/common/items/weapons/sword_1h/iron-2.ron
+++ b/assets/common/items/weapons/sword_1h/iron-2.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Sword,
         hands: One,
         stats: (
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 1.2,
             poise_strength: 1.0,
             speed: 0.8,
diff --git a/assets/common/items/weapons/sword_1h/iron-3.ron b/assets/common/items/weapons/sword_1h/iron-3.ron
index 8ab9418dae..6257983083 100644
--- a/assets/common/items/weapons/sword_1h/iron-3.ron
+++ b/assets/common/items/weapons/sword_1h/iron-3.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Sword,
         hands: One,
         stats: (
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 0.8,
             poise_strength: 1.0,
             speed: 1.2,
diff --git a/assets/common/items/weapons/sword_1h/iron-4.ron b/assets/common/items/weapons/sword_1h/iron-4.ron
index 6a1fc6ea43..cea0370fc9 100644
--- a/assets/common/items/weapons/sword_1h/iron-4.ron
+++ b/assets/common/items/weapons/sword_1h/iron-4.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Sword,
         hands: One,
         stats: (
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 1.1,
             poise_strength: 1.0,
             speed: 0.9,
diff --git a/assets/common/items/weapons/sword_1h/obsidian-0.ron b/assets/common/items/weapons/sword_1h/obsidian-0.ron
index a7bbcfe291..db312f8de3 100644
--- a/assets/common/items/weapons/sword_1h/obsidian-0.ron
+++ b/assets/common/items/weapons/sword_1h/obsidian-0.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Sword,
         hands: One,
         stats: (
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 1.95,
             poise_strength: 1.0,
             speed: 0.8,
diff --git a/assets/common/items/weapons/sword_1h/orichalcum-0.ron b/assets/common/items/weapons/sword_1h/orichalcum-0.ron
index d325243e10..99e74a3adc 100644
--- a/assets/common/items/weapons/sword_1h/orichalcum-0.ron
+++ b/assets/common/items/weapons/sword_1h/orichalcum-0.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Sword,
         hands: One,
         stats: (
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 2.1,
             poise_strength: 1.0,
             speed: 0.9,
diff --git a/assets/common/items/weapons/sword_1h/orichalcum-1.ron b/assets/common/items/weapons/sword_1h/orichalcum-1.ron
index a6b5bb670c..f48efd7d64 100644
--- a/assets/common/items/weapons/sword_1h/orichalcum-1.ron
+++ b/assets/common/items/weapons/sword_1h/orichalcum-1.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Sword,
         hands: One,
         stats: (
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 1.9,
             poise_strength: 1.0,
             speed: 1.1,
diff --git a/assets/common/items/weapons/sword_1h/steel-0.ron b/assets/common/items/weapons/sword_1h/steel-0.ron
index d7cf2121e7..998c2bedc7 100644
--- a/assets/common/items/weapons/sword_1h/steel-0.ron
+++ b/assets/common/items/weapons/sword_1h/steel-0.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Sword,
         hands: One,
         stats: (
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 1.5,
             poise_strength: 1.0,
             speed: 0.75,
diff --git a/assets/common/items/weapons/sword_1h/steel-1.ron b/assets/common/items/weapons/sword_1h/steel-1.ron
index 56016c62d1..71a2aa1abf 100644
--- a/assets/common/items/weapons/sword_1h/steel-1.ron
+++ b/assets/common/items/weapons/sword_1h/steel-1.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Sword,
         hands: One,
         stats: (
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 1.3,
             poise_strength: 1.0,
             speed: .95,
diff --git a/assets/common/items/weapons/sword_1h/steel-2.ron b/assets/common/items/weapons/sword_1h/steel-2.ron
index eede6c0e38..2ffe879bf8 100644
--- a/assets/common/items/weapons/sword_1h/steel-2.ron
+++ b/assets/common/items/weapons/sword_1h/steel-2.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Sword,
         hands: One,
         stats: (
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 1.05,
             poise_strength: 1.0,
             speed: 1.2,
diff --git a/assets/common/items/weapons/sword_1h/steel-3.ron b/assets/common/items/weapons/sword_1h/steel-3.ron
index 22bc629bef..4b588f7583 100644
--- a/assets/common/items/weapons/sword_1h/steel-3.ron
+++ b/assets/common/items/weapons/sword_1h/steel-3.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Sword,
         hands: One,
         stats: (
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 1.2,
             poise_strength: 1.0,
             speed: 1.05,
diff --git a/assets/common/items/weapons/tool/broom.ron b/assets/common/items/weapons/tool/broom.ron
index ea4722b958..8740dd82b0 100644
--- a/assets/common/items/weapons/tool/broom.ron
+++ b/assets/common/items/weapons/tool/broom.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Farming,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 1.0,
             poise_strength: 1.0,
             speed: 1.0,
diff --git a/assets/common/items/weapons/tool/fishing_rod.ron b/assets/common/items/weapons/tool/fishing_rod.ron
index 0ca7992bc3..4e82e5b915 100644
--- a/assets/common/items/weapons/tool/fishing_rod.ron
+++ b/assets/common/items/weapons/tool/fishing_rod.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Farming,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 1.0,
             poise_strength: 1.0,
             speed: 1.0,
diff --git a/assets/common/items/weapons/tool/hoe.ron b/assets/common/items/weapons/tool/hoe.ron
index e311f62538..4b81521996 100644
--- a/assets/common/items/weapons/tool/hoe.ron
+++ b/assets/common/items/weapons/tool/hoe.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Farming,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 1.0,
             poise_strength: 1.5,
             speed: 1.0,
diff --git a/assets/common/items/weapons/tool/pickaxe.ron b/assets/common/items/weapons/tool/pickaxe.ron
index ce47e34a75..9e873b39f7 100644
--- a/assets/common/items/weapons/tool/pickaxe.ron
+++ b/assets/common/items/weapons/tool/pickaxe.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Farming,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 1.0,
             poise_strength: 1.0,
             speed: 1.0,
diff --git a/assets/common/items/weapons/tool/pitchfork.ron b/assets/common/items/weapons/tool/pitchfork.ron
index fa46363371..7741143d54 100644
--- a/assets/common/items/weapons/tool/pitchfork.ron
+++ b/assets/common/items/weapons/tool/pitchfork.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Farming,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 1.0,
             poise_strength: 4.0,
             speed: 1.0,
diff --git a/assets/common/items/weapons/tool/rake.ron b/assets/common/items/weapons/tool/rake.ron
index 7164f20a0b..c44b545464 100644
--- a/assets/common/items/weapons/tool/rake.ron
+++ b/assets/common/items/weapons/tool/rake.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Farming,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 1.0,
             poise_strength: 1.0,
             speed: 1.0,
diff --git a/assets/common/items/weapons/tool/shovel-0.ron b/assets/common/items/weapons/tool/shovel-0.ron
index 48fb8a81aa..94d7c0a355 100644
--- a/assets/common/items/weapons/tool/shovel-0.ron
+++ b/assets/common/items/weapons/tool/shovel-0.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Farming,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 1.0,
             poise_strength: 2.0,
             speed: 1.0,
diff --git a/assets/common/items/weapons/tool/shovel-1.ron b/assets/common/items/weapons/tool/shovel-1.ron
index 6c647c97df..555f87d653 100644
--- a/assets/common/items/weapons/tool/shovel-1.ron
+++ b/assets/common/items/weapons/tool/shovel-1.ron
@@ -5,7 +5,7 @@ ItemDef(
         kind: Farming,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 400,
+            equip_time_secs: 0.4,
             power: 1.0,
             poise_strength: 2.0,
             speed: 1.0,
diff --git a/assets/common/material_stats_manifest.ron b/assets/common/material_stats_manifest.ron
index 4ce0747fcb..9f7ffecd88 100644
--- a/assets/common/material_stats_manifest.ron
+++ b/assets/common/material_stats_manifest.ron
@@ -1,43 +1,43 @@
-// Keep in mind that material stats are multiplied by the form stats, not added (e.g. equip_time_millis is most sensitive to this)
+// Keep in mind that material stats are multiplied by the form stats, not added (e.g. equip_time_secs is most sensitive to this)
 ({
     "common.items.crafting_ing.bloodsteel_ingot": (
-        equip_time_millis: 1,
+        equip_time_secs: 1.0,
         power: 1.75,
         poise_strength: 1.75,
         speed: 1.75,
     ),
     "common.items.crafting_ing.bronze_ingot": (
-        equip_time_millis: 1,
+        equip_time_secs: 1.0,
         power: 0.75,
         poise_strength: 0.75,
         speed: 0.75,
     ),
     "common.items.crafting_ing.cobalt_ingot": (
-        equip_time_millis: 1,
+        equip_time_secs: 1.0,
         power: 1.5,
         poise_strength: 1.5,
         speed: 1.5,
     ),
     "common.items.crafting_ing.copper_ingot": (
-        equip_time_millis: 1,
+        equip_time_secs: 1.0,
         power: 0.4,
         poise_strength: 0.4,
         speed: 0.4,
     ),
     "common.items.crafting_ing.iron_ingot": (
-        equip_time_millis: 1,
+        equip_time_secs: 1.0,
         power: 1.0,
         poise_strength: 1.0,
         speed: 1.0,
     ),
     "common.items.crafting_ing.steel_ingot": (
-        equip_time_millis: 1,
+        equip_time_secs: 1.0,
         power: 1.25,
         poise_strength: 1.25,
         speed: 1.25,
     ),
     "common.items.crafting_ing.tin_ingot": (
-        equip_time_millis: 1,
+        equip_time_secs: 1.0,
         power: 0.25,
         poise_strength: 0.25,
         speed: 0.25,
diff --git a/common/src/bin/csv_import/main.rs b/common/src/bin/csv_import/main.rs
index ad55be1467..46cbd2b62d 100644
--- a/common/src/bin/csv_import/main.rs
+++ b/common/src/bin/csv_import/main.rs
@@ -170,7 +170,7 @@ fn weapon_stats() -> Result<(), Box<dyn Error>> {
                         if item.item_definition_id() == record.get(0).expect("No file path in csv?")
                         {
                             let kind = tool.kind;
-                            let equip_time_millis: u32 = record
+                            let equip_time_secs: f32 = record
                                 .get(8)
                                 .expect(&format!(
                                     "Error unwrapping equip time for {:?}",
@@ -227,7 +227,7 @@ fn weapon_stats() -> Result<(), Box<dyn Error>> {
                             let tool = comp::item::tool::Tool::new(
                                 kind,
                                 hands,
-                                equip_time_millis,
+                                equip_time_secs,
                                 power,
                                 poise_strength,
                                 speed,
diff --git a/common/src/comp/inventory/item/modular.rs b/common/src/comp/inventory/item/modular.rs
index 89f2d7eff4..4a17daaf6e 100644
--- a/common/src/comp/inventory/item/modular.rs
+++ b/common/src/comp/inventory/item/modular.rs
@@ -165,7 +165,7 @@ fn make_component_def(
         toolkind,
         modkind,
         stats: tool::Stats {
-            equip_time_millis: 250,
+            equip_time_secs: 0.25,
             power: if matches!(modkind, ModularComponentKind::Damage) {
                 AVERAGE_STAT_VALUE[tier]
             } else {
diff --git a/common/src/comp/inventory/item/tool.rs b/common/src/comp/inventory/item/tool.rs
index 55bc5f7139..bdbadd77d5 100644
--- a/common/src/comp/inventory/item/tool.rs
+++ b/common/src/comp/inventory/item/tool.rs
@@ -69,7 +69,7 @@ pub enum Hands {
 
 #[derive(Clone, Copy, Debug, PartialEq, Serialize, Deserialize)]
 pub struct Stats {
-    pub equip_time_millis: u32,
+    pub equip_time_secs: f32,
     pub power: f32,
     pub poise_strength: f32,
     pub speed: f32,
@@ -78,7 +78,7 @@ pub struct Stats {
 impl Stats {
     pub fn zeroed() -> Stats {
         Stats {
-            equip_time_millis: 0,
+            equip_time_secs: 0.0,
             power: 0.0,
             poise_strength: 0.0,
             speed: 0.0,
@@ -101,7 +101,7 @@ impl Asset for Stats {
 
 impl AddAssign<Stats> for Stats {
     fn add_assign(&mut self, other: Stats) {
-        self.equip_time_millis += other.equip_time_millis;
+        self.equip_time_secs += other.equip_time_secs;
         self.power += other.power;
         self.poise_strength += other.poise_strength;
         self.speed += other.speed;
@@ -109,10 +109,7 @@ impl AddAssign<Stats> for Stats {
 }
 impl MulAssign<Stats> for Stats {
     fn mul_assign(&mut self, other: Stats) {
-        // equip_time_millis doesn't quite work with mul since it's u32, so we can't
-        // scale delay down, only up, so it needs to be balanced carefully in
-        // multiplicative contexts
-        self.equip_time_millis *= other.equip_time_millis;
+        self.equip_time_secs *= other.equip_time_secs;
         self.power *= other.power;
         self.poise_strength *= other.poise_strength;
         self.speed *= other.speed;
@@ -120,10 +117,10 @@ impl MulAssign<Stats> for Stats {
 }
 impl DivAssign<usize> for Stats {
     fn div_assign(&mut self, scalar: usize) {
-        self.equip_time_millis /= scalar as u32;
+        self.equip_time_secs /= scalar as f32;
         // since averaging occurs when the stats are used multiplicatively, don't permit
-        // multiplying an equip_time_millis by 0, since that would be overpowered
-        self.equip_time_millis = self.equip_time_millis.max(1);
+        // multiplying an equip_time_secs by 0, since that would be overpowered
+        self.equip_time_secs = self.equip_time_secs.max(0.001);
         self.power /= scalar as f32;
         self.poise_strength /= scalar as f32;
         self.speed /= scalar as f32;
@@ -199,7 +196,7 @@ impl From<(&MaterialStatManifest, &[Item], &Tool)> for Stats {
             Hands::Two => (1.0, 1.0),
         };
         Self {
-            equip_time_millis: raw_stats.equip_time_millis,
+            equip_time_secs: raw_stats.equip_time_secs,
             power: raw_stats.power * power,
             poise_strength: raw_stats.poise_strength,
             speed: raw_stats.speed * speed,
@@ -221,7 +218,7 @@ impl Tool {
     pub fn new(
         kind: ToolKind,
         hands: Hands,
-        equip_time_millis: u32,
+        equip_time_secs: f32,
         power: f32,
         poise_strength: f32,
         speed: f32,
@@ -230,7 +227,7 @@ impl Tool {
             kind,
             hands,
             stats: StatKind::Direct(Stats {
-                equip_time_millis,
+                equip_time_secs,
                 power,
                 poise_strength,
                 speed,
@@ -243,7 +240,7 @@ impl Tool {
             kind: ToolKind::Empty,
             hands: Hands::One,
             stats: StatKind::Direct(Stats {
-                equip_time_millis: 0,
+                equip_time_secs: 0.0,
                 power: 1.00,
                 poise_strength: 1.00,
                 speed: 1.00,
@@ -268,7 +265,7 @@ impl Tool {
     }
 
     pub fn equip_time(&self, msm: &MaterialStatManifest, components: &[Item]) -> Duration {
-        Duration::from_millis(self.stats.resolve_stats(msm, components).equip_time_millis as u64)
+        Duration::from_secs_f32(self.stats.resolve_stats(msm, components).equip_time_secs)
     }
 
     pub fn get_abilities(
diff --git a/voxygen/src/hud/util.rs b/voxygen/src/hud/util.rs
index 0056771305..7a470feaff 100644
--- a/voxygen/src/hud/util.rs
+++ b/voxygen/src/hud/util.rs
@@ -254,7 +254,7 @@ mod tests {
         testmsm.0.insert(
             "common.items.crafting_ing.bronze_ingot".to_string(),
             Stats {
-                equip_time_millis: 0,
+                equip_time_secs: 0.0,
                 power: 3.0,
                 poise_strength: 5.0,
                 speed: 7.0,

From 8a82e1aa37f6a74f23e9000b6bbf27048766e52c Mon Sep 17 00:00:00 2001
From: jshipsey <jshipsey18@gmail.com>
Date: Mon, 1 Mar 2021 17:37:47 -0500
Subject: [PATCH 12/16] final asset corrections, fix glider anim

---
 .../armor/{twigflowers => twigsflowers}/belt.ron |   0
 .../{twigflowers => twigsflowers}/chest.ron      |   0
 .../armor/{twigflowers => twigsflowers}/foot.ron |   0
 .../armor/{twigflowers => twigsflowers}/hand.ron |   0
 .../{twigflowers => twigsflowers}/pants.ron      |   0
 .../{twigflowers => twigsflowers}/shoulder.ron   |   0
 assets/voxygen/item_image_manifest.ron           |   8 ++++----
 assets/voxygen/voxel/armor/cultist/shoulder.vox  | Bin 0 -> 1388 bytes
 .../pants/{grayscale_pants.vox => grayscale.vox} | Bin
 .../up.sql                                       |  12 ++++++------
 voxygen/anim/src/character/gliding.rs            |  10 ++++++----
 voxygen/anim/src/character/jump.rs               |   2 +-
 voxygen/anim/src/character/stand.rs              |   4 ++--
 13 files changed, 19 insertions(+), 17 deletions(-)
 rename assets/common/items/armor/{twigflowers => twigsflowers}/belt.ron (100%)
 rename assets/common/items/armor/{twigflowers => twigsflowers}/chest.ron (100%)
 rename assets/common/items/armor/{twigflowers => twigsflowers}/foot.ron (100%)
 rename assets/common/items/armor/{twigflowers => twigsflowers}/hand.ron (100%)
 rename assets/common/items/armor/{twigflowers => twigsflowers}/pants.ron (100%)
 rename assets/common/items/armor/{twigflowers => twigsflowers}/shoulder.ron (100%)
 create mode 100644 assets/voxygen/voxel/armor/cultist/shoulder.vox
 rename assets/voxygen/voxel/armor/misc/pants/{grayscale_pants.vox => grayscale.vox} (100%)

diff --git a/assets/common/items/armor/twigflowers/belt.ron b/assets/common/items/armor/twigsflowers/belt.ron
similarity index 100%
rename from assets/common/items/armor/twigflowers/belt.ron
rename to assets/common/items/armor/twigsflowers/belt.ron
diff --git a/assets/common/items/armor/twigflowers/chest.ron b/assets/common/items/armor/twigsflowers/chest.ron
similarity index 100%
rename from assets/common/items/armor/twigflowers/chest.ron
rename to assets/common/items/armor/twigsflowers/chest.ron
diff --git a/assets/common/items/armor/twigflowers/foot.ron b/assets/common/items/armor/twigsflowers/foot.ron
similarity index 100%
rename from assets/common/items/armor/twigflowers/foot.ron
rename to assets/common/items/armor/twigsflowers/foot.ron
diff --git a/assets/common/items/armor/twigflowers/hand.ron b/assets/common/items/armor/twigsflowers/hand.ron
similarity index 100%
rename from assets/common/items/armor/twigflowers/hand.ron
rename to assets/common/items/armor/twigsflowers/hand.ron
diff --git a/assets/common/items/armor/twigflowers/pants.ron b/assets/common/items/armor/twigsflowers/pants.ron
similarity index 100%
rename from assets/common/items/armor/twigflowers/pants.ron
rename to assets/common/items/armor/twigsflowers/pants.ron
diff --git a/assets/common/items/armor/twigflowers/shoulder.ron b/assets/common/items/armor/twigsflowers/shoulder.ron
similarity index 100%
rename from assets/common/items/armor/twigflowers/shoulder.ron
rename to assets/common/items/armor/twigsflowers/shoulder.ron
diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron
index cb65368e4c..256e70decb 100644
--- a/assets/voxygen/item_image_manifest.ron
+++ b/assets/voxygen/item_image_manifest.ron
@@ -1259,7 +1259,7 @@
     ),
     //Leather Armor
     Armor(Shoulder("Leather")): VoxTrans(
-        "voxel.armor.shoulder.leather_right-1",
+        "voxel.armor.leather.shoulder",
         (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
     ),
     //Agile Armor
@@ -1425,7 +1425,7 @@
         (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0,
     ),
     Armor(Shoulder("Twigs")): VoxTrans(
-        "voxel.armor.twigs.shoulders",
+        "voxel.armor.twigs.shoulder",
         (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
         ),
     //TwigsLeaves Set
@@ -1467,7 +1467,7 @@
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.4,
     ),
     Armor(Foot("TwigsFlowers")): VoxTrans(
-        "voxel.armor.fotwigsflowersot.foot",
+        "voxel.armor.twigsflowers.foot",
         (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1,
     ),
     Armor(Hand("TwigsFlowers")): VoxTrans(
@@ -1609,7 +1609,7 @@
         (0.0, -2.0, 0.0), (-90.0, 180.0, 0.0), 1.0,
     ),
     Armor(Back("Backpack")): VoxTrans(
-        "voxel.armor.misc.backpack",
+        "voxel.armor.misc.back.backpack",
         (0.0, 0.0, 0.0), (-90.0, 0.0, 0.0), 1.0,
     ),
     Armor(Back("BackpackBlue")): VoxTrans(
diff --git a/assets/voxygen/voxel/armor/cultist/shoulder.vox b/assets/voxygen/voxel/armor/cultist/shoulder.vox
new file mode 100644
index 0000000000000000000000000000000000000000..76eb745193849cd8a2559aa1425384515676c0ec
GIT binary patch
literal 1388
zcmbu8T})eL7{{M;-nW(b6)L4bnFR_HT9zRn0};fsQAe4qV`#%VhQ>fPR*73R&DJza
zwz@62pbQDq#97faTo|#EN;JDbvXHr?Sqxc>Hw)Q?m)sfS-QR!Nt_;%)Px8xie&;>U
z^PKaX_k@B&m2)D}-yJx}AVU_B!9dvmWL|hs<*|ox=twwFXXLMn1c+gkK0}PtCQ(Ea
z!=MvIv|$7dlTH-TCSB2qB3jWkohYI;-9jgdXbatH1WYTPXkv(Y(iAhO#AGj%y-fBp
z*^6${i6YuG4;hM16w!*V>Ds)k7`3Kb=oUJoCWe)@t*mX$*H+`Ep@Pa#tgB9%CeKa9
zx^zWXbVVnIrfa&U6T`w>3*DklAKt&WTlCh*1UwRn1n$oWdatjc+Wr^*u-mb^+Mi#-
zH-Yc}l|r8b9m9Lzf4d8wR6E3PfkYmM%s&HJbD*$aP%<H?_t#=qMo<tDJe3p_O$!`f
z3tIZ0K;J|m!sm<d!Sb`{NeBjJ1#c}1&i=yO0ViDJZqy{aXwCXi9<{?g<%Bm~fyP_4
zC>a*ioEPkx6LhW!<Tdt>7eHp8hAi1JS!=_>^ToLPQaR99g$@yLpWs*WJDEKrSo~P9
zx*)jy9o;9G_X~bFEVy@Eke;f-<#(N1F@K&XlgS{L%VBeK69X+yjQib)57c39tO<$N
z+c0-xA7;k7f!sXms~zZUs=$Gl>o68-L!?iTJSIrJCs_GN(CTs`;H|-M>uyAQ+7a?P
zFy2y*sr@^V9ce)LP&XoP9z^2QQCvB99PxL;n7$Z6cHt7%Z(fJZW<zO_4V9IZX!N+z
zy8Ai2*yMq~vk}2p+A;n94lI7*#&5U1xOb->pRs2)Ey&#vxWq@|B#H`&pi)LrCCA{F
z5UM4J8tFxt^EeX{OpkIdF~L5MVB`fstVi$(uRrSj@pB5;So`1a-`w1ct8FPXG|r=A
z@&d||Ww`aF;O<dw-E<lrj|Z_>46pVsL6UJ4M~kt1?ZG!Z=j7gTxp4L3EV?>oFnZ+@
zN=Hg?=i8lF4wqquGyCWK^Y`Uz9U06adIC6mZ2`%zviNZ6CO-XX9eYkqqU%Bm2R>iH
zU}haYpAYx>C{jT1C)B!N<HrZjx554OU+eq}xBjzj<BjyA*SM0;**5RtT0VKl-U*bp
Nzk%|G#qI8uzX73vKCS=&

literal 0
HcmV?d00001

diff --git a/assets/voxygen/voxel/armor/misc/pants/grayscale_pants.vox b/assets/voxygen/voxel/armor/misc/pants/grayscale.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/misc/pants/grayscale_pants.vox
rename to assets/voxygen/voxel/armor/misc/pants/grayscale.vox
diff --git a/server/src/migrations/2021-03-01-053817_armor-reorganization/up.sql b/server/src/migrations/2021-03-01-053817_armor-reorganization/up.sql
index d829868d03..9394ceb4c1 100644
--- a/server/src/migrations/2021-03-01-053817_armor-reorganization/up.sql
+++ b/server/src/migrations/2021-03-01-053817_armor-reorganization/up.sql
@@ -47,7 +47,7 @@ SET item_definition_id = 'common.items.armor.tarasque.belt' WHERE item_definitio
 UPDATE item
 SET item_definition_id = 'common.items.armor.twigs.belt' WHERE item_definition_id = 'common.items.armor.belt.twig';
 UPDATE item
-SET item_definition_id = 'common.items.armor.twigflowers.belt' WHERE item_definition_id = 'common.items.armor.belt.twigsflowers';
+SET item_definition_id = 'common.items.armor.twigsflowers.belt' WHERE item_definition_id = 'common.items.armor.belt.twigsflowers';
 UPDATE item
 SET item_definition_id = 'common.items.armor.twigsleaves.belt' WHERE item_definition_id = 'common.items.armor.belt.twigsleaves';
 UPDATE item
@@ -91,7 +91,7 @@ SET item_definition_id = 'common.items.armor.tarasque.chest' WHERE item_definiti
 UPDATE item
 SET item_definition_id = 'common.items.armor.twigs.chest' WHERE item_definition_id = 'common.items.armor.chest.twig';
 UPDATE item
-SET item_definition_id = 'common.items.armor.twigflowers.chest' WHERE item_definition_id = 'common.items.armor.chest.twigsflowers';
+SET item_definition_id = 'common.items.armor.twigsflowers.chest' WHERE item_definition_id = 'common.items.armor.chest.twigsflowers';
 UPDATE item
 SET item_definition_id = 'common.items.armor.twigsleaves.chest' WHERE item_definition_id = 'common.items.armor.chest.twigsleaves';
 UPDATE item
@@ -155,7 +155,7 @@ SET item_definition_id = 'common.items.armor.tarasque.foot' WHERE item_definitio
 UPDATE item
 SET item_definition_id = 'common.items.armor.twigs.foot' WHERE item_definition_id = 'common.items.armor.foot.twig';
 UPDATE item
-SET item_definition_id = 'common.items.armor.twigflowers.foot' WHERE item_definition_id = 'common.items.armor.foot.twigsflowers';
+SET item_definition_id = 'common.items.armor.twigsflowers.foot' WHERE item_definition_id = 'common.items.armor.foot.twigsflowers';
 UPDATE item
 SET item_definition_id = 'common.items.armor.twigsleaves.foot' WHERE item_definition_id = 'common.items.armor.foot.twigsleaves';
 UPDATE item
@@ -197,7 +197,7 @@ SET item_definition_id = 'common.items.armor.tarasque.hand' WHERE item_definitio
 UPDATE item
 SET item_definition_id = 'common.items.armor.twigs.hand' WHERE item_definition_id = 'common.items.armor.hand.twig';
 UPDATE item
-SET item_definition_id = 'common.items.armor.twigflowers.hand' WHERE item_definition_id = 'common.items.armor.hand.twigsflowers';
+SET item_definition_id = 'common.items.armor.twigsflowers.hand' WHERE item_definition_id = 'common.items.armor.hand.twigsflowers';
 UPDATE item
 SET item_definition_id = 'common.items.armor.twigsleaves.hand' WHERE item_definition_id = 'common.items.armor.hand.twigsleaves';
 UPDATE item
@@ -257,7 +257,7 @@ SET item_definition_id = 'common.items.armor.tarasque.pants' WHERE item_definiti
 UPDATE item
 SET item_definition_id = 'common.items.armor.twigs.pants' WHERE item_definition_id = 'common.items.armor.pants.twig';
 UPDATE item
-SET item_definition_id = 'common.items.armor.twigflowers.pants' WHERE item_definition_id = 'common.items.armor.pants.twigsflowers';
+SET item_definition_id = 'common.items.armor.twigsflowers.pants' WHERE item_definition_id = 'common.items.armor.pants.twigsflowers';
 UPDATE item
 SET item_definition_id = 'common.items.armor.twigsleaves.pants' WHERE item_definition_id = 'common.items.armor.pants.twigsleaves';
 UPDATE item
@@ -323,7 +323,7 @@ SET item_definition_id = 'common.items.armor.tarasque.shoulder' WHERE item_defin
 UPDATE item
 SET item_definition_id = 'common.items.armor.twigs.shoulder' WHERE item_definition_id = 'common.items.armor.shoulder.twigs';
 UPDATE item
-SET item_definition_id = 'common.items.armor.twigflowers.shoulder' WHERE item_definition_id = 'common.items.armor.shoulder.twigsflowers';
+SET item_definition_id = 'common.items.armor.twigsflowers.shoulder' WHERE item_definition_id = 'common.items.armor.shoulder.twigsflowers';
 UPDATE item
 SET item_definition_id = 'common.items.armor.twigsleaves.shoulder' WHERE item_definition_id = 'common.items.armor.shoulder.twigsleaves';
 UPDATE item
diff --git a/voxygen/anim/src/character/gliding.rs b/voxygen/anim/src/character/gliding.rs
index 5eb7900bbf..68276ad03a 100644
--- a/voxygen/anim/src/character/gliding.rs
+++ b/voxygen/anim/src/character/gliding.rs
@@ -44,8 +44,8 @@ impl Animation for GlidingAnimation {
         let slowa = (anim_time * 3.0 + PI / 2.0).sin();
 
         let head_look = Vec2::new(
-            (global_time + anim_time / 4.0).floor().mul(7331.0).sin() * 0.5,
-            (global_time + anim_time / 4.0).floor().mul(1337.0).sin() * 0.25,
+            ((global_time + anim_time) / 5.0).floor().mul(7331.0).sin() * 0.5,
+            ((global_time + anim_time) / 5.0).floor().mul(1337.0).sin() * 0.25,
         );
 
         let ori: Vec2<f32> = Vec2::from(orientation);
@@ -71,8 +71,10 @@ impl Animation for GlidingAnimation {
         next.chest.orientation = Quaternion::rotation_z(slowa * 0.02);
 
         next.belt.orientation = Quaternion::rotation_z(slowa * 0.1 + tilt * tiltcancel * 12.0);
+        next.belt.position = Vec3::new(0.0, s_a.belt.0, s_a.belt.1);
 
         next.shorts.orientation = Quaternion::rotation_z(slowa * 0.12 + tilt * tiltcancel * 16.0);
+        next.shorts.position = Vec3::new(0.0, s_a.shorts.0, s_a.shorts.1);
 
         next.hand_l.position = Vec3::new(-9.5, -3.0, 10.0);
         next.hand_l.orientation =
@@ -105,8 +107,8 @@ impl Animation for GlidingAnimation {
             Quaternion::rotation_x(0.8) * Quaternion::rotation_y(slowa * 0.04);
         next.glider.scale = Vec3::one();
 
-        next.torso.position = Vec3::new(0.0, -4.0, 10.0) / 11.0 * s_a.scaler;
-        next.torso.orientation = Quaternion::rotation_x(-0.06 * speed.max(12.0) + slow * 0.04)
+        next.torso.position = Vec3::new(0.0, -1.0, 0.0) / 11.0 * s_a.scaler;
+        next.torso.orientation = Quaternion::rotation_x(-0.03 * speed.max(12.0) + slow * 0.04)
             * Quaternion::rotation_y(tilt * tiltcancel * 32.0);
 
         next
diff --git a/voxygen/anim/src/character/jump.rs b/voxygen/anim/src/character/jump.rs
index e606262f10..fae86e1af7 100644
--- a/voxygen/anim/src/character/jump.rs
+++ b/voxygen/anim/src/character/jump.rs
@@ -43,7 +43,7 @@ impl Animation for JumpAnimation {
         let switch = if random > 0.5 { 1.0 } else { -1.0 };
 
         let speed = Vec2::<f32>::from(velocity).magnitude();
-        let speednorm = speed / 10.0;
+        let speednorm = (speed / 10.0).min(1.0);
 
         let ori: Vec2<f32> = Vec2::from(orientation);
         let last_ori = Vec2::from(last_ori);
diff --git a/voxygen/anim/src/character/stand.rs b/voxygen/anim/src/character/stand.rs
index 0cb8c118ad..30e4e2407d 100644
--- a/voxygen/anim/src/character/stand.rs
+++ b/voxygen/anim/src/character/stand.rs
@@ -34,8 +34,8 @@ impl Animation for StandAnimation {
         let slow = (anim_time * 1.0).sin();
         let impact = (avg_vel.z).max(-15.0);
         let head_look = Vec2::new(
-            (global_time + anim_time / 12.0).floor().mul(7331.0).sin() * 0.3,
-            (global_time + anim_time / 12.0).floor().mul(1337.0).sin() * 0.15,
+            ((global_time + anim_time) / 10.0).floor().mul(7331.0).sin() * 0.15,
+            ((global_time + anim_time) / 10.0).floor().mul(1337.0).sin() * 0.07,
         );
         next.head.scale = Vec3::one() * s_a.head_scale;
         next.chest.scale = Vec3::one() * 1.01;

From 6b1ba22d1f260163973d2cad13ec9fbe9a62b26d Mon Sep 17 00:00:00 2001
From: Jesus Bracho <jessebracho@gmail.com>
Date: Tue, 2 Mar 2021 00:08:46 +0000
Subject: [PATCH 13/16] Implement stacking and splitting

---
 CHANGELOG.md                         |   1 +
 client/src/lib.rs                    |  24 +++++
 common/src/comp/controller.rs        |   8 ++
 common/src/comp/inventory/mod.rs     |  54 +++++++++++
 server/src/events/inventory_manip.rs | 112 +++++++++++++++++++++--
 voxygen/src/hud/mod.rs               |  41 ++++++++-
 voxygen/src/session.rs               |  58 ++++++++++++
 voxygen/src/ui/widgets/slot.rs       | 131 ++++++++++++++++++++++++---
 8 files changed, 406 insertions(+), 23 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e929be2ddb..ba39d8af27 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -39,6 +39,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Talk animation
 - New bosses in 5 lower dungeons
 = New enemies in 5 lower dungeons
+- Item stacking and splitting
 
 ### Changed
 
diff --git a/client/src/lib.rs b/client/src/lib.rs
index c30c5db091..d181381543 100644
--- a/client/src/lib.rs
+++ b/client/src/lib.rs
@@ -668,6 +668,30 @@ impl Client {
 
     pub fn is_dead(&self) -> bool { self.current::<comp::Health>().map_or(false, |h| h.is_dead) }
 
+    pub fn split_swap_slots(&mut self, a: comp::slot::Slot, b: comp::slot::Slot) {
+        match (a, b) {
+            (Slot::Equip(equip), slot) | (slot, Slot::Equip(equip)) => {
+                self.control_action(ControlAction::LoadoutManip(LoadoutManip::Swap(equip, slot)))
+            },
+            (Slot::Inventory(inv1), Slot::Inventory(inv2)) => {
+                self.send_msg(ClientGeneral::ControlEvent(ControlEvent::InventoryManip(
+                    InventoryManip::SplitSwap(inv1, inv2),
+                )))
+            },
+        }
+    }
+
+    pub fn split_drop_slot(&mut self, slot: comp::slot::Slot) {
+        match slot {
+            Slot::Equip(equip) => {
+                self.control_action(ControlAction::LoadoutManip(LoadoutManip::Drop(equip)))
+            },
+            Slot::Inventory(inv) => self.send_msg(ClientGeneral::ControlEvent(
+                ControlEvent::InventoryManip(InventoryManip::SplitDrop(inv)),
+            )),
+        }
+    }
+
     pub fn pick_up(&mut self, entity: EcsEntity) {
         // Get the health component from the entity
 
diff --git a/common/src/comp/controller.rs b/common/src/comp/controller.rs
index 733d47ef2e..20891432fe 100644
--- a/common/src/comp/controller.rs
+++ b/common/src/comp/controller.rs
@@ -23,7 +23,9 @@ pub enum InventoryManip {
     Collect(Vec3<i32>),
     Use(InvSlotId),
     Swap(InvSlotId, InvSlotId),
+    SplitSwap(InvSlotId, InvSlotId),
     Drop(InvSlotId),
+    SplitDrop(InvSlotId),
     CraftRecipe(String),
 }
 
@@ -40,7 +42,9 @@ pub enum SlotManip {
     Collect(Vec3<i32>),
     Use(Slot),
     Swap(Slot, Slot),
+    SplitSwap(Slot, Slot),
     Drop(Slot),
+    SplitDrop(Slot),
     CraftRecipe(String),
 }
 
@@ -63,7 +67,11 @@ impl From<InventoryManip> for SlotManip {
             InventoryManip::Swap(inv1, inv2) => {
                 Self::Swap(Slot::Inventory(inv1), Slot::Inventory(inv2))
             },
+            InventoryManip::SplitSwap(inv1, inv2) => {
+                Self::SplitSwap(Slot::Inventory(inv1), Slot::Inventory(inv2))
+            },
             InventoryManip::Drop(inv) => Self::Drop(Slot::Inventory(inv)),
+            InventoryManip::SplitDrop(inv) => Self::SplitDrop(Slot::Inventory(inv)),
             InventoryManip::CraftRecipe(recipe) => Self::CraftRecipe(recipe),
         }
     }
diff --git a/common/src/comp/inventory/mod.rs b/common/src/comp/inventory/mod.rs
index df78f961a5..666de975d7 100644
--- a/common/src/comp/inventory/mod.rs
+++ b/common/src/comp/inventory/mod.rs
@@ -167,6 +167,32 @@ impl Inventory {
         }
     }
 
+    /// Merge the stack of items at src into the stack at dst if the items are
+    /// compatible and stackable, and return whether anything was changed
+    pub fn merge_stack_into(&mut self, src: InvSlotId, dst: InvSlotId) -> bool {
+        let mut amount = None;
+        if let (Some(srcitem), Some(dstitem)) = (self.get(src), self.get(dst)) {
+            // The equality check ensures the items have the same definition, to avoid e.g.
+            // transmuting coins to diamonds, and the stackable check avoids creating a
+            // stack of swords
+            if srcitem == dstitem && srcitem.is_stackable() {
+                amount = Some(srcitem.amount());
+            }
+        }
+        if let Some(amount) = amount {
+            self.remove(src);
+            let dstitem = self
+                .get_mut(dst)
+                .expect("self.get(dst) was Some right above this");
+            dstitem
+                .increase_amount(amount)
+                .expect("already checked is_stackable");
+            true
+        } else {
+            false
+        }
+    }
+
     /// Checks if inserting item exists in given cell. Inserts an item if it
     /// exists.
     pub fn insert_or_stack_at(
@@ -215,6 +241,11 @@ impl Inventory {
         self.slot(inv_slot_id).and_then(Option::as_ref)
     }
 
+    /// Mutably get content of a slot
+    fn get_mut(&mut self, inv_slot_id: InvSlotId) -> Option<&mut Item> {
+        self.slot_mut(inv_slot_id).and_then(Option::as_mut)
+    }
+
     /// Returns a reference to the item (if any) equipped in the given EquipSlot
     pub fn equipped(&self, equip_slot: EquipSlot) -> Option<&Item> {
         self.loadout.equipped(equip_slot)
@@ -275,6 +306,29 @@ impl Inventory {
         }
     }
 
+    /// Takes half of the items from a slot in the inventory
+    pub fn take_half(
+        &mut self,
+        inv_slot_id: InvSlotId,
+        msm: &MaterialStatManifest,
+    ) -> Option<Item> {
+        if let Some(Some(item)) = self.slot_mut(inv_slot_id) {
+            if item.is_stackable() && item.amount() > 1 {
+                let mut return_item = item.duplicate(msm);
+                let returning_amount = item.amount() / 2;
+                item.decrease_amount(returning_amount).ok()?;
+                return_item
+                    .set_amount(returning_amount)
+                    .expect("Items duplicated from a stackable item must be stackable.");
+                Some(return_item)
+            } else {
+                self.remove(inv_slot_id)
+            }
+        } else {
+            None
+        }
+    }
+
     /// Takes all items from the inventory
     pub fn drain(&mut self) -> impl Iterator<Item = Item> + '_ {
         self.slots_mut()
diff --git a/server/src/events/inventory_manip.rs b/server/src/events/inventory_manip.rs
index 48cc8c0ede..f73e871503 100644
--- a/server/src/events/inventory_manip.rs
+++ b/server/src/events/inventory_manip.rs
@@ -5,7 +5,8 @@ use vek::{Rgb, Vec3};
 
 use common::{
     comp::{
-        self, item,
+        self,
+        item::{self, MaterialStatManifest},
         slot::{self, Slot},
     },
     consts::MAX_PICKUP_RANGE,
@@ -429,15 +430,26 @@ pub fn handle_inventory(server: &mut Server, entity: EcsEntity, manip: comp::Slo
             if let Some(pos) = ecs.read_storage::<comp::Pos>().get(entity) {
                 if let Some(mut inventory) = ecs.write_storage::<comp::Inventory>().get_mut(entity)
                 {
-                    dropped_items.extend(inventory.swap(a, b).into_iter().map(|x| {
-                        (
-                            *pos,
-                            state
-                                .read_component_copied::<comp::Ori>(entity)
-                                .unwrap_or_default(),
-                            x,
-                        )
-                    }));
+                    let mut merged_stacks = false;
+
+                    // If both slots have items and we're attemping to drag from one stack
+                    // into another, stack the items.
+                    if let (Slot::Inventory(slot_a), Slot::Inventory(slot_b)) = (a, b) {
+                        merged_stacks |= inventory.merge_stack_into(slot_a, slot_b);
+                    }
+
+                    // If the stacks weren't mergable carry out a swap.
+                    if !merged_stacks {
+                        dropped_items.extend(inventory.swap(a, b).into_iter().map(|x| {
+                            (
+                                *pos,
+                                state
+                                    .read_component_copied::<comp::Ori>(entity)
+                                    .unwrap_or_default(),
+                                x,
+                            )
+                        }));
+                    }
                 }
             }
 
@@ -447,6 +459,55 @@ pub fn handle_inventory(server: &mut Server, entity: EcsEntity, manip: comp::Slo
             );
         },
 
+        comp::SlotManip::SplitSwap(slot, target) => {
+            let msm = state.ecs().read_resource::<MaterialStatManifest>();
+            let mut inventories = state.ecs().write_storage::<comp::Inventory>();
+            let mut inventory = if let Some(inventory) = inventories.get_mut(entity) {
+                inventory
+            } else {
+                error!(
+                    ?entity,
+                    "Can't manipulate inventory, entity doesn't have one"
+                );
+                return;
+            };
+
+            // If both slots have items and we're attemping to split from one stack
+            // into another, ensure that they are the same type of item. If they are
+            // the same type do nothing, as you don't want to overwrite the existing item.
+
+            if let (Slot::Inventory(source_inv_slot_id), Slot::Inventory(target_inv_slot_id)) =
+                (slot, target)
+            {
+                if let Some(source_item) = inventory.get(source_inv_slot_id) {
+                    if let Some(target_item) = inventory.get(target_inv_slot_id) {
+                        if source_item != target_item {
+                            return;
+                        }
+                    }
+                }
+            }
+
+            let item = match slot {
+                Slot::Inventory(slot) => inventory.take_half(slot, &msm),
+                Slot::Equip(_) => None,
+            };
+
+            if let Some(item) = item {
+                if let Slot::Inventory(target) = target {
+                    inventory.insert_or_stack_at(target, item).ok();
+                }
+            }
+            drop(inventory);
+            drop(inventories);
+            drop(msm);
+
+            state.write_component(
+                entity,
+                comp::InventoryUpdate::new(comp::InventoryUpdateEvent::Swapped),
+            );
+        },
+
         comp::SlotManip::Drop(slot) => {
             let item = match slot {
                 Slot::Inventory(slot) => state
@@ -480,6 +541,37 @@ pub fn handle_inventory(server: &mut Server, entity: EcsEntity, manip: comp::Slo
             );
         },
 
+        comp::SlotManip::SplitDrop(slot) => {
+            let msm = state.ecs().read_resource::<MaterialStatManifest>();
+            let item = match slot {
+                Slot::Inventory(slot) => state
+                    .ecs()
+                    .write_storage::<comp::Inventory>()
+                    .get_mut(entity)
+                    .and_then(|mut inv| inv.take_half(slot, &msm)),
+                Slot::Equip(_) => None,
+            };
+
+            // FIXME: We should really require the drop and write to be atomic!
+            if let (Some(mut item), Some(pos)) =
+                (item, state.ecs().read_storage::<comp::Pos>().get(entity))
+            {
+                item.put_in_world();
+                dropped_items.push((
+                    *pos,
+                    state
+                        .read_component_copied::<comp::Ori>(entity)
+                        .unwrap_or_default(),
+                    item,
+                ));
+            }
+            drop(msm);
+            state.write_component(
+                entity,
+                comp::InventoryUpdate::new(comp::InventoryUpdateEvent::Dropped),
+            );
+        },
+
         comp::SlotManip::CraftRecipe(recipe) => {
             if let Some(mut inv) = state
                 .ecs()
diff --git a/voxygen/src/hud/mod.rs b/voxygen/src/hud/mod.rs
index 706bed30b3..7550b7bbf6 100644
--- a/voxygen/src/hud/mod.rs
+++ b/voxygen/src/hud/mod.rs
@@ -391,7 +391,13 @@ pub enum Event {
         slot_b: comp::slot::Slot,
         bypass_dialog: bool,
     },
+    SplitSwapSlots {
+        slot_a: comp::slot::Slot,
+        slot_b: comp::slot::Slot,
+        bypass_dialog: bool,
+    },
     DropSlot(comp::slot::Slot),
+    SplitDropSlot(comp::slot::Slot),
     ChangeHotbarState(Box<HotbarState>),
     TradeAction(TradeAction),
     Ability3(bool),
@@ -769,7 +775,15 @@ impl Hud {
         let hotbar_state =
             HotbarState::new(global_state.profile.get_hotbar_slots(server, character_id));
 
-        let slot_manager = slots::SlotManager::new(ui.id_generator(), Vec2::broadcast(40.0));
+        let slot_manager = slots::SlotManager::new(
+            ui.id_generator(),
+            Vec2::broadcast(40.0)
+            // TODO(heyzoos) Will be useful for whoever works on rendering the number of items "in hand".
+            // fonts.cyri.conrod_id,
+            // Vec2::new(1.0, 1.0),
+            // fonts.cyri.scale(12),
+            // TEXT_COLOR,
+        );
 
         Self {
             ui,
@@ -2788,6 +2802,31 @@ impl Hud {
                         }
                     }
                 },
+                slot::Event::SplitDropped(from) => {
+                    // Drop item
+                    if let Some(from) = to_slot(from) {
+                        events.push(Event::SplitDropSlot(from));
+                    } else if let Hotbar(h) = from {
+                        self.hotbar.clear_slot(h);
+                        events.push(Event::ChangeHotbarState(Box::new(self.hotbar.to_owned())));
+                    }
+                },
+                slot::Event::SplitDragged(a, b) => {
+                    // Swap between slots
+                    if let (Some(a), Some(b)) = (to_slot(a), to_slot(b)) {
+                        events.push(Event::SplitSwapSlots {
+                            slot_a: a,
+                            slot_b: b,
+                            bypass_dialog: false,
+                        });
+                    } else if let (Inventory(i), Hotbar(h)) = (a, b) {
+                        self.hotbar.add_inventory_link(h, i.slot);
+                        events.push(Event::ChangeHotbarState(Box::new(self.hotbar.to_owned())));
+                    } else if let (Hotbar(a), Hotbar(b)) = (a, b) {
+                        self.hotbar.swap(a, b);
+                        events.push(Event::ChangeHotbarState(Box::new(self.hotbar.to_owned())));
+                    }
+                },
                 slot::Event::Used(from) => {
                     // Item used (selected and then clicked again)
                     if let Some(from) = to_slot(from) {
diff --git a/voxygen/src/session.rs b/voxygen/src/session.rs
index b37dec9d5e..a7e863c183 100644
--- a/voxygen/src/session.rs
+++ b/voxygen/src/session.rs
@@ -1136,6 +1136,57 @@ impl PlayState for SessionState {
                             self.client.borrow_mut().swap_slots(slot_a, slot_b);
                         }
                     },
+                    HudEvent::SplitSwapSlots {
+                        slot_a,
+                        slot_b,
+                        bypass_dialog,
+                    } => {
+                        let mut move_allowed = true;
+                        if !bypass_dialog {
+                            if let Some(inventory) = self
+                                .client
+                                .borrow()
+                                .state()
+                                .ecs()
+                                .read_storage::<comp::Inventory>()
+                                .get(self.client.borrow().entity())
+                            {
+                                match (slot_a, slot_b) {
+                                    (Slot::Inventory(inv_slot), Slot::Equip(equip_slot))
+                                    | (Slot::Equip(equip_slot), Slot::Inventory(inv_slot)) => {
+                                        if !inventory.can_swap(inv_slot, equip_slot) {
+                                            move_allowed = false;
+                                        } else {
+                                            let slot_deficit =
+                                                inventory.free_after_swap(equip_slot, inv_slot);
+                                            if slot_deficit < 0 {
+                                                self.hud.set_prompt_dialog(
+                                                    PromptDialogSettings::new(
+                                                        format!(
+                                                            "This will result in dropping {} \
+                                                             item(s) on the ground. Are you sure?",
+                                                            slot_deficit.abs()
+                                                        ),
+                                                        HudEvent::SwapSlots {
+                                                            slot_a,
+                                                            slot_b,
+                                                            bypass_dialog: true,
+                                                        },
+                                                        None,
+                                                    ),
+                                                );
+                                                move_allowed = false;
+                                            }
+                                        }
+                                    },
+                                    _ => {},
+                                }
+                            }
+                        };
+                        if move_allowed {
+                            self.client.borrow_mut().split_swap_slots(slot_a, slot_b);
+                        }
+                    },
                     HudEvent::DropSlot(x) => {
                         let mut client = self.client.borrow_mut();
                         client.drop_slot(x);
@@ -1143,6 +1194,13 @@ impl PlayState for SessionState {
                             client.disable_lantern();
                         }
                     },
+                    HudEvent::SplitDropSlot(x) => {
+                        let mut client = self.client.borrow_mut();
+                        client.split_drop_slot(x);
+                        if let comp::slot::Slot::Equip(comp::slot::EquipSlot::Lantern) = x {
+                            client.disable_lantern();
+                        }
+                    },
                     HudEvent::ChangeHotbarState(state) => {
                         let client = self.client.borrow();
 
diff --git a/voxygen/src/ui/widgets/slot.rs b/voxygen/src/ui/widgets/slot.rs
index b190acb5c4..2a936c6712 100644
--- a/voxygen/src/ui/widgets/slot.rs
+++ b/voxygen/src/ui/widgets/slot.rs
@@ -94,7 +94,13 @@ where
 
 #[derive(Clone, Copy)]
 enum ManagerState<K> {
-    Dragging(widget::Id, K, image::Id),
+    Dragging(
+        widget::Id,
+        K,
+        image::Id,
+        /// Amount of items being dragged in the stack.
+        Option<u32>,
+    ),
     Selected(widget::Id, K),
     Idle,
 }
@@ -110,6 +116,10 @@ pub enum Event<K> {
     Dragged(K, K),
     // Dragged to open space
     Dropped(K),
+    // Dropped half of the stack
+    SplitDropped(K),
+    // Dragged half of the stack
+    SplitDragged(K, K),
     // Clicked while selected
     Used(K),
 }
@@ -127,21 +137,56 @@ pub struct SlotManager<S: SumSlot> {
     // Note: could potentially be specialized for each slot if needed
     drag_img_size: Vec2<f32>,
     pub mouse_over_slot: Option<S>,
+    /* TODO(heyzoos) Will be useful for whoever works on rendering the number of items "in
+     * hand".
+     *
+     * drag_amount_id: widget::Id,
+     * drag_amount_shadow_id: widget::Id, */
+
+    /* Asset ID pointing to a font set.
+     * amount_font: font::Id, */
+
+    /* Specifies the size of the font used to display number of items held in
+     * a stack when dragging.
+     * amount_font_size: u32, */
+
+    /* Specifies how much space should be used in the margins of the item
+     * amount relative to the slot.
+     * amount_margins: Vec2<f32>, */
+
+    /* Specifies the color of the text used to display the number of items held
+     * in a stack when dragging.
+     * amount_text_color: Color, */
 }
 
 impl<S> SlotManager<S>
 where
     S: SumSlot,
 {
-    pub fn new(mut gen: widget::id::Generator, drag_img_size: Vec2<f32>) -> Self {
+    pub fn new(
+        mut gen: widget::id::Generator,
+        drag_img_size: Vec2<f32>,
+        /* TODO(heyzoos) Will be useful for whoever works on rendering the number of items "in
+         * hand". amount_font: font::Id,
+         * amount_margins: Vec2<f32>,
+         * amount_font_size: u32,
+         * amount_text_color: Color, */
+    ) -> Self {
         Self {
             state: ManagerState::Idle,
             slot_ids: Vec::new(),
             slots: Vec::new(),
             events: Vec::new(),
             drag_id: gen.next(),
-            drag_img_size,
             mouse_over_slot: None,
+            // TODO(heyzoos) Will be useful for whoever works on rendering the number of items "in
+            // hand". drag_amount_id: gen.next(),
+            // drag_amount_shadow_id: gen.next(),
+            // amount_font,
+            // amount_font_size,
+            // amount_margins,
+            // amount_text_color,
+            drag_img_size,
         }
     }
 
@@ -166,8 +211,32 @@ where
 
         // If dragging and mouse is released check if there is a slot widget under the
         // mouse
-        if let ManagerState::Dragging(_, slot, content_img) = &self.state {
+        if let ManagerState::Dragging(_, slot, content_img, drag_amount) = &self.state {
             let content_img = *content_img;
+            let drag_amount = *drag_amount;
+
+            // If we are dragging and we right click, drop half the stack
+            // on the ground or into the slot under the cursor. This only
+            // works with open slots or slots containing the same kind of
+            // item.
+
+            if drag_amount.is_some() {
+                if let Some(id) = input.widget_under_mouse {
+                    if ui.widget_input(id).clicks().right().next().is_some() {
+                        if id == ui.window {
+                            let temp_slot = *slot;
+                            self.events.push(Event::SplitDropped(temp_slot));
+                        } else if let Some(idx) = slot_ids.iter().position(|slot_id| *slot_id == id)
+                        {
+                            let (from, to) = (*slot, slots[idx]);
+                            if from != to {
+                                self.events.push(Event::SplitDragged(from, to));
+                            }
+                        }
+                    }
+                }
+            }
+
             if let mouse::ButtonPosition::Up = input.mouse.buttons.left() {
                 // Get widget under the mouse
                 if let Some(id) = input.widget_under_mouse {
@@ -186,6 +255,7 @@ where
                 // Mouse released stop dragging
                 self.state = ManagerState::Idle;
             }
+
             // Draw image of contents being dragged
             let [mouse_x, mouse_y] = input.mouse.xy;
             let size = self.drag_img_size.map(|e| e as f64).into_array();
@@ -193,6 +263,34 @@ where
                 .wh(size)
                 .xy([mouse_x, mouse_y])
                 .set(self.drag_id, ui);
+
+            // TODO(heyzoos) Will be useful for whoever works on rendering the
+            // number of items "in hand".
+            //
+            // if let Some(drag_amount) = drag_amount {
+            //     Text::new(format!("{}", drag_amount).as_str())
+            //         .parent(self.drag_id)
+            //         .font_id(self.amount_font)
+            //         .font_size(self.amount_font_size)
+            //         .bottom_right_with_margins_on(
+            //             self.drag_id,
+            //             self.amount_margins.x as f64,
+            //             self.amount_margins.y as f64,
+            //         )
+            //         .color(Color::Rgba(0.0, 0.0, 0.0, 1.0))
+            //         .set(self.drag_amount_shadow_id, ui);
+            //     Text::new(format!("{}", drag_amount).as_str())
+            //         .parent(self.drag_id)
+            //         .font_id(self.amount_font)
+            //         .font_size(self.amount_font_size)
+            //         .bottom_right_with_margins_on(
+            //             self.drag_id,
+            //             self.amount_margins.x as f64,
+            //             self.amount_margins.y as f64,
+            //         )
+            //         .color(self.amount_text_color)
+            //         .set(self.drag_amount_id, ui);
+            // }
         }
 
         std::mem::replace(&mut self.events, Vec::new())
@@ -204,6 +302,7 @@ where
         slot: S,
         ui: &conrod_core::Ui,
         content_img: Option<Vec<image::Id>>,
+        drag_amount: Option<u32>,
     ) -> Interaction {
         // Add to list of slots
         self.slot_ids.push(widget);
@@ -212,7 +311,7 @@ where
         let filled = content_img.is_some();
         // If the slot is no longer filled deselect it or cancel dragging
         match &self.state {
-            ManagerState::Selected(id, _) | ManagerState::Dragging(id, _, _)
+            ManagerState::Selected(id, _) | ManagerState::Dragging(id, _, _, _)
                 if *id == widget && !filled =>
             {
                 self.state = ManagerState::Idle;
@@ -223,7 +322,7 @@ where
         // If this is the selected/dragged widget make sure the slot value is up to date
         match &mut self.state {
             ManagerState::Selected(id, stored_slot)
-            | ManagerState::Dragging(id, stored_slot, _)
+            | ManagerState::Dragging(id, stored_slot, _, _)
                 if *id == widget =>
             {
                 *stored_slot = slot
@@ -278,24 +377,26 @@ where
                     // If something is selected, deselect
                     self.state = ManagerState::Idle;
                 },
-                ManagerState::Dragging(_, _, _) => {},
+                ManagerState::Dragging(_, _, _, _) => {},
             }
         }
 
         // If not dragging and there is a drag event on this slot start dragging
         if input.drags().left().next().is_some()
-            && !matches!(self.state, ManagerState::Dragging(_, _, _))
+            && !matches!(self.state, ManagerState::Dragging(_, _, _, _))
         {
             // Start dragging if widget is filled
-            if let Some(img) = content_img {
-                self.state = ManagerState::Dragging(widget, slot, img[0]);
+            if let Some(images) = content_img {
+                if !images.is_empty() {
+                    self.state = ManagerState::Dragging(widget, slot, images[0], drag_amount);
+                }
             }
         }
 
         // Determine whether this slot is being interacted with
         match self.state {
             ManagerState::Selected(id, _) if id == widget => Interaction::Selected,
-            ManagerState::Dragging(id, _, _) if id == widget => Interaction::Dragging,
+            ManagerState::Dragging(id, _, _, _) if id == widget => Interaction::Dragging,
             _ => Interaction::None,
         }
     }
@@ -488,7 +589,13 @@ where
         let content_images = state.cached_images.as_ref().map(|c| c.1.clone());
         // Get whether this slot is selected
         let interaction = self.slot_manager.map_or(Interaction::None, |m| {
-            m.update(id, slot_key.into(), ui, content_images.clone())
+            m.update(
+                id,
+                slot_key.into(),
+                ui,
+                content_images.clone(),
+                slot_key.amount(content_source),
+            )
         });
         // No content if it is being dragged
         let content_images = if let Interaction::Dragging = interaction {

From 06ecf398db6a3ecb690800a5ffb9860852d2bcbe Mon Sep 17 00:00:00 2001
From: Sam <samuelkeiffer@gmail.com>
Date: Mon, 1 Mar 2021 17:40:42 -0500
Subject: [PATCH 14/16] Item use is now goes through a control action rather
 than a control event.

---
 client/src/lib.rs                    | 51 ++++++++++++----------------
 common/src/comp/controller.rs        | 46 ++++++++++++-------------
 common/src/comp/mod.rs               |  2 +-
 common/src/event.rs                  |  2 +-
 common/src/states/behavior.rs        | 10 +++---
 common/src/states/dance.rs           |  6 ++--
 common/src/states/glide_wield.rs     |  6 ++--
 common/src/states/idle.rs            |  6 ++--
 common/src/states/sit.rs             |  6 ++--
 common/src/states/sneak.rs           |  6 ++--
 common/src/states/talk.rs            |  6 ++--
 common/src/states/utils.rs           | 11 +++---
 common/src/states/wielding.rs        | 14 ++++----
 common/sys/src/controller.rs         |  4 +--
 server/src/events/inventory_manip.rs | 25 +++++---------
 15 files changed, 91 insertions(+), 110 deletions(-)

diff --git a/client/src/lib.rs b/client/src/lib.rs
index d181381543..bacc5d2e83 100644
--- a/client/src/lib.rs
+++ b/client/src/lib.rs
@@ -27,7 +27,7 @@ use common::{
         skills::Skill,
         slot::Slot,
         ChatMode, ControlAction, ControlEvent, Controller, ControllerInputs, GroupManip,
-        InventoryManip, InventoryUpdateEvent, LoadoutManip,
+        InventoryAction, InventoryEvent, InventoryUpdateEvent,
     },
     event::{EventBus, LocalEvent},
     grid::Grid,
@@ -621,24 +621,17 @@ impl Client {
     }
 
     pub fn use_slot(&mut self, slot: Slot) {
-        match slot {
-            Slot::Equip(equip) => {
-                self.control_action(ControlAction::LoadoutManip(LoadoutManip::Use(equip)))
-            },
-            Slot::Inventory(inv) => self.send_msg(ClientGeneral::ControlEvent(
-                ControlEvent::InventoryManip(InventoryManip::Use(inv)),
-            )),
-        }
+        self.control_action(ControlAction::InventoryAction(InventoryAction::Use(slot)))
     }
 
     pub fn swap_slots(&mut self, a: Slot, b: Slot) {
         match (a, b) {
-            (Slot::Equip(equip), slot) | (slot, Slot::Equip(equip)) => {
-                self.control_action(ControlAction::LoadoutManip(LoadoutManip::Swap(equip, slot)))
-            },
+            (Slot::Equip(equip), slot) | (slot, Slot::Equip(equip)) => self.control_action(
+                ControlAction::InventoryAction(InventoryAction::Swap(equip, slot)),
+            ),
             (Slot::Inventory(inv1), Slot::Inventory(inv2)) => {
-                self.send_msg(ClientGeneral::ControlEvent(ControlEvent::InventoryManip(
-                    InventoryManip::Swap(inv1, inv2),
+                self.send_msg(ClientGeneral::ControlEvent(ControlEvent::InventoryEvent(
+                    InventoryEvent::Swap(inv1, inv2),
                 )))
             },
         }
@@ -647,10 +640,10 @@ impl Client {
     pub fn drop_slot(&mut self, slot: Slot) {
         match slot {
             Slot::Equip(equip) => {
-                self.control_action(ControlAction::LoadoutManip(LoadoutManip::Drop(equip)))
+                self.control_action(ControlAction::InventoryAction(InventoryAction::Drop(equip)))
             },
             Slot::Inventory(inv) => self.send_msg(ClientGeneral::ControlEvent(
-                ControlEvent::InventoryManip(InventoryManip::Drop(inv)),
+                ControlEvent::InventoryEvent(InventoryEvent::Drop(inv)),
             )),
         }
     }
@@ -670,12 +663,12 @@ impl Client {
 
     pub fn split_swap_slots(&mut self, a: comp::slot::Slot, b: comp::slot::Slot) {
         match (a, b) {
-            (Slot::Equip(equip), slot) | (slot, Slot::Equip(equip)) => {
-                self.control_action(ControlAction::LoadoutManip(LoadoutManip::Swap(equip, slot)))
-            },
+            (Slot::Equip(equip), slot) | (slot, Slot::Equip(equip)) => self.control_action(
+                ControlAction::InventoryAction(InventoryAction::Swap(equip, slot)),
+            ),
             (Slot::Inventory(inv1), Slot::Inventory(inv2)) => {
-                self.send_msg(ClientGeneral::ControlEvent(ControlEvent::InventoryManip(
-                    InventoryManip::SplitSwap(inv1, inv2),
+                self.send_msg(ClientGeneral::ControlEvent(ControlEvent::InventoryEvent(
+                    InventoryEvent::SplitSwap(inv1, inv2),
                 )))
             },
         }
@@ -684,10 +677,10 @@ impl Client {
     pub fn split_drop_slot(&mut self, slot: comp::slot::Slot) {
         match slot {
             Slot::Equip(equip) => {
-                self.control_action(ControlAction::LoadoutManip(LoadoutManip::Drop(equip)))
+                self.control_action(ControlAction::InventoryAction(InventoryAction::Drop(equip)))
             },
             Slot::Inventory(inv) => self.send_msg(ClientGeneral::ControlEvent(
-                ControlEvent::InventoryManip(InventoryManip::SplitDrop(inv)),
+                ControlEvent::InventoryEvent(InventoryEvent::SplitDrop(inv)),
             )),
         }
     }
@@ -701,8 +694,8 @@ impl Client {
                 return;
             }
 
-            self.send_msg(ClientGeneral::ControlEvent(ControlEvent::InventoryManip(
-                InventoryManip::Pickup(uid),
+            self.send_msg(ClientGeneral::ControlEvent(ControlEvent::InventoryEvent(
+                InventoryEvent::Pickup(uid),
             )));
         }
     }
@@ -740,8 +733,8 @@ impl Client {
 
     pub fn craft_recipe(&mut self, recipe: &str) -> bool {
         if self.can_craft_recipe(recipe) {
-            self.send_msg(ClientGeneral::ControlEvent(ControlEvent::InventoryManip(
-                InventoryManip::CraftRecipe(recipe.to_string()),
+            self.send_msg(ClientGeneral::ControlEvent(ControlEvent::InventoryEvent(
+                InventoryEvent::CraftRecipe(recipe.to_string()),
             )));
             true
         } else {
@@ -1048,8 +1041,8 @@ impl Client {
     }
 
     pub fn collect_block(&mut self, pos: Vec3<i32>) {
-        self.send_msg(ClientGeneral::ControlEvent(ControlEvent::InventoryManip(
-            InventoryManip::Collect(pos),
+        self.send_msg(ClientGeneral::ControlEvent(ControlEvent::InventoryEvent(
+            InventoryEvent::Collect(pos),
         )));
     }
 
diff --git a/common/src/comp/controller.rs b/common/src/comp/controller.rs
index 20891432fe..000c13de57 100644
--- a/common/src/comp/controller.rs
+++ b/common/src/comp/controller.rs
@@ -18,10 +18,9 @@ use vek::*;
 pub const DEFAULT_HOLD_DURATION: Duration = Duration::from_millis(200);
 
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-pub enum InventoryManip {
+pub enum InventoryEvent {
     Pickup(Uid),
     Collect(Vec3<i32>),
-    Use(InvSlotId),
     Swap(InvSlotId, InvSlotId),
     SplitSwap(InvSlotId, InvSlotId),
     Drop(InvSlotId),
@@ -30,14 +29,14 @@ pub enum InventoryManip {
 }
 
 #[derive(Clone, Copy, Debug, PartialEq, Serialize, Deserialize)]
-pub enum LoadoutManip {
-    Use(EquipSlot),
+pub enum InventoryAction {
     Swap(EquipSlot, Slot),
     Drop(EquipSlot),
+    Use(Slot),
 }
 
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-pub enum SlotManip {
+pub enum InventoryManip {
     Pickup(Uid),
     Collect(Vec3<i32>),
     Use(Slot),
@@ -48,31 +47,30 @@ pub enum SlotManip {
     CraftRecipe(String),
 }
 
-impl From<LoadoutManip> for SlotManip {
-    fn from(loadout_manip: LoadoutManip) -> Self {
-        match loadout_manip {
-            LoadoutManip::Use(equip) => Self::Use(Slot::Equip(equip)),
-            LoadoutManip::Swap(equip, slot) => Self::Swap(Slot::Equip(equip), slot),
-            LoadoutManip::Drop(equip) => Self::Drop(Slot::Equip(equip)),
+impl From<InventoryAction> for InventoryManip {
+    fn from(inv_action: InventoryAction) -> Self {
+        match inv_action {
+            InventoryAction::Use(slot) => Self::Use(slot),
+            InventoryAction::Swap(equip, slot) => Self::Swap(Slot::Equip(equip), slot),
+            InventoryAction::Drop(equip) => Self::Drop(Slot::Equip(equip)),
         }
     }
 }
 
-impl From<InventoryManip> for SlotManip {
-    fn from(inv_manip: InventoryManip) -> Self {
-        match inv_manip {
-            InventoryManip::Pickup(pickup) => Self::Pickup(pickup),
-            InventoryManip::Collect(collect) => Self::Collect(collect),
-            InventoryManip::Use(inv) => Self::Use(Slot::Inventory(inv)),
-            InventoryManip::Swap(inv1, inv2) => {
+impl From<InventoryEvent> for InventoryManip {
+    fn from(inv_event: InventoryEvent) -> Self {
+        match inv_event {
+            InventoryEvent::Pickup(pickup) => Self::Pickup(pickup),
+            InventoryEvent::Collect(collect) => Self::Collect(collect),
+            InventoryEvent::Swap(inv1, inv2) => {
                 Self::Swap(Slot::Inventory(inv1), Slot::Inventory(inv2))
             },
-            InventoryManip::SplitSwap(inv1, inv2) => {
+            InventoryEvent::SplitSwap(inv1, inv2) => {
                 Self::SplitSwap(Slot::Inventory(inv1), Slot::Inventory(inv2))
             },
-            InventoryManip::Drop(inv) => Self::Drop(Slot::Inventory(inv)),
-            InventoryManip::SplitDrop(inv) => Self::SplitDrop(Slot::Inventory(inv)),
-            InventoryManip::CraftRecipe(recipe) => Self::CraftRecipe(recipe),
+            InventoryEvent::Drop(inv) => Self::Drop(Slot::Inventory(inv)),
+            InventoryEvent::SplitDrop(inv) => Self::SplitDrop(Slot::Inventory(inv)),
+            InventoryEvent::CraftRecipe(recipe) => Self::CraftRecipe(recipe),
         }
     }
 }
@@ -95,7 +93,7 @@ pub enum ControlEvent {
     PerformTradeAction(TradeId, TradeAction),
     Mount(Uid),
     Unmount,
-    InventoryManip(InventoryManip),
+    InventoryEvent(InventoryEvent),
     GroupManip(GroupManip),
     RemoveBuff(BuffKind),
     Respawn,
@@ -104,7 +102,7 @@ pub enum ControlEvent {
 #[derive(Clone, Copy, Debug, PartialEq, Serialize, Deserialize)]
 pub enum ControlAction {
     SwapEquippedWeapons,
-    LoadoutManip(LoadoutManip),
+    InventoryAction(InventoryAction),
     Wield,
     GlideWield,
     Unwield,
diff --git a/common/src/comp/mod.rs b/common/src/comp/mod.rs
index 8e342cde4e..b2ffefc035 100644
--- a/common/src/comp/mod.rs
+++ b/common/src/comp/mod.rs
@@ -62,7 +62,7 @@ pub use self::{
     combo::Combo,
     controller::{
         Climb, ControlAction, ControlEvent, Controller, ControllerInputs, GroupManip, Input,
-        InventoryManip, LoadoutManip, MountState, Mounting, SlotManip,
+        InventoryAction, InventoryEvent, InventoryManip, MountState, Mounting,
     },
     energy::{Energy, EnergyChange, EnergySource},
     group::Group,
diff --git a/common/src/event.rs b/common/src/event.rs
index ecf2f784ea..f4b97f95e1 100644
--- a/common/src/event.rs
+++ b/common/src/event.rs
@@ -54,7 +54,7 @@ pub enum ServerEvent {
         entity: EcsEntity,
         cause: comp::HealthSource,
     },
-    InventoryManip(EcsEntity, comp::SlotManip),
+    InventoryManip(EcsEntity, comp::InventoryManip),
     GroupManip(EcsEntity, comp::GroupManip),
     Respawn(EcsEntity),
     Shoot {
diff --git a/common/src/states/behavior.rs b/common/src/states/behavior.rs
index f791dd13d1..cbc31ec5de 100644
--- a/common/src/states/behavior.rs
+++ b/common/src/states/behavior.rs
@@ -1,8 +1,8 @@
 use crate::{
     comp::{
         item::MaterialStatManifest, Beam, Body, CharacterState, Combo, ControlAction, Controller,
-        ControllerInputs, Energy, Health, Inventory, LoadoutManip, Melee, Ori, PhysicsState, Pos,
-        StateUpdate, Stats, Vel,
+        ControllerInputs, Energy, Health, Inventory, InventoryAction, Melee, Ori, PhysicsState,
+        Pos, StateUpdate, Stats, Vel,
     },
     resources::DeltaTime,
     uid::Uid,
@@ -18,7 +18,7 @@ pub trait CharacterBehavior {
     fn behavior(&self, data: &JoinData) -> StateUpdate;
     // Impl these to provide behavior for these inputs
     fn swap_equipped_weapons(&self, data: &JoinData) -> StateUpdate { StateUpdate::from(data) }
-    fn manipulate_loadout(&self, data: &JoinData, _loadout_manip: LoadoutManip) -> StateUpdate {
+    fn manipulate_loadout(&self, data: &JoinData, _inv_action: InventoryAction) -> StateUpdate {
         StateUpdate::from(data)
     }
     fn wield(&self, data: &JoinData) -> StateUpdate { StateUpdate::from(data) }
@@ -32,9 +32,7 @@ pub trait CharacterBehavior {
     fn handle_event(&self, data: &JoinData, event: ControlAction) -> StateUpdate {
         match event {
             ControlAction::SwapEquippedWeapons => self.swap_equipped_weapons(data),
-            ControlAction::LoadoutManip(loadout_manip) => {
-                self.manipulate_loadout(data, loadout_manip)
-            },
+            ControlAction::InventoryAction(inv_action) => self.manipulate_loadout(data, inv_action),
             ControlAction::Wield => self.wield(data),
             ControlAction::GlideWield => self.glide_wield(data),
             ControlAction::Unwield => self.unwield(data),
diff --git a/common/src/states/dance.rs b/common/src/states/dance.rs
index d5a039ac1e..2966600bfd 100644
--- a/common/src/states/dance.rs
+++ b/common/src/states/dance.rs
@@ -1,6 +1,6 @@
 use super::utils::*;
 use crate::{
-    comp::{CharacterState, LoadoutManip, StateUpdate},
+    comp::{CharacterState, InventoryAction, StateUpdate},
     states::behavior::{CharacterBehavior, JoinData},
 };
 use serde::{Deserialize, Serialize};
@@ -42,9 +42,9 @@ impl CharacterBehavior for Data {
         update
     }
 
-    fn manipulate_loadout(&self, data: &JoinData, loadout_manip: LoadoutManip) -> StateUpdate {
+    fn manipulate_loadout(&self, data: &JoinData, inv_action: InventoryAction) -> StateUpdate {
         let mut update = StateUpdate::from(data);
-        handle_manipulate_loadout(&data, &mut update, loadout_manip);
+        handle_manipulate_loadout(&data, &mut update, inv_action);
         update
     }
 }
diff --git a/common/src/states/glide_wield.rs b/common/src/states/glide_wield.rs
index 2cd42d6313..ffc1568d64 100644
--- a/common/src/states/glide_wield.rs
+++ b/common/src/states/glide_wield.rs
@@ -1,6 +1,6 @@
 use super::utils::*;
 use crate::{
-    comp::{slot::EquipSlot, CharacterState, EnergySource, LoadoutManip, StateUpdate},
+    comp::{slot::EquipSlot, CharacterState, EnergySource, InventoryAction, StateUpdate},
     states::behavior::{CharacterBehavior, JoinData},
 };
 
@@ -69,9 +69,9 @@ impl CharacterBehavior for Data {
         update
     }
 
-    fn manipulate_loadout(&self, data: &JoinData, loadout_manip: LoadoutManip) -> StateUpdate {
+    fn manipulate_loadout(&self, data: &JoinData, inv_action: InventoryAction) -> StateUpdate {
         let mut update = StateUpdate::from(data);
-        handle_manipulate_loadout(&data, &mut update, loadout_manip);
+        handle_manipulate_loadout(&data, &mut update, inv_action);
         update
     }
 }
diff --git a/common/src/states/idle.rs b/common/src/states/idle.rs
index 7ffa0f351e..a32728844e 100644
--- a/common/src/states/idle.rs
+++ b/common/src/states/idle.rs
@@ -1,6 +1,6 @@
 use super::utils::*;
 use crate::{
-    comp::{LoadoutManip, StateUpdate},
+    comp::{InventoryAction, StateUpdate},
     states::behavior::{CharacterBehavior, JoinData},
 };
 
@@ -61,9 +61,9 @@ impl CharacterBehavior for Data {
         update
     }
 
-    fn manipulate_loadout(&self, data: &JoinData, loadout_manip: LoadoutManip) -> StateUpdate {
+    fn manipulate_loadout(&self, data: &JoinData, inv_action: InventoryAction) -> StateUpdate {
         let mut update = StateUpdate::from(data);
-        handle_manipulate_loadout(&data, &mut update, loadout_manip);
+        handle_manipulate_loadout(&data, &mut update, inv_action);
         update
     }
 }
diff --git a/common/src/states/sit.rs b/common/src/states/sit.rs
index 07ddbf1eb3..5091e0be45 100644
--- a/common/src/states/sit.rs
+++ b/common/src/states/sit.rs
@@ -1,6 +1,6 @@
 use super::utils::*;
 use crate::{
-    comp::{CharacterState, LoadoutManip, StateUpdate},
+    comp::{CharacterState, InventoryAction, StateUpdate},
     states::behavior::{CharacterBehavior, JoinData},
 };
 use serde::{Deserialize, Serialize};
@@ -42,9 +42,9 @@ impl CharacterBehavior for Data {
         update
     }
 
-    fn manipulate_loadout(&self, data: &JoinData, loadout_manip: LoadoutManip) -> StateUpdate {
+    fn manipulate_loadout(&self, data: &JoinData, inv_action: InventoryAction) -> StateUpdate {
         let mut update = StateUpdate::from(data);
-        handle_manipulate_loadout(&data, &mut update, loadout_manip);
+        handle_manipulate_loadout(&data, &mut update, inv_action);
         update
     }
 }
diff --git a/common/src/states/sneak.rs b/common/src/states/sneak.rs
index 4a1b13e444..03fe51772a 100644
--- a/common/src/states/sneak.rs
+++ b/common/src/states/sneak.rs
@@ -1,6 +1,6 @@
 use super::utils::*;
 use crate::{
-    comp::{CharacterState, LoadoutManip, StateUpdate},
+    comp::{CharacterState, InventoryAction, StateUpdate},
     states::behavior::{CharacterBehavior, JoinData},
 };
 
@@ -60,9 +60,9 @@ impl CharacterBehavior for Data {
         update
     }
 
-    fn manipulate_loadout(&self, data: &JoinData, loadout_manip: LoadoutManip) -> StateUpdate {
+    fn manipulate_loadout(&self, data: &JoinData, inv_action: InventoryAction) -> StateUpdate {
         let mut update = StateUpdate::from(data);
-        handle_manipulate_loadout(&data, &mut update, loadout_manip);
+        handle_manipulate_loadout(&data, &mut update, inv_action);
         update
     }
 }
diff --git a/common/src/states/talk.rs b/common/src/states/talk.rs
index 9519865815..9017ef16e0 100644
--- a/common/src/states/talk.rs
+++ b/common/src/states/talk.rs
@@ -1,6 +1,6 @@
 use super::utils::*;
 use crate::{
-    comp::{CharacterState, LoadoutManip, StateUpdate},
+    comp::{CharacterState, InventoryAction, StateUpdate},
     states::behavior::{CharacterBehavior, JoinData},
 };
 use serde::{Deserialize, Serialize};
@@ -47,9 +47,9 @@ impl CharacterBehavior for Data {
         update
     }
 
-    fn manipulate_loadout(&self, data: &JoinData, loadout_manip: LoadoutManip) -> StateUpdate {
+    fn manipulate_loadout(&self, data: &JoinData, inv_action: InventoryAction) -> StateUpdate {
         let mut update = StateUpdate::from(data);
-        handle_manipulate_loadout(&data, &mut update, loadout_manip);
+        handle_manipulate_loadout(&data, &mut update, inv_action);
         update
     }
 }
diff --git a/common/src/states/utils.rs b/common/src/states/utils.rs
index 032173629d..e2913acbe7 100644
--- a/common/src/states/utils.rs
+++ b/common/src/states/utils.rs
@@ -5,7 +5,7 @@ use crate::{
         item::{Hands, ItemKind, Tool, ToolKind},
         quadruped_low, quadruped_medium, quadruped_small,
         skills::Skill,
-        theropod, Body, CharacterAbility, CharacterState, LoadoutManip, StateUpdate,
+        theropod, Body, CharacterAbility, CharacterState, InventoryAction, StateUpdate,
     },
     consts::{FRIC_GROUND, GRAVITY},
     event::{LocalEvent, ServerEvent},
@@ -395,12 +395,11 @@ pub fn attempt_swap_equipped_weapons(data: &JoinData, update: &mut StateUpdate)
 pub fn handle_manipulate_loadout(
     data: &JoinData,
     update: &mut StateUpdate,
-    loadout_manip: LoadoutManip,
+    inv_action: InventoryAction,
 ) {
-    update.server_events.push_front(ServerEvent::InventoryManip(
-        data.entity,
-        loadout_manip.into(),
-    ));
+    update
+        .server_events
+        .push_front(ServerEvent::InventoryManip(data.entity, inv_action.into()));
 }
 
 /// Checks that player can wield the glider and updates `CharacterState` if so
diff --git a/common/src/states/wielding.rs b/common/src/states/wielding.rs
index dc21ae44d7..d0a67f9ec9 100644
--- a/common/src/states/wielding.rs
+++ b/common/src/states/wielding.rs
@@ -2,7 +2,7 @@ use super::utils::*;
 use crate::{
     comp::{
         slot::{EquipSlot, Slot},
-        CharacterState, LoadoutManip, StateUpdate,
+        CharacterState, InventoryAction, StateUpdate,
     },
     states::behavior::{CharacterBehavior, JoinData},
 };
@@ -61,17 +61,17 @@ impl CharacterBehavior for Data {
         update
     }
 
-    fn manipulate_loadout(&self, data: &JoinData, loadout_manip: LoadoutManip) -> StateUpdate {
+    fn manipulate_loadout(&self, data: &JoinData, inv_action: InventoryAction) -> StateUpdate {
         let mut update = StateUpdate::from(data);
-        match loadout_manip {
-            LoadoutManip::Drop(EquipSlot::Mainhand)
-            | LoadoutManip::Swap(EquipSlot::Mainhand, _)
-            | LoadoutManip::Swap(_, Slot::Equip(EquipSlot::Mainhand)) => {
+        match inv_action {
+            InventoryAction::Drop(EquipSlot::Mainhand)
+            | InventoryAction::Swap(EquipSlot::Mainhand, _)
+            | InventoryAction::Swap(_, Slot::Equip(EquipSlot::Mainhand)) => {
                 update.character = CharacterState::Idle;
             },
             _ => (),
         }
-        handle_manipulate_loadout(&data, &mut update, loadout_manip);
+        handle_manipulate_loadout(&data, &mut update, inv_action);
         update
     }
 }
diff --git a/common/sys/src/controller.rs b/common/sys/src/controller.rs
index 9289c5d497..8618c55e97 100644
--- a/common/sys/src/controller.rs
+++ b/common/sys/src/controller.rs
@@ -93,8 +93,8 @@ impl<'a> System<'a> for Sys {
                         server_emitter
                             .emit(ServerEvent::ProcessTradeAction(entity, trade_id, action));
                     },
-                    ControlEvent::InventoryManip(manip) => {
-                        server_emitter.emit(ServerEvent::InventoryManip(entity, manip.into()));
+                    ControlEvent::InventoryEvent(event) => {
+                        server_emitter.emit(ServerEvent::InventoryManip(entity, event.into()));
                     },
                     ControlEvent::GroupManip(manip) => {
                         server_emitter.emit(ServerEvent::GroupManip(entity, manip))
diff --git a/server/src/events/inventory_manip.rs b/server/src/events/inventory_manip.rs
index f73e871503..f1adfee1f9 100644
--- a/server/src/events/inventory_manip.rs
+++ b/server/src/events/inventory_manip.rs
@@ -39,7 +39,7 @@ pub fn snuff_lantern(storage: &mut WriteStorage<comp::LightEmitter>, entity: Ecs
 
 #[allow(clippy::blocks_in_if_conditions)]
 #[allow(clippy::same_item_push)] // TODO: Pending review in #587
-pub fn handle_inventory(server: &mut Server, entity: EcsEntity, manip: comp::SlotManip) {
+pub fn handle_inventory(server: &mut Server, entity: EcsEntity, manip: comp::InventoryManip) {
     let state = server.state_mut();
 
     let uid = state
@@ -76,7 +76,7 @@ pub fn handle_inventory(server: &mut Server, entity: EcsEntity, manip: comp::Slo
     };
 
     match manip {
-        comp::SlotManip::Pickup(uid) => {
+        comp::InventoryManip::Pickup(uid) => {
             let picked_up_item: Option<comp::Item>;
             let item_entity = if let (Some((item, item_entity)), Some(mut inv)) = (
                 state
@@ -148,8 +148,7 @@ pub fn handle_inventory(server: &mut Server, entity: EcsEntity, manip: comp::Slo
 
             state.write_component(entity, event);
         },
-
-        comp::SlotManip::Collect(pos) => {
+        comp::InventoryManip::Collect(pos) => {
             let block = state.terrain().get(pos).ok().copied();
 
             if let Some(block) = block {
@@ -219,8 +218,7 @@ pub fn handle_inventory(server: &mut Server, entity: EcsEntity, manip: comp::Slo
                 }
             }
         },
-
-        comp::SlotManip::Use(slot) => {
+        comp::InventoryManip::Use(slot) => {
             let mut inventories = state.ecs().write_storage::<comp::Inventory>();
             let mut inventory = if let Some(inventory) = inventories.get_mut(entity) {
                 inventory
@@ -423,8 +421,7 @@ pub fn handle_inventory(server: &mut Server, entity: EcsEntity, manip: comp::Slo
                 state.write_component(entity, comp::InventoryUpdate::new(event));
             }
         },
-
-        comp::SlotManip::Swap(a, b) => {
+        comp::InventoryManip::Swap(a, b) => {
             let ecs = state.ecs();
 
             if let Some(pos) = ecs.read_storage::<comp::Pos>().get(entity) {
@@ -458,8 +455,7 @@ pub fn handle_inventory(server: &mut Server, entity: EcsEntity, manip: comp::Slo
                 comp::InventoryUpdate::new(comp::InventoryUpdateEvent::Swapped),
             );
         },
-
-        comp::SlotManip::SplitSwap(slot, target) => {
+        comp::InventoryManip::SplitSwap(slot, target) => {
             let msm = state.ecs().read_resource::<MaterialStatManifest>();
             let mut inventories = state.ecs().write_storage::<comp::Inventory>();
             let mut inventory = if let Some(inventory) = inventories.get_mut(entity) {
@@ -507,8 +503,7 @@ pub fn handle_inventory(server: &mut Server, entity: EcsEntity, manip: comp::Slo
                 comp::InventoryUpdate::new(comp::InventoryUpdateEvent::Swapped),
             );
         },
-
-        comp::SlotManip::Drop(slot) => {
+        comp::InventoryManip::Drop(slot) => {
             let item = match slot {
                 Slot::Inventory(slot) => state
                     .ecs()
@@ -540,8 +535,7 @@ pub fn handle_inventory(server: &mut Server, entity: EcsEntity, manip: comp::Slo
                 comp::InventoryUpdate::new(comp::InventoryUpdateEvent::Dropped),
             );
         },
-
-        comp::SlotManip::SplitDrop(slot) => {
+        comp::InventoryManip::SplitDrop(slot) => {
             let msm = state.ecs().read_resource::<MaterialStatManifest>();
             let item = match slot {
                 Slot::Inventory(slot) => state
@@ -571,8 +565,7 @@ pub fn handle_inventory(server: &mut Server, entity: EcsEntity, manip: comp::Slo
                 comp::InventoryUpdate::new(comp::InventoryUpdateEvent::Dropped),
             );
         },
-
-        comp::SlotManip::CraftRecipe(recipe) => {
+        comp::InventoryManip::CraftRecipe(recipe) => {
             if let Some(mut inv) = state
                 .ecs()
                 .write_storage::<comp::Inventory>()

From 9c788e2e3fdb7a9cfa2007b965d7793c0879d78f Mon Sep 17 00:00:00 2001
From: Sam <samuelkeiffer@gmail.com>
Date: Mon, 1 Mar 2021 21:37:14 -0500
Subject: [PATCH 15/16] Migration to fix sturdy red backpack

---
 .../2021-03-02-023541_fix-sturdy-red-backpack/down.sql          | 1 +
 .../migrations/2021-03-02-023541_fix-sturdy-red-backpack/up.sql | 2 ++
 2 files changed, 3 insertions(+)
 create mode 100644 server/src/migrations/2021-03-02-023541_fix-sturdy-red-backpack/down.sql
 create mode 100644 server/src/migrations/2021-03-02-023541_fix-sturdy-red-backpack/up.sql

diff --git a/server/src/migrations/2021-03-02-023541_fix-sturdy-red-backpack/down.sql b/server/src/migrations/2021-03-02-023541_fix-sturdy-red-backpack/down.sql
new file mode 100644
index 0000000000..291a97c5ce
--- /dev/null
+++ b/server/src/migrations/2021-03-02-023541_fix-sturdy-red-backpack/down.sql
@@ -0,0 +1 @@
+-- This file should undo anything in `up.sql`
\ No newline at end of file
diff --git a/server/src/migrations/2021-03-02-023541_fix-sturdy-red-backpack/up.sql b/server/src/migrations/2021-03-02-023541_fix-sturdy-red-backpack/up.sql
new file mode 100644
index 0000000000..366b3d137b
--- /dev/null
+++ b/server/src/migrations/2021-03-02-023541_fix-sturdy-red-backpack/up.sql
@@ -0,0 +1,2 @@
+UPDATE item
+SET item_definition_id = 'common.items.armor.misc.bag.sturdy_red_backpack' WHERE item_definition_id = 'common.items.armor.bag.sturdy_red_backpack';
\ No newline at end of file

From e4cc802d6c51c0a42b4139cc51e26924662427a7 Mon Sep 17 00:00:00 2001
From: Sam <samuelkeiffer@gmail.com>
Date: Mon, 1 Mar 2021 23:27:20 -0500
Subject: [PATCH 16/16] Migration for missed backpacks

---
 .../down.sql                                  |  1 +
 .../up.sql                                    | 22 +++++++++++++++++++
 2 files changed, 23 insertions(+)
 create mode 100644 server/src/migrations/2021-03-02-041950_fix-other-backpacks/down.sql
 create mode 100644 server/src/migrations/2021-03-02-041950_fix-other-backpacks/up.sql

diff --git a/server/src/migrations/2021-03-02-041950_fix-other-backpacks/down.sql b/server/src/migrations/2021-03-02-041950_fix-other-backpacks/down.sql
new file mode 100644
index 0000000000..291a97c5ce
--- /dev/null
+++ b/server/src/migrations/2021-03-02-041950_fix-other-backpacks/down.sql
@@ -0,0 +1 @@
+-- This file should undo anything in `up.sql`
\ No newline at end of file
diff --git a/server/src/migrations/2021-03-02-041950_fix-other-backpacks/up.sql b/server/src/migrations/2021-03-02-041950_fix-other-backpacks/up.sql
new file mode 100644
index 0000000000..7152dd0fc8
--- /dev/null
+++ b/server/src/migrations/2021-03-02-041950_fix-other-backpacks/up.sql
@@ -0,0 +1,22 @@
+UPDATE item
+SET item_definition_id = 'common.items.armor.misc.bag.heavy_seabag' WHERE item_definition_id = 'common.items.armor.bag.heavy_seabag';
+UPDATE item
+SET item_definition_id = 'common.items.armor.misc.bag.knitted_red_pouch' WHERE item_definition_id = 'common.items.armor.bag.knitted_red_pouch';
+UPDATE item
+SET item_definition_id = 'common.items.armor.misc.bag.liana_kit' WHERE item_definition_id = 'common.items.armor.bag.liana_kit';
+UPDATE item
+SET item_definition_id = 'common.items.armor.misc.bag.mindflayer_spellbag' WHERE item_definition_id = 'common.items.armor.bag.mindflayer_spellbag';
+UPDATE item
+SET item_definition_id = 'common.items.armor.misc.bag.reliable_backpack' WHERE item_definition_id = 'common.items.armor.bag.reliable_backpack';
+UPDATE item
+SET item_definition_id = 'common.items.armor.misc.bag.soulkeeper_cursed' WHERE item_definition_id = 'common.items.armor.bag.soulkeeper_cursed';
+UPDATE item
+SET item_definition_id = 'common.items.armor.misc.bag.soulkeeper_pure' WHERE item_definition_id = 'common.items.armor.bag.soulkeeper_pure';
+UPDATE item
+SET item_definition_id = 'common.items.armor.misc.bag.tiny_leather_pouch' WHERE item_definition_id = 'common.items.armor.bag.tiny_leather_pouch';
+UPDATE item
+SET item_definition_id = 'common.items.armor.misc.bag.tiny_red_pouch' WHERE item_definition_id = 'common.items.armor.bag.tiny_red_pouch';
+UPDATE item
+SET item_definition_id = 'common.items.armor.misc.bag.troll_hide_pack' WHERE item_definition_id = 'common.items.armor.bag.troll_hide_pack';
+UPDATE item
+SET item_definition_id = 'common.items.armor.misc.bag.woven_red_bag' WHERE item_definition_id = 'common.items.armor.bag.woven_red_bag';
\ No newline at end of file