From 079f1e7dc074c2152d7e75ef3f6ba09582cc19f1 Mon Sep 17 00:00:00 2001 From: jshipsey Date: Sat, 27 Feb 2021 22:00:30 -0500 Subject: [PATCH 1/5] 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 f4a10912b02969a1a902511e9749b926f67e5029 Mon Sep 17 00:00:00 2001 From: jshipsey Date: Sun, 28 Feb 2021 22:18:43 -0500 Subject: [PATCH 2/5] 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)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)2Z4+y2$pk#&@i^{J2|BK=p)}_&{E?G`)zvOL zg>Qo2|0|h(7n%q5An;Bre6vlEfCCbF95VL|WX*-lESE6CbkHTmUyc2FzCW}yW zs~mX)g0i!MT{D7~6@k3Y`LPVh^wW^V9E_J|VgC7C+Hd-i>g;i&#$uW`=7K zf1?pI$M<1sxD80pp{mq{mf9j5c)0?@eT|583KB;Jv+oO5J`pr{+z3{dVW43*qU}xS zt8^h;UxC7?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^uJZmJY+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#m9=U)$YUj?U!h_=i)6Rq9WV(0n1zq3eru-dx4w@vyF=NV(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>xx5UTOUFc{qs6~lNq(}4bom3m=PgAg;|VgA_a6xO 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}V^aeJxnCt$f8n zQ%woG-majpyPjaX5IZC!J{IP_5bBDZ_&sIx)NLWu)E7_H1upJ_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;k zRYmwX&o9KSBh};xG9;0Zf*~0sxc&^{f~53GVhDz;>Sd9Sn?6=?pU(^_I5UVL70)_i zNM%$sdf5qXw)FSzY1{Jw(THL`{LA!yR@#I zvs>q``xm(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?^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(&CxZTjl*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)0zy`-E?g32SGBppMT6gt61= zj|eR;q4z~0(klG3JV{qgAp<@q(XMhP`l^Y&QO87o3*&vwurf`>Zaa`qurZDxcu<)@^TU3bOT}n^we!{Kw1l)E8Y8;HV?IG1$N$_Yhp;Mj2&YfiB{WC=0 z2{LvmL~7r31A z9~gRX%l`{BaX8RB20 z_-O7f*S}xoz`0?XhNd|D*#h0SR`GhhJkqU5rovyOtqSYkZR~Gd|F8dx>m7W2&oab0e*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{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_;Zq2xhQ!LAcp0Fg1nEX2b9I^TMt8HZt$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>u0pn45)!+G2ZBP%sE~F+DEA~$-;<2*L<(=tKSEuf&=?jD z&I-q`E4ML=oUVKd`iiKCImzy|kw20}(Nr!aONFGj2?ZyFE#pG9u*`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&};>cToXt6Lmmwd1NTVb8M;R$ku4*9VOcCQ(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>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*|6?Xmuu55hMQ_= zQo=}igu$T~DlW6W?Pm1y<>$t1XhEDJ8i#1OI=zx%-$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?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^%Zjat1Zk1iy6~B`}h8v?aXiWbS)7+ z3MVh7iGQBq!~!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+>*Jt0wDx5ZJe$SGGcVH;75s7G$dqvE zu72ycQ_$<6IO?J%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=4}KR0di)%3Zzj-Ojk}_R@K7ehSFBvWo5vD`EAi0}f?PiH9#@C@{xkn)x-V2_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-Kx2mQkf>mwaM~PfUdvx;6r0+JlB^ z516LeC!#P+wb|5W1`JUcmR)tR1;kJ`YyneQ)Zb7)Qz53|GemQUJt&4bvv 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{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)3RbKXP%}q zAk>WrZ%hfN@9EyUG&0(<$q6_qig-xxw2?iShI2fV{KZ^SnuMIQ!mg0uo)hF%&EFG? zj68u%+vv;P#>8_;+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)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+;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(juk#|Tc2U?l%;Aq_slFMasHlilO+_LU z{Ej6gJoxHieh+lM{_8xPpH25IGE#R&{r?VbkFmbK&c?>Zmc6pFlCrWgTrL+*rxUx~ z&dA6J6B82zgF$9yW>{QYBoqp|^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}VPTkVlPABgE5nvxoua@}1CMJ*h8SiU@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;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|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-zT>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?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);nRoU#bGtkc9(JBKE4)~eq$!OpQ^iSo zf61{5s_6k+%RoAx{-SrZ= zqJ4XQzs@+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=JhqWAP@46jG+`*s22h&eP?`}?nvqbN4WTp}L1{LI(rf~y83m=;6iP$?%ns*I z1e-%?Mnh?8pfp=RY3Lsw=Y3#Dm<(lkM7wu90%Lun>JX|{*bOoYoS3@FV^D9uh#nw_CEyFh7XL1|_~Y34v_c7@XH2Bp~@ zO0x%)#(>i738gWiH0@BD7?dUsrLmwi2`G&XrAb0*94O6PD9t=5jSHnoL21%Z8V^d7 zfzr%}(qy4DIVepYN>hN+EP&Eu*mCTI!K5XZ~XfzxYUIsI5yA}BHSeBkrT? z$_?{Y68-CgqAVO1lSHXkd9_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)~2fSoNTqfq$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_-JpN| 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=7FhGm9jcckYuLpN%B=NPtN;A8bWOCKo|$h}r!-dzVH#5~jh3 zp(HEU45pZsCZkyqC(=rQOB0N0QW19a{tCqq=SaV>q%QLuW+SP>g8|Zlu{) z6BlQ;EQoAgOae#9Ry5j-kmk3&F%hmu1GA-FdMXudDt?|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!xFTNi6j2$5aeY&e>e>peGZwo^T$m;zs=P0^T*Zvn5g7Vtb%V|E90y7 z621ud7(FV?eIzW-2tQmCMuWmcNcei6aQ`i#NByJS!i6_9J|wjGgud;?IQNGTd3jSbr7q{eH%dv@p`&1a~JGYj5U!xRLi;0vvCsXQubh^A z4}nq_bv3zc3*=B7a+2Scjcb1vnSGh5eB<*jcDi%$=Q^o&W>Jylpu}OP(7u^aC`4Aq zCOjSwl|C@e@UVaL@_@&3m@6k*=2@l@0`lm+nsdG6A z7w6MkS5B<8o|@>H)LsX>?h-o!$1cv0n7YpS`S1AT+ZAfx`GAJgX3e^%_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=762AqEFbnT|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<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{ zQtW-c27`%pnEE&$Ki(|Hom(aNkZaCN2o|pie)?Vz>ny_MzH-c8X+VaQAy*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_di5srx-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{{;s1jJIx11&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)HF4sH8ohK%EhyE#g%Zab?Bd5rx;b-(%aIi!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_^7(d}bCg*~Fyv5VFa`V0+rY z#BxsDg32t!BxakK^so;mA!}e`*@z%yNc6oA5q&h)G0aqcE-s8Dm1W(K=f~;;4q|xvJ}`b;JZ5Pv7!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%VVOal99wQxxt^W?$)U4!w{^Pe&DfEkfi~Ve%be z=>s9hm%uY=Npw{{OQ^A$j)G)*%QF}`n8QMMF~OJX>3jV!;nT+%K6jGAw}Omb>|c#E6tI4`kdO4tg=t~+ zmhjt8!eDP6*CJ)CTyNlyU)u={$1^hPQr^(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!9P3VNsuRMxQEiNx$GMCq;q=jObtdbcYRnBGQXBwT$ zcR44aVV~zz)3>ru2u5caxsPZ+Vac79Q20he%@RU*8j~LChPvS$+|B8JPOeYDzdM83hr@jb?Kb*S z#X-G3bk5S`B!a0a#HAAI)61ABWYm&>`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_(MD#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&czTGQW>lZ{BAMX}S z9A9f*HVTH@1m~IWtSg2S_94;f$JCJ;B=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%iHcVq{^$fO+o`NUk!OhEpdj|wp{C)%i0SuH6PNLxos8_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{)2PDbiiO%W*$jebHSXCopLqm}$Sp~FR2-Xfk%O;<)=DmPp=h;=S*jf;Ely4Ksc ziIurE~+jaESQSYc{A4_YQS7O4R-bNkc-r2xd z*L7jsQfFP@UFfr?Wi4^6RcoSZZP!xcoe4bmPB+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>dV713NFvc354J<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`J3cg>uihIp@Y_BZh{;dEH?+T7Og1>(e;1BXR20ZBlj&eA2{tWsr_hazNATkRX z41F_%k@XRjwn~`%aT0TTb6EU!5xpN@L}I*x{@OJRe03ck1huV|;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@Z8HVmxImU+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@;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_XUtVfDLs 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%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(`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@mxoHMBUpVqF6Kl 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=_ahU%9za4POfz)JJx8s!$GZg$EZ6f~PPh0rEgDU@j3kAOanbuNp gJ*Ggrje^<#8%DGLw@T#rZe%OOF-VT2@H`pqyi zWZ2p;LZ(Q-G$dp=B&077Woo`*hDO6^>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`MYL54-7g5^uL+B%g~F61DzY-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^_8iAkNsV6nv zqYWcuiug@KLY7NHwo4{$m&ROL6J`VqQ}YcoWIC}h%{9%CVTk(0Z`oR7J3dipp5@dU z+S>>jmN99sY0b0DfTcXPZBAO2<|=Gkxh<`=9G}KSCM|_6P9NA-r;7IQKT!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$$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*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%a*ioEPkx6LhW!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(fJZWpRs2)Ey&#vxWq@|B#H`&pi)LrCCA{F z5UM4J8tFxt^EeX{OpkIdF~L5MVB`fstVi$(uRrSj@pB5;So`1a-`w1ct8FPXG|r=A z@&d||Ww`aF;O46pVsL6UJ4M~kt1?ZG!Z=j7gTxp4L3EV?>oFnZ+@ zN=Hg?=i8lF4wqquGyCWK^Y`Uz9U06adIC6mZ2`%zviNZ6CO-XX9eYkqqU%Bm2R>iH zU}haYpAYx>C{jT1C)B!N)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&WFsSUMp6UtBBUnYYyJE7y%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&y2pO(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{eEZdODM+LnDV-^px%}W8p3UUj$j@JB07%)XD&}5^650*pSp>mZ%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*Hee@IN)yHkOX5S zVI!Vd5&H2Y>P#m_I(yrLz-Vxj5C?qur)G>hqhb zf6?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%&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|OF&ySc)NtEP{B7plet)hM0}&26_Y-F<{Jyi9yYTkx?wdgjqGl zh>X@4j1eg&q==CcAc{~Sg%v~8MOL46%&E^^QcjN!%Kav_uh;uq34&n4w!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$=L5dvVYmduEvm3%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^2zVA9q5F2BDolt=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-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~b2rAIyl({FTEMqJwO(th=^HQHJi#WJ48TXC7( zu`^CKYM;(s>hG969Mvk0YW1*baZKH4RIkwyMWbbFv?b#*K8me#%j9|wu_f(j-Bw(p z9+qm&+(h+sXvzReLG%j)q7`0 zQ&SVkWReHt!p@7!lzaZ-508hXrB2Ma8u?~T@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@zgnI{tD^*nl0s;EV2Y6%W9FiKOAW^`=`A6??$fw^d3zv(kx2fA;Q=!aA1XGmS1=aab`eE!1Y_tNuwwQCQ3)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%bGhXDkfA9Kw&^yobfa z2)4if2Sr^$Vx;k&zJ$3=AL|jUt&$B9TZS|DX+b RDcmgnt9oop4++HbT*kclL%!Kn~fvH$uXGM z2BwxXxh-hv_s+v+%r?2C7-$lr0~_la5u^->{M$bw!hha}v z;q&>hF-kameF=Lkf8uwG1&fRIu_fGefAvI?oT;d2JqXu3m9UMMgIorvD*d4x_6*_teLmZm zfvnD4v5yl@(Q z?|LwDsSA;*%h>qgb0j7vVt4XR)3F>RJUGQyHynn|W(4L?W1z{GNq5r~;U zG&2yhuv`jqcXDI^+6@B#fxz3_dlZj`!Dt#FBMms{tNnL2RQc~`q5VJ3%?u+9m0h|2 z>w2?eh{N*S|KAQc}>&U3!!d(L^@ z=dC+@EXgk-Rizb&)JTIvq_)E2e$sMusVh$?Y>H#`o{CIEH@YenhRwt<%ptp71`WHh zspLUD9WvC~^vtwiGdB&jvIXVa6%J$5v>8J-hcRS2%ppdmXRYy7E(E3`#(7r@{)6hN*8aDAQ~&OiCx>11xM$_jC_;;Y9Zq9mHahP}AoF2*%nfVdqbKVkeT{nFChT(w zCteiV%7l%D>(u1N(dRmP*0* zhA{lDF#Dm9mk>uqdI}AByJ#&dpe{X{=G=IC_wOWdVmF@ZQd-_Tg!k-my3e1a;~fuu z7h4F7Ut;x#&j}9?XM5x}l9H0hawU_u>jhrQcHu6{;&6EZeeXTXxRjcdLf=5Ov}{g+x=yCdkm;pF!HSXM}U?EKgCUjA)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-@%Y=%*~D+Pup?1MpOq9c=#?Qj@u zrwvRjXW|xA?wk-CG26r>*$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|7AYo8%8CLdKqg%(yUEkbO>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<}UV5NscvnJ%btzjuS+;=n>t}BN9W6(IVP5 z2@BDQ86#msp>n8N6lIfbTEwtutW)`_PK%fpm8)vBh)&fRH;JKos@_DDZ|V^(s?4J; z?60XcOx6;OwIC+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_b%g2)7 zN=8}pKDgg5hkdLR;uzs5Txo zrxV~kpNRM8oeXbA$R zDlyVl0jy3Se`hkBj!YbU)rPjl5_HrE{BH`z-W4o-C@9WIgC{Qs&Bc4rRaJ_{ykxW& zrDJISE(BZl!dq8?j<*iMcjh<-&YeW>J6;T5=st*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}fKmYju@MfQn8< zqar9y*XuNn(bQT+P~m+U#Z#L`dqG9hsh^K&FQ{LmIF0s#_9~CzekzJ0BC61+PsCJJ zqkJ08BO;nc$GWIfH4)W>h^i{@sg2r&jH5P9uTugV<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_-(XZX0D(g#BvBj~wII=J~Z6IZ<<}bv~bm9ATyso~(4%@Y@?l!*(1EFEfsY zZ%7;sKiD`LehcAf_=Sw4Sp`b7DwL)ll!l)foabhBC{2GT%>XD3epRR{!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-&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)%dCvwsHhCfGigd$3ERxbF`XK`(xg*pC~us;gpdc#PAV-A?D<)j-c9ZyR5jK>*z{aXdEKvHFn=( 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 z5QQ}jxf*gceJ;&STDUZqG_lkoQZp->zdL$;aD7SKOQj8m!!_$OSigb)@CF_pZq+Bl z_QtcVtNk12`tS1d?zex=pYGhP7tik3vtvfl-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@JCmhuYSlW^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;g2wV`SMwLw>)2dt}p$KUFFAUE6LG{A}$K93gSv!R20ODv_dJvU;MvdNJwMli%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?` zIfYtgwC`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+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)+bTVl0)Pt@(UR|DVY60urwpM z{uSkbU@9p1=AhvAF+rH}$xgw@QSJ{4n*D 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=rxZ5kn42|`pIC{=QR(B?De7Ow^ z;cSeuXZQBsp0mCVcdTOII52c^2C>iQ@!s4ueDvKKcAgkUu1~ 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_(|%Z zkMTs5jwzyvQ95po^^~S2hB(G}%1{$StRHW6Tw7`)+*di&w1!q()^-_BL@`$x);2NG zCZ>ochKQjiniwLMnrLE(ILvjZX+`@zSx;*lH?-pSXe@Irb1ieJiMI69TF%IFE|#;f zJcIT7X0KKo&vGwojptYucNpVn#o5s^#?drr1;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;O1Ay?-|)_}1i^}zBJiZ-RAwsa%*yi|ZA?Um?m77V>1n0!yLa8^)}lZB?j&FHAu zhW^HCv=^qMt2`TLc5T6YXEDOB)}#Bay@>W6!s!!75qUR^9aYa`e#XPf^-D-fNzd?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 Date: Mon, 1 Mar 2021 00:42:35 -0500 Subject: [PATCH 3/5] 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> { "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> { 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 Date: Mon, 1 Mar 2021 00:58:43 -0500 Subject: [PATCH 4/5] 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 8a82e1aa37f6a74f23e9000b6bbf27048766e52c Mon Sep 17 00:00:00 2001 From: jshipsey Date: Mon, 1 Mar 2021 17:37:47 -0500 Subject: [PATCH 5/5] 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%a*ioEPkx6LhW!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(fJZWpRs2)Ey&#vxWq@|B#H`&pi)LrCCA{F z5UM4J8tFxt^EeX{OpkIdF~L5MVB`fstVi$(uRrSj@pB5;So`1a-`w1ct8FPXG|r=A z@&d||Ww`aF;O46pVsL6UJ4M~kt1?ZG!Z=j7gTxp4L3EV?>oFnZ+@ zN=Hg?=i8lF4wqquGyCWK^Y`Uz9U06adIC6mZ2`%zviNZ6CO-XX9eYkqqU%Bm2R>iH zU}haYpAYx>C{jT1C)B!N = 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::::from(velocity).magnitude(); - let speednorm = speed / 10.0; + let speednorm = (speed / 10.0).min(1.0); let ori: Vec2 = 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;