From 18e9b5b89048526667a8c7c2e4e3b1e3411390a2 Mon Sep 17 00:00:00 2001 From: jshipsey Date: Sat, 15 May 2021 16:29:56 -0400 Subject: [PATCH] recipes, re-organization, cleanup --- assets/common/item_price_calculation.ron | 6 +- .../armor/{lifecloth => cloth/druid}/back.ron | 4 +- .../armor/{lifecloth => cloth/druid}/belt.ron | 4 +- .../{lifecloth => cloth/druid}/chest.ron | 4 +- .../armor/{lifecloth => cloth/druid}/foot.ron | 4 +- .../armor/{lifecloth => cloth/druid}/hand.ron | 4 +- .../{lifecloth => cloth/druid}/pants.ron | 4 +- .../{lifecloth => cloth/druid}/shoulder.ron | 4 +- .../items/armor/{ => cloth}/linen/back.ron | 0 .../items/armor/{ => cloth}/linen/belt.ron | 0 .../items/armor/{ => cloth}/linen/chest.ron | 0 .../items/armor/{ => cloth}/linen/foot.ron | 0 .../items/armor/{ => cloth}/linen/hand.ron | 0 .../items/armor/{ => cloth}/linen/pants.ron | 0 .../armor/{ => cloth}/linen/shoulder.ron | 0 .../armor/{ => cloth}/moonweave/back.ron | 0 .../armor/{ => cloth}/moonweave/belt.ron | 0 .../armor/{ => cloth}/moonweave/chest.ron | 0 .../armor/{ => cloth}/moonweave/foot.ron | 0 .../armor/{ => cloth}/moonweave/hand.ron | 0 .../armor/{ => cloth}/moonweave/pants.ron | 0 .../armor/{ => cloth}/moonweave/shoulder.ron | 0 .../items/armor/{ => cloth}/silken/back.ron | 0 .../items/armor/{ => cloth}/silken/belt.ron | 0 .../items/armor/{ => cloth}/silken/chest.ron | 0 .../items/armor/{ => cloth}/silken/foot.ron | 0 .../items/armor/{ => cloth}/silken/hand.ron | 0 .../items/armor/{ => cloth}/silken/pants.ron | 0 .../armor/{ => cloth}/silken/shoulder.ron | 0 .../items/armor/{ => cloth}/sunsilk/back.ron | 0 .../items/armor/{ => cloth}/sunsilk/belt.ron | 0 .../items/armor/{ => cloth}/sunsilk/chest.ron | 0 .../items/armor/{ => cloth}/sunsilk/foot.ron | 0 .../items/armor/{ => cloth}/sunsilk/hand.ron | 0 .../items/armor/{ => cloth}/sunsilk/pants.ron | 0 .../armor/{ => cloth}/sunsilk/shoulder.ron | 0 .../items/armor/{ => cloth}/woolen/back.ron | 0 .../items/armor/{ => cloth}/woolen/belt.ron | 0 .../items/armor/{ => cloth}/woolen/chest.ron | 0 .../items/armor/{ => cloth}/woolen/foot.ron | 0 .../items/armor/{ => cloth}/woolen/hand.ron | 0 .../items/armor/{ => cloth}/woolen/pants.ron | 0 .../armor/{ => cloth}/woolen/shoulder.ron | 0 assets/common/items/armor/druid/belt.ron | 13 - assets/common/items/armor/druid/chest.ron | 13 - assets/common/items/armor/druid/foot.ron | 13 - assets/common/items/armor/druid/hand.ron | 13 - assets/common/items/armor/druid/pants.ron | 13 - assets/common/items/armor/druid/shoulder.ron | 13 - .../items/armor/{ => hide}/carapace/back.ron | 0 .../items/armor/{ => hide}/carapace/belt.ron | 0 .../items/armor/{ => hide}/carapace/chest.ron | 0 .../items/armor/{ => hide}/carapace/foot.ron | 0 .../items/armor/{ => hide}/carapace/hand.ron | 0 .../items/armor/{ => hide}/carapace/pants.ron | 0 .../armor/{ => hide}/carapace/shoulder.ron | 0 .../armor/{ => hide}/dragonscale/back.ron | 0 .../armor/{ => hide}/dragonscale/belt.ron | 0 .../armor/{ => hide}/dragonscale/chest.ron | 0 .../armor/{ => hide}/dragonscale/foot.ron | 0 .../armor/{ => hide}/dragonscale/hand.ron | 0 .../armor/{ => hide}/dragonscale/pants.ron | 0 .../armor/{ => hide}/dragonscale/shoulder.ron | 0 .../common/items/armor/hide/leather/back.ron | 13 + .../armor/{swift => hide/leather}/belt.ron | 4 +- .../armor/{swift => hide/leather}/chest.ron | 4 +- .../armor/{swift => hide/leather}/foot.ron | 4 +- .../armor/{swift => hide/leather}/hand.ron | 4 +- .../armor/{swift => hide/leather}/head.ron | 4 +- .../armor/{swift => hide/leather}/pants.ron | 4 +- .../{swift => hide/leather}/shoulder.ron | 4 +- .../{platescale => hide/primal}/back.ron | 4 +- .../{platescale => hide/primal}/belt.ron | 4 +- .../{platescale => hide/primal}/chest.ron | 4 +- .../{platescale => hide/primal}/foot.ron | 4 +- .../{platescale => hide/primal}/hand.ron | 4 +- .../{platescale => hide/primal}/pants.ron | 4 +- .../{platescale => hide/primal}/shoulder.ron | 4 +- .../armor/{agile => hide/rawhide}/back.ron | 4 +- .../armor/{agile => hide/rawhide}/belt.ron | 4 +- .../armor/{agile => hide/rawhide}/chest.ron | 4 +- .../armor/{agile => hide/rawhide}/foot.ron | 4 +- .../armor/{agile => hide/rawhide}/hand.ron | 4 +- .../armor/{agile => hide/rawhide}/pants.ron | 4 +- .../{agile => hide/rawhide}/shoulder.ron | 4 +- .../items/armor/{ => hide}/scale/back.ron | 0 .../items/armor/{ => hide}/scale/belt.ron | 0 .../items/armor/{ => hide}/scale/chest.ron | 0 .../items/armor/{ => hide}/scale/foot.ron | 0 .../items/armor/{ => hide}/scale/hand.ron | 0 .../items/armor/{ => hide}/scale/pants.ron | 0 .../items/armor/{ => hide}/scale/shoulder.ron | 0 .../armor/{ => mail}/bloodsteel/back.ron | 0 .../armor/{ => mail}/bloodsteel/belt.ron | 0 .../armor/{ => mail}/bloodsteel/chest.ron | 0 .../armor/{ => mail}/bloodsteel/foot.ron | 0 .../armor/{ => mail}/bloodsteel/hand.ron | 0 .../armor/{ => mail}/bloodsteel/pants.ron | 0 .../armor/{ => mail}/bloodsteel/shoulder.ron | 0 .../items/armor/{ => mail}/bronze/back.ron | 0 .../items/armor/{ => mail}/bronze/belt.ron | 0 .../items/armor/{ => mail}/bronze/chest.ron | 0 .../items/armor/{ => mail}/bronze/foot.ron | 2 +- .../items/armor/{ => mail}/bronze/hand.ron | 0 .../items/armor/{ => mail}/bronze/pants.ron | 0 .../armor/{ => mail}/bronze/shoulder.ron | 0 .../items/armor/{ => mail}/cobalt/back.ron | 0 .../items/armor/{ => mail}/cobalt/belt.ron | 0 .../items/armor/{ => mail}/cobalt/chest.ron | 0 .../items/armor/{ => mail}/cobalt/foot.ron | 0 .../items/armor/{ => mail}/cobalt/hand.ron | 0 .../items/armor/{ => mail}/cobalt/pants.ron | 0 .../armor/{ => mail}/cobalt/shoulder.ron | 0 .../items/armor/{ => mail}/iron/back.ron | 0 .../items/armor/{ => mail}/iron/belt.ron | 0 .../items/armor/{ => mail}/iron/chest.ron | 0 .../items/armor/{ => mail}/iron/foot.ron | 0 .../items/armor/{ => mail}/iron/hand.ron | 0 .../items/armor/{ => mail}/iron/pants.ron | 0 .../items/armor/{ => mail}/iron/shoulder.ron | 0 .../armor/{ => mail}/orichalcum/back.ron | 0 .../armor/{ => mail}/orichalcum/belt.ron | 0 .../armor/{ => mail}/orichalcum/chest.ron | 0 .../armor/{ => mail}/orichalcum/foot.ron | 0 .../armor/{ => mail}/orichalcum/hand.ron | 0 .../armor/{ => mail}/orichalcum/pants.ron | 0 .../armor/{ => mail}/orichalcum/shoulder.ron | 0 .../items/armor/{ => mail}/steel/back.ron | 0 .../items/armor/{ => mail}/steel/belt.ron | 0 .../items/armor/{ => mail}/steel/chest.ron | 0 .../items/armor/{ => mail}/steel/foot.ron | 0 .../items/armor/{ => mail}/steel/hand.ron | 0 .../items/armor/{ => mail}/steel/pants.ron | 0 .../items/armor/{ => mail}/steel/shoulder.ron | 0 assets/common/items/armor/plate/belt.ron | 13 - assets/common/items/armor/plate/chest.ron | 13 - assets/common/items/armor/plate/foot.ron | 13 - assets/common/items/armor/plate/hand.ron | 13 - assets/common/items/armor/plate/pants.ron | 13 - assets/common/items/armor/plate/shoulder.ron | 13 - .../{bloodsteel_ingot.ron => bloodsteel.ron} | 0 .../ingot/{bronze_ingot.ron => bronze.ron} | 0 .../ingot/{cobalt_ingot.ron => cobalt.ron} | 0 .../ingot/{copper_ingot.ron => copper.ron} | 0 .../ingot/{gold_ingot.ron => gold.ron} | 0 .../ingot/{iron_ingot.ron => iron.ron} | 0 .../{orichalcum_ingot.ron => orichalcum.ron} | 0 .../ingot/{silver_ingot.ron => silver.ron} | 0 .../ingot/{steel_ingot.ron => steel.ron} | 0 .../mineral/ingot/{tin_ingot.ron => tin.ron} | 0 .../items/tag_examples/leather_item.ron | 24 +- assets/common/loot_tables/armor/agile.ron | 9 - assets/common/loot_tables/armor/druid.ron | 8 - assets/common/loot_tables/armor/leather.ron | 8 + assets/common/loot_tables/armor/plate.ron | 8 - assets/common/loot_tables/armor/rawhide.ron | 9 + assets/common/loot_tables/armor/steel.ron | 12 +- assets/common/loot_tables/armor/swift.ron | 8 - .../common/loot_tables/creature/humanoid.ron | 2 +- .../loot_tables/dungeon/tier-1/enemy.ron | 2 +- .../loot_tables/dungeon/tier-2/enemy.ron | 1 - .../loot_tables/sprite/chest-buried.ron | 2 +- assets/common/loot_tables/sprite/chest.ron | 3 +- assets/common/recipe_book.ron | 849 ++++++++++++++++-- assets/server/manifests/kits.ron | 12 +- assets/voxygen/item_image_manifest.ron | 362 ++++---- .../armor/{lifecloth => cloth/druid}/back.vox | 0 .../armor/{lifecloth => cloth/druid}/belt.vox | 0 .../{lifecloth => cloth/druid}/chest.vox | 0 .../armor/{lifecloth => cloth/druid}/foot.vox | 0 .../armor/{lifecloth => cloth/druid}/hand.vox | 0 .../{lifecloth => cloth/druid}/pants.vox | 0 .../{lifecloth => cloth/druid}/shoulder.vox | 0 .../voxel/armor/{ => cloth}/linen/back.vox | 0 .../voxel/armor/{ => cloth}/linen/belt.vox | 0 .../voxel/armor/{ => cloth}/linen/chest.vox | 0 .../voxel/armor/{ => cloth}/linen/foot.vox | 0 .../voxel/armor/{ => cloth}/linen/hand.vox | 0 .../voxel/armor/{ => cloth}/linen/pants.vox | 0 .../armor/{ => cloth}/linen/shoulder.vox | 0 .../armor/{ => cloth}/moonweave/back.vox | 0 .../armor/{ => cloth}/moonweave/belt.vox | 0 .../armor/{ => cloth}/moonweave/chest.vox | 0 .../armor/{ => cloth}/moonweave/foot.vox | 0 .../armor/{ => cloth}/moonweave/hand.vox | 0 .../armor/{ => cloth}/moonweave/pants.vox | 0 .../armor/{ => cloth}/moonweave/shoulder.vox | 0 .../voxel/armor/{ => cloth}/silken/back.vox | 0 .../voxel/armor/{ => cloth}/silken/belt.vox | 0 .../voxel/armor/{ => cloth}/silken/chest.vox | 0 .../voxel/armor/{ => cloth}/silken/foot.vox | 0 .../voxel/armor/{ => cloth}/silken/hand.vox | 0 .../voxel/armor/{ => cloth}/silken/pants.vox | 0 .../armor/{ => cloth}/silken/shoulder.vox | 0 .../voxel/armor/{ => cloth}/sunsilk/back.vox | 0 .../voxel/armor/{ => cloth}/sunsilk/belt.vox | 0 .../voxel/armor/{ => cloth}/sunsilk/chest.vox | 0 .../voxel/armor/{ => cloth}/sunsilk/foot.vox | 0 .../voxel/armor/{ => cloth}/sunsilk/hand.vox | 0 .../voxel/armor/{ => cloth}/sunsilk/pants.vox | 0 .../armor/{ => cloth}/sunsilk/shoulder.vox | 0 .../voxel/armor/{ => cloth}/woolen/back.vox | 0 .../voxel/armor/{ => cloth}/woolen/belt.vox | 0 .../voxel/armor/{ => cloth}/woolen/chest.vox | 0 .../voxel/armor/{ => cloth}/woolen/foot.vox | 0 .../voxel/armor/{ => cloth}/woolen/hand.vox | 0 .../voxel/armor/{ => cloth}/woolen/pants.vox | 0 .../armor/{ => cloth}/woolen/shoulder.vox | 0 assets/voxygen/voxel/armor/druid/belt.vox | 3 - assets/voxygen/voxel/armor/druid/chest.vox | 3 - assets/voxygen/voxel/armor/druid/foot.vox | 3 - assets/voxygen/voxel/armor/druid/hand.vox | 3 - assets/voxygen/voxel/armor/druid/pants.vox | 3 - assets/voxygen/voxel/armor/druid/shoulder.vox | 3 - .../voxel/armor/{ => hide}/carapace/back.vox | 0 .../voxel/armor/{ => hide}/carapace/belt.vox | 0 .../voxel/armor/{ => hide}/carapace/chest.vox | 0 .../voxel/armor/{ => hide}/carapace/foot.vox | 0 .../voxel/armor/{ => hide}/carapace/hand.vox | 0 .../voxel/armor/{ => hide}/carapace/pants.vox | 0 .../armor/{ => hide}/carapace/shoulder.vox | 0 .../armor/{ => hide}/dragonscale/back.vox | 0 .../armor/{ => hide}/dragonscale/belt.vox | 0 .../armor/{ => hide}/dragonscale/chest.vox | 0 .../armor/{ => hide}/dragonscale/foot.vox | 0 .../armor/{ => hide}/dragonscale/hand.vox | 0 .../armor/{ => hide}/dragonscale/pants.vox | 0 .../armor/{ => hide}/dragonscale/shoulder.vox | 0 .../armor/{swift => hide/leather}/back.vox | 0 .../armor/{swift => hide/leather}/belt.vox | 0 .../armor/{swift => hide/leather}/chest.vox | 0 .../armor/{swift => hide/leather}/foot.vox | 0 .../armor/{swift => hide/leather}/hand.vox | 0 .../armor/{swift => hide/leather}/pants.vox | 0 .../{swift => hide/leather}/shoulder.vox | 0 .../{platescale => hide/primal}/back.vox | 0 .../{platescale => hide/primal}/belt.vox | 0 .../{platescale => hide/primal}/chest.vox | 0 .../{platescale => hide/primal}/foot.vox | 0 .../{platescale => hide/primal}/hand.vox | 0 .../{platescale => hide/primal}/pants.vox | 0 .../{platescale => hide/primal}/shoulder.vox | 0 .../armor/{agile => hide/rawhide}/back.vox | 0 .../armor/{agile => hide/rawhide}/belt.vox | 0 .../armor/{agile => hide/rawhide}/chest.vox | 0 .../armor/{agile => hide/rawhide}/foot.vox | 0 .../armor/{agile => hide/rawhide}/hand.vox | 0 .../armor/{agile => hide/rawhide}/pants.vox | 0 .../{agile => hide/rawhide}/shoulder.vox | 0 .../voxel/armor/{ => hide}/scale/back.vox | 0 .../voxel/armor/{ => hide}/scale/belt.vox | 0 .../voxel/armor/{ => hide}/scale/chest.vox | 0 .../voxel/armor/{ => hide}/scale/foot.vox | 0 .../voxel/armor/{ => hide}/scale/hand.vox | 0 .../voxel/armor/{ => hide}/scale/pants.vox | 0 .../voxel/armor/{ => hide}/scale/shoulder.vox | 0 .../armor/{ => mail}/bloodsteel/back.vox | 0 .../armor/{ => mail}/bloodsteel/belt.vox | 0 .../armor/{ => mail}/bloodsteel/chest.vox | 0 .../armor/{ => mail}/bloodsteel/foot.vox | 0 .../armor/{ => mail}/bloodsteel/hand.vox | 0 .../armor/{ => mail}/bloodsteel/pants.vox | 0 .../armor/{ => mail}/bloodsteel/shoulder.vox | 0 .../voxel/armor/{ => mail}/bronze/back.vox | 0 .../voxel/armor/{ => mail}/bronze/belt.vox | 0 .../voxel/armor/{ => mail}/bronze/chest.vox | 0 .../voxel/armor/{ => mail}/bronze/foot.vox | 0 .../voxel/armor/{ => mail}/bronze/hand.vox | 0 .../voxel/armor/{ => mail}/bronze/pants.vox | 0 .../armor/{ => mail}/bronze/shoulder.vox | 0 .../voxel/armor/{ => mail}/cobalt/back.vox | 0 .../voxel/armor/{ => mail}/cobalt/belt.vox | 0 .../voxel/armor/{ => mail}/cobalt/chest.vox | 0 .../voxel/armor/{ => mail}/cobalt/foot.vox | 0 .../voxel/armor/{ => mail}/cobalt/hand.vox | 0 .../voxel/armor/{ => mail}/cobalt/pants.vox | 0 .../armor/{ => mail}/cobalt/shoulder.vox | 0 .../voxel/armor/{ => mail}/iron/back.vox | 0 .../voxel/armor/{ => mail}/iron/belt.vox | 0 .../voxel/armor/{ => mail}/iron/chest.vox | 0 .../voxel/armor/{ => mail}/iron/foot.vox | 0 .../voxel/armor/{ => mail}/iron/hand.vox | 0 .../voxel/armor/{ => mail}/iron/pants.vox | 0 .../voxel/armor/{ => mail}/iron/shoulder.vox | 0 .../armor/{ => mail}/orichalcum/back.vox | 0 .../armor/{ => mail}/orichalcum/belt.vox | 0 .../armor/{ => mail}/orichalcum/chest.vox | 0 .../armor/{ => mail}/orichalcum/foot.vox | 0 .../armor/{ => mail}/orichalcum/hand.vox | 0 .../armor/{ => mail}/orichalcum/pants.vox | 0 .../armor/{ => mail}/orichalcum/shoulder.vox | 0 .../voxel/armor/{ => mail}/steel/back.vox | 0 .../voxel/armor/{ => mail}/steel/belt.vox | 0 .../voxel/armor/{ => mail}/steel/chest.vox | 0 .../voxel/armor/{ => mail}/steel/foot.vox | 0 .../voxel/armor/{ => mail}/steel/hand.vox | 0 .../voxel/armor/{ => mail}/steel/pants.vox | 0 .../voxel/armor/{ => mail}/steel/shoulder.vox | 0 assets/voxygen/voxel/armor/plate/belt.vox | 3 - assets/voxygen/voxel/armor/plate/chest.vox | 3 - assets/voxygen/voxel/armor/plate/foot.vox | 3 - assets/voxygen/voxel/armor/plate/hand.vox | 3 - assets/voxygen/voxel/armor/plate/pants.vox | 3 - assets/voxygen/voxel/armor/plate/shoulder.vox | 3 - .../voxel/humanoid_armor_back_manifest.ron | 48 +- .../voxel/humanoid_armor_belt_manifest.ron | 60 +- .../voxel/humanoid_armor_chest_manifest.ron | 62 +- .../voxel/humanoid_armor_foot_manifest.ron | 60 +- .../voxel/humanoid_armor_hand_manifest.ron | 130 ++- .../voxel/humanoid_armor_pants_manifest.ron | 60 +- .../humanoid_armor_shoulder_manifest.ron | 130 ++- server/src/rtsim/entity.rs | 4 +- 312 files changed, 1311 insertions(+), 887 deletions(-) rename assets/common/items/armor/{lifecloth => cloth/druid}/back.ron (79%) rename assets/common/items/armor/{lifecloth => cloth/druid}/belt.ron (79%) rename assets/common/items/armor/{lifecloth => cloth/druid}/chest.ron (78%) rename assets/common/items/armor/{lifecloth => cloth/druid}/foot.ron (79%) rename assets/common/items/armor/{lifecloth => cloth/druid}/hand.ron (78%) rename assets/common/items/armor/{lifecloth => cloth/druid}/pants.ron (78%) rename assets/common/items/armor/{lifecloth => cloth/druid}/shoulder.ron (76%) rename assets/common/items/armor/{ => cloth}/linen/back.ron (100%) rename assets/common/items/armor/{ => cloth}/linen/belt.ron (100%) rename assets/common/items/armor/{ => cloth}/linen/chest.ron (100%) rename assets/common/items/armor/{ => cloth}/linen/foot.ron (100%) rename assets/common/items/armor/{ => cloth}/linen/hand.ron (100%) rename assets/common/items/armor/{ => cloth}/linen/pants.ron (100%) rename assets/common/items/armor/{ => cloth}/linen/shoulder.ron (100%) rename assets/common/items/armor/{ => cloth}/moonweave/back.ron (100%) rename assets/common/items/armor/{ => cloth}/moonweave/belt.ron (100%) rename assets/common/items/armor/{ => cloth}/moonweave/chest.ron (100%) rename assets/common/items/armor/{ => cloth}/moonweave/foot.ron (100%) rename assets/common/items/armor/{ => cloth}/moonweave/hand.ron (100%) rename assets/common/items/armor/{ => cloth}/moonweave/pants.ron (100%) rename assets/common/items/armor/{ => cloth}/moonweave/shoulder.ron (100%) rename assets/common/items/armor/{ => cloth}/silken/back.ron (100%) rename assets/common/items/armor/{ => cloth}/silken/belt.ron (100%) rename assets/common/items/armor/{ => cloth}/silken/chest.ron (100%) rename assets/common/items/armor/{ => cloth}/silken/foot.ron (100%) rename assets/common/items/armor/{ => cloth}/silken/hand.ron (100%) rename assets/common/items/armor/{ => cloth}/silken/pants.ron (100%) rename assets/common/items/armor/{ => cloth}/silken/shoulder.ron (100%) rename assets/common/items/armor/{ => cloth}/sunsilk/back.ron (100%) rename assets/common/items/armor/{ => cloth}/sunsilk/belt.ron (100%) rename assets/common/items/armor/{ => cloth}/sunsilk/chest.ron (100%) rename assets/common/items/armor/{ => cloth}/sunsilk/foot.ron (100%) rename assets/common/items/armor/{ => cloth}/sunsilk/hand.ron (100%) rename assets/common/items/armor/{ => cloth}/sunsilk/pants.ron (100%) rename assets/common/items/armor/{ => cloth}/sunsilk/shoulder.ron (100%) rename assets/common/items/armor/{ => cloth}/woolen/back.ron (100%) rename assets/common/items/armor/{ => cloth}/woolen/belt.ron (100%) rename assets/common/items/armor/{ => cloth}/woolen/chest.ron (100%) rename assets/common/items/armor/{ => cloth}/woolen/foot.ron (100%) rename assets/common/items/armor/{ => cloth}/woolen/hand.ron (100%) rename assets/common/items/armor/{ => cloth}/woolen/pants.ron (100%) rename assets/common/items/armor/{ => cloth}/woolen/shoulder.ron (100%) delete mode 100644 assets/common/items/armor/druid/belt.ron delete mode 100644 assets/common/items/armor/druid/chest.ron delete mode 100644 assets/common/items/armor/druid/foot.ron delete mode 100644 assets/common/items/armor/druid/hand.ron delete mode 100644 assets/common/items/armor/druid/pants.ron delete mode 100644 assets/common/items/armor/druid/shoulder.ron rename assets/common/items/armor/{ => hide}/carapace/back.ron (100%) rename assets/common/items/armor/{ => hide}/carapace/belt.ron (100%) rename assets/common/items/armor/{ => hide}/carapace/chest.ron (100%) rename assets/common/items/armor/{ => hide}/carapace/foot.ron (100%) rename assets/common/items/armor/{ => hide}/carapace/hand.ron (100%) rename assets/common/items/armor/{ => hide}/carapace/pants.ron (100%) rename assets/common/items/armor/{ => hide}/carapace/shoulder.ron (100%) rename assets/common/items/armor/{ => hide}/dragonscale/back.ron (100%) rename assets/common/items/armor/{ => hide}/dragonscale/belt.ron (100%) rename assets/common/items/armor/{ => hide}/dragonscale/chest.ron (100%) rename assets/common/items/armor/{ => hide}/dragonscale/foot.ron (100%) rename assets/common/items/armor/{ => hide}/dragonscale/hand.ron (100%) rename assets/common/items/armor/{ => hide}/dragonscale/pants.ron (100%) rename assets/common/items/armor/{ => hide}/dragonscale/shoulder.ron (100%) create mode 100644 assets/common/items/armor/hide/leather/back.ron rename assets/common/items/armor/{swift => hide/leather}/belt.ron (79%) rename assets/common/items/armor/{swift => hide/leather}/chest.ron (79%) rename assets/common/items/armor/{swift => hide/leather}/foot.ron (79%) rename assets/common/items/armor/{swift => hide/leather}/hand.ron (79%) rename assets/common/items/armor/{swift => hide/leather}/head.ron (77%) rename assets/common/items/armor/{swift => hide/leather}/pants.ron (79%) rename assets/common/items/armor/{swift => hide/leather}/shoulder.ron (76%) rename assets/common/items/armor/{platescale => hide/primal}/back.ron (78%) rename assets/common/items/armor/{platescale => hide/primal}/belt.ron (78%) rename assets/common/items/armor/{platescale => hide/primal}/chest.ron (77%) rename assets/common/items/armor/{platescale => hide/primal}/foot.ron (78%) rename assets/common/items/armor/{platescale => hide/primal}/hand.ron (77%) rename assets/common/items/armor/{platescale => hide/primal}/pants.ron (77%) rename assets/common/items/armor/{platescale => hide/primal}/shoulder.ron (75%) rename assets/common/items/armor/{agile => hide/rawhide}/back.ron (82%) rename assets/common/items/armor/{agile => hide/rawhide}/belt.ron (82%) rename assets/common/items/armor/{agile => hide/rawhide}/chest.ron (81%) rename assets/common/items/armor/{agile => hide/rawhide}/foot.ron (81%) rename assets/common/items/armor/{agile => hide/rawhide}/hand.ron (81%) rename assets/common/items/armor/{agile => hide/rawhide}/pants.ron (80%) rename assets/common/items/armor/{agile => hide/rawhide}/shoulder.ron (80%) rename assets/common/items/armor/{ => hide}/scale/back.ron (100%) rename assets/common/items/armor/{ => hide}/scale/belt.ron (100%) rename assets/common/items/armor/{ => hide}/scale/chest.ron (100%) rename assets/common/items/armor/{ => hide}/scale/foot.ron (100%) rename assets/common/items/armor/{ => hide}/scale/hand.ron (100%) rename assets/common/items/armor/{ => hide}/scale/pants.ron (100%) rename assets/common/items/armor/{ => hide}/scale/shoulder.ron (100%) rename assets/common/items/armor/{ => mail}/bloodsteel/back.ron (100%) rename assets/common/items/armor/{ => mail}/bloodsteel/belt.ron (100%) rename assets/common/items/armor/{ => mail}/bloodsteel/chest.ron (100%) rename assets/common/items/armor/{ => mail}/bloodsteel/foot.ron (100%) rename assets/common/items/armor/{ => mail}/bloodsteel/hand.ron (100%) rename assets/common/items/armor/{ => mail}/bloodsteel/pants.ron (100%) rename assets/common/items/armor/{ => mail}/bloodsteel/shoulder.ron (100%) rename assets/common/items/armor/{ => mail}/bronze/back.ron (100%) rename assets/common/items/armor/{ => mail}/bronze/belt.ron (100%) rename assets/common/items/armor/{ => mail}/bronze/chest.ron (100%) rename assets/common/items/armor/{ => mail}/bronze/foot.ron (89%) rename assets/common/items/armor/{ => mail}/bronze/hand.ron (100%) rename assets/common/items/armor/{ => mail}/bronze/pants.ron (100%) rename assets/common/items/armor/{ => mail}/bronze/shoulder.ron (100%) rename assets/common/items/armor/{ => mail}/cobalt/back.ron (100%) rename assets/common/items/armor/{ => mail}/cobalt/belt.ron (100%) rename assets/common/items/armor/{ => mail}/cobalt/chest.ron (100%) rename assets/common/items/armor/{ => mail}/cobalt/foot.ron (100%) rename assets/common/items/armor/{ => mail}/cobalt/hand.ron (100%) rename assets/common/items/armor/{ => mail}/cobalt/pants.ron (100%) rename assets/common/items/armor/{ => mail}/cobalt/shoulder.ron (100%) rename assets/common/items/armor/{ => mail}/iron/back.ron (100%) rename assets/common/items/armor/{ => mail}/iron/belt.ron (100%) rename assets/common/items/armor/{ => mail}/iron/chest.ron (100%) rename assets/common/items/armor/{ => mail}/iron/foot.ron (100%) rename assets/common/items/armor/{ => mail}/iron/hand.ron (100%) rename assets/common/items/armor/{ => mail}/iron/pants.ron (100%) rename assets/common/items/armor/{ => mail}/iron/shoulder.ron (100%) rename assets/common/items/armor/{ => mail}/orichalcum/back.ron (100%) rename assets/common/items/armor/{ => mail}/orichalcum/belt.ron (100%) rename assets/common/items/armor/{ => mail}/orichalcum/chest.ron (100%) rename assets/common/items/armor/{ => mail}/orichalcum/foot.ron (100%) rename assets/common/items/armor/{ => mail}/orichalcum/hand.ron (100%) rename assets/common/items/armor/{ => mail}/orichalcum/pants.ron (100%) rename assets/common/items/armor/{ => mail}/orichalcum/shoulder.ron (100%) rename assets/common/items/armor/{ => mail}/steel/back.ron (100%) rename assets/common/items/armor/{ => mail}/steel/belt.ron (100%) rename assets/common/items/armor/{ => mail}/steel/chest.ron (100%) rename assets/common/items/armor/{ => mail}/steel/foot.ron (100%) rename assets/common/items/armor/{ => mail}/steel/hand.ron (100%) rename assets/common/items/armor/{ => mail}/steel/pants.ron (100%) rename assets/common/items/armor/{ => mail}/steel/shoulder.ron (100%) delete mode 100644 assets/common/items/armor/plate/belt.ron delete mode 100644 assets/common/items/armor/plate/chest.ron delete mode 100644 assets/common/items/armor/plate/foot.ron delete mode 100644 assets/common/items/armor/plate/hand.ron delete mode 100644 assets/common/items/armor/plate/pants.ron delete mode 100644 assets/common/items/armor/plate/shoulder.ron rename assets/common/items/mineral/ingot/{bloodsteel_ingot.ron => bloodsteel.ron} (100%) rename assets/common/items/mineral/ingot/{bronze_ingot.ron => bronze.ron} (100%) rename assets/common/items/mineral/ingot/{cobalt_ingot.ron => cobalt.ron} (100%) rename assets/common/items/mineral/ingot/{copper_ingot.ron => copper.ron} (100%) rename assets/common/items/mineral/ingot/{gold_ingot.ron => gold.ron} (100%) rename assets/common/items/mineral/ingot/{iron_ingot.ron => iron.ron} (100%) rename assets/common/items/mineral/ingot/{orichalcum_ingot.ron => orichalcum.ron} (100%) rename assets/common/items/mineral/ingot/{silver_ingot.ron => silver.ron} (100%) rename assets/common/items/mineral/ingot/{steel_ingot.ron => steel.ron} (100%) rename assets/common/items/mineral/ingot/{tin_ingot.ron => tin.ron} (100%) delete mode 100644 assets/common/loot_tables/armor/agile.ron delete mode 100644 assets/common/loot_tables/armor/druid.ron create mode 100644 assets/common/loot_tables/armor/leather.ron delete mode 100644 assets/common/loot_tables/armor/plate.ron create mode 100644 assets/common/loot_tables/armor/rawhide.ron delete mode 100644 assets/common/loot_tables/armor/swift.ron rename assets/voxygen/voxel/armor/{lifecloth => cloth/druid}/back.vox (100%) rename assets/voxygen/voxel/armor/{lifecloth => cloth/druid}/belt.vox (100%) rename assets/voxygen/voxel/armor/{lifecloth => cloth/druid}/chest.vox (100%) rename assets/voxygen/voxel/armor/{lifecloth => cloth/druid}/foot.vox (100%) rename assets/voxygen/voxel/armor/{lifecloth => cloth/druid}/hand.vox (100%) rename assets/voxygen/voxel/armor/{lifecloth => cloth/druid}/pants.vox (100%) rename assets/voxygen/voxel/armor/{lifecloth => cloth/druid}/shoulder.vox (100%) rename assets/voxygen/voxel/armor/{ => cloth}/linen/back.vox (100%) rename assets/voxygen/voxel/armor/{ => cloth}/linen/belt.vox (100%) rename assets/voxygen/voxel/armor/{ => cloth}/linen/chest.vox (100%) rename assets/voxygen/voxel/armor/{ => cloth}/linen/foot.vox (100%) rename assets/voxygen/voxel/armor/{ => cloth}/linen/hand.vox (100%) rename assets/voxygen/voxel/armor/{ => cloth}/linen/pants.vox (100%) rename assets/voxygen/voxel/armor/{ => cloth}/linen/shoulder.vox (100%) rename assets/voxygen/voxel/armor/{ => cloth}/moonweave/back.vox (100%) rename assets/voxygen/voxel/armor/{ => cloth}/moonweave/belt.vox (100%) rename assets/voxygen/voxel/armor/{ => cloth}/moonweave/chest.vox (100%) rename assets/voxygen/voxel/armor/{ => cloth}/moonweave/foot.vox (100%) rename assets/voxygen/voxel/armor/{ => cloth}/moonweave/hand.vox (100%) rename assets/voxygen/voxel/armor/{ => cloth}/moonweave/pants.vox (100%) rename assets/voxygen/voxel/armor/{ => cloth}/moonweave/shoulder.vox (100%) rename assets/voxygen/voxel/armor/{ => cloth}/silken/back.vox (100%) rename assets/voxygen/voxel/armor/{ => cloth}/silken/belt.vox (100%) rename assets/voxygen/voxel/armor/{ => cloth}/silken/chest.vox (100%) rename assets/voxygen/voxel/armor/{ => cloth}/silken/foot.vox (100%) rename assets/voxygen/voxel/armor/{ => cloth}/silken/hand.vox (100%) rename assets/voxygen/voxel/armor/{ => cloth}/silken/pants.vox (100%) rename assets/voxygen/voxel/armor/{ => cloth}/silken/shoulder.vox (100%) rename assets/voxygen/voxel/armor/{ => cloth}/sunsilk/back.vox (100%) rename assets/voxygen/voxel/armor/{ => cloth}/sunsilk/belt.vox (100%) rename assets/voxygen/voxel/armor/{ => cloth}/sunsilk/chest.vox (100%) rename assets/voxygen/voxel/armor/{ => cloth}/sunsilk/foot.vox (100%) rename assets/voxygen/voxel/armor/{ => cloth}/sunsilk/hand.vox (100%) rename assets/voxygen/voxel/armor/{ => cloth}/sunsilk/pants.vox (100%) rename assets/voxygen/voxel/armor/{ => cloth}/sunsilk/shoulder.vox (100%) rename assets/voxygen/voxel/armor/{ => cloth}/woolen/back.vox (100%) rename assets/voxygen/voxel/armor/{ => cloth}/woolen/belt.vox (100%) rename assets/voxygen/voxel/armor/{ => cloth}/woolen/chest.vox (100%) rename assets/voxygen/voxel/armor/{ => cloth}/woolen/foot.vox (100%) rename assets/voxygen/voxel/armor/{ => cloth}/woolen/hand.vox (100%) rename assets/voxygen/voxel/armor/{ => cloth}/woolen/pants.vox (100%) rename assets/voxygen/voxel/armor/{ => cloth}/woolen/shoulder.vox (100%) delete mode 100644 assets/voxygen/voxel/armor/druid/belt.vox delete mode 100644 assets/voxygen/voxel/armor/druid/chest.vox delete mode 100644 assets/voxygen/voxel/armor/druid/foot.vox delete mode 100644 assets/voxygen/voxel/armor/druid/hand.vox delete mode 100644 assets/voxygen/voxel/armor/druid/pants.vox delete mode 100644 assets/voxygen/voxel/armor/druid/shoulder.vox rename assets/voxygen/voxel/armor/{ => hide}/carapace/back.vox (100%) rename assets/voxygen/voxel/armor/{ => hide}/carapace/belt.vox (100%) rename assets/voxygen/voxel/armor/{ => hide}/carapace/chest.vox (100%) rename assets/voxygen/voxel/armor/{ => hide}/carapace/foot.vox (100%) rename assets/voxygen/voxel/armor/{ => hide}/carapace/hand.vox (100%) rename assets/voxygen/voxel/armor/{ => hide}/carapace/pants.vox (100%) rename assets/voxygen/voxel/armor/{ => hide}/carapace/shoulder.vox (100%) rename assets/voxygen/voxel/armor/{ => hide}/dragonscale/back.vox (100%) rename assets/voxygen/voxel/armor/{ => hide}/dragonscale/belt.vox (100%) rename assets/voxygen/voxel/armor/{ => hide}/dragonscale/chest.vox (100%) rename assets/voxygen/voxel/armor/{ => hide}/dragonscale/foot.vox (100%) rename assets/voxygen/voxel/armor/{ => hide}/dragonscale/hand.vox (100%) rename assets/voxygen/voxel/armor/{ => hide}/dragonscale/pants.vox (100%) rename assets/voxygen/voxel/armor/{ => hide}/dragonscale/shoulder.vox (100%) rename assets/voxygen/voxel/armor/{swift => hide/leather}/back.vox (100%) rename assets/voxygen/voxel/armor/{swift => hide/leather}/belt.vox (100%) rename assets/voxygen/voxel/armor/{swift => hide/leather}/chest.vox (100%) rename assets/voxygen/voxel/armor/{swift => hide/leather}/foot.vox (100%) rename assets/voxygen/voxel/armor/{swift => hide/leather}/hand.vox (100%) rename assets/voxygen/voxel/armor/{swift => hide/leather}/pants.vox (100%) rename assets/voxygen/voxel/armor/{swift => hide/leather}/shoulder.vox (100%) rename assets/voxygen/voxel/armor/{platescale => hide/primal}/back.vox (100%) rename assets/voxygen/voxel/armor/{platescale => hide/primal}/belt.vox (100%) rename assets/voxygen/voxel/armor/{platescale => hide/primal}/chest.vox (100%) rename assets/voxygen/voxel/armor/{platescale => hide/primal}/foot.vox (100%) rename assets/voxygen/voxel/armor/{platescale => hide/primal}/hand.vox (100%) rename assets/voxygen/voxel/armor/{platescale => hide/primal}/pants.vox (100%) rename assets/voxygen/voxel/armor/{platescale => hide/primal}/shoulder.vox (100%) rename assets/voxygen/voxel/armor/{agile => hide/rawhide}/back.vox (100%) rename assets/voxygen/voxel/armor/{agile => hide/rawhide}/belt.vox (100%) rename assets/voxygen/voxel/armor/{agile => hide/rawhide}/chest.vox (100%) rename assets/voxygen/voxel/armor/{agile => hide/rawhide}/foot.vox (100%) rename assets/voxygen/voxel/armor/{agile => hide/rawhide}/hand.vox (100%) rename assets/voxygen/voxel/armor/{agile => hide/rawhide}/pants.vox (100%) rename assets/voxygen/voxel/armor/{agile => hide/rawhide}/shoulder.vox (100%) rename assets/voxygen/voxel/armor/{ => hide}/scale/back.vox (100%) rename assets/voxygen/voxel/armor/{ => hide}/scale/belt.vox (100%) rename assets/voxygen/voxel/armor/{ => hide}/scale/chest.vox (100%) rename assets/voxygen/voxel/armor/{ => hide}/scale/foot.vox (100%) rename assets/voxygen/voxel/armor/{ => hide}/scale/hand.vox (100%) rename assets/voxygen/voxel/armor/{ => hide}/scale/pants.vox (100%) rename assets/voxygen/voxel/armor/{ => hide}/scale/shoulder.vox (100%) rename assets/voxygen/voxel/armor/{ => mail}/bloodsteel/back.vox (100%) rename assets/voxygen/voxel/armor/{ => mail}/bloodsteel/belt.vox (100%) rename assets/voxygen/voxel/armor/{ => mail}/bloodsteel/chest.vox (100%) rename assets/voxygen/voxel/armor/{ => mail}/bloodsteel/foot.vox (100%) rename assets/voxygen/voxel/armor/{ => mail}/bloodsteel/hand.vox (100%) rename assets/voxygen/voxel/armor/{ => mail}/bloodsteel/pants.vox (100%) rename assets/voxygen/voxel/armor/{ => mail}/bloodsteel/shoulder.vox (100%) rename assets/voxygen/voxel/armor/{ => mail}/bronze/back.vox (100%) rename assets/voxygen/voxel/armor/{ => mail}/bronze/belt.vox (100%) rename assets/voxygen/voxel/armor/{ => mail}/bronze/chest.vox (100%) rename assets/voxygen/voxel/armor/{ => mail}/bronze/foot.vox (100%) rename assets/voxygen/voxel/armor/{ => mail}/bronze/hand.vox (100%) rename assets/voxygen/voxel/armor/{ => mail}/bronze/pants.vox (100%) rename assets/voxygen/voxel/armor/{ => mail}/bronze/shoulder.vox (100%) rename assets/voxygen/voxel/armor/{ => mail}/cobalt/back.vox (100%) rename assets/voxygen/voxel/armor/{ => mail}/cobalt/belt.vox (100%) rename assets/voxygen/voxel/armor/{ => mail}/cobalt/chest.vox (100%) rename assets/voxygen/voxel/armor/{ => mail}/cobalt/foot.vox (100%) rename assets/voxygen/voxel/armor/{ => mail}/cobalt/hand.vox (100%) rename assets/voxygen/voxel/armor/{ => mail}/cobalt/pants.vox (100%) rename assets/voxygen/voxel/armor/{ => mail}/cobalt/shoulder.vox (100%) rename assets/voxygen/voxel/armor/{ => mail}/iron/back.vox (100%) rename assets/voxygen/voxel/armor/{ => mail}/iron/belt.vox (100%) rename assets/voxygen/voxel/armor/{ => mail}/iron/chest.vox (100%) rename assets/voxygen/voxel/armor/{ => mail}/iron/foot.vox (100%) rename assets/voxygen/voxel/armor/{ => mail}/iron/hand.vox (100%) rename assets/voxygen/voxel/armor/{ => mail}/iron/pants.vox (100%) rename assets/voxygen/voxel/armor/{ => mail}/iron/shoulder.vox (100%) rename assets/voxygen/voxel/armor/{ => mail}/orichalcum/back.vox (100%) rename assets/voxygen/voxel/armor/{ => mail}/orichalcum/belt.vox (100%) rename assets/voxygen/voxel/armor/{ => mail}/orichalcum/chest.vox (100%) rename assets/voxygen/voxel/armor/{ => mail}/orichalcum/foot.vox (100%) rename assets/voxygen/voxel/armor/{ => mail}/orichalcum/hand.vox (100%) rename assets/voxygen/voxel/armor/{ => mail}/orichalcum/pants.vox (100%) rename assets/voxygen/voxel/armor/{ => mail}/orichalcum/shoulder.vox (100%) rename assets/voxygen/voxel/armor/{ => mail}/steel/back.vox (100%) rename assets/voxygen/voxel/armor/{ => mail}/steel/belt.vox (100%) rename assets/voxygen/voxel/armor/{ => mail}/steel/chest.vox (100%) rename assets/voxygen/voxel/armor/{ => mail}/steel/foot.vox (100%) rename assets/voxygen/voxel/armor/{ => mail}/steel/hand.vox (100%) rename assets/voxygen/voxel/armor/{ => mail}/steel/pants.vox (100%) rename assets/voxygen/voxel/armor/{ => mail}/steel/shoulder.vox (100%) delete mode 100644 assets/voxygen/voxel/armor/plate/belt.vox delete mode 100644 assets/voxygen/voxel/armor/plate/chest.vox delete mode 100644 assets/voxygen/voxel/armor/plate/foot.vox delete mode 100644 assets/voxygen/voxel/armor/plate/hand.vox delete mode 100644 assets/voxygen/voxel/armor/plate/pants.vox delete mode 100644 assets/voxygen/voxel/armor/plate/shoulder.vox diff --git a/assets/common/item_price_calculation.ron b/assets/common/item_price_calculation.ron index c2825e5e7d..0748d14fbe 100644 --- a/assets/common/item_price_calculation.ron +++ b/assets/common/item_price_calculation.ron @@ -14,13 +14,11 @@ loot_tables: [ (0.04, false, "common.loot_tables.weapons.legendary"), // Armor (20.0, true, "common.loot_tables.armor.cloth"), - (6.0, true, "common.loot_tables.armor.agile"), - (3.0, true, "common.loot_tables.armor.swift"), - (6.0, true, "common.loot_tables.armor.druid"), + (6.0, true, "common.loot_tables.armor.rawhide"), + (3.0, true, "common.loot_tables.armor.leather"), (1.0, true, "common.loot_tables.armor.twigs"), (1.0, true, "common.loot_tables.armor.twigsflowers"), (1.0, true, "common.loot_tables.armor.twigsleaves"), - (0.5, true, "common.loot_tables.armor.plate"), (0.25, false, "common.loot_tables.armor.steel"), (0.075, false, "common.loot_tables.armor.cultist"), // Materials diff --git a/assets/common/items/armor/lifecloth/back.ron b/assets/common/items/armor/cloth/druid/back.ron similarity index 79% rename from assets/common/items/armor/lifecloth/back.ron rename to assets/common/items/armor/cloth/druid/back.ron index 313555cf39..2be8792649 100644 --- a/assets/common/items/armor/lifecloth/back.ron +++ b/assets/common/items/armor/cloth/druid/back.ron @@ -1,8 +1,8 @@ ItemDef( - name: "Lifecloth Cape", + name: "Druid Cape", description: "Incredibly light, with the essence of nature.", kind: Armor(( - kind: Back("Lifecloth"), + kind: Back("Druid"), stats: ( protection: Normal(4.0), poise_resilience: Normal(0.2), diff --git a/assets/common/items/armor/lifecloth/belt.ron b/assets/common/items/armor/cloth/druid/belt.ron similarity index 79% rename from assets/common/items/armor/lifecloth/belt.ron rename to assets/common/items/armor/cloth/druid/belt.ron index 5a5c75799a..cc4422ed2b 100644 --- a/assets/common/items/armor/lifecloth/belt.ron +++ b/assets/common/items/armor/cloth/druid/belt.ron @@ -1,8 +1,8 @@ ItemDef( - name: "Lifecloth Belt", + name: "Druid Belt", description: "Incredibly light, with the essence of nature.", kind: Armor(( - kind: Belt("Lifecloth"), + kind: Belt("Druid"), stats: ( protection: Normal(4.0), poise_resilience: Normal(1.0), diff --git a/assets/common/items/armor/lifecloth/chest.ron b/assets/common/items/armor/cloth/druid/chest.ron similarity index 78% rename from assets/common/items/armor/lifecloth/chest.ron rename to assets/common/items/armor/cloth/druid/chest.ron index 5bde533f6f..1c14968f83 100644 --- a/assets/common/items/armor/lifecloth/chest.ron +++ b/assets/common/items/armor/cloth/druid/chest.ron @@ -1,8 +1,8 @@ ItemDef( - name: "Lifecloth Cuirass", + name: "Druid Cuirass", description: "Incredibly light, with the essence of nature.", kind: Armor(( - kind: Chest("Lifecloth"), + kind: Chest("Druid"), stats: ( protection: Normal(25.0), poise_resilience: Normal(1.0), diff --git a/assets/common/items/armor/lifecloth/foot.ron b/assets/common/items/armor/cloth/druid/foot.ron similarity index 79% rename from assets/common/items/armor/lifecloth/foot.ron rename to assets/common/items/armor/cloth/druid/foot.ron index 7c5ccacc9d..393fcd3677 100644 --- a/assets/common/items/armor/lifecloth/foot.ron +++ b/assets/common/items/armor/cloth/druid/foot.ron @@ -1,8 +1,8 @@ ItemDef( - name: "Lifecloth Boots", + name: "Druid Boots", description: "Incredibly light, with the essence of nature.", kind: Armor(( - kind: Foot("Lifecloth"), + kind: Foot("Druid"), stats: ( protection: Normal(5.0), poise_resilience: Normal(1.0), diff --git a/assets/common/items/armor/lifecloth/hand.ron b/assets/common/items/armor/cloth/druid/hand.ron similarity index 78% rename from assets/common/items/armor/lifecloth/hand.ron rename to assets/common/items/armor/cloth/druid/hand.ron index 2bd80e871f..330b689b5b 100644 --- a/assets/common/items/armor/lifecloth/hand.ron +++ b/assets/common/items/armor/cloth/druid/hand.ron @@ -1,8 +1,8 @@ ItemDef( - name: "Lifecloth Gauntlets", + name: "Druid Gauntlets", description: "Incredibly light, with the essence of nature.", kind: Armor(( - kind: Hand("Lifecloth"), + kind: Hand("Druid"), stats: ( protection: Normal(10.0), poise_resilience: Normal(1.0), diff --git a/assets/common/items/armor/lifecloth/pants.ron b/assets/common/items/armor/cloth/druid/pants.ron similarity index 78% rename from assets/common/items/armor/lifecloth/pants.ron rename to assets/common/items/armor/cloth/druid/pants.ron index faf580d649..b87665a82b 100644 --- a/assets/common/items/armor/lifecloth/pants.ron +++ b/assets/common/items/armor/cloth/druid/pants.ron @@ -1,8 +1,8 @@ ItemDef( - name: "Lifecloth Chausses", + name: "Druid Chausses", description: "Incredibly light, with the essence of nature.", kind: Armor(( - kind: Pants("Lifecloth"), + kind: Pants("Druid"), stats: ( protection: Normal(20.0), poise_resilience: Normal(1.0), diff --git a/assets/common/items/armor/lifecloth/shoulder.ron b/assets/common/items/armor/cloth/druid/shoulder.ron similarity index 76% rename from assets/common/items/armor/lifecloth/shoulder.ron rename to assets/common/items/armor/cloth/druid/shoulder.ron index f3da966f4d..60e9be6c3b 100644 --- a/assets/common/items/armor/lifecloth/shoulder.ron +++ b/assets/common/items/armor/cloth/druid/shoulder.ron @@ -1,8 +1,8 @@ ItemDef( - name: "Lifecloth Shoulder Pad", + name: "Druid Shoulder Pad", description: "Incredibly light, with the essence of nature.", kind: Armor(( - kind: Shoulder("Lifecloth"), + kind: Shoulder("Druid"), stats: ( protection: Normal(15.0), poise_resilience: Normal(1.0), diff --git a/assets/common/items/armor/linen/back.ron b/assets/common/items/armor/cloth/linen/back.ron similarity index 100% rename from assets/common/items/armor/linen/back.ron rename to assets/common/items/armor/cloth/linen/back.ron diff --git a/assets/common/items/armor/linen/belt.ron b/assets/common/items/armor/cloth/linen/belt.ron similarity index 100% rename from assets/common/items/armor/linen/belt.ron rename to assets/common/items/armor/cloth/linen/belt.ron diff --git a/assets/common/items/armor/linen/chest.ron b/assets/common/items/armor/cloth/linen/chest.ron similarity index 100% rename from assets/common/items/armor/linen/chest.ron rename to assets/common/items/armor/cloth/linen/chest.ron diff --git a/assets/common/items/armor/linen/foot.ron b/assets/common/items/armor/cloth/linen/foot.ron similarity index 100% rename from assets/common/items/armor/linen/foot.ron rename to assets/common/items/armor/cloth/linen/foot.ron diff --git a/assets/common/items/armor/linen/hand.ron b/assets/common/items/armor/cloth/linen/hand.ron similarity index 100% rename from assets/common/items/armor/linen/hand.ron rename to assets/common/items/armor/cloth/linen/hand.ron diff --git a/assets/common/items/armor/linen/pants.ron b/assets/common/items/armor/cloth/linen/pants.ron similarity index 100% rename from assets/common/items/armor/linen/pants.ron rename to assets/common/items/armor/cloth/linen/pants.ron diff --git a/assets/common/items/armor/linen/shoulder.ron b/assets/common/items/armor/cloth/linen/shoulder.ron similarity index 100% rename from assets/common/items/armor/linen/shoulder.ron rename to assets/common/items/armor/cloth/linen/shoulder.ron diff --git a/assets/common/items/armor/moonweave/back.ron b/assets/common/items/armor/cloth/moonweave/back.ron similarity index 100% rename from assets/common/items/armor/moonweave/back.ron rename to assets/common/items/armor/cloth/moonweave/back.ron diff --git a/assets/common/items/armor/moonweave/belt.ron b/assets/common/items/armor/cloth/moonweave/belt.ron similarity index 100% rename from assets/common/items/armor/moonweave/belt.ron rename to assets/common/items/armor/cloth/moonweave/belt.ron diff --git a/assets/common/items/armor/moonweave/chest.ron b/assets/common/items/armor/cloth/moonweave/chest.ron similarity index 100% rename from assets/common/items/armor/moonweave/chest.ron rename to assets/common/items/armor/cloth/moonweave/chest.ron diff --git a/assets/common/items/armor/moonweave/foot.ron b/assets/common/items/armor/cloth/moonweave/foot.ron similarity index 100% rename from assets/common/items/armor/moonweave/foot.ron rename to assets/common/items/armor/cloth/moonweave/foot.ron diff --git a/assets/common/items/armor/moonweave/hand.ron b/assets/common/items/armor/cloth/moonweave/hand.ron similarity index 100% rename from assets/common/items/armor/moonweave/hand.ron rename to assets/common/items/armor/cloth/moonweave/hand.ron diff --git a/assets/common/items/armor/moonweave/pants.ron b/assets/common/items/armor/cloth/moonweave/pants.ron similarity index 100% rename from assets/common/items/armor/moonweave/pants.ron rename to assets/common/items/armor/cloth/moonweave/pants.ron diff --git a/assets/common/items/armor/moonweave/shoulder.ron b/assets/common/items/armor/cloth/moonweave/shoulder.ron similarity index 100% rename from assets/common/items/armor/moonweave/shoulder.ron rename to assets/common/items/armor/cloth/moonweave/shoulder.ron diff --git a/assets/common/items/armor/silken/back.ron b/assets/common/items/armor/cloth/silken/back.ron similarity index 100% rename from assets/common/items/armor/silken/back.ron rename to assets/common/items/armor/cloth/silken/back.ron diff --git a/assets/common/items/armor/silken/belt.ron b/assets/common/items/armor/cloth/silken/belt.ron similarity index 100% rename from assets/common/items/armor/silken/belt.ron rename to assets/common/items/armor/cloth/silken/belt.ron diff --git a/assets/common/items/armor/silken/chest.ron b/assets/common/items/armor/cloth/silken/chest.ron similarity index 100% rename from assets/common/items/armor/silken/chest.ron rename to assets/common/items/armor/cloth/silken/chest.ron diff --git a/assets/common/items/armor/silken/foot.ron b/assets/common/items/armor/cloth/silken/foot.ron similarity index 100% rename from assets/common/items/armor/silken/foot.ron rename to assets/common/items/armor/cloth/silken/foot.ron diff --git a/assets/common/items/armor/silken/hand.ron b/assets/common/items/armor/cloth/silken/hand.ron similarity index 100% rename from assets/common/items/armor/silken/hand.ron rename to assets/common/items/armor/cloth/silken/hand.ron diff --git a/assets/common/items/armor/silken/pants.ron b/assets/common/items/armor/cloth/silken/pants.ron similarity index 100% rename from assets/common/items/armor/silken/pants.ron rename to assets/common/items/armor/cloth/silken/pants.ron diff --git a/assets/common/items/armor/silken/shoulder.ron b/assets/common/items/armor/cloth/silken/shoulder.ron similarity index 100% rename from assets/common/items/armor/silken/shoulder.ron rename to assets/common/items/armor/cloth/silken/shoulder.ron diff --git a/assets/common/items/armor/sunsilk/back.ron b/assets/common/items/armor/cloth/sunsilk/back.ron similarity index 100% rename from assets/common/items/armor/sunsilk/back.ron rename to assets/common/items/armor/cloth/sunsilk/back.ron diff --git a/assets/common/items/armor/sunsilk/belt.ron b/assets/common/items/armor/cloth/sunsilk/belt.ron similarity index 100% rename from assets/common/items/armor/sunsilk/belt.ron rename to assets/common/items/armor/cloth/sunsilk/belt.ron diff --git a/assets/common/items/armor/sunsilk/chest.ron b/assets/common/items/armor/cloth/sunsilk/chest.ron similarity index 100% rename from assets/common/items/armor/sunsilk/chest.ron rename to assets/common/items/armor/cloth/sunsilk/chest.ron diff --git a/assets/common/items/armor/sunsilk/foot.ron b/assets/common/items/armor/cloth/sunsilk/foot.ron similarity index 100% rename from assets/common/items/armor/sunsilk/foot.ron rename to assets/common/items/armor/cloth/sunsilk/foot.ron diff --git a/assets/common/items/armor/sunsilk/hand.ron b/assets/common/items/armor/cloth/sunsilk/hand.ron similarity index 100% rename from assets/common/items/armor/sunsilk/hand.ron rename to assets/common/items/armor/cloth/sunsilk/hand.ron diff --git a/assets/common/items/armor/sunsilk/pants.ron b/assets/common/items/armor/cloth/sunsilk/pants.ron similarity index 100% rename from assets/common/items/armor/sunsilk/pants.ron rename to assets/common/items/armor/cloth/sunsilk/pants.ron diff --git a/assets/common/items/armor/sunsilk/shoulder.ron b/assets/common/items/armor/cloth/sunsilk/shoulder.ron similarity index 100% rename from assets/common/items/armor/sunsilk/shoulder.ron rename to assets/common/items/armor/cloth/sunsilk/shoulder.ron diff --git a/assets/common/items/armor/woolen/back.ron b/assets/common/items/armor/cloth/woolen/back.ron similarity index 100% rename from assets/common/items/armor/woolen/back.ron rename to assets/common/items/armor/cloth/woolen/back.ron diff --git a/assets/common/items/armor/woolen/belt.ron b/assets/common/items/armor/cloth/woolen/belt.ron similarity index 100% rename from assets/common/items/armor/woolen/belt.ron rename to assets/common/items/armor/cloth/woolen/belt.ron diff --git a/assets/common/items/armor/woolen/chest.ron b/assets/common/items/armor/cloth/woolen/chest.ron similarity index 100% rename from assets/common/items/armor/woolen/chest.ron rename to assets/common/items/armor/cloth/woolen/chest.ron diff --git a/assets/common/items/armor/woolen/foot.ron b/assets/common/items/armor/cloth/woolen/foot.ron similarity index 100% rename from assets/common/items/armor/woolen/foot.ron rename to assets/common/items/armor/cloth/woolen/foot.ron diff --git a/assets/common/items/armor/woolen/hand.ron b/assets/common/items/armor/cloth/woolen/hand.ron similarity index 100% rename from assets/common/items/armor/woolen/hand.ron rename to assets/common/items/armor/cloth/woolen/hand.ron diff --git a/assets/common/items/armor/woolen/pants.ron b/assets/common/items/armor/cloth/woolen/pants.ron similarity index 100% rename from assets/common/items/armor/woolen/pants.ron rename to assets/common/items/armor/cloth/woolen/pants.ron diff --git a/assets/common/items/armor/woolen/shoulder.ron b/assets/common/items/armor/cloth/woolen/shoulder.ron similarity index 100% rename from assets/common/items/armor/woolen/shoulder.ron rename to assets/common/items/armor/cloth/woolen/shoulder.ron diff --git a/assets/common/items/armor/druid/belt.ron b/assets/common/items/armor/druid/belt.ron deleted file mode 100644 index 98f9893097..0000000000 --- a/assets/common/items/armor/druid/belt.ron +++ /dev/null @@ -1,13 +0,0 @@ -ItemDef( - name: "Druid\'s Belt", - description: "Twisted vines to keep everything secure.", - kind: Armor(( - kind: Belt("Druid"), - stats: ( - protection: Normal(2.0), - poise_resilience: Normal(1.0), - ), - )), - quality: Moderate, - tags: [], -) \ No newline at end of file diff --git a/assets/common/items/armor/druid/chest.ron b/assets/common/items/armor/druid/chest.ron deleted file mode 100644 index 346e0e31aa..0000000000 --- a/assets/common/items/armor/druid/chest.ron +++ /dev/null @@ -1,13 +0,0 @@ -ItemDef( - name: "Druid\'s Vest", - description: "Vines and leaves formed into a tunic.", - kind: Armor(( - kind: Chest("Druid"), - stats: ( - protection: Normal(6.0), - poise_resilience: Normal(1.0), - ), - )), - quality: Moderate, - tags: [], -) \ No newline at end of file diff --git a/assets/common/items/armor/druid/foot.ron b/assets/common/items/armor/druid/foot.ron deleted file mode 100644 index 9bc8abc377..0000000000 --- a/assets/common/items/armor/druid/foot.ron +++ /dev/null @@ -1,13 +0,0 @@ -ItemDef( - name: "Druid\'s Slippers", - description: "For treading softly through the woods.", - kind: Armor(( - kind: Foot("Druid"), - stats: ( - protection: Normal(1.0), - poise_resilience: Normal(1.0), - ), - )), - quality: Moderate, - tags: [], -) \ No newline at end of file diff --git a/assets/common/items/armor/druid/hand.ron b/assets/common/items/armor/druid/hand.ron deleted file mode 100644 index abca18a39a..0000000000 --- a/assets/common/items/armor/druid/hand.ron +++ /dev/null @@ -1,13 +0,0 @@ -ItemDef( - name: "Druid\'s Gloves", - description: "Soft, strong, and flexible.", - kind: Armor(( - kind: Hand("Druid"), - stats: ( - protection: Normal(2.0), - poise_resilience: Normal(1.0), - ), - )), - quality: Common, - tags: [], -) \ No newline at end of file diff --git a/assets/common/items/armor/druid/pants.ron b/assets/common/items/armor/druid/pants.ron deleted file mode 100644 index ce3a392812..0000000000 --- a/assets/common/items/armor/druid/pants.ron +++ /dev/null @@ -1,13 +0,0 @@ -ItemDef( - name: "Druid\'s Kilt", - description: "Feel the breeze!", - kind: Armor(( - kind: Pants("Druid"), - stats: ( - protection: Normal(4.0), - poise_resilience: Normal(1.0), - ), - )), - quality: Moderate, - 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 deleted file mode 100644 index e1cf6c0d1c..0000000000 --- a/assets/common/items/armor/druid/shoulder.ron +++ /dev/null @@ -1,13 +0,0 @@ -ItemDef( - name: "Druid Shoulders", - description: "Forged for protectors of the wild.", - kind: Armor(( - kind: Shoulder("Druid"), - stats: ( - protection: Normal(3.0), - poise_resilience: Normal(1.0), - ), - )), - quality: Common, - tags: [], -) diff --git a/assets/common/items/armor/carapace/back.ron b/assets/common/items/armor/hide/carapace/back.ron similarity index 100% rename from assets/common/items/armor/carapace/back.ron rename to assets/common/items/armor/hide/carapace/back.ron diff --git a/assets/common/items/armor/carapace/belt.ron b/assets/common/items/armor/hide/carapace/belt.ron similarity index 100% rename from assets/common/items/armor/carapace/belt.ron rename to assets/common/items/armor/hide/carapace/belt.ron diff --git a/assets/common/items/armor/carapace/chest.ron b/assets/common/items/armor/hide/carapace/chest.ron similarity index 100% rename from assets/common/items/armor/carapace/chest.ron rename to assets/common/items/armor/hide/carapace/chest.ron diff --git a/assets/common/items/armor/carapace/foot.ron b/assets/common/items/armor/hide/carapace/foot.ron similarity index 100% rename from assets/common/items/armor/carapace/foot.ron rename to assets/common/items/armor/hide/carapace/foot.ron diff --git a/assets/common/items/armor/carapace/hand.ron b/assets/common/items/armor/hide/carapace/hand.ron similarity index 100% rename from assets/common/items/armor/carapace/hand.ron rename to assets/common/items/armor/hide/carapace/hand.ron diff --git a/assets/common/items/armor/carapace/pants.ron b/assets/common/items/armor/hide/carapace/pants.ron similarity index 100% rename from assets/common/items/armor/carapace/pants.ron rename to assets/common/items/armor/hide/carapace/pants.ron diff --git a/assets/common/items/armor/carapace/shoulder.ron b/assets/common/items/armor/hide/carapace/shoulder.ron similarity index 100% rename from assets/common/items/armor/carapace/shoulder.ron rename to assets/common/items/armor/hide/carapace/shoulder.ron diff --git a/assets/common/items/armor/dragonscale/back.ron b/assets/common/items/armor/hide/dragonscale/back.ron similarity index 100% rename from assets/common/items/armor/dragonscale/back.ron rename to assets/common/items/armor/hide/dragonscale/back.ron diff --git a/assets/common/items/armor/dragonscale/belt.ron b/assets/common/items/armor/hide/dragonscale/belt.ron similarity index 100% rename from assets/common/items/armor/dragonscale/belt.ron rename to assets/common/items/armor/hide/dragonscale/belt.ron diff --git a/assets/common/items/armor/dragonscale/chest.ron b/assets/common/items/armor/hide/dragonscale/chest.ron similarity index 100% rename from assets/common/items/armor/dragonscale/chest.ron rename to assets/common/items/armor/hide/dragonscale/chest.ron diff --git a/assets/common/items/armor/dragonscale/foot.ron b/assets/common/items/armor/hide/dragonscale/foot.ron similarity index 100% rename from assets/common/items/armor/dragonscale/foot.ron rename to assets/common/items/armor/hide/dragonscale/foot.ron diff --git a/assets/common/items/armor/dragonscale/hand.ron b/assets/common/items/armor/hide/dragonscale/hand.ron similarity index 100% rename from assets/common/items/armor/dragonscale/hand.ron rename to assets/common/items/armor/hide/dragonscale/hand.ron diff --git a/assets/common/items/armor/dragonscale/pants.ron b/assets/common/items/armor/hide/dragonscale/pants.ron similarity index 100% rename from assets/common/items/armor/dragonscale/pants.ron rename to assets/common/items/armor/hide/dragonscale/pants.ron diff --git a/assets/common/items/armor/dragonscale/shoulder.ron b/assets/common/items/armor/hide/dragonscale/shoulder.ron similarity index 100% rename from assets/common/items/armor/dragonscale/shoulder.ron rename to assets/common/items/armor/hide/dragonscale/shoulder.ron diff --git a/assets/common/items/armor/hide/leather/back.ron b/assets/common/items/armor/hide/leather/back.ron new file mode 100644 index 0000000000..51f5f219f4 --- /dev/null +++ b/assets/common/items/armor/hide/leather/back.ron @@ -0,0 +1,13 @@ +ItemDef( + name: "Leather Cape", + description: "Swift like the wind.", + kind: Armor(( + kind: Back("Leather"), + stats: ( + protection: Normal(0.2), + poise_resilience: Normal(0.1), + ), + )), + quality: Common, + tags: [LeatherItem], +) \ No newline at end of file diff --git a/assets/common/items/armor/swift/belt.ron b/assets/common/items/armor/hide/leather/belt.ron similarity index 79% rename from assets/common/items/armor/swift/belt.ron rename to assets/common/items/armor/hide/leather/belt.ron index 26dc51c308..464c2476e1 100644 --- a/assets/common/items/armor/swift/belt.ron +++ b/assets/common/items/armor/hide/leather/belt.ron @@ -1,8 +1,8 @@ ItemDef( - name: "Swift Belt", + name: "Leather Belt", description: "Swift like the wind.", kind: Armor(( - kind: Belt("Swift"), + kind: Belt("Leather"), stats: ( protection: Normal(1.0), poise_resilience: Normal(1.0), diff --git a/assets/common/items/armor/swift/chest.ron b/assets/common/items/armor/hide/leather/chest.ron similarity index 79% rename from assets/common/items/armor/swift/chest.ron rename to assets/common/items/armor/hide/leather/chest.ron index 1d72079492..96e69faf5a 100644 --- a/assets/common/items/armor/swift/chest.ron +++ b/assets/common/items/armor/hide/leather/chest.ron @@ -1,8 +1,8 @@ ItemDef( - name: "Swift Chest", + name: "Leather Chest", description: "Swift like the wind.", kind: Armor(( - kind: Chest("Swift"), + kind: Chest("Leather"), stats: ( protection: Normal(10.0), poise_resilience: Normal(1.0), diff --git a/assets/common/items/armor/swift/foot.ron b/assets/common/items/armor/hide/leather/foot.ron similarity index 79% rename from assets/common/items/armor/swift/foot.ron rename to assets/common/items/armor/hide/leather/foot.ron index 9a66903375..d2e1da064a 100644 --- a/assets/common/items/armor/swift/foot.ron +++ b/assets/common/items/armor/hide/leather/foot.ron @@ -1,8 +1,8 @@ ItemDef( - name: "Swift Boots", + name: "Leather Boots", description: "Swift like the wind.", kind: Armor(( - kind: Foot("Swift"), + kind: Foot("Leather"), stats: ( protection: Normal(2.0), poise_resilience: Normal(1.0), diff --git a/assets/common/items/armor/swift/hand.ron b/assets/common/items/armor/hide/leather/hand.ron similarity index 79% rename from assets/common/items/armor/swift/hand.ron rename to assets/common/items/armor/hide/leather/hand.ron index b4c93f4f5a..3a493eb0b2 100644 --- a/assets/common/items/armor/swift/hand.ron +++ b/assets/common/items/armor/hide/leather/hand.ron @@ -1,8 +1,8 @@ ItemDef( - name: "Swift Gloves", + name: "Leather Gloves", description: "Swift like the wind.", kind: Armor(( - kind: Hand("Swift"), + kind: Hand("Leather"), stats: ( protection: Normal(4.0), poise_resilience: Normal(1.0), diff --git a/assets/common/items/armor/swift/head.ron b/assets/common/items/armor/hide/leather/head.ron similarity index 77% rename from assets/common/items/armor/swift/head.ron rename to assets/common/items/armor/hide/leather/head.ron index 61ddec127f..83021585ba 100644 --- a/assets/common/items/armor/swift/head.ron +++ b/assets/common/items/armor/hide/leather/head.ron @@ -1,8 +1,8 @@ ItemDef( - name: "Swift Leather Cap", + name: "Leather Leather Cap", description: "Swift like the wind.", kind: Armor(( - kind: Head("Swift"), + kind: Head("Leather"), stats: ( protection: Normal(0.0), poise_resilience: Normal(0.0), diff --git a/assets/common/items/armor/swift/pants.ron b/assets/common/items/armor/hide/leather/pants.ron similarity index 79% rename from assets/common/items/armor/swift/pants.ron rename to assets/common/items/armor/hide/leather/pants.ron index 0520fcf154..131372be83 100644 --- a/assets/common/items/armor/swift/pants.ron +++ b/assets/common/items/armor/hide/leather/pants.ron @@ -1,8 +1,8 @@ ItemDef( - name: "Swift Pants", + name: "Leather Pants", description: "Swift like the wind.", kind: Armor(( - kind: Pants("Swift"), + kind: Pants("Leather"), stats: ( protection: Normal(8.0), poise_resilience: Normal(1.0), diff --git a/assets/common/items/armor/swift/shoulder.ron b/assets/common/items/armor/hide/leather/shoulder.ron similarity index 76% rename from assets/common/items/armor/swift/shoulder.ron rename to assets/common/items/armor/hide/leather/shoulder.ron index af5ed206fb..fd34014e40 100644 --- a/assets/common/items/armor/swift/shoulder.ron +++ b/assets/common/items/armor/hide/leather/shoulder.ron @@ -1,8 +1,8 @@ ItemDef( - name: "Swift Shoulderpads", + name: "Leather Shoulderpads", description: "Swift like the wind.", kind: Armor(( - kind: Shoulder("Swift"), + kind: Shoulder("Leather"), stats: ( protection: Normal(6.0), poise_resilience: Normal(1.0), diff --git a/assets/common/items/armor/platescale/back.ron b/assets/common/items/armor/hide/primal/back.ron similarity index 78% rename from assets/common/items/armor/platescale/back.ron rename to assets/common/items/armor/hide/primal/back.ron index b905544818..5eca073382 100644 --- a/assets/common/items/armor/platescale/back.ron +++ b/assets/common/items/armor/hide/primal/back.ron @@ -1,8 +1,8 @@ ItemDef( - name: "Platescale cape", + name: "Primal cape", description: "Smithed from hide tougher than steel.", kind: Armor(( - kind: Back("Platescale"), + kind: Back("Primal"), stats: ( protection: Normal(4.0), poise_resilience: Normal(0.2), diff --git a/assets/common/items/armor/platescale/belt.ron b/assets/common/items/armor/hide/primal/belt.ron similarity index 78% rename from assets/common/items/armor/platescale/belt.ron rename to assets/common/items/armor/hide/primal/belt.ron index a9541d787a..2a6ebccab6 100644 --- a/assets/common/items/armor/platescale/belt.ron +++ b/assets/common/items/armor/hide/primal/belt.ron @@ -1,8 +1,8 @@ ItemDef( - name: "Platescale Belt", + name: "Primal Belt", description: "Smithed from hide tougher than steel.", kind: Armor(( - kind: Belt("Platescale"), + kind: Belt("Primal"), stats: ( protection: Normal(4.0), poise_resilience: Normal(1.0), diff --git a/assets/common/items/armor/platescale/chest.ron b/assets/common/items/armor/hide/primal/chest.ron similarity index 77% rename from assets/common/items/armor/platescale/chest.ron rename to assets/common/items/armor/hide/primal/chest.ron index 0bef3dbeb2..6ceed8a10a 100644 --- a/assets/common/items/armor/platescale/chest.ron +++ b/assets/common/items/armor/hide/primal/chest.ron @@ -1,8 +1,8 @@ ItemDef( - name: "Platescale Cuirass", + name: "Primal Cuirass", description: "Smithed from hide tougher than steel.", kind: Armor(( - kind: Chest("Platescale"), + kind: Chest("Primal"), stats: ( protection: Normal(25.0), poise_resilience: Normal(1.0), diff --git a/assets/common/items/armor/platescale/foot.ron b/assets/common/items/armor/hide/primal/foot.ron similarity index 78% rename from assets/common/items/armor/platescale/foot.ron rename to assets/common/items/armor/hide/primal/foot.ron index 79885dc632..57ce218691 100644 --- a/assets/common/items/armor/platescale/foot.ron +++ b/assets/common/items/armor/hide/primal/foot.ron @@ -1,8 +1,8 @@ ItemDef( - name: "Platescale Boots", + name: "Primal Boots", description: "Smithed from hide tougher than steel.", kind: Armor(( - kind: Foot("Platescale"), + kind: Foot("Primal"), stats: ( protection: Normal(5.0), poise_resilience: Normal(1.0), diff --git a/assets/common/items/armor/platescale/hand.ron b/assets/common/items/armor/hide/primal/hand.ron similarity index 77% rename from assets/common/items/armor/platescale/hand.ron rename to assets/common/items/armor/hide/primal/hand.ron index 9c4bea5a4f..1a9bd8faf3 100644 --- a/assets/common/items/armor/platescale/hand.ron +++ b/assets/common/items/armor/hide/primal/hand.ron @@ -1,8 +1,8 @@ ItemDef( - name: "Platescale Gauntlets", + name: "Primal Gauntlets", description: "Smithed from hide tougher than steel.", kind: Armor(( - kind: Hand("Platescale"), + kind: Hand("Primal"), stats: ( protection: Normal(10.0), poise_resilience: Normal(1.0), diff --git a/assets/common/items/armor/platescale/pants.ron b/assets/common/items/armor/hide/primal/pants.ron similarity index 77% rename from assets/common/items/armor/platescale/pants.ron rename to assets/common/items/armor/hide/primal/pants.ron index d0fbd6b6af..1ce8ba8b77 100644 --- a/assets/common/items/armor/platescale/pants.ron +++ b/assets/common/items/armor/hide/primal/pants.ron @@ -1,8 +1,8 @@ ItemDef( - name: "Platescale Chausses", + name: "Primal Chausses", description: "Smithed from hide tougher than steel.", kind: Armor(( - kind: Pants("Platescale"), + kind: Pants("Primal"), stats: ( protection: Normal(20.0), poise_resilience: Normal(1.0), diff --git a/assets/common/items/armor/platescale/shoulder.ron b/assets/common/items/armor/hide/primal/shoulder.ron similarity index 75% rename from assets/common/items/armor/platescale/shoulder.ron rename to assets/common/items/armor/hide/primal/shoulder.ron index 77642ba97f..f60ca411a6 100644 --- a/assets/common/items/armor/platescale/shoulder.ron +++ b/assets/common/items/armor/hide/primal/shoulder.ron @@ -1,8 +1,8 @@ ItemDef( - name: "Platescale Shoulder Pad", + name: "Primal Shoulder Pad", description: "Smithed from hide tougher than steel.", kind: Armor(( - kind: Shoulder("Platescale"), + kind: Shoulder("Primal"), stats: ( protection: Normal(15.0), poise_resilience: Normal(1.0), diff --git a/assets/common/items/armor/agile/back.ron b/assets/common/items/armor/hide/rawhide/back.ron similarity index 82% rename from assets/common/items/armor/agile/back.ron rename to assets/common/items/armor/hide/rawhide/back.ron index dc32fda209..d9cfad30ac 100644 --- a/assets/common/items/armor/agile/back.ron +++ b/assets/common/items/armor/hide/rawhide/back.ron @@ -1,8 +1,8 @@ ItemDef( - name: "Agile Cape", + name: "Rawhide Cape", description: "\'Tightly packed pieces of leather to endure all weather.\'", kind: Armor(( - kind: Back("Agile"), + kind: Back("Rawhide"), stats: ( protection: Normal(0.2), poise_resilience: Normal(0.1), diff --git a/assets/common/items/armor/agile/belt.ron b/assets/common/items/armor/hide/rawhide/belt.ron similarity index 82% rename from assets/common/items/armor/agile/belt.ron rename to assets/common/items/armor/hide/rawhide/belt.ron index 60924fa1c3..5ab0ce633e 100644 --- a/assets/common/items/armor/agile/belt.ron +++ b/assets/common/items/armor/hide/rawhide/belt.ron @@ -1,8 +1,8 @@ ItemDef( - name: "Agile Belt", + name: "Rawhide Belt", description: "\'Tightly packed pieces of leather to endure all weather.\'", kind: Armor(( - kind: Belt("Agile"), + kind: Belt("Rawhide"), stats: ( protection: Normal(1.0), poise_resilience: Normal(1.0), diff --git a/assets/common/items/armor/agile/chest.ron b/assets/common/items/armor/hide/rawhide/chest.ron similarity index 81% rename from assets/common/items/armor/agile/chest.ron rename to assets/common/items/armor/hide/rawhide/chest.ron index cc53636533..f0d606e3dc 100644 --- a/assets/common/items/armor/agile/chest.ron +++ b/assets/common/items/armor/hide/rawhide/chest.ron @@ -1,8 +1,8 @@ ItemDef( - name: "Agile Chest", + name: "Rawhide Chest", description: "Tightly packed pieces of leather to endure all weather.", kind: Armor(( - kind: Chest("Agile"), + kind: Chest("Rawhide"), stats: ( protection: Normal(8.0), poise_resilience: Normal(1.0), diff --git a/assets/common/items/armor/agile/foot.ron b/assets/common/items/armor/hide/rawhide/foot.ron similarity index 81% rename from assets/common/items/armor/agile/foot.ron rename to assets/common/items/armor/hide/rawhide/foot.ron index 1c8d6f7318..c4202d6082 100644 --- a/assets/common/items/armor/agile/foot.ron +++ b/assets/common/items/armor/hide/rawhide/foot.ron @@ -1,8 +1,8 @@ ItemDef( - name: "Agile Kickers", + name: "Rawhide Kickers", description: "\'Tightly packed pieces of leather to endure all weather.", kind: Armor(( - kind: Foot("Agile"), + kind: Foot("Rawhide"), stats: ( protection: Normal(2.0), poise_resilience: Normal(1.0), diff --git a/assets/common/items/armor/agile/hand.ron b/assets/common/items/armor/hide/rawhide/hand.ron similarity index 81% rename from assets/common/items/armor/agile/hand.ron rename to assets/common/items/armor/hide/rawhide/hand.ron index 304609dcf2..08ccb00b24 100644 --- a/assets/common/items/armor/agile/hand.ron +++ b/assets/common/items/armor/hide/rawhide/hand.ron @@ -1,8 +1,8 @@ ItemDef( - name: "Agile Gauntlets", + name: "Rawhide Gauntlets", description: "\'Tightly packed pieces of leather to endure all weather.\'", kind: Armor(( - kind: Hand("Agile"), + kind: Hand("Rawhide"), stats: ( protection: Normal(4.0), poise_resilience: Normal(1.0), diff --git a/assets/common/items/armor/agile/pants.ron b/assets/common/items/armor/hide/rawhide/pants.ron similarity index 80% rename from assets/common/items/armor/agile/pants.ron rename to assets/common/items/armor/hide/rawhide/pants.ron index 563da5f983..4e855dec03 100644 --- a/assets/common/items/armor/agile/pants.ron +++ b/assets/common/items/armor/hide/rawhide/pants.ron @@ -1,8 +1,8 @@ ItemDef( - name: "Agile Pantalons", + name: "Rawhide Pantalons", description: "\'Tightly packed pieces of leather to endure all weather.\'", kind: Armor(( - kind: Pants("Agile"), + kind: Pants("Rawhide"), stats: ( protection: Normal(6.0), poise_resilience: Normal(1.0), diff --git a/assets/common/items/armor/agile/shoulder.ron b/assets/common/items/armor/hide/rawhide/shoulder.ron similarity index 80% rename from assets/common/items/armor/agile/shoulder.ron rename to assets/common/items/armor/hide/rawhide/shoulder.ron index 9e09202fe5..988621649e 100644 --- a/assets/common/items/armor/agile/shoulder.ron +++ b/assets/common/items/armor/hide/rawhide/shoulder.ron @@ -1,8 +1,8 @@ ItemDef( - name: "Agile Guards", + name: "Rawhide Guards", description: "Tightly packed pieces of leather to endure all weather.", kind: Armor(( - kind: Shoulder("Agile"), + kind: Shoulder("Rawhide"), stats: ( protection: Normal(8.0), poise_resilience: Normal(1.0), diff --git a/assets/common/items/armor/scale/back.ron b/assets/common/items/armor/hide/scale/back.ron similarity index 100% rename from assets/common/items/armor/scale/back.ron rename to assets/common/items/armor/hide/scale/back.ron diff --git a/assets/common/items/armor/scale/belt.ron b/assets/common/items/armor/hide/scale/belt.ron similarity index 100% rename from assets/common/items/armor/scale/belt.ron rename to assets/common/items/armor/hide/scale/belt.ron diff --git a/assets/common/items/armor/scale/chest.ron b/assets/common/items/armor/hide/scale/chest.ron similarity index 100% rename from assets/common/items/armor/scale/chest.ron rename to assets/common/items/armor/hide/scale/chest.ron diff --git a/assets/common/items/armor/scale/foot.ron b/assets/common/items/armor/hide/scale/foot.ron similarity index 100% rename from assets/common/items/armor/scale/foot.ron rename to assets/common/items/armor/hide/scale/foot.ron diff --git a/assets/common/items/armor/scale/hand.ron b/assets/common/items/armor/hide/scale/hand.ron similarity index 100% rename from assets/common/items/armor/scale/hand.ron rename to assets/common/items/armor/hide/scale/hand.ron diff --git a/assets/common/items/armor/scale/pants.ron b/assets/common/items/armor/hide/scale/pants.ron similarity index 100% rename from assets/common/items/armor/scale/pants.ron rename to assets/common/items/armor/hide/scale/pants.ron diff --git a/assets/common/items/armor/scale/shoulder.ron b/assets/common/items/armor/hide/scale/shoulder.ron similarity index 100% rename from assets/common/items/armor/scale/shoulder.ron rename to assets/common/items/armor/hide/scale/shoulder.ron diff --git a/assets/common/items/armor/bloodsteel/back.ron b/assets/common/items/armor/mail/bloodsteel/back.ron similarity index 100% rename from assets/common/items/armor/bloodsteel/back.ron rename to assets/common/items/armor/mail/bloodsteel/back.ron diff --git a/assets/common/items/armor/bloodsteel/belt.ron b/assets/common/items/armor/mail/bloodsteel/belt.ron similarity index 100% rename from assets/common/items/armor/bloodsteel/belt.ron rename to assets/common/items/armor/mail/bloodsteel/belt.ron diff --git a/assets/common/items/armor/bloodsteel/chest.ron b/assets/common/items/armor/mail/bloodsteel/chest.ron similarity index 100% rename from assets/common/items/armor/bloodsteel/chest.ron rename to assets/common/items/armor/mail/bloodsteel/chest.ron diff --git a/assets/common/items/armor/bloodsteel/foot.ron b/assets/common/items/armor/mail/bloodsteel/foot.ron similarity index 100% rename from assets/common/items/armor/bloodsteel/foot.ron rename to assets/common/items/armor/mail/bloodsteel/foot.ron diff --git a/assets/common/items/armor/bloodsteel/hand.ron b/assets/common/items/armor/mail/bloodsteel/hand.ron similarity index 100% rename from assets/common/items/armor/bloodsteel/hand.ron rename to assets/common/items/armor/mail/bloodsteel/hand.ron diff --git a/assets/common/items/armor/bloodsteel/pants.ron b/assets/common/items/armor/mail/bloodsteel/pants.ron similarity index 100% rename from assets/common/items/armor/bloodsteel/pants.ron rename to assets/common/items/armor/mail/bloodsteel/pants.ron diff --git a/assets/common/items/armor/bloodsteel/shoulder.ron b/assets/common/items/armor/mail/bloodsteel/shoulder.ron similarity index 100% rename from assets/common/items/armor/bloodsteel/shoulder.ron rename to assets/common/items/armor/mail/bloodsteel/shoulder.ron diff --git a/assets/common/items/armor/bronze/back.ron b/assets/common/items/armor/mail/bronze/back.ron similarity index 100% rename from assets/common/items/armor/bronze/back.ron rename to assets/common/items/armor/mail/bronze/back.ron diff --git a/assets/common/items/armor/bronze/belt.ron b/assets/common/items/armor/mail/bronze/belt.ron similarity index 100% rename from assets/common/items/armor/bronze/belt.ron rename to assets/common/items/armor/mail/bronze/belt.ron diff --git a/assets/common/items/armor/bronze/chest.ron b/assets/common/items/armor/mail/bronze/chest.ron similarity index 100% rename from assets/common/items/armor/bronze/chest.ron rename to assets/common/items/armor/mail/bronze/chest.ron diff --git a/assets/common/items/armor/bronze/foot.ron b/assets/common/items/armor/mail/bronze/foot.ron similarity index 89% rename from assets/common/items/armor/bronze/foot.ron rename to assets/common/items/armor/mail/bronze/foot.ron index df72529582..cb30e3e3e4 100644 --- a/assets/common/items/armor/bronze/foot.ron +++ b/assets/common/items/armor/mail/bronze/foot.ron @@ -2,7 +2,7 @@ ItemDef( name: "Bronze Kickers", description: "\'Heavy and dull, but it can take a punch.", kind: Armor(( - kind: Foot("Agile"), + kind: Foot("Bronze"), stats: ( protection: Normal(2.0), poise_resilience: Normal(1.0), diff --git a/assets/common/items/armor/bronze/hand.ron b/assets/common/items/armor/mail/bronze/hand.ron similarity index 100% rename from assets/common/items/armor/bronze/hand.ron rename to assets/common/items/armor/mail/bronze/hand.ron diff --git a/assets/common/items/armor/bronze/pants.ron b/assets/common/items/armor/mail/bronze/pants.ron similarity index 100% rename from assets/common/items/armor/bronze/pants.ron rename to assets/common/items/armor/mail/bronze/pants.ron diff --git a/assets/common/items/armor/bronze/shoulder.ron b/assets/common/items/armor/mail/bronze/shoulder.ron similarity index 100% rename from assets/common/items/armor/bronze/shoulder.ron rename to assets/common/items/armor/mail/bronze/shoulder.ron diff --git a/assets/common/items/armor/cobalt/back.ron b/assets/common/items/armor/mail/cobalt/back.ron similarity index 100% rename from assets/common/items/armor/cobalt/back.ron rename to assets/common/items/armor/mail/cobalt/back.ron diff --git a/assets/common/items/armor/cobalt/belt.ron b/assets/common/items/armor/mail/cobalt/belt.ron similarity index 100% rename from assets/common/items/armor/cobalt/belt.ron rename to assets/common/items/armor/mail/cobalt/belt.ron diff --git a/assets/common/items/armor/cobalt/chest.ron b/assets/common/items/armor/mail/cobalt/chest.ron similarity index 100% rename from assets/common/items/armor/cobalt/chest.ron rename to assets/common/items/armor/mail/cobalt/chest.ron diff --git a/assets/common/items/armor/cobalt/foot.ron b/assets/common/items/armor/mail/cobalt/foot.ron similarity index 100% rename from assets/common/items/armor/cobalt/foot.ron rename to assets/common/items/armor/mail/cobalt/foot.ron diff --git a/assets/common/items/armor/cobalt/hand.ron b/assets/common/items/armor/mail/cobalt/hand.ron similarity index 100% rename from assets/common/items/armor/cobalt/hand.ron rename to assets/common/items/armor/mail/cobalt/hand.ron diff --git a/assets/common/items/armor/cobalt/pants.ron b/assets/common/items/armor/mail/cobalt/pants.ron similarity index 100% rename from assets/common/items/armor/cobalt/pants.ron rename to assets/common/items/armor/mail/cobalt/pants.ron diff --git a/assets/common/items/armor/cobalt/shoulder.ron b/assets/common/items/armor/mail/cobalt/shoulder.ron similarity index 100% rename from assets/common/items/armor/cobalt/shoulder.ron rename to assets/common/items/armor/mail/cobalt/shoulder.ron diff --git a/assets/common/items/armor/iron/back.ron b/assets/common/items/armor/mail/iron/back.ron similarity index 100% rename from assets/common/items/armor/iron/back.ron rename to assets/common/items/armor/mail/iron/back.ron diff --git a/assets/common/items/armor/iron/belt.ron b/assets/common/items/armor/mail/iron/belt.ron similarity index 100% rename from assets/common/items/armor/iron/belt.ron rename to assets/common/items/armor/mail/iron/belt.ron diff --git a/assets/common/items/armor/iron/chest.ron b/assets/common/items/armor/mail/iron/chest.ron similarity index 100% rename from assets/common/items/armor/iron/chest.ron rename to assets/common/items/armor/mail/iron/chest.ron diff --git a/assets/common/items/armor/iron/foot.ron b/assets/common/items/armor/mail/iron/foot.ron similarity index 100% rename from assets/common/items/armor/iron/foot.ron rename to assets/common/items/armor/mail/iron/foot.ron diff --git a/assets/common/items/armor/iron/hand.ron b/assets/common/items/armor/mail/iron/hand.ron similarity index 100% rename from assets/common/items/armor/iron/hand.ron rename to assets/common/items/armor/mail/iron/hand.ron diff --git a/assets/common/items/armor/iron/pants.ron b/assets/common/items/armor/mail/iron/pants.ron similarity index 100% rename from assets/common/items/armor/iron/pants.ron rename to assets/common/items/armor/mail/iron/pants.ron diff --git a/assets/common/items/armor/iron/shoulder.ron b/assets/common/items/armor/mail/iron/shoulder.ron similarity index 100% rename from assets/common/items/armor/iron/shoulder.ron rename to assets/common/items/armor/mail/iron/shoulder.ron diff --git a/assets/common/items/armor/orichalcum/back.ron b/assets/common/items/armor/mail/orichalcum/back.ron similarity index 100% rename from assets/common/items/armor/orichalcum/back.ron rename to assets/common/items/armor/mail/orichalcum/back.ron diff --git a/assets/common/items/armor/orichalcum/belt.ron b/assets/common/items/armor/mail/orichalcum/belt.ron similarity index 100% rename from assets/common/items/armor/orichalcum/belt.ron rename to assets/common/items/armor/mail/orichalcum/belt.ron diff --git a/assets/common/items/armor/orichalcum/chest.ron b/assets/common/items/armor/mail/orichalcum/chest.ron similarity index 100% rename from assets/common/items/armor/orichalcum/chest.ron rename to assets/common/items/armor/mail/orichalcum/chest.ron diff --git a/assets/common/items/armor/orichalcum/foot.ron b/assets/common/items/armor/mail/orichalcum/foot.ron similarity index 100% rename from assets/common/items/armor/orichalcum/foot.ron rename to assets/common/items/armor/mail/orichalcum/foot.ron diff --git a/assets/common/items/armor/orichalcum/hand.ron b/assets/common/items/armor/mail/orichalcum/hand.ron similarity index 100% rename from assets/common/items/armor/orichalcum/hand.ron rename to assets/common/items/armor/mail/orichalcum/hand.ron diff --git a/assets/common/items/armor/orichalcum/pants.ron b/assets/common/items/armor/mail/orichalcum/pants.ron similarity index 100% rename from assets/common/items/armor/orichalcum/pants.ron rename to assets/common/items/armor/mail/orichalcum/pants.ron diff --git a/assets/common/items/armor/orichalcum/shoulder.ron b/assets/common/items/armor/mail/orichalcum/shoulder.ron similarity index 100% rename from assets/common/items/armor/orichalcum/shoulder.ron rename to assets/common/items/armor/mail/orichalcum/shoulder.ron diff --git a/assets/common/items/armor/steel/back.ron b/assets/common/items/armor/mail/steel/back.ron similarity index 100% rename from assets/common/items/armor/steel/back.ron rename to assets/common/items/armor/mail/steel/back.ron diff --git a/assets/common/items/armor/steel/belt.ron b/assets/common/items/armor/mail/steel/belt.ron similarity index 100% rename from assets/common/items/armor/steel/belt.ron rename to assets/common/items/armor/mail/steel/belt.ron diff --git a/assets/common/items/armor/steel/chest.ron b/assets/common/items/armor/mail/steel/chest.ron similarity index 100% rename from assets/common/items/armor/steel/chest.ron rename to assets/common/items/armor/mail/steel/chest.ron diff --git a/assets/common/items/armor/steel/foot.ron b/assets/common/items/armor/mail/steel/foot.ron similarity index 100% rename from assets/common/items/armor/steel/foot.ron rename to assets/common/items/armor/mail/steel/foot.ron diff --git a/assets/common/items/armor/steel/hand.ron b/assets/common/items/armor/mail/steel/hand.ron similarity index 100% rename from assets/common/items/armor/steel/hand.ron rename to assets/common/items/armor/mail/steel/hand.ron diff --git a/assets/common/items/armor/steel/pants.ron b/assets/common/items/armor/mail/steel/pants.ron similarity index 100% rename from assets/common/items/armor/steel/pants.ron rename to assets/common/items/armor/mail/steel/pants.ron diff --git a/assets/common/items/armor/steel/shoulder.ron b/assets/common/items/armor/mail/steel/shoulder.ron similarity index 100% rename from assets/common/items/armor/steel/shoulder.ron rename to assets/common/items/armor/mail/steel/shoulder.ron diff --git a/assets/common/items/armor/plate/belt.ron b/assets/common/items/armor/plate/belt.ron deleted file mode 100644 index 5b9c4372df..0000000000 --- a/assets/common/items/armor/plate/belt.ron +++ /dev/null @@ -1,13 +0,0 @@ -ItemDef( - name: "Plate Belt", - description: "A tanned leather belt with a forged iron buckle.", - kind: Armor(( - kind: Belt("Plate"), - stats: ( - protection: Normal(3.0), - poise_resilience: Normal(1.0), - ), - )), - quality: Moderate, - tags: [], -) \ No newline at end of file diff --git a/assets/common/items/armor/plate/chest.ron b/assets/common/items/armor/plate/chest.ron deleted file mode 100644 index 41007c6815..0000000000 --- a/assets/common/items/armor/plate/chest.ron +++ /dev/null @@ -1,13 +0,0 @@ -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("Plate"), - stats: ( - protection: Normal(20.0), - poise_resilience: Normal(1.0), - ), - )), - quality: Moderate, - tags: [], -) \ No newline at end of file diff --git a/assets/common/items/armor/plate/foot.ron b/assets/common/items/armor/plate/foot.ron deleted file mode 100644 index 0ac2599e95..0000000000 --- a/assets/common/items/armor/plate/foot.ron +++ /dev/null @@ -1,13 +0,0 @@ -ItemDef( - name: "Iron Feet", - description: "Quickly shaped iron plates, forming boots that are uncomfortable but durable.", - kind: Armor(( - kind: Foot("Plate"), - stats: ( - protection: Normal(4.0), - poise_resilience: Normal(1.0), - ), - )), - quality: Moderate, - tags: [], -) \ No newline at end of file diff --git a/assets/common/items/armor/plate/hand.ron b/assets/common/items/armor/plate/hand.ron deleted file mode 100644 index aaf1ec66ef..0000000000 --- a/assets/common/items/armor/plate/hand.ron +++ /dev/null @@ -1,13 +0,0 @@ -ItemDef( - name: "Iron Handguards", - description: "Heavy chunks of metal plate, not the most comfortable but keeps the wearer safe.", - kind: Armor(( - kind: Hand("Plate"), - stats: ( - protection: Normal(8.0), - poise_resilience: Normal(1.0), - ), - )), - quality: Moderate, - tags: [], -) \ No newline at end of file diff --git a/assets/common/items/armor/plate/pants.ron b/assets/common/items/armor/plate/pants.ron deleted file mode 100644 index 906543ec56..0000000000 --- a/assets/common/items/armor/plate/pants.ron +++ /dev/null @@ -1,13 +0,0 @@ -ItemDef( - name: "Iron Legguards", - description: "Heavy iron plate formed into protective greaves, decorated with rough green fabric.", - kind: Armor(( - kind: Pants("Plate"), - stats: ( - protection: Normal(16.0), - poise_resilience: Normal(1.0), - ), - )), - quality: Moderate, - tags: [], -) \ No newline at end of file diff --git a/assets/common/items/armor/plate/shoulder.ron b/assets/common/items/armor/plate/shoulder.ron deleted file mode 100644 index c7657ca136..0000000000 --- a/assets/common/items/armor/plate/shoulder.ron +++ /dev/null @@ -1,13 +0,0 @@ -ItemDef( - name: "Iron Shoulderguards", - description: "Heavy iron shoulder protection.", - kind: Armor(( - kind: Shoulder("Plate"), - stats: ( - protection: Normal(12.0), - poise_resilience: Normal(1.0), - ), - )), - quality: Moderate, - tags: [], -) \ No newline at end of file diff --git a/assets/common/items/mineral/ingot/bloodsteel_ingot.ron b/assets/common/items/mineral/ingot/bloodsteel.ron similarity index 100% rename from assets/common/items/mineral/ingot/bloodsteel_ingot.ron rename to assets/common/items/mineral/ingot/bloodsteel.ron diff --git a/assets/common/items/mineral/ingot/bronze_ingot.ron b/assets/common/items/mineral/ingot/bronze.ron similarity index 100% rename from assets/common/items/mineral/ingot/bronze_ingot.ron rename to assets/common/items/mineral/ingot/bronze.ron diff --git a/assets/common/items/mineral/ingot/cobalt_ingot.ron b/assets/common/items/mineral/ingot/cobalt.ron similarity index 100% rename from assets/common/items/mineral/ingot/cobalt_ingot.ron rename to assets/common/items/mineral/ingot/cobalt.ron diff --git a/assets/common/items/mineral/ingot/copper_ingot.ron b/assets/common/items/mineral/ingot/copper.ron similarity index 100% rename from assets/common/items/mineral/ingot/copper_ingot.ron rename to assets/common/items/mineral/ingot/copper.ron diff --git a/assets/common/items/mineral/ingot/gold_ingot.ron b/assets/common/items/mineral/ingot/gold.ron similarity index 100% rename from assets/common/items/mineral/ingot/gold_ingot.ron rename to assets/common/items/mineral/ingot/gold.ron diff --git a/assets/common/items/mineral/ingot/iron_ingot.ron b/assets/common/items/mineral/ingot/iron.ron similarity index 100% rename from assets/common/items/mineral/ingot/iron_ingot.ron rename to assets/common/items/mineral/ingot/iron.ron diff --git a/assets/common/items/mineral/ingot/orichalcum_ingot.ron b/assets/common/items/mineral/ingot/orichalcum.ron similarity index 100% rename from assets/common/items/mineral/ingot/orichalcum_ingot.ron rename to assets/common/items/mineral/ingot/orichalcum.ron diff --git a/assets/common/items/mineral/ingot/silver_ingot.ron b/assets/common/items/mineral/ingot/silver.ron similarity index 100% rename from assets/common/items/mineral/ingot/silver_ingot.ron rename to assets/common/items/mineral/ingot/silver.ron diff --git a/assets/common/items/mineral/ingot/steel_ingot.ron b/assets/common/items/mineral/ingot/steel.ron similarity index 100% rename from assets/common/items/mineral/ingot/steel_ingot.ron rename to assets/common/items/mineral/ingot/steel.ron diff --git a/assets/common/items/mineral/ingot/tin_ingot.ron b/assets/common/items/mineral/ingot/tin.ron similarity index 100% rename from assets/common/items/mineral/ingot/tin_ingot.ron rename to assets/common/items/mineral/ingot/tin.ron diff --git a/assets/common/items/tag_examples/leather_item.ron b/assets/common/items/tag_examples/leather_item.ron index 4bbd0e217c..cf8914346d 100644 --- a/assets/common/items/tag_examples/leather_item.ron +++ b/assets/common/items/tag_examples/leather_item.ron @@ -3,18 +3,18 @@ ItemDef( description: "Various leather armors.", kind: TagExamples( item_ids: [ - "common.items.armor.agile.back", - "common.items.armor.agile.belt", - "common.items.armor.agile.chest", - "common.items.armor.agile.foot", - "common.items.armor.agile.hand", - "common.items.armor.agile.pants", - "common.items.armor.agile.shoulder", - "common.items.armor.swift.belt", - "common.items.armor.swift.chest", - "common.items.armor.swift.foot", - "common.items.armor.swift.hand", - "common.items.armor.swift.pants", + "common.items.armor.hide.rawhide.back", + "common.items.armor.hide.rawhide.belt", + "common.items.armor.hide.rawhide.chest", + "common.items.armor.hide.rawhide.foot", + "common.items.armor.hide.rawhide.hand", + "common.items.armor.hide.rawhide.pants", + "common.items.armor.hide.rawhide.shoulder", + "common.items.armor.hide.leather.belt", + "common.items.armor.hide.leather.chest", + "common.items.armor.hide.leather.foot", + "common.items.armor.hide.leather.hand", + "common.items.armor.hide.leather.pants", ], ), diff --git a/assets/common/loot_tables/armor/agile.ron b/assets/common/loot_tables/armor/agile.ron deleted file mode 100644 index 1cd2150a6c..0000000000 --- a/assets/common/loot_tables/armor/agile.ron +++ /dev/null @@ -1,9 +0,0 @@ -[ - (1.0, Item("common.items.armor.agile.back")), - (1.0, Item("common.items.armor.agile.belt")), - (1.0, Item("common.items.armor.agile.chest")), - (1.0, Item("common.items.armor.agile.foot")), - (1.0, Item("common.items.armor.agile.hand")), - (1.0, Item("common.items.armor.agile.pants")), - (1.0, Item("common.items.armor.agile.shoulder")), -] \ No newline at end of file diff --git a/assets/common/loot_tables/armor/druid.ron b/assets/common/loot_tables/armor/druid.ron deleted file mode 100644 index 13b73adcde..0000000000 --- a/assets/common/loot_tables/armor/druid.ron +++ /dev/null @@ -1,8 +0,0 @@ -[ - (1.0, Item("common.items.armor.druid.belt")), - (1.0, Item("common.items.armor.druid.chest")), - (1.0, Item("common.items.armor.druid.foot")), - (1.0, Item("common.items.armor.druid.hand")), - (1.0, Item("common.items.armor.druid.pants")), - (1.0, Item("common.items.armor.druid.shoulder")), -] \ No newline at end of file diff --git a/assets/common/loot_tables/armor/leather.ron b/assets/common/loot_tables/armor/leather.ron new file mode 100644 index 0000000000..c3035dc72c --- /dev/null +++ b/assets/common/loot_tables/armor/leather.ron @@ -0,0 +1,8 @@ +[ + (1.0, Item("common.items.armor.hide.leather.belt")), + (1.0, Item("common.items.armor.hide.leather.chest")), + (1.0, Item("common.items.armor.hide.leather.foot")), + (1.0, Item("common.items.armor.hide.leather.hand")), + (1.0, Item("common.items.armor.hide.leather.pants")), + (1.0, Item("common.items.armor.hide.leather.shoulder")), +] \ No newline at end of file diff --git a/assets/common/loot_tables/armor/plate.ron b/assets/common/loot_tables/armor/plate.ron deleted file mode 100644 index e7ba66a81b..0000000000 --- a/assets/common/loot_tables/armor/plate.ron +++ /dev/null @@ -1,8 +0,0 @@ -[ - (1.0, Item("common.items.armor.plate.belt")), - (1.0, Item("common.items.armor.plate.chest")), - (1.0, Item("common.items.armor.plate.foot")), - (1.0, Item("common.items.armor.plate.hand")), - (1.0, Item("common.items.armor.plate.pants")), - (1.0, Item("common.items.armor.plate.shoulder")), -] \ No newline at end of file diff --git a/assets/common/loot_tables/armor/rawhide.ron b/assets/common/loot_tables/armor/rawhide.ron new file mode 100644 index 0000000000..7f0007d5f8 --- /dev/null +++ b/assets/common/loot_tables/armor/rawhide.ron @@ -0,0 +1,9 @@ +[ + (1.0, Item("common.items.armor.hide.rawhide.back")), + (1.0, Item("common.items.armor.hide.rawhide.belt")), + (1.0, Item("common.items.armor.hide.rawhide.chest")), + (1.0, Item("common.items.armor.hide.rawhide.foot")), + (1.0, Item("common.items.armor.hide.rawhide.hand")), + (1.0, Item("common.items.armor.hide.rawhide.pants")), + (1.0, Item("common.items.armor.hide.rawhide.shoulder")), +] \ No newline at end of file diff --git a/assets/common/loot_tables/armor/steel.ron b/assets/common/loot_tables/armor/steel.ron index b189ec8186..5d0060f9c3 100644 --- a/assets/common/loot_tables/armor/steel.ron +++ b/assets/common/loot_tables/armor/steel.ron @@ -1,8 +1,8 @@ [ - (1.0, Item("common.items.armor.steel.belt")), - (1.0, Item("common.items.armor.steel.chest")), - (1.0, Item("common.items.armor.steel.foot")), - (1.0, Item("common.items.armor.steel.hand")), - (1.0, Item("common.items.armor.steel.pants")), - (1.0, Item("common.items.armor.steel.shoulder")), + (1.0, Item("common.items.armor.mail.steel.belt")), + (1.0, Item("common.items.armor.mail.steel.chest")), + (1.0, Item("common.items.armor.mail.steel.foot")), + (1.0, Item("common.items.armor.mail.steel.hand")), + (1.0, Item("common.items.armor.mail.steel.pants")), + (1.0, Item("common.items.armor.mail.steel.shoulder")), ] \ No newline at end of file diff --git a/assets/common/loot_tables/armor/swift.ron b/assets/common/loot_tables/armor/swift.ron deleted file mode 100644 index 8d1bb0d7ea..0000000000 --- a/assets/common/loot_tables/armor/swift.ron +++ /dev/null @@ -1,8 +0,0 @@ -[ - (1.0, Item("common.items.armor.swift.belt")), - (1.0, Item("common.items.armor.swift.chest")), - (1.0, Item("common.items.armor.swift.foot")), - (1.0, Item("common.items.armor.swift.hand")), - (1.0, Item("common.items.armor.swift.pants")), - (1.0, Item("common.items.armor.swift.shoulder")), -] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/humanoid.ron b/assets/common/loot_tables/creature/humanoid.ron index 58dc68d62a..3364f9c097 100644 --- a/assets/common/loot_tables/creature/humanoid.ron +++ b/assets/common/loot_tables/creature/humanoid.ron @@ -1,6 +1,6 @@ [ (1.0, LootTable("common.loot_tables.humanoids")), - (1.0, LootTable("common.loot_tables.armor.swift")), + (1.0, LootTable("common.loot_tables.armor.leather")), (1.0, LootTable("common.loot_tables.armor.cloth")), (1.0, LootTable("common.loot_tables.weapons.starter")), ] \ No newline at end of file diff --git a/assets/common/loot_tables/dungeon/tier-1/enemy.ron b/assets/common/loot_tables/dungeon/tier-1/enemy.ron index 7493b71f24..d3129fed5e 100644 --- a/assets/common/loot_tables/dungeon/tier-1/enemy.ron +++ b/assets/common/loot_tables/dungeon/tier-1/enemy.ron @@ -1,5 +1,5 @@ [ (1.0, LootTable("common.loot_tables.humanoids")), - (1.0, LootTable("common.loot_tables.armor.swift")), + (1.0, LootTable("common.loot_tables.armor.leather")), (2.0, LootTable("common.loot_tables.weapons.tier-1")), ] \ No newline at end of file diff --git a/assets/common/loot_tables/dungeon/tier-2/enemy.ron b/assets/common/loot_tables/dungeon/tier-2/enemy.ron index 1c45d01caf..65ca40674b 100644 --- a/assets/common/loot_tables/dungeon/tier-2/enemy.ron +++ b/assets/common/loot_tables/dungeon/tier-2/enemy.ron @@ -1,5 +1,4 @@ [ (1.0, LootTable("common.loot_tables.humanoids")), - (1.0, LootTable("common.loot_tables.armor.plate")), (2.0, LootTable("common.loot_tables.weapons.tier-2")), ] \ No newline at end of file diff --git a/assets/common/loot_tables/sprite/chest-buried.ron b/assets/common/loot_tables/sprite/chest-buried.ron index 1dbfc39b6b..26af68dc76 100644 --- a/assets/common/loot_tables/sprite/chest-buried.ron +++ b/assets/common/loot_tables/sprite/chest-buried.ron @@ -1,5 +1,5 @@ [ (1.0, LootTable("common.loot_tables.weapons.tier-1")), (1.0, LootTable("common.loot_tables.armor.cloth")), - (1.0, LootTable("common.loot_tables.armor.swift")), + (1.0, LootTable("common.loot_tables.armor.leather")), ] \ No newline at end of file diff --git a/assets/common/loot_tables/sprite/chest.ron b/assets/common/loot_tables/sprite/chest.ron index 16c8c66572..4ed06d22c4 100644 --- a/assets/common/loot_tables/sprite/chest.ron +++ b/assets/common/loot_tables/sprite/chest.ron @@ -2,6 +2,5 @@ (1.0, LootTable("common.loot_tables.weapons.tier-0")), (1.0, LootTable("common.loot_tables.weapons.tier-1")), (1.0, LootTable("common.loot_tables.armor.cloth")), - (1.0, LootTable("common.loot_tables.armor.swift")), - (0.1, LootTable("common.loot_tables.armor.plate")), + (1.0, LootTable("common.loot_tables.armor.leather")), ] \ No newline at end of file diff --git a/assets/common/recipe_book.ron b/assets/common/recipe_book.ron index dbc75c1f98..a008e4bbaa 100644 --- a/assets/common/recipe_book.ron +++ b/assets/common/recipe_book.ron @@ -325,66 +325,123 @@ ], craft_sprite: Some(Anvil), ), -//ARMOR/LEATHER/ADVENTURER - "adventure back": ( - output: ("common.items.armor.agile.back", 1), +//ARMOR/HIDE/RAWHIDE + "rawhide back": ( + output: ("common.items.armor.hide.rawhide.back", 1), inputs: [ (Item("common.items.crafting_ing.leather.simple_leather"), 4), (Item("common.items.crafting_ing.leather.leather_strips"), 2), ], craft_sprite: Some(CraftingBench), ), - "adventure belt": ( - output: ("common.items.armor.agile.belt", 1), + "rawhide belt": ( + output: ("common.items.armor.hide.rawhide.belt", 1), inputs: [ (Item("common.items.crafting_ing.leather.simple_leather"), 2), (Item("common.items.crafting_ing.leather.leather_strips"), 2), ], craft_sprite: Some(CraftingBench), ), - "adventure chest": ( - output: ("common.items.armor.agile.chest", 1), + "rawhide chest": ( + output: ("common.items.armor.hide.rawhide.chest", 1), inputs: [ (Item("common.items.crafting_ing.leather.simple_leather"), 10), (Item("common.items.crafting_ing.leather.leather_strips"), 4), ], craft_sprite: Some(CraftingBench), ), - "adventure feet": ( - output: ("common.items.armor.agile.foot", 1), + "rawhide feet": ( + output: ("common.items.armor.hide.rawhide.foot", 1), inputs: [ (Item("common.items.crafting_ing.leather.simple_leather"), 4), (Item("common.items.crafting_ing.leather.leather_strips"), 2), ], craft_sprite: Some(CraftingBench), ), - "adventure hands": ( - output: ("common.items.armor.agile.hand", 1), + "rawhide hands": ( + output: ("common.items.armor.hide.rawhide.hand", 1), inputs: [ (Item("common.items.crafting_ing.leather.simple_leather"), 4), (Item("common.items.crafting_ing.leather.leather_strips"), 2), ], craft_sprite: Some(CraftingBench), ), - "adventure pants": ( - output: ("common.items.armor.agile.pants", 1), + "rawhide pants": ( + output: ("common.items.armor.hide.rawhide.pants", 1), inputs: [ (Item("common.items.crafting_ing.leather.simple_leather"), 8), (Item("common.items.crafting_ing.leather.leather_strips"), 4), ], craft_sprite: Some(CraftingBench), ), - "adventure shoulder": ( - output: ("common.items.armor.agile.shoulder", 1), + "rawhide shoulder": ( + output: ("common.items.armor.hide.rawhide.shoulder", 1), inputs: [ (Item("common.items.crafting_ing.leather.simple_leather"), 10), (Item("common.items.crafting_ing.leather.leather_strips"), 6), ], craft_sprite: Some(CraftingBench), ), -//ARMOR/LEATHER/SCALE +//ARMOR/HIDE/LEATHER + "leather back": ( + output: ("common.items.armor.hide.leather.back", 1), + inputs: [ + (Item("common.items.crafting_ing.leather.thick_leather"), 4), + (Item("common.items.crafting_ing.leather.leather_strips"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "leather belt": ( + output: ("common.items.armor.hide.leather.belt", 1), + inputs: [ + (Item("common.items.crafting_ing.leather.thick_leather"), 2), + (Item("common.items.crafting_ing.leather.leather_strips"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "leather chest": ( + output: ("common.items.armor.hide.leather.chest", 1), + inputs: [ + (Item("common.items.crafting_ing.leather.thick_leather"), 10), + (Item("common.items.crafting_ing.leather.leather_strips"), 4), + ], + craft_sprite: Some(CraftingBench), + ), + "leather feet": ( + output: ("common.items.armor.hide.leather.foot", 1), + inputs: [ + (Item("common.items.crafting_ing.leather.thick_leather"), 4), + (Item("common.items.crafting_ing.leather.leather_strips"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "leather hands": ( + output: ("common.items.armor.hide.leather.hand", 1), + inputs: [ + (Item("common.items.crafting_ing.leather.thick_leather"), 4), + (Item("common.items.crafting_ing.leather.leather_strips"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "leather pants": ( + output: ("common.items.armor.hide.leather.pants", 1), + inputs: [ + (Item("common.items.crafting_ing.leather.thick_leather"), 8), + (Item("common.items.crafting_ing.leather.leather_strips"), 4), + ], + craft_sprite: Some(CraftingBench), + ), + "leather shoulder": ( + output: ("common.items.armor.hide.leather.shoulder", 1), + inputs: [ + (Item("common.items.crafting_ing.leather.thick_leather"), 10), + (Item("common.items.crafting_ing.leather.leather_strips"), 6), + ], + craft_sprite: Some(CraftingBench), + ), +//ARMOR/HIDE/SCALE "scale back": ( - output: ("common.items.armor.scale.back", 1), + output: ("common.items.armor.hide.scale.back", 1), inputs: [ (Item("common.items.crafting_ing.hide.scales"), 4), (Item("common.items.crafting_ing.leather.leather_strips"), 2), @@ -392,7 +449,7 @@ craft_sprite: Some(CraftingBench), ), "scale belt": ( - output: ("common.items.armor.scale.belt", 1), + output: ("common.items.armor.hide.scale.belt", 1), inputs: [ (Item("common.items.crafting_ing.hide.scales"), 2), (Item("common.items.crafting_ing.leather.leather_strips"), 2), @@ -400,7 +457,7 @@ craft_sprite: Some(CraftingBench), ), "scale chest": ( - output: ("common.items.armor.scale.chest", 1), + output: ("common.items.armor.hide.scale.chest", 1), inputs: [ (Item("common.items.crafting_ing.hide.scales"), 10), (Item("common.items.crafting_ing.leather.leather_strips"), 4), @@ -408,7 +465,7 @@ craft_sprite: Some(CraftingBench), ), "scale feet": ( - output: ("common.items.armor.scale.foot", 1), + output: ("common.items.armor.hide.scale.foot", 1), inputs: [ (Item("common.items.crafting_ing.hide.scales"), 4), (Item("common.items.crafting_ing.leather.leather_strips"), 2), @@ -416,7 +473,7 @@ craft_sprite: Some(CraftingBench), ), "scale hands": ( - output: ("common.items.armor.scale.hand", 1), + output: ("common.items.armor.hide.scale.hand", 1), inputs: [ (Item("common.items.crafting_ing.hide.scales"), 4), (Item("common.items.crafting_ing.leather.leather_strips"), 2), @@ -424,7 +481,7 @@ craft_sprite: Some(CraftingBench), ), "scale pants": ( - output: ("common.items.armor.scale.pants", 1), + output: ("common.items.armor.hide.scale.pants", 1), inputs: [ (Item("common.items.crafting_ing.hide.scales"), 8), (Item("common.items.crafting_ing.leather.leather_strips"), 4), @@ -432,16 +489,16 @@ craft_sprite: Some(CraftingBench), ), "scale shoulder": ( - output: ("common.items.armor.scale.shoulder", 1), + output: ("common.items.armor.hide.scale.shoulder", 1), inputs: [ (Item("common.items.crafting_ing.hide.scales"), 10), (Item("common.items.crafting_ing.leather.leather_strips"), 6), ], craft_sprite: Some(CraftingBench), ), -//ARMOR/LEATHER/CARAPACE +//ARMOR/HIDE/CARAPACE "carapace back": ( - output: ("common.items.armor.carapace.back", 1), + output: ("common.items.armor.hide.carapace.back", 1), inputs: [ (Item("common.items.crafting_ing.hide.carapace"), 4), (Item("common.items.crafting_ing.leather.leather_strips"), 2), @@ -449,7 +506,7 @@ craft_sprite: Some(CraftingBench), ), "carapace belt": ( - output: ("common.items.armor.carapace.belt", 1), + output: ("common.items.armor.hide.carapace.belt", 1), inputs: [ (Item("common.items.crafting_ing.hide.carapace"), 2), (Item("common.items.crafting_ing.leather.leather_strips"), 2), @@ -457,7 +514,7 @@ craft_sprite: Some(CraftingBench), ), "carapace chest": ( - output: ("common.items.armor.carapace.chest", 1), + output: ("common.items.armor.hide.carapace.chest", 1), inputs: [ (Item("common.items.crafting_ing.hide.carapace"), 10), (Item("common.items.crafting_ing.leather.leather_strips"), 4), @@ -465,7 +522,7 @@ craft_sprite: Some(CraftingBench), ), "carapace feet": ( - output: ("common.items.armor.carapace.foot", 1), + output: ("common.items.armor.hide.carapace.foot", 1), inputs: [ (Item("common.items.crafting_ing.hide.carapace"), 4), (Item("common.items.crafting_ing.leather.leather_strips"), 2), @@ -473,7 +530,7 @@ craft_sprite: Some(CraftingBench), ), "carapace hands": ( - output: ("common.items.armor.carapace.hand", 1), + output: ("common.items.armor.hide.carapace.hand", 1), inputs: [ (Item("common.items.crafting_ing.hide.carapace"), 4), (Item("common.items.crafting_ing.leather.leather_strips"), 2), @@ -481,7 +538,7 @@ craft_sprite: Some(CraftingBench), ), "carapace pants": ( - output: ("common.items.armor.carapace.pants", 1), + output: ("common.items.armor.hide.carapace.pants", 1), inputs: [ (Item("common.items.crafting_ing.hide.carapace"), 8), (Item("common.items.crafting_ing.leather.leather_strips"), 4), @@ -489,73 +546,73 @@ craft_sprite: Some(CraftingBench), ), "carapace shoulder": ( - output: ("common.items.armor.carapace.shoulder", 1), + output: ("common.items.armor.hide.carapace.shoulder", 1), inputs: [ (Item("common.items.crafting_ing.hide.carapace"), 10), (Item("common.items.crafting_ing.leather.leather_strips"), 6), ], craft_sprite: Some(CraftingBench), ), -//ARMOR/LEATHER/PLATESCALE - "platescale back": ( - output: ("common.items.armor.platescale.back", 1), +//ARMOR/HIDE/PRIMAL + "primal back": ( + output: ("common.items.armor.hide.primal.back", 1), inputs: [ (Item("common.items.crafting_ing.hide.plate"), 4), (Item("common.items.crafting_ing.leather.leather_strips"), 2), ], craft_sprite: Some(CraftingBench), ), - "platescale belt": ( - output: ("common.items.armor.platescale.belt", 1), + "primal belt": ( + output: ("common.items.armor.hide.primal.belt", 1), inputs: [ (Item("common.items.crafting_ing.hide.plate"), 2), (Item("common.items.crafting_ing.leather.leather_strips"), 2), ], craft_sprite: Some(CraftingBench), ), - "platescale chest": ( - output: ("common.items.armor.platescale.chest", 1), + "primal chest": ( + output: ("common.items.armor.hide.primal.chest", 1), inputs: [ (Item("common.items.crafting_ing.hide.plate"), 10), (Item("common.items.crafting_ing.leather.leather_strips"), 4), ], craft_sprite: Some(CraftingBench), ), - "platescale feet": ( - output: ("common.items.armor.platescale.foot", 1), + "primal feet": ( + output: ("common.items.armor.hide.primal.foot", 1), inputs: [ (Item("common.items.crafting_ing.hide.plate"), 4), (Item("common.items.crafting_ing.leather.leather_strips"), 2), ], craft_sprite: Some(CraftingBench), ), - "platescale hands": ( - output: ("common.items.armor.platescale.hand", 1), + "primal hands": ( + output: ("common.items.armor.hide.primal.hand", 1), inputs: [ (Item("common.items.crafting_ing.hide.plate"), 4), (Item("common.items.crafting_ing.leather.leather_strips"), 2), ], craft_sprite: Some(CraftingBench), ), - "platescale pants": ( - output: ("common.items.armor.platescale.pants", 1), + "primal pants": ( + output: ("common.items.armor.hide.primal.pants", 1), inputs: [ (Item("common.items.crafting_ing.hide.plate"), 8), (Item("common.items.crafting_ing.leather.leather_strips"), 4), ], craft_sprite: Some(CraftingBench), ), - "platescale shoulder": ( - output: ("common.items.armor.platescale.shoulder", 1), + "primal shoulder": ( + output: ("common.items.armor.hide.primal.shoulder", 1), inputs: [ (Item("common.items.crafting_ing.hide.plate"), 10), (Item("common.items.crafting_ing.leather.leather_strips"), 6), ], craft_sprite: Some(CraftingBench), ), -//ARMOR/LEATHER/DRAGONSCALE +//ARMOR/HIDE/DRAGONSCALE "dragonscale back": ( - output: ("common.items.armor.dragonscale.back", 1), + output: ("common.items.armor.hide.dragonscale.back", 1), inputs: [ (Item("common.items.crafting_ing.hide.dragon_scale"), 4), (Item("common.items.crafting_ing.leather.leather_strips"), 2), @@ -563,7 +620,7 @@ craft_sprite: Some(CraftingBench), ), "dragonscale belt": ( - output: ("common.items.armor.dragonscale.belt", 1), + output: ("common.items.armor.hide.dragonscale.belt", 1), inputs: [ (Item("common.items.crafting_ing.hide.dragon_scale"), 2), (Item("common.items.crafting_ing.leather.leather_strips"), 2), @@ -571,7 +628,7 @@ craft_sprite: Some(CraftingBench), ), "dragonscale chest": ( - output: ("common.items.armor.dragonscale.chest", 1), + output: ("common.items.armor.hide.dragonscale.chest", 1), inputs: [ (Item("common.items.crafting_ing.hide.dragon_scale"), 10), (Item("common.items.crafting_ing.leather.leather_strips"), 4), @@ -579,7 +636,7 @@ craft_sprite: Some(CraftingBench), ), "dragonscale feet": ( - output: ("common.items.armor.dragonscale.foot", 1), + output: ("common.items.armor.hide.dragonscale.foot", 1), inputs: [ (Item("common.items.crafting_ing.hide.dragon_scale"), 4), (Item("common.items.crafting_ing.leather.leather_strips"), 2), @@ -587,7 +644,7 @@ craft_sprite: Some(CraftingBench), ), "dragonscale hands": ( - output: ("common.items.armor.dragonscale.hand", 1), + output: ("common.items.armor.hide.dragonscale.hand", 1), inputs: [ (Item("common.items.crafting_ing.hide.dragon_scale"), 4), (Item("common.items.crafting_ing.leather.leather_strips"), 2), @@ -595,7 +652,7 @@ craft_sprite: Some(CraftingBench), ), "dragonscale pants": ( - output: ("common.items.armor.dragonscale.pants", 1), + output: ("common.items.armor.hide.dragonscale.pants", 1), inputs: [ (Item("common.items.crafting_ing.hide.dragon_scale"), 8), (Item("common.items.crafting_ing.leather.leather_strips"), 4), @@ -603,13 +660,697 @@ craft_sprite: Some(CraftingBench), ), "dragonscale shoulder": ( - output: ("common.items.armor.dragonscale.shoulder", 1), + output: ("common.items.armor.hide.dragonscale.shoulder", 1), inputs: [ (Item("common.items.crafting_ing.hide.dragon_scale"), 10), (Item("common.items.crafting_ing.leather.leather_strips"), 6), ], craft_sprite: Some(CraftingBench), ), +//ARMOR/CLOTH/LINEN + "linen back": ( + output: ("common.items.armor.cloth.linen.back", 1), + inputs: [ + (Item("common.items.crafting_ing.cloth.linen"), 4), + (Item("common.items.crafting_ing.leather.leather_strips"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "linen belt": ( + output: ("common.items.armor.cloth.linen.belt", 1), + inputs: [ + (Item("common.items.crafting_ing.cloth.linen"), 2), + (Item("common.items.crafting_ing.leather.leather_strips"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "linen chest": ( + output: ("common.items.armor.cloth.linen.chest", 1), + inputs: [ + (Item("common.items.crafting_ing.cloth.linen"), 10), + (Item("common.items.crafting_ing.leather.leather_strips"), 4), + ], + craft_sprite: Some(CraftingBench), + ), + "linen feet": ( + output: ("common.items.armor.cloth.linen.foot", 1), + inputs: [ + (Item("common.items.crafting_ing.cloth.linen"), 4), + (Item("common.items.crafting_ing.leather.leather_strips"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "linen hands": ( + output: ("common.items.armor.cloth.linen.hand", 1), + inputs: [ + (Item("common.items.crafting_ing.cloth.linen"), 4), + (Item("common.items.crafting_ing.leather.leather_strips"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "linen pants": ( + output: ("common.items.armor.cloth.linen.pants", 1), + inputs: [ + (Item("common.items.crafting_ing.cloth.linen"), 8), + (Item("common.items.crafting_ing.leather.leather_strips"), 4), + ], + craft_sprite: Some(CraftingBench), + ), + "linen shoulder": ( + output: ("common.items.armor.cloth.linen.shoulder", 1), + inputs: [ + (Item("common.items.crafting_ing.cloth.linen"), 10), + (Item("common.items.crafting_ing.leather.leather_strips"), 6), + ], + craft_sprite: Some(CraftingBench), + ), +//ARMOR/CLOTH/WOOLEN + "woolen back": ( + output: ("common.items.armor.cloth.woolen.back", 1), + inputs: [ + (Item("common.items.crafting_ing.cloth.wool"), 4), + (Item("common.items.crafting_ing.leather.leather_strips"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "woolen belt": ( + output: ("common.items.armor.cloth.woolen.belt", 1), + inputs: [ + (Item("common.items.crafting_ing.cloth.wool"), 2), + (Item("common.items.crafting_ing.leather.leather_strips"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "woolen chest": ( + output: ("common.items.armor.cloth.woolen.chest", 1), + inputs: [ + (Item("common.items.crafting_ing.cloth.wool"), 10), + (Item("common.items.crafting_ing.leather.leather_strips"), 4), + ], + craft_sprite: Some(CraftingBench), + ), + "woolen feet": ( + output: ("common.items.armor.cloth.woolen.foot", 1), + inputs: [ + (Item("common.items.crafting_ing.cloth.wool"), 4), + (Item("common.items.crafting_ing.leather.leather_strips"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "woolen hands": ( + output: ("common.items.armor.cloth.woolen.hand", 1), + inputs: [ + (Item("common.items.crafting_ing.cloth.wool"), 4), + (Item("common.items.crafting_ing.leather.leather_strips"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "woolen pants": ( + output: ("common.items.armor.cloth.woolen.pants", 1), + inputs: [ + (Item("common.items.crafting_ing.cloth.wool"), 8), + (Item("common.items.crafting_ing.leather.leather_strips"), 4), + ], + craft_sprite: Some(CraftingBench), + ), + "woolen shoulder": ( + output: ("common.items.armor.cloth.woolen.shoulder", 1), + inputs: [ + (Item("common.items.crafting_ing.cloth.wool"), 10), + (Item("common.items.crafting_ing.leather.leather_strips"), 6), + ], + craft_sprite: Some(CraftingBench), + ), +//ARMOR/CLOTH/SILKEN + "silken back": ( + output: ("common.items.armor.cloth.silken.back", 1), + inputs: [ + (Item("common.items.crafting_ing.cloth.silk"), 4), + (Item("common.items.crafting_ing.leather.leather_strips"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "silken belt": ( + output: ("common.items.armor.cloth.silken.belt", 1), + inputs: [ + (Item("common.items.crafting_ing.cloth.silk"), 2), + (Item("common.items.crafting_ing.leather.leather_strips"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "silken chest": ( + output: ("common.items.armor.cloth.silken.chest", 1), + inputs: [ + (Item("common.items.crafting_ing.cloth.silk"), 10), + (Item("common.items.crafting_ing.leather.leather_strips"), 4), + ], + craft_sprite: Some(CraftingBench), + ), + "silken feet": ( + output: ("common.items.armor.cloth.silken.foot", 1), + inputs: [ + (Item("common.items.crafting_ing.cloth.silk"), 4), + (Item("common.items.crafting_ing.leather.leather_strips"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "silken hands": ( + output: ("common.items.armor.cloth.silken.hand", 1), + inputs: [ + (Item("common.items.crafting_ing.cloth.silk"), 4), + (Item("common.items.crafting_ing.leather.leather_strips"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "silken pants": ( + output: ("common.items.armor.cloth.silken.pants", 1), + inputs: [ + (Item("common.items.crafting_ing.cloth.silk"), 8), + (Item("common.items.crafting_ing.leather.leather_strips"), 4), + ], + craft_sprite: Some(CraftingBench), + ), + "silken shoulder": ( + output: ("common.items.armor.cloth.silken.shoulder", 1), + inputs: [ + (Item("common.items.crafting_ing.cloth.silk"), 10), + (Item("common.items.crafting_ing.leather.leather_strips"), 6), + ], + craft_sprite: Some(CraftingBench), + ), +//ARMOR/CLOTH/DRUID + "druid back": ( + output: ("common.items.armor.cloth.druid.back", 1), + inputs: [ + (Item("common.items.crafting_ing.cloth.lifecloth"), 4), + (Item("common.items.crafting_ing.leather.leather_strips"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "druid belt": ( + output: ("common.items.armor.cloth.druid.belt", 1), + inputs: [ + (Item("common.items.crafting_ing.cloth.lifecloth"), 2), + (Item("common.items.crafting_ing.leather.leather_strips"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "druid chest": ( + output: ("common.items.armor.cloth.druid.chest", 1), + inputs: [ + (Item("common.items.crafting_ing.cloth.lifecloth"), 10), + (Item("common.items.crafting_ing.leather.leather_strips"), 4), + ], + craft_sprite: Some(CraftingBench), + ), + "druid feet": ( + output: ("common.items.armor.cloth.druid.foot", 1), + inputs: [ + (Item("common.items.crafting_ing.cloth.lifecloth"), 4), + (Item("common.items.crafting_ing.leather.leather_strips"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "druid hands": ( + output: ("common.items.armor.cloth.druid.hand", 1), + inputs: [ + (Item("common.items.crafting_ing.cloth.lifecloth"), 4), + (Item("common.items.crafting_ing.leather.leather_strips"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "druid pants": ( + output: ("common.items.armor.cloth.druid.pants", 1), + inputs: [ + (Item("common.items.crafting_ing.cloth.lifecloth"), 8), + (Item("common.items.crafting_ing.leather.leather_strips"), 4), + ], + craft_sprite: Some(CraftingBench), + ), + "druid shoulder": ( + output: ("common.items.armor.cloth.druid.shoulder", 1), + inputs: [ + (Item("common.items.crafting_ing.cloth.lifecloth"), 10), + (Item("common.items.crafting_ing.leather.leather_strips"), 6), + ], + craft_sprite: Some(CraftingBench), + ), +//ARMOR/CLOTH/MOONWEAVE + "moonweave back": ( + output: ("common.items.armor.cloth.moonweave.back", 1), + inputs: [ + (Item("common.items.crafting_ing.cloth.moonweave"), 4), + (Item("common.items.crafting_ing.leather.leather_strips"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "moonweave belt": ( + output: ("common.items.armor.cloth.moonweave.belt", 1), + inputs: [ + (Item("common.items.crafting_ing.cloth.moonweave"), 2), + (Item("common.items.crafting_ing.leather.leather_strips"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "moonweave chest": ( + output: ("common.items.armor.cloth.moonweave.chest", 1), + inputs: [ + (Item("common.items.crafting_ing.cloth.moonweave"), 10), + (Item("common.items.crafting_ing.leather.leather_strips"), 4), + ], + craft_sprite: Some(CraftingBench), + ), + "moonweave feet": ( + output: ("common.items.armor.cloth.moonweave.foot", 1), + inputs: [ + (Item("common.items.crafting_ing.cloth.moonweave"), 4), + (Item("common.items.crafting_ing.leather.leather_strips"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "moonweave hands": ( + output: ("common.items.armor.cloth.moonweave.hand", 1), + inputs: [ + (Item("common.items.crafting_ing.cloth.moonweave"), 4), + (Item("common.items.crafting_ing.leather.leather_strips"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "moonweave pants": ( + output: ("common.items.armor.cloth.moonweave.pants", 1), + inputs: [ + (Item("common.items.crafting_ing.cloth.moonweave"), 8), + (Item("common.items.crafting_ing.leather.leather_strips"), 4), + ], + craft_sprite: Some(CraftingBench), + ), + "moonweave shoulder": ( + output: ("common.items.armor.cloth.moonweave.shoulder", 1), + inputs: [ + (Item("common.items.crafting_ing.cloth.moonweave"), 10), + (Item("common.items.crafting_ing.leather.leather_strips"), 6), + ], + craft_sprite: Some(CraftingBench), + ), +//ARMOR/CLOTH/SUNSILK + "sunsilk back": ( + output: ("common.items.armor.cloth.sunsilk.back", 1), + inputs: [ + (Item("common.items.crafting_ing.cloth.sunsilk"), 4), + (Item("common.items.crafting_ing.leather.leather_strips"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "sunsilk belt": ( + output: ("common.items.armor.cloth.sunsilk.belt", 1), + inputs: [ + (Item("common.items.crafting_ing.cloth.sunsilk"), 2), + (Item("common.items.crafting_ing.leather.leather_strips"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "sunsilk chest": ( + output: ("common.items.armor.cloth.sunsilk.chest", 1), + inputs: [ + (Item("common.items.crafting_ing.cloth.sunsilk"), 10), + (Item("common.items.crafting_ing.leather.leather_strips"), 4), + ], + craft_sprite: Some(CraftingBench), + ), + "sunsilk feet": ( + output: ("common.items.armor.cloth.sunsilk.foot", 1), + inputs: [ + (Item("common.items.crafting_ing.cloth.sunsilk"), 4), + (Item("common.items.crafting_ing.leather.leather_strips"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "sunsilk hands": ( + output: ("common.items.armor.cloth.sunsilk.hand", 1), + inputs: [ + (Item("common.items.crafting_ing.cloth.sunsilk"), 4), + (Item("common.items.crafting_ing.leather.leather_strips"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "sunsilk pants": ( + output: ("common.items.armor.cloth.sunsilk.pants", 1), + inputs: [ + (Item("common.items.crafting_ing.cloth.sunsilk"), 8), + (Item("common.items.crafting_ing.leather.leather_strips"), 4), + ], + craft_sprite: Some(CraftingBench), + ), + "sunsilk shoulder": ( + output: ("common.items.armor.cloth.sunsilk.shoulder", 1), + inputs: [ + (Item("common.items.crafting_ing.cloth.sunsilk"), 10), + (Item("common.items.crafting_ing.leather.leather_strips"), 6), + ], + craft_sprite: Some(CraftingBench), + ), +//ARMOR/MAIL/BRONZE + "bronze back": ( + output: ("common.items.armor.mail.bronze.back", 1), + inputs: [ + (Item("common.items.mineral.ingot.bronze"), 4), + (Item("common.items.crafting_ing.leather.leather_strips"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "bronze belt": ( + output: ("common.items.armor.mail.bronze.belt", 1), + inputs: [ + (Item("common.items.mineral.ingot.bronze"), 2), + (Item("common.items.crafting_ing.leather.leather_strips"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "bronze chest": ( + output: ("common.items.armor.mail.bronze.chest", 1), + inputs: [ + (Item("common.items.mineral.ingot.bronze"), 10), + (Item("common.items.crafting_ing.leather.leather_strips"), 4), + ], + craft_sprite: Some(CraftingBench), + ), + "bronze feet": ( + output: ("common.items.armor.mail.bronze.foot", 1), + inputs: [ + (Item("common.items.mineral.ingot.bronze"), 4), + (Item("common.items.crafting_ing.leather.leather_strips"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "bronze hands": ( + output: ("common.items.armor.mail.bronze.hand", 1), + inputs: [ + (Item("common.items.mineral.ingot.bronze"), 4), + (Item("common.items.crafting_ing.leather.leather_strips"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "bronze pants": ( + output: ("common.items.armor.mail.bronze.pants", 1), + inputs: [ + (Item("common.items.mineral.ingot.bronze"), 8), + (Item("common.items.crafting_ing.leather.leather_strips"), 4), + ], + craft_sprite: Some(CraftingBench), + ), + "bronze shoulder": ( + output: ("common.items.armor.mail.bronze.shoulder", 1), + inputs: [ + (Item("common.items.mineral.ingot.bronze"), 10), + (Item("common.items.crafting_ing.leather.leather_strips"), 6), + ], + craft_sprite: Some(CraftingBench), + ), + //ARMOR/MAIL/IRON + "iron back": ( + output: ("common.items.armor.mail.iron.back", 1), + inputs: [ + (Item("common.items.mineral.ingot.iron"), 4), + (Item("common.items.crafting_ing.leather.leather_strips"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "iron belt": ( + output: ("common.items.armor.mail.iron.belt", 1), + inputs: [ + (Item("common.items.mineral.ingot.iron"), 2), + (Item("common.items.crafting_ing.leather.leather_strips"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "iron chest": ( + output: ("common.items.armor.mail.iron.chest", 1), + inputs: [ + (Item("common.items.mineral.ingot.iron"), 10), + (Item("common.items.crafting_ing.leather.leather_strips"), 4), + ], + craft_sprite: Some(CraftingBench), + ), + "iron feet": ( + output: ("common.items.armor.mail.iron.foot", 1), + inputs: [ + (Item("common.items.mineral.ingot.iron"), 4), + (Item("common.items.crafting_ing.leather.leather_strips"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "iron hands": ( + output: ("common.items.armor.mail.iron.hand", 1), + inputs: [ + (Item("common.items.mineral.ingot.iron"), 4), + (Item("common.items.crafting_ing.leather.leather_strips"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "iron pants": ( + output: ("common.items.armor.mail.iron.pants", 1), + inputs: [ + (Item("common.items.mineral.ingot.iron"), 8), + (Item("common.items.crafting_ing.leather.leather_strips"), 4), + ], + craft_sprite: Some(CraftingBench), + ), + "iron shoulder": ( + output: ("common.items.armor.mail.iron.shoulder", 1), + inputs: [ + (Item("common.items.mineral.ingot.iron"), 10), + (Item("common.items.crafting_ing.leather.leather_strips"), 6), + ], + craft_sprite: Some(CraftingBench), + ), +//ARMOR/MAIL/STEEL + "steel back": ( + output: ("common.items.armor.mail.steel.back", 1), + inputs: [ + (Item("common.items.mineral.ingot.steel"), 4), + (Item("common.items.crafting_ing.leather.leather_strips"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "steel belt": ( + output: ("common.items.armor.mail.steel.belt", 1), + inputs: [ + (Item("common.items.mineral.ingot.steel"), 2), + (Item("common.items.crafting_ing.leather.leather_strips"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "steel chest": ( + output: ("common.items.armor.mail.steel.chest", 1), + inputs: [ + (Item("common.items.mineral.ingot.steel"), 10), + (Item("common.items.crafting_ing.leather.leather_strips"), 4), + ], + craft_sprite: Some(CraftingBench), + ), + "steel feet": ( + output: ("common.items.armor.mail.steel.foot", 1), + inputs: [ + (Item("common.items.mineral.ingot.steel"), 4), + (Item("common.items.crafting_ing.leather.leather_strips"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "steel hands": ( + output: ("common.items.armor.mail.steel.hand", 1), + inputs: [ + (Item("common.items.mineral.ingot.steel"), 4), + (Item("common.items.crafting_ing.leather.leather_strips"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "steel pants": ( + output: ("common.items.armor.mail.steel.pants", 1), + inputs: [ + (Item("common.items.mineral.ingot.steel"), 8), + (Item("common.items.crafting_ing.leather.leather_strips"), 4), + ], + craft_sprite: Some(CraftingBench), + ), + "steel shoulder": ( + output: ("common.items.armor.mail.steel.shoulder", 1), + inputs: [ + (Item("common.items.mineral.ingot.steel"), 10), + (Item("common.items.crafting_ing.leather.leather_strips"), 6), + ], + craft_sprite: Some(CraftingBench), + ), +//ARMOR/MAIL/COBALT + "cobalt back": ( + output: ("common.items.armor.mail.cobalt.back", 1), + inputs: [ + (Item("common.items.mineral.ingot.cobalt"), 4), + (Item("common.items.crafting_ing.leather.leather_strips"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "cobalt belt": ( + output: ("common.items.armor.mail.cobalt.belt", 1), + inputs: [ + (Item("common.items.mineral.ingot.cobalt"), 2), + (Item("common.items.crafting_ing.leather.leather_strips"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "cobalt chest": ( + output: ("common.items.armor.mail.cobalt.chest", 1), + inputs: [ + (Item("common.items.mineral.ingot.cobalt"), 10), + (Item("common.items.crafting_ing.leather.leather_strips"), 4), + ], + craft_sprite: Some(CraftingBench), + ), + "cobalt feet": ( + output: ("common.items.armor.mail.cobalt.foot", 1), + inputs: [ + (Item("common.items.mineral.ingot.cobalt"), 4), + (Item("common.items.crafting_ing.leather.leather_strips"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "cobalt hands": ( + output: ("common.items.armor.mail.cobalt.hand", 1), + inputs: [ + (Item("common.items.mineral.ingot.cobalt"), 4), + (Item("common.items.crafting_ing.leather.leather_strips"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "cobalt pants": ( + output: ("common.items.armor.mail.cobalt.pants", 1), + inputs: [ + (Item("common.items.mineral.ingot.cobalt"), 8), + (Item("common.items.crafting_ing.leather.leather_strips"), 4), + ], + craft_sprite: Some(CraftingBench), + ), + "cobalt shoulder": ( + output: ("common.items.armor.mail.cobalt.shoulder", 1), + inputs: [ + (Item("common.items.mineral.ingot.cobalt"), 10), + (Item("common.items.crafting_ing.leather.leather_strips"), 6), + ], + craft_sprite: Some(CraftingBench), + ), +//ARMOR/MAIL/BLOODSTEEL + "bloodsteel back": ( + output: ("common.items.armor.mail.bloodsteel.back", 1), + inputs: [ + (Item("common.items.mineral.ingot.bloodsteel"), 4), + (Item("common.items.crafting_ing.leather.leather_strips"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "bloodsteel belt": ( + output: ("common.items.armor.mail.bloodsteel.belt", 1), + inputs: [ + (Item("common.items.mineral.ingot.bloodsteel"), 2), + (Item("common.items.crafting_ing.leather.leather_strips"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "bloodsteel chest": ( + output: ("common.items.armor.mail.bloodsteel.chest", 1), + inputs: [ + (Item("common.items.mineral.ingot.bloodsteel"), 10), + (Item("common.items.crafting_ing.leather.leather_strips"), 4), + ], + craft_sprite: Some(CraftingBench), + ), + "bloodsteel feet": ( + output: ("common.items.armor.mail.bloodsteel.foot", 1), + inputs: [ + (Item("common.items.mineral.ingot.bloodsteel"), 4), + (Item("common.items.crafting_ing.leather.leather_strips"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "bloodsteel hands": ( + output: ("common.items.armor.mail.brobloodsteelnze.hand", 1), + inputs: [ + (Item("common.items.mineral.ingot.bloodsteel"), 4), + (Item("common.items.crafting_ing.leather.leather_strips"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "bloodsteel pants": ( + output: ("common.items.armor.mail.bloodsteel.pants", 1), + inputs: [ + (Item("common.items.mineral.ingot.bloodsteel"), 8), + (Item("common.items.crafting_ing.leather.leather_strips"), 4), + ], + craft_sprite: Some(CraftingBench), + ), + "bloodsteel shoulder": ( + output: ("common.items.armor.mail.bloodsteel.shoulder", 1), + inputs: [ + (Item("common.items.mineral.ingot.bloodsteel"), 10), + (Item("common.items.crafting_ing.leather.leather_strips"), 6), + ], + craft_sprite: Some(CraftingBench), + ), +//ARMOR/MAIL/ORICHALCUM + "orichalcum back": ( + output: ("common.items.armor.mail.orichalcum.back", 1), + inputs: [ + (Item("common.items.mineral.ingot.orichalcum"), 4), + (Item("common.items.crafting_ing.leather.leather_strips"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "orichalcum belt": ( + output: ("common.items.armor.mail.orichalcum.belt", 1), + inputs: [ + (Item("common.items.mineral.ingot.orichalcum"), 2), + (Item("common.items.crafting_ing.leather.leather_strips"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "orichalcum chest": ( + output: ("common.items.armor.mail.orichalcum.chest", 1), + inputs: [ + (Item("common.items.mineral.ingot.orichalcum"), 10), + (Item("common.items.crafting_ing.leather.leather_strips"), 4), + ], + craft_sprite: Some(CraftingBench), + ), + "orichalcum feet": ( + output: ("common.items.armor.mail.orichalcum.foot", 1), + inputs: [ + (Item("common.items.mineral.ingot.orichalcum"), 4), + (Item("common.items.crafting_ing.leather.leather_strips"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "orichalcum hands": ( + output: ("common.items.armor.mail.orichalcum.hand", 1), + inputs: [ + (Item("common.items.mineral.ingot.orichalcum"), 4), + (Item("common.items.crafting_ing.leather.leather_strips"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "orichalcum pants": ( + output: ("common.items.armor.mail.orichalcum.pants", 1), + inputs: [ + (Item("common.items.mineral.ingot.orichalcum"), 8), + (Item("common.items.crafting_ing.leather.leather_strips"), 4), + ], + craft_sprite: Some(CraftingBench), + ), + "orichalcum shoulder": ( + output: ("common.items.armor.mail.orichalcum.shoulder", 1), + inputs: [ + (Item("common.items.mineral.ingot.orichalcum"), 10), + (Item("common.items.crafting_ing.leather.leather_strips"), 6), + ], + craft_sprite: Some(CraftingBench), + ), "Seashell Necklace": ( output: ("common.items.armor.misc.neck.shell", 1), diff --git a/assets/server/manifests/kits.ron b/assets/server/manifests/kits.ron index bc2bb504e5..09c4726a39 100644 --- a/assets/server/manifests/kits.ron +++ b/assets/server/manifests/kits.ron @@ -51,12 +51,12 @@ ("common.items.food.apple_mushroom_curry", 100), ], "tier-4": [ - ("common.items.armor.steel.belt", 1), - ("common.items.armor.steel.chest", 1), - ("common.items.armor.steel.foot", 1), - ("common.items.armor.steel.hand", 1), - ("common.items.armor.steel.pants", 1), - ("common.items.armor.steel.shoulder", 1), + ("common.items.armor.mail.steel.belt", 1), + ("common.items.armor.mail.steel.chest", 1), + ("common.items.armor.mail.steel.foot", 1), + ("common.items.armor.mail.steel.hand", 1), + ("common.items.armor.mail.steel.pants", 1), + ("common.items.armor.mail.steel.shoulder", 1), ("common.items.weapons.sword.cobalt-0", 1), ("common.items.weapons.axe.cobalt_axe-0", 1), ("common.items.weapons.hammer.cobalt_hammer-0", 1), diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron index 4da6e7de6e..64dbd1bb9d 100644 --- a/assets/voxygen/item_image_manifest.ron +++ b/assets/voxygen/item_image_manifest.ron @@ -1126,31 +1126,6 @@ "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.druid.chest", - (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, - ), - Armor(Pants("Druid")): VoxTrans( - "voxel.armor.druid.pants", - (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, - ), - Armor(Belt("Druid")): VoxTrans( - "voxel.armor.druid.belt", - (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.4, - ), - Armor(Foot("Druid")): VoxTrans( - "voxel.armor.druid.foot", - (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1, - ), - Armor(Hand("Druid")): VoxTrans( - "voxel.armor.druid.hand", - (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0, - ), - 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("WorkerBlue")): VoxTrans( "voxel.armor.misc.pants.worker_blue", @@ -1250,31 +1225,6 @@ "voxel.armor.assassin.shoulder", (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, ), - // Starting Armor - Plate - Armor(Chest("Plate")): VoxTrans( - "voxel.armor.plate.chest", - (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, - ), - Armor(Pants("Plate")): VoxTrans( - "voxel.armor.plate.pants", - (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, - ), - Armor(Belt("Plate")): VoxTrans( - "voxel.armor.plate.belt", - (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.8, - ), - Armor(Foot("Plate")): VoxTrans( - "voxel.armor.plate.foot", - (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1, - ), - Armor(Hand("Plate")): VoxTrans( - "voxel.armor.plate.hand", - (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0, - ), - Armor(Shoulder("Plate")): VoxTrans( - "voxel.armor.plate.shoulder", - (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2, - ), //PlateLeather Armor Armor(Chest("LeatherPlate")): VoxTrans( "voxel.armor.leather_plate.chest", @@ -1301,53 +1251,53 @@ (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2, ), //Leather0 Armor - Armor(Chest("Swift")): VoxTrans( - "voxel.armor.swift.chest", + Armor(Chest("Leather")): VoxTrans( + "voxel.armor.hide.leather.chest", (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, ), - Armor(Pants("Swift")): VoxTrans( - "voxel.armor.swift.pants", + Armor(Pants("Leather")): VoxTrans( + "voxel.armor.hide.leather.pants", (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, ), - Armor(Belt("Swift")): VoxTrans( - "voxel.armor.swift.belt", + Armor(Belt("Leather")): VoxTrans( + "voxel.armor.hide.leather.belt", (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.8, ), - Armor(Foot("Swift")): VoxTrans( - "voxel.armor.swift.foot", + Armor(Foot("Leather")): VoxTrans( + "voxel.armor.hide.leather.foot", (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1, ), - Armor(Hand("Swift")): VoxTrans( - "voxel.armor.swift.hand", + Armor(Hand("Leather")): VoxTrans( + "voxel.armor.hide.leather.hand", (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0, ), - Armor(Shoulder("Swift")): VoxTrans( - "voxel.armor.swift.shoulder", + Armor(Shoulder("Leather")): VoxTrans( + "voxel.armor.hide.leather.shoulder", (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2, ), - //Agile Armor - Armor(Chest("Agile")): VoxTrans( - "voxel.armor.agile.chest", + //Rawhide Armor + Armor(Chest("Rawhide")): VoxTrans( + "voxel.armor.hide.rawhide.chest", (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, ), - Armor(Pants("Agile")): VoxTrans( - "voxel.armor.agile.pants", + Armor(Pants("Rawhide")): VoxTrans( + "voxel.armor.hide.rawhide.pants", (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, ), - Armor(Belt("Agile")): VoxTrans( - "voxel.armor.agile.belt", + Armor(Belt("Rawhide")): VoxTrans( + "voxel.armor.hide.rawhide.belt", (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.8, ), - Armor(Foot("Agile")): VoxTrans( - "voxel.armor.agile.foot", + Armor(Foot("Rawhide")): VoxTrans( + "voxel.armor.hide.rawhide.foot", (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1, ), - Armor(Hand("Agile")): VoxTrans( - "voxel.armor.agile.hand", + Armor(Hand("Rawhide")): VoxTrans( + "voxel.armor.hide.rawhide.hand", (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0, ), - Armor(Shoulder("Agile")): VoxTrans( - "voxel.armor.agile.shoulder", + Armor(Shoulder("Rawhide")): VoxTrans( + "voxel.armor.hide.rawhide.shoulder", (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2, ), //Ferocious Armor @@ -1672,118 +1622,118 @@ ), //Scale Set Armor(Chest("Scale")): VoxTrans( - "voxel.armor.scale.chest", + "voxel.armor.hide.scale.chest", (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, ), Armor(Pants("Scale")): VoxTrans( - "voxel.armor.scale.pants", + "voxel.armor.hide.scale.pants", (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, ), Armor(Belt("Scale")): VoxTrans( - "voxel.armor.scale.belt", + "voxel.armor.hide.scale.belt", (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.4, ), Armor(Foot("Scale")): VoxTrans( - "voxel.armor.scale.foot", + "voxel.armor.hide.scale.foot", (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1, ), Armor(Hand("Scale")): VoxTrans( - "voxel.armor.scale.hand", + "voxel.armor.hide.scale.hand", (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0, ), Armor(Shoulder("Scale")): VoxTrans( - "voxel.armor.scale.shoulder", + "voxel.armor.hide.scale.shoulder", (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2, ), Armor(Back("Scale")): VoxTrans( - "voxel.armor.scale.back", + "voxel.armor.hide.scale.back", (0.0, 0.0, 0.0), (-90.0, 0.0, 0.0), 1.0, ), //Carapace Set Armor(Chest("Carapace")): VoxTrans( - "voxel.armor.carapace.chest", + "voxel.armor.hide.carapace.chest", (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, ), Armor(Pants("Carapace")): VoxTrans( - "voxel.armor.carapace.pants", + "voxel.armor.hide.carapace.pants", (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, ), Armor(Belt("Carapace")): VoxTrans( - "voxel.armor.carapace.belt", + "voxel.armor.hide.carapace.belt", (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.4, ), Armor(Foot("Carapace")): VoxTrans( - "voxel.armor.carapace.foot", + "voxel.armor.hide.carapace.foot", (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1, ), Armor(Hand("Carapace")): VoxTrans( - "voxel.armor.carapace.hand", + "voxel.armor.hide.carapace.hand", (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0, ), Armor(Shoulder("Carapace")): VoxTrans( - "voxel.armor.carapace.shoulder", + "voxel.armor.hide.carapace.shoulder", (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2, ), Armor(Back("Carapace")): VoxTrans( - "voxel.armor.carapace.back", + "voxel.armor.hide.carapace.back", (0.0, 0.0, 0.0), (-90.0, 0.0, 0.0), 1.0, ), - //Platescale Set - Armor(Chest("Platescale")): VoxTrans( - "voxel.armor.platescale.chest", + //Primal Set + Armor(Chest("Primal")): VoxTrans( + "voxel.armor.hide.primal.chest", (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, ), - Armor(Pants("Platescale")): VoxTrans( - "voxel.armor.platescale.pants", + Armor(Pants("Primal")): VoxTrans( + "voxel.armor.hide.primal.pants", (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, ), - Armor(Belt("Platescale")): VoxTrans( - "voxel.armor.platescale.belt", + Armor(Belt("Primal")): VoxTrans( + "voxel.armor.hide.primal.belt", (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.4, ), - Armor(Foot("Platescale")): VoxTrans( - "voxel.armor.platescale.foot", + Armor(Foot("Primal")): VoxTrans( + "voxel.armor.hide.primal.foot", (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1, ), - Armor(Hand("Platescale")): VoxTrans( - "voxel.armor.platescale.hand", + Armor(Hand("Primal")): VoxTrans( + "voxel.armor.hide.primal.hand", (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0, ), - Armor(Shoulder("Platescale")): VoxTrans( - "voxel.armor.platescale.shoulder", + Armor(Shoulder("Primal")): VoxTrans( + "voxel.armor.hide.primal.shoulder", (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2, ), - Armor(Back("Platescale")): VoxTrans( - "voxel.armor.platescale.back", + Armor(Back("Primal")): VoxTrans( + "voxel.armor.hide.primal.back", (0.0, 0.0, 0.0), (-90.0, 0.0, 0.0), 1.0, ), //Dragonscale Set Armor(Chest("Dragonscale")): VoxTrans( - "voxel.armor.dragonscale.chest", + "voxel.armor.hide.dragonscale.chest", (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, ), Armor(Pants("Dragonscale")): VoxTrans( - "voxel.armor.dragonscale.pants", + "voxel.armor.hide.dragonscale.pants", (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, ), Armor(Belt("Dragonscale")): VoxTrans( - "voxel.armor.dragonscale.belt", + "voxel.armor.hide.dragonscale.belt", (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.4, ), Armor(Foot("Dragonscale")): VoxTrans( - "voxel.armor.dragonscale.foot", + "voxel.armor.hide.dragonscale.foot", (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1, ), Armor(Hand("Dragonscale")): VoxTrans( - "voxel.armor.dragonscale.hand", + "voxel.armor.hide.dragonscale.hand", (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0, ), Armor(Shoulder("Dragonscale")): VoxTrans( - "voxel.armor.dragonscale.shoulder", + "voxel.armor.hide.dragonscale.shoulder", (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2, ), Armor(Back("Dragonscale")): VoxTrans( - "voxel.armor.dragonscale.back", + "voxel.armor.hide.dragonscale.back", (0.0, 0.0, 0.0), (-90.0, 0.0, 0.0), 1.0, ), //Savage Set @@ -1817,350 +1767,350 @@ ), //Linen Set Armor(Chest("Linen")): VoxTrans( - "voxel.armor.linen.chest", + "voxel.armor.cloth.linen.chest", (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, ), Armor(Pants("Linen")): VoxTrans( - "voxel.armor.linen.pants", + "voxel.armor.cloth.linen.pants", (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, ), Armor(Belt("Linen")): VoxTrans( - "voxel.armor.linen.belt", + "voxel.armor.cloth.linen.belt", (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.4, ), Armor(Foot("Linen")): VoxTrans( - "voxel.armor.linen.foot", + "voxel.armor.cloth.linen.foot", (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1, ), Armor(Hand("Linen")): VoxTrans( - "voxel.armor.linen.hand", + "voxel.armor.cloth.linen.hand", (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0, ), Armor(Shoulder("Linen")): VoxTrans( - "voxel.armor.linen.shoulder", + "voxel.armor.cloth.linen.shoulder", (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2, ), Armor(Back("Linen")): VoxTrans( - "voxel.armor.linen.back", + "voxel.armor.cloth.linen.back", (0.0, 0.0, 0.0), (-90.0, 0.0, 0.0), 1.0, ), //Woolen Set Armor(Chest("Woolen")): VoxTrans( - "voxel.armor.woolen.chest", + "voxel.armor.cloth.woolen.chest", (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, ), Armor(Pants("Woolen")): VoxTrans( - "voxel.armor.woolen.pants", + "voxel.armor.cloth.woolen.pants", (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, ), Armor(Belt("Woolen")): VoxTrans( - "voxel.armor.woolen.belt", + "voxel.armor.cloth.woolen.belt", (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.4, ), Armor(Foot("Woolen")): VoxTrans( - "voxel.armor.woolen.foot", + "voxel.armor.cloth.woolen.foot", (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1, ), Armor(Hand("Woolen")): VoxTrans( - "voxel.armor.woolen.hand", + "voxel.armor.cloth.woolen.hand", (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0, ), Armor(Shoulder("Woolen")): VoxTrans( - "voxel.armor.woolen.shoulder", + "voxel.armor.cloth.woolen.shoulder", (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2, ), Armor(Back("Woolen")): VoxTrans( - "voxel.armor.woolen.back", + "voxel.armor.cloth.woolen.back", (0.0, 0.0, 0.0), (-90.0, 0.0, 0.0), 1.0, ), //Silken Set Armor(Chest("Silken")): VoxTrans( - "voxel.armor.silken.chest", + "voxel.armor.cloth.silken.chest", (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, ), Armor(Pants("Silken")): VoxTrans( - "voxel.armor.silken.pants", + "voxel.armor.cloth.silken.pants", (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, ), Armor(Belt("Silken")): VoxTrans( - "voxel.armor.silken.belt", + "voxel.armor.cloth.silken.belt", (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.4, ), Armor(Foot("Silken")): VoxTrans( - "voxel.armor.silken.foot", + "voxel.armor.cloth.silken.foot", (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1, ), Armor(Hand("Silken")): VoxTrans( - "voxel.armor.silken.hand", + "voxel.armor.cloth.silken.hand", (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0, ), Armor(Shoulder("Silken")): VoxTrans( - "voxel.armor.silken.shoulder", + "voxel.armor.cloth.silken.shoulder", (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2, ), Armor(Back("Silken")): VoxTrans( - "voxel.armor.silken.back", + "voxel.armor.cloth.silken.back", (0.0, 0.0, 0.0), (-90.0, 0.0, 0.0), 1.0, ), - //Lifecloth Set - Armor(Chest("Lifecloth")): VoxTrans( - "voxel.armor.lifecloth.chest", + //Druid Set + Armor(Chest("Druid")): VoxTrans( + "voxel.armor.cloth.druid.chest", (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, ), - Armor(Pants("Lifecloth")): VoxTrans( - "voxel.armor.lifecloth.pants", + Armor(Pants("Druid")): VoxTrans( + "voxel.armor.cloth.druid.pants", (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, ), - Armor(Belt("Lifecloth")): VoxTrans( - "voxel.armor.lifecloth.belt", + Armor(Belt("Druid")): VoxTrans( + "voxel.armor.cloth.druid.belt", (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.4, ), - Armor(Foot("Lifecloth")): VoxTrans( - "voxel.armor.lifecloth.foot", + Armor(Foot("Druid")): VoxTrans( + "voxel.armor.cloth.druid.foot", (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1, ), - Armor(Hand("Lifecloth")): VoxTrans( - "voxel.armor.lifecloth.hand", + Armor(Hand("Druid")): VoxTrans( + "voxel.armor.cloth.druid.hand", (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0, ), - Armor(Shoulder("Lifecloth")): VoxTrans( - "voxel.armor.lifecloth.shoulder", + Armor(Shoulder("Druid")): VoxTrans( + "voxel.armor.cloth.druid.shoulder", (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2, ), - Armor(Back("Lifecloth")): VoxTrans( - "voxel.armor.lifecloth.back", + Armor(Back("Druid")): VoxTrans( + "voxel.armor.cloth.druid.back", (0.0, 0.0, 0.0), (-90.0, 0.0, 0.0), 1.0, ), //Moonweave Set Armor(Chest("Moonweave")): VoxTrans( - "voxel.armor.moonweave.chest", + "voxel.armor.cloth.moonweave.chest", (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, ), Armor(Pants("Moonweave")): VoxTrans( - "voxel.armor.moonweave.pants", + "voxel.armor.cloth.moonweave.pants", (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, ), Armor(Belt("Moonweave")): VoxTrans( - "voxel.armor.moonweave.belt", + "voxel.armor.cloth.moonweave.belt", (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.4, ), Armor(Foot("Moonweave")): VoxTrans( - "voxel.armor.moonweave.foot", + "voxel.armor.cloth.moonweave.foot", (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1, ), Armor(Hand("Moonweave")): VoxTrans( - "voxel.armor.moonweave.hand", + "voxel.armor.cloth.moonweave.hand", (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0, ), Armor(Shoulder("Moonweave")): VoxTrans( - "voxel.armor.moonweave.shoulder", + "voxel.armor.cloth.moonweave.shoulder", (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2, ), Armor(Back("Moonweave")): VoxTrans( - "voxel.armor.moonweave.back", + "voxel.armor.cloth.moonweave.back", (0.0, 0.0, 0.0), (-90.0, 0.0, 0.0), 1.0, ), //Sunsilk Set Armor(Chest("Sunsilk")): VoxTrans( - "voxel.armor.sunsilk.chest", + "voxel.armor.cloth.sunsilk.chest", (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, ), Armor(Pants("Sunsilk")): VoxTrans( - "voxel.armor.sunsilk.pants", + "voxel.armor.cloth.sunsilk.pants", (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, ), Armor(Belt("Sunsilk")): VoxTrans( - "voxel.armor.sunsilk.belt", + "voxel.armor.cloth.sunsilk.belt", (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.4, ), Armor(Foot("Sunsilk")): VoxTrans( - "voxel.armor.sunsilk.foot", + "voxel.armor.cloth.sunsilk.foot", (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1, ), Armor(Hand("Sunsilk")): VoxTrans( - "voxel.armor.sunsilk.hand", + "voxel.armor.cloth.sunsilk.hand", (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0, ), Armor(Shoulder("Sunsilk")): VoxTrans( - "voxel.armor.sunsilk.shoulder", + "voxel.armor.cloth.sunsilk.shoulder", (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2, ), Armor(Back("Sunsilk")): VoxTrans( - "voxel.armor.sunsilk.back", + "voxel.armor.cloth.sunsilk.back", (0.0, 0.0, 0.0), (-90.0, 0.0, 0.0), 1.0, ), //Bronze Set Armor(Chest("Bronze")): VoxTrans( - "voxel.armor.bronze.chest", + "voxel.armor.mail.bronze.chest", (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, ), Armor(Pants("Bronze")): VoxTrans( - "voxel.armor.bronze.pants", + "voxel.armor.mail.bronze.pants", (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, ), Armor(Belt("Bronze")): VoxTrans( - "voxel.armor.bronze.belt", + "voxel.armor.mail.bronze.belt", (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.4, ), Armor(Foot("Bronze")): VoxTrans( - "voxel.armor.bronze.foot", + "voxel.armor.mail.bronze.foot", (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1, ), Armor(Hand("Bronze")): VoxTrans( - "voxel.armor.bronze.hand", + "voxel.armor.mail.bronze.hand", (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0, ), Armor(Shoulder("Bronze")): VoxTrans( - "voxel.armor.bronze.shoulder", + "voxel.armor.mail.bronze.shoulder", (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2, ), Armor(Back("Bronze")): VoxTrans( - "voxel.armor.bronze.back", + "voxel.armor.mail.bronze.back", (0.0, 0.0, 0.0), (-90.0, 0.0, 0.0), 1.0, ), //Iron Set Armor(Chest("Iron")): VoxTrans( - "voxel.armor.iron.chest", + "voxel.armor.mail.iron.chest", (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, ), Armor(Pants("Iron")): VoxTrans( - "voxel.armor.iron.pants", + "voxel.armor.mail.iron.pants", (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, ), Armor(Belt("Iron")): VoxTrans( - "voxel.armor.iron.belt", + "voxel.armor.mail.iron.belt", (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.4, ), Armor(Foot("Iron")): VoxTrans( - "voxel.armor.iron.foot", + "voxel.armor.mail.iron.foot", (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1, ), Armor(Hand("Iron")): VoxTrans( - "voxel.armor.iron.hand", + "voxel.armor.mail.iron.hand", (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0, ), Armor(Shoulder("Iron")): VoxTrans( - "voxel.armor.iron.shoulder", + "voxel.armor.mail.iron.shoulder", (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2, ), Armor(Back("Iron")): VoxTrans( - "voxel.armor.iron.back", + "voxel.armor.mail.iron.back", (0.0, 0.0, 0.0), (-90.0, 0.0, 0.0), 1.0, ), //Steel Set Armor(Chest("Steel")): VoxTrans( - "voxel.armor.steel.chest", + "voxel.armor.mail.steel.chest", (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, ), Armor(Pants("Steel")): VoxTrans( - "voxel.armor.steel.pants", + "voxel.armor.mail.steel.pants", (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, ), Armor(Belt("Steel")): VoxTrans( - "voxel.armor.steel.belt", + "voxel.armor.mail.steel.belt", (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.4, ), Armor(Foot("Steel")): VoxTrans( - "voxel.armor.steel.foot", + "voxel.armor.mail.steel.foot", (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1, ), Armor(Hand("Steel")): VoxTrans( - "voxel.armor.steel.hand", + "voxel.armor.mail.steel.hand", (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0, ), Armor(Shoulder("Steel")): VoxTrans( - "voxel.armor.steel.shoulder", + "voxel.armor.mail.steel.shoulder", (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2, ), Armor(Back("Steel")): VoxTrans( - "voxel.armor.steel.back", + "voxel.armor.mail.steel.back", (0.0, 0.0, 0.0), (-90.0, 0.0, 0.0), 1.0, ), //Cobalt Set Armor(Chest("Cobalt")): VoxTrans( - "voxel.armor.cobalt.chest", + "voxel.armor.mail.cobalt.chest", (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, ), Armor(Pants("Cobalt")): VoxTrans( - "voxel.armor.cobalt.pants", + "voxel.armor.mail.cobalt.pants", (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, ), Armor(Belt("Cobalt")): VoxTrans( - "voxel.armor.cobalt.belt", + "voxel.armor.mail.cobalt.belt", (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.4, ), Armor(Foot("Cobalt")): VoxTrans( - "voxel.armor.cobalt.foot", + "voxel.armor.mail.cobalt.foot", (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1, ), Armor(Hand("Cobalt")): VoxTrans( - "voxel.armor.cobalt.hand", + "voxel.armor.mail.cobalt.hand", (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0, ), Armor(Shoulder("Cobalt")): VoxTrans( - "voxel.armor.cobalt.shoulder", + "voxel.armor.mail.cobalt.shoulder", (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2, ), Armor(Back("Cobalt")): VoxTrans( - "voxel.armor.cobalt.back", + "voxel.armor.mail.cobalt.back", (0.0, 0.0, 0.0), (-90.0, 0.0, 0.0), 1.0, ), //Bloodsteel Set Armor(Chest("Bloodsteel")): VoxTrans( - "voxel.armor.bloodsteel.chest", + "voxel.armor.mail.bloodsteel.chest", (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, ), Armor(Pants("Bloodsteel")): VoxTrans( - "voxel.armor.bloodsteel.pants", + "voxel.armor.mail.bloodsteel.pants", (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, ), Armor(Belt("Bloodsteel")): VoxTrans( - "voxel.armor.bloodsteel.belt", + "voxel.armor.mail.bloodsteel.belt", (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.4, ), Armor(Foot("Bloodsteel")): VoxTrans( - "voxel.armor.bloodsteel.foot", + "voxel.armor.mail.bloodsteel.foot", (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1, ), Armor(Hand("Bloodsteel")): VoxTrans( - "voxel.armor.bloodsteel.hand", + "voxel.armor.mail.bloodsteel.hand", (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0, ), Armor(Shoulder("Bloodsteel")): VoxTrans( - "voxel.armor.bloodsteel.shoulder", + "voxel.armor.mail.bloodsteel.shoulder", (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2, ), Armor(Back("Bloodsteel")): VoxTrans( - "voxel.armor.bloodsteel.back", + "voxel.armor.mail.bloodsteel.back", (0.0, 0.0, 0.0), (-90.0, 0.0, 0.0), 1.0, ), //Orichalcum Set Armor(Chest("Orichalcum")): VoxTrans( - "voxel.armor.orichalcum.chest", + "voxel.armor.mail.orichalcum.chest", (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, ), Armor(Pants("Orichalcum")): VoxTrans( - "voxel.armor.orichalcum.pants", + "voxel.armor.mail.orichalcum.pants", (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, ), Armor(Belt("Orichalcum")): VoxTrans( - "voxel.armor.orichalcum.belt", + "voxel.armor.mail.orichalcum.belt", (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.4, ), Armor(Foot("Orichalcum")): VoxTrans( - "voxel.armor.orichalcum.foot", + "voxel.armor.mail.orichalcum.foot", (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1, ), Armor(Hand("Orichalcum")): VoxTrans( - "voxel.armor.orichalcum.hand", + "voxel.armor.mail.orichalcum.hand", (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0, ), Armor(Shoulder("Orichalcum")): VoxTrans( - "voxel.armor.orichalcum.shoulder", + "voxel.armor.mail.orichalcum.shoulder", (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2, ), Armor(Back("Orichalcum")): VoxTrans( - "voxel.armor.orichalcum.back", + "voxel.armor.mail.orichalcum.back", (0.0, 0.0, 0.0), (-90.0, 0.0, 0.0), 1.0, ), //misc @@ -2185,8 +2135,8 @@ "voxel.armor.misc.back.dungeon_purple", (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.0, ), - Armor(Back("Agile")): VoxTrans( - "voxel.armor.agile.back", + Armor(Back("Rawhide")): VoxTrans( + "voxel.armor.hide.rawhide.back", (0.0, -2.0, 0.0), (-90.0, 180.0, 0.0), 1.0, ), Armor(Back("LeatherBlue")): VoxTrans( @@ -2239,7 +2189,7 @@ "element.items.tabard_admin", ), // Heads - Armor(Head("Swift")): VoxTrans( + Armor(Head("Leather")): VoxTrans( "voxel.armor.misc.head.leather-0", (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.0, ), diff --git a/assets/voxygen/voxel/armor/lifecloth/back.vox b/assets/voxygen/voxel/armor/cloth/druid/back.vox similarity index 100% rename from assets/voxygen/voxel/armor/lifecloth/back.vox rename to assets/voxygen/voxel/armor/cloth/druid/back.vox diff --git a/assets/voxygen/voxel/armor/lifecloth/belt.vox b/assets/voxygen/voxel/armor/cloth/druid/belt.vox similarity index 100% rename from assets/voxygen/voxel/armor/lifecloth/belt.vox rename to assets/voxygen/voxel/armor/cloth/druid/belt.vox diff --git a/assets/voxygen/voxel/armor/lifecloth/chest.vox b/assets/voxygen/voxel/armor/cloth/druid/chest.vox similarity index 100% rename from assets/voxygen/voxel/armor/lifecloth/chest.vox rename to assets/voxygen/voxel/armor/cloth/druid/chest.vox diff --git a/assets/voxygen/voxel/armor/lifecloth/foot.vox b/assets/voxygen/voxel/armor/cloth/druid/foot.vox similarity index 100% rename from assets/voxygen/voxel/armor/lifecloth/foot.vox rename to assets/voxygen/voxel/armor/cloth/druid/foot.vox diff --git a/assets/voxygen/voxel/armor/lifecloth/hand.vox b/assets/voxygen/voxel/armor/cloth/druid/hand.vox similarity index 100% rename from assets/voxygen/voxel/armor/lifecloth/hand.vox rename to assets/voxygen/voxel/armor/cloth/druid/hand.vox diff --git a/assets/voxygen/voxel/armor/lifecloth/pants.vox b/assets/voxygen/voxel/armor/cloth/druid/pants.vox similarity index 100% rename from assets/voxygen/voxel/armor/lifecloth/pants.vox rename to assets/voxygen/voxel/armor/cloth/druid/pants.vox diff --git a/assets/voxygen/voxel/armor/lifecloth/shoulder.vox b/assets/voxygen/voxel/armor/cloth/druid/shoulder.vox similarity index 100% rename from assets/voxygen/voxel/armor/lifecloth/shoulder.vox rename to assets/voxygen/voxel/armor/cloth/druid/shoulder.vox diff --git a/assets/voxygen/voxel/armor/linen/back.vox b/assets/voxygen/voxel/armor/cloth/linen/back.vox similarity index 100% rename from assets/voxygen/voxel/armor/linen/back.vox rename to assets/voxygen/voxel/armor/cloth/linen/back.vox diff --git a/assets/voxygen/voxel/armor/linen/belt.vox b/assets/voxygen/voxel/armor/cloth/linen/belt.vox similarity index 100% rename from assets/voxygen/voxel/armor/linen/belt.vox rename to assets/voxygen/voxel/armor/cloth/linen/belt.vox diff --git a/assets/voxygen/voxel/armor/linen/chest.vox b/assets/voxygen/voxel/armor/cloth/linen/chest.vox similarity index 100% rename from assets/voxygen/voxel/armor/linen/chest.vox rename to assets/voxygen/voxel/armor/cloth/linen/chest.vox diff --git a/assets/voxygen/voxel/armor/linen/foot.vox b/assets/voxygen/voxel/armor/cloth/linen/foot.vox similarity index 100% rename from assets/voxygen/voxel/armor/linen/foot.vox rename to assets/voxygen/voxel/armor/cloth/linen/foot.vox diff --git a/assets/voxygen/voxel/armor/linen/hand.vox b/assets/voxygen/voxel/armor/cloth/linen/hand.vox similarity index 100% rename from assets/voxygen/voxel/armor/linen/hand.vox rename to assets/voxygen/voxel/armor/cloth/linen/hand.vox diff --git a/assets/voxygen/voxel/armor/linen/pants.vox b/assets/voxygen/voxel/armor/cloth/linen/pants.vox similarity index 100% rename from assets/voxygen/voxel/armor/linen/pants.vox rename to assets/voxygen/voxel/armor/cloth/linen/pants.vox diff --git a/assets/voxygen/voxel/armor/linen/shoulder.vox b/assets/voxygen/voxel/armor/cloth/linen/shoulder.vox similarity index 100% rename from assets/voxygen/voxel/armor/linen/shoulder.vox rename to assets/voxygen/voxel/armor/cloth/linen/shoulder.vox diff --git a/assets/voxygen/voxel/armor/moonweave/back.vox b/assets/voxygen/voxel/armor/cloth/moonweave/back.vox similarity index 100% rename from assets/voxygen/voxel/armor/moonweave/back.vox rename to assets/voxygen/voxel/armor/cloth/moonweave/back.vox diff --git a/assets/voxygen/voxel/armor/moonweave/belt.vox b/assets/voxygen/voxel/armor/cloth/moonweave/belt.vox similarity index 100% rename from assets/voxygen/voxel/armor/moonweave/belt.vox rename to assets/voxygen/voxel/armor/cloth/moonweave/belt.vox diff --git a/assets/voxygen/voxel/armor/moonweave/chest.vox b/assets/voxygen/voxel/armor/cloth/moonweave/chest.vox similarity index 100% rename from assets/voxygen/voxel/armor/moonweave/chest.vox rename to assets/voxygen/voxel/armor/cloth/moonweave/chest.vox diff --git a/assets/voxygen/voxel/armor/moonweave/foot.vox b/assets/voxygen/voxel/armor/cloth/moonweave/foot.vox similarity index 100% rename from assets/voxygen/voxel/armor/moonweave/foot.vox rename to assets/voxygen/voxel/armor/cloth/moonweave/foot.vox diff --git a/assets/voxygen/voxel/armor/moonweave/hand.vox b/assets/voxygen/voxel/armor/cloth/moonweave/hand.vox similarity index 100% rename from assets/voxygen/voxel/armor/moonweave/hand.vox rename to assets/voxygen/voxel/armor/cloth/moonweave/hand.vox diff --git a/assets/voxygen/voxel/armor/moonweave/pants.vox b/assets/voxygen/voxel/armor/cloth/moonweave/pants.vox similarity index 100% rename from assets/voxygen/voxel/armor/moonweave/pants.vox rename to assets/voxygen/voxel/armor/cloth/moonweave/pants.vox diff --git a/assets/voxygen/voxel/armor/moonweave/shoulder.vox b/assets/voxygen/voxel/armor/cloth/moonweave/shoulder.vox similarity index 100% rename from assets/voxygen/voxel/armor/moonweave/shoulder.vox rename to assets/voxygen/voxel/armor/cloth/moonweave/shoulder.vox diff --git a/assets/voxygen/voxel/armor/silken/back.vox b/assets/voxygen/voxel/armor/cloth/silken/back.vox similarity index 100% rename from assets/voxygen/voxel/armor/silken/back.vox rename to assets/voxygen/voxel/armor/cloth/silken/back.vox diff --git a/assets/voxygen/voxel/armor/silken/belt.vox b/assets/voxygen/voxel/armor/cloth/silken/belt.vox similarity index 100% rename from assets/voxygen/voxel/armor/silken/belt.vox rename to assets/voxygen/voxel/armor/cloth/silken/belt.vox diff --git a/assets/voxygen/voxel/armor/silken/chest.vox b/assets/voxygen/voxel/armor/cloth/silken/chest.vox similarity index 100% rename from assets/voxygen/voxel/armor/silken/chest.vox rename to assets/voxygen/voxel/armor/cloth/silken/chest.vox diff --git a/assets/voxygen/voxel/armor/silken/foot.vox b/assets/voxygen/voxel/armor/cloth/silken/foot.vox similarity index 100% rename from assets/voxygen/voxel/armor/silken/foot.vox rename to assets/voxygen/voxel/armor/cloth/silken/foot.vox diff --git a/assets/voxygen/voxel/armor/silken/hand.vox b/assets/voxygen/voxel/armor/cloth/silken/hand.vox similarity index 100% rename from assets/voxygen/voxel/armor/silken/hand.vox rename to assets/voxygen/voxel/armor/cloth/silken/hand.vox diff --git a/assets/voxygen/voxel/armor/silken/pants.vox b/assets/voxygen/voxel/armor/cloth/silken/pants.vox similarity index 100% rename from assets/voxygen/voxel/armor/silken/pants.vox rename to assets/voxygen/voxel/armor/cloth/silken/pants.vox diff --git a/assets/voxygen/voxel/armor/silken/shoulder.vox b/assets/voxygen/voxel/armor/cloth/silken/shoulder.vox similarity index 100% rename from assets/voxygen/voxel/armor/silken/shoulder.vox rename to assets/voxygen/voxel/armor/cloth/silken/shoulder.vox diff --git a/assets/voxygen/voxel/armor/sunsilk/back.vox b/assets/voxygen/voxel/armor/cloth/sunsilk/back.vox similarity index 100% rename from assets/voxygen/voxel/armor/sunsilk/back.vox rename to assets/voxygen/voxel/armor/cloth/sunsilk/back.vox diff --git a/assets/voxygen/voxel/armor/sunsilk/belt.vox b/assets/voxygen/voxel/armor/cloth/sunsilk/belt.vox similarity index 100% rename from assets/voxygen/voxel/armor/sunsilk/belt.vox rename to assets/voxygen/voxel/armor/cloth/sunsilk/belt.vox diff --git a/assets/voxygen/voxel/armor/sunsilk/chest.vox b/assets/voxygen/voxel/armor/cloth/sunsilk/chest.vox similarity index 100% rename from assets/voxygen/voxel/armor/sunsilk/chest.vox rename to assets/voxygen/voxel/armor/cloth/sunsilk/chest.vox diff --git a/assets/voxygen/voxel/armor/sunsilk/foot.vox b/assets/voxygen/voxel/armor/cloth/sunsilk/foot.vox similarity index 100% rename from assets/voxygen/voxel/armor/sunsilk/foot.vox rename to assets/voxygen/voxel/armor/cloth/sunsilk/foot.vox diff --git a/assets/voxygen/voxel/armor/sunsilk/hand.vox b/assets/voxygen/voxel/armor/cloth/sunsilk/hand.vox similarity index 100% rename from assets/voxygen/voxel/armor/sunsilk/hand.vox rename to assets/voxygen/voxel/armor/cloth/sunsilk/hand.vox diff --git a/assets/voxygen/voxel/armor/sunsilk/pants.vox b/assets/voxygen/voxel/armor/cloth/sunsilk/pants.vox similarity index 100% rename from assets/voxygen/voxel/armor/sunsilk/pants.vox rename to assets/voxygen/voxel/armor/cloth/sunsilk/pants.vox diff --git a/assets/voxygen/voxel/armor/sunsilk/shoulder.vox b/assets/voxygen/voxel/armor/cloth/sunsilk/shoulder.vox similarity index 100% rename from assets/voxygen/voxel/armor/sunsilk/shoulder.vox rename to assets/voxygen/voxel/armor/cloth/sunsilk/shoulder.vox diff --git a/assets/voxygen/voxel/armor/woolen/back.vox b/assets/voxygen/voxel/armor/cloth/woolen/back.vox similarity index 100% rename from assets/voxygen/voxel/armor/woolen/back.vox rename to assets/voxygen/voxel/armor/cloth/woolen/back.vox diff --git a/assets/voxygen/voxel/armor/woolen/belt.vox b/assets/voxygen/voxel/armor/cloth/woolen/belt.vox similarity index 100% rename from assets/voxygen/voxel/armor/woolen/belt.vox rename to assets/voxygen/voxel/armor/cloth/woolen/belt.vox diff --git a/assets/voxygen/voxel/armor/woolen/chest.vox b/assets/voxygen/voxel/armor/cloth/woolen/chest.vox similarity index 100% rename from assets/voxygen/voxel/armor/woolen/chest.vox rename to assets/voxygen/voxel/armor/cloth/woolen/chest.vox diff --git a/assets/voxygen/voxel/armor/woolen/foot.vox b/assets/voxygen/voxel/armor/cloth/woolen/foot.vox similarity index 100% rename from assets/voxygen/voxel/armor/woolen/foot.vox rename to assets/voxygen/voxel/armor/cloth/woolen/foot.vox diff --git a/assets/voxygen/voxel/armor/woolen/hand.vox b/assets/voxygen/voxel/armor/cloth/woolen/hand.vox similarity index 100% rename from assets/voxygen/voxel/armor/woolen/hand.vox rename to assets/voxygen/voxel/armor/cloth/woolen/hand.vox diff --git a/assets/voxygen/voxel/armor/woolen/pants.vox b/assets/voxygen/voxel/armor/cloth/woolen/pants.vox similarity index 100% rename from assets/voxygen/voxel/armor/woolen/pants.vox rename to assets/voxygen/voxel/armor/cloth/woolen/pants.vox diff --git a/assets/voxygen/voxel/armor/woolen/shoulder.vox b/assets/voxygen/voxel/armor/cloth/woolen/shoulder.vox similarity index 100% rename from assets/voxygen/voxel/armor/woolen/shoulder.vox rename to assets/voxygen/voxel/armor/cloth/woolen/shoulder.vox diff --git a/assets/voxygen/voxel/armor/druid/belt.vox b/assets/voxygen/voxel/armor/druid/belt.vox deleted file mode 100644 index cf5791c77a..0000000000 --- a/assets/voxygen/voxel/armor/druid/belt.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e17f7b042a132bbff59c3a53f17ebbb99b1737d40ff15a61ceeb9830bee378ed -size 1504 diff --git a/assets/voxygen/voxel/armor/druid/chest.vox b/assets/voxygen/voxel/armor/druid/chest.vox deleted file mode 100644 index 238780228c..0000000000 --- a/assets/voxygen/voxel/armor/druid/chest.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3be924d0ad4456fdc7b5693e55abff6ba458c4f4370395658ae7e0213f212e93 -size 2624 diff --git a/assets/voxygen/voxel/armor/druid/foot.vox b/assets/voxygen/voxel/armor/druid/foot.vox deleted file mode 100644 index ef2caf7d11..0000000000 --- a/assets/voxygen/voxel/armor/druid/foot.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dd8e717593c9b5778c851d7749377f32f21fd2903b8ed6b94d4308f937aa3049 -size 1376 diff --git a/assets/voxygen/voxel/armor/druid/hand.vox b/assets/voxygen/voxel/armor/druid/hand.vox deleted file mode 100644 index 4ec34cb6f8..0000000000 --- a/assets/voxygen/voxel/armor/druid/hand.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:eef70a6f6cf51aec6d767a75a00defc0b060d2d3c285068ba70eb7f938cc5603 -size 1240 diff --git a/assets/voxygen/voxel/armor/druid/pants.vox b/assets/voxygen/voxel/armor/druid/pants.vox deleted file mode 100644 index 1243714d0a..0000000000 --- a/assets/voxygen/voxel/armor/druid/pants.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7efa079e94cf18cea9e54e0c683b64b8743e8111bb5555119cb0064d36d6c7e7 -size 2272 diff --git a/assets/voxygen/voxel/armor/druid/shoulder.vox b/assets/voxygen/voxel/armor/druid/shoulder.vox deleted file mode 100644 index 0313e87587..0000000000 --- a/assets/voxygen/voxel/armor/druid/shoulder.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:129b8fe8ed4c0019e1ad15dfe2461476e771e567c6e7628e0164a2f6dc1df9ff -size 1628 diff --git a/assets/voxygen/voxel/armor/carapace/back.vox b/assets/voxygen/voxel/armor/hide/carapace/back.vox similarity index 100% rename from assets/voxygen/voxel/armor/carapace/back.vox rename to assets/voxygen/voxel/armor/hide/carapace/back.vox diff --git a/assets/voxygen/voxel/armor/carapace/belt.vox b/assets/voxygen/voxel/armor/hide/carapace/belt.vox similarity index 100% rename from assets/voxygen/voxel/armor/carapace/belt.vox rename to assets/voxygen/voxel/armor/hide/carapace/belt.vox diff --git a/assets/voxygen/voxel/armor/carapace/chest.vox b/assets/voxygen/voxel/armor/hide/carapace/chest.vox similarity index 100% rename from assets/voxygen/voxel/armor/carapace/chest.vox rename to assets/voxygen/voxel/armor/hide/carapace/chest.vox diff --git a/assets/voxygen/voxel/armor/carapace/foot.vox b/assets/voxygen/voxel/armor/hide/carapace/foot.vox similarity index 100% rename from assets/voxygen/voxel/armor/carapace/foot.vox rename to assets/voxygen/voxel/armor/hide/carapace/foot.vox diff --git a/assets/voxygen/voxel/armor/carapace/hand.vox b/assets/voxygen/voxel/armor/hide/carapace/hand.vox similarity index 100% rename from assets/voxygen/voxel/armor/carapace/hand.vox rename to assets/voxygen/voxel/armor/hide/carapace/hand.vox diff --git a/assets/voxygen/voxel/armor/carapace/pants.vox b/assets/voxygen/voxel/armor/hide/carapace/pants.vox similarity index 100% rename from assets/voxygen/voxel/armor/carapace/pants.vox rename to assets/voxygen/voxel/armor/hide/carapace/pants.vox diff --git a/assets/voxygen/voxel/armor/carapace/shoulder.vox b/assets/voxygen/voxel/armor/hide/carapace/shoulder.vox similarity index 100% rename from assets/voxygen/voxel/armor/carapace/shoulder.vox rename to assets/voxygen/voxel/armor/hide/carapace/shoulder.vox diff --git a/assets/voxygen/voxel/armor/dragonscale/back.vox b/assets/voxygen/voxel/armor/hide/dragonscale/back.vox similarity index 100% rename from assets/voxygen/voxel/armor/dragonscale/back.vox rename to assets/voxygen/voxel/armor/hide/dragonscale/back.vox diff --git a/assets/voxygen/voxel/armor/dragonscale/belt.vox b/assets/voxygen/voxel/armor/hide/dragonscale/belt.vox similarity index 100% rename from assets/voxygen/voxel/armor/dragonscale/belt.vox rename to assets/voxygen/voxel/armor/hide/dragonscale/belt.vox diff --git a/assets/voxygen/voxel/armor/dragonscale/chest.vox b/assets/voxygen/voxel/armor/hide/dragonscale/chest.vox similarity index 100% rename from assets/voxygen/voxel/armor/dragonscale/chest.vox rename to assets/voxygen/voxel/armor/hide/dragonscale/chest.vox diff --git a/assets/voxygen/voxel/armor/dragonscale/foot.vox b/assets/voxygen/voxel/armor/hide/dragonscale/foot.vox similarity index 100% rename from assets/voxygen/voxel/armor/dragonscale/foot.vox rename to assets/voxygen/voxel/armor/hide/dragonscale/foot.vox diff --git a/assets/voxygen/voxel/armor/dragonscale/hand.vox b/assets/voxygen/voxel/armor/hide/dragonscale/hand.vox similarity index 100% rename from assets/voxygen/voxel/armor/dragonscale/hand.vox rename to assets/voxygen/voxel/armor/hide/dragonscale/hand.vox diff --git a/assets/voxygen/voxel/armor/dragonscale/pants.vox b/assets/voxygen/voxel/armor/hide/dragonscale/pants.vox similarity index 100% rename from assets/voxygen/voxel/armor/dragonscale/pants.vox rename to assets/voxygen/voxel/armor/hide/dragonscale/pants.vox diff --git a/assets/voxygen/voxel/armor/dragonscale/shoulder.vox b/assets/voxygen/voxel/armor/hide/dragonscale/shoulder.vox similarity index 100% rename from assets/voxygen/voxel/armor/dragonscale/shoulder.vox rename to assets/voxygen/voxel/armor/hide/dragonscale/shoulder.vox diff --git a/assets/voxygen/voxel/armor/swift/back.vox b/assets/voxygen/voxel/armor/hide/leather/back.vox similarity index 100% rename from assets/voxygen/voxel/armor/swift/back.vox rename to assets/voxygen/voxel/armor/hide/leather/back.vox diff --git a/assets/voxygen/voxel/armor/swift/belt.vox b/assets/voxygen/voxel/armor/hide/leather/belt.vox similarity index 100% rename from assets/voxygen/voxel/armor/swift/belt.vox rename to assets/voxygen/voxel/armor/hide/leather/belt.vox diff --git a/assets/voxygen/voxel/armor/swift/chest.vox b/assets/voxygen/voxel/armor/hide/leather/chest.vox similarity index 100% rename from assets/voxygen/voxel/armor/swift/chest.vox rename to assets/voxygen/voxel/armor/hide/leather/chest.vox diff --git a/assets/voxygen/voxel/armor/swift/foot.vox b/assets/voxygen/voxel/armor/hide/leather/foot.vox similarity index 100% rename from assets/voxygen/voxel/armor/swift/foot.vox rename to assets/voxygen/voxel/armor/hide/leather/foot.vox diff --git a/assets/voxygen/voxel/armor/swift/hand.vox b/assets/voxygen/voxel/armor/hide/leather/hand.vox similarity index 100% rename from assets/voxygen/voxel/armor/swift/hand.vox rename to assets/voxygen/voxel/armor/hide/leather/hand.vox diff --git a/assets/voxygen/voxel/armor/swift/pants.vox b/assets/voxygen/voxel/armor/hide/leather/pants.vox similarity index 100% rename from assets/voxygen/voxel/armor/swift/pants.vox rename to assets/voxygen/voxel/armor/hide/leather/pants.vox diff --git a/assets/voxygen/voxel/armor/swift/shoulder.vox b/assets/voxygen/voxel/armor/hide/leather/shoulder.vox similarity index 100% rename from assets/voxygen/voxel/armor/swift/shoulder.vox rename to assets/voxygen/voxel/armor/hide/leather/shoulder.vox diff --git a/assets/voxygen/voxel/armor/platescale/back.vox b/assets/voxygen/voxel/armor/hide/primal/back.vox similarity index 100% rename from assets/voxygen/voxel/armor/platescale/back.vox rename to assets/voxygen/voxel/armor/hide/primal/back.vox diff --git a/assets/voxygen/voxel/armor/platescale/belt.vox b/assets/voxygen/voxel/armor/hide/primal/belt.vox similarity index 100% rename from assets/voxygen/voxel/armor/platescale/belt.vox rename to assets/voxygen/voxel/armor/hide/primal/belt.vox diff --git a/assets/voxygen/voxel/armor/platescale/chest.vox b/assets/voxygen/voxel/armor/hide/primal/chest.vox similarity index 100% rename from assets/voxygen/voxel/armor/platescale/chest.vox rename to assets/voxygen/voxel/armor/hide/primal/chest.vox diff --git a/assets/voxygen/voxel/armor/platescale/foot.vox b/assets/voxygen/voxel/armor/hide/primal/foot.vox similarity index 100% rename from assets/voxygen/voxel/armor/platescale/foot.vox rename to assets/voxygen/voxel/armor/hide/primal/foot.vox diff --git a/assets/voxygen/voxel/armor/platescale/hand.vox b/assets/voxygen/voxel/armor/hide/primal/hand.vox similarity index 100% rename from assets/voxygen/voxel/armor/platescale/hand.vox rename to assets/voxygen/voxel/armor/hide/primal/hand.vox diff --git a/assets/voxygen/voxel/armor/platescale/pants.vox b/assets/voxygen/voxel/armor/hide/primal/pants.vox similarity index 100% rename from assets/voxygen/voxel/armor/platescale/pants.vox rename to assets/voxygen/voxel/armor/hide/primal/pants.vox diff --git a/assets/voxygen/voxel/armor/platescale/shoulder.vox b/assets/voxygen/voxel/armor/hide/primal/shoulder.vox similarity index 100% rename from assets/voxygen/voxel/armor/platescale/shoulder.vox rename to assets/voxygen/voxel/armor/hide/primal/shoulder.vox diff --git a/assets/voxygen/voxel/armor/agile/back.vox b/assets/voxygen/voxel/armor/hide/rawhide/back.vox similarity index 100% rename from assets/voxygen/voxel/armor/agile/back.vox rename to assets/voxygen/voxel/armor/hide/rawhide/back.vox diff --git a/assets/voxygen/voxel/armor/agile/belt.vox b/assets/voxygen/voxel/armor/hide/rawhide/belt.vox similarity index 100% rename from assets/voxygen/voxel/armor/agile/belt.vox rename to assets/voxygen/voxel/armor/hide/rawhide/belt.vox diff --git a/assets/voxygen/voxel/armor/agile/chest.vox b/assets/voxygen/voxel/armor/hide/rawhide/chest.vox similarity index 100% rename from assets/voxygen/voxel/armor/agile/chest.vox rename to assets/voxygen/voxel/armor/hide/rawhide/chest.vox diff --git a/assets/voxygen/voxel/armor/agile/foot.vox b/assets/voxygen/voxel/armor/hide/rawhide/foot.vox similarity index 100% rename from assets/voxygen/voxel/armor/agile/foot.vox rename to assets/voxygen/voxel/armor/hide/rawhide/foot.vox diff --git a/assets/voxygen/voxel/armor/agile/hand.vox b/assets/voxygen/voxel/armor/hide/rawhide/hand.vox similarity index 100% rename from assets/voxygen/voxel/armor/agile/hand.vox rename to assets/voxygen/voxel/armor/hide/rawhide/hand.vox diff --git a/assets/voxygen/voxel/armor/agile/pants.vox b/assets/voxygen/voxel/armor/hide/rawhide/pants.vox similarity index 100% rename from assets/voxygen/voxel/armor/agile/pants.vox rename to assets/voxygen/voxel/armor/hide/rawhide/pants.vox diff --git a/assets/voxygen/voxel/armor/agile/shoulder.vox b/assets/voxygen/voxel/armor/hide/rawhide/shoulder.vox similarity index 100% rename from assets/voxygen/voxel/armor/agile/shoulder.vox rename to assets/voxygen/voxel/armor/hide/rawhide/shoulder.vox diff --git a/assets/voxygen/voxel/armor/scale/back.vox b/assets/voxygen/voxel/armor/hide/scale/back.vox similarity index 100% rename from assets/voxygen/voxel/armor/scale/back.vox rename to assets/voxygen/voxel/armor/hide/scale/back.vox diff --git a/assets/voxygen/voxel/armor/scale/belt.vox b/assets/voxygen/voxel/armor/hide/scale/belt.vox similarity index 100% rename from assets/voxygen/voxel/armor/scale/belt.vox rename to assets/voxygen/voxel/armor/hide/scale/belt.vox diff --git a/assets/voxygen/voxel/armor/scale/chest.vox b/assets/voxygen/voxel/armor/hide/scale/chest.vox similarity index 100% rename from assets/voxygen/voxel/armor/scale/chest.vox rename to assets/voxygen/voxel/armor/hide/scale/chest.vox diff --git a/assets/voxygen/voxel/armor/scale/foot.vox b/assets/voxygen/voxel/armor/hide/scale/foot.vox similarity index 100% rename from assets/voxygen/voxel/armor/scale/foot.vox rename to assets/voxygen/voxel/armor/hide/scale/foot.vox diff --git a/assets/voxygen/voxel/armor/scale/hand.vox b/assets/voxygen/voxel/armor/hide/scale/hand.vox similarity index 100% rename from assets/voxygen/voxel/armor/scale/hand.vox rename to assets/voxygen/voxel/armor/hide/scale/hand.vox diff --git a/assets/voxygen/voxel/armor/scale/pants.vox b/assets/voxygen/voxel/armor/hide/scale/pants.vox similarity index 100% rename from assets/voxygen/voxel/armor/scale/pants.vox rename to assets/voxygen/voxel/armor/hide/scale/pants.vox diff --git a/assets/voxygen/voxel/armor/scale/shoulder.vox b/assets/voxygen/voxel/armor/hide/scale/shoulder.vox similarity index 100% rename from assets/voxygen/voxel/armor/scale/shoulder.vox rename to assets/voxygen/voxel/armor/hide/scale/shoulder.vox diff --git a/assets/voxygen/voxel/armor/bloodsteel/back.vox b/assets/voxygen/voxel/armor/mail/bloodsteel/back.vox similarity index 100% rename from assets/voxygen/voxel/armor/bloodsteel/back.vox rename to assets/voxygen/voxel/armor/mail/bloodsteel/back.vox diff --git a/assets/voxygen/voxel/armor/bloodsteel/belt.vox b/assets/voxygen/voxel/armor/mail/bloodsteel/belt.vox similarity index 100% rename from assets/voxygen/voxel/armor/bloodsteel/belt.vox rename to assets/voxygen/voxel/armor/mail/bloodsteel/belt.vox diff --git a/assets/voxygen/voxel/armor/bloodsteel/chest.vox b/assets/voxygen/voxel/armor/mail/bloodsteel/chest.vox similarity index 100% rename from assets/voxygen/voxel/armor/bloodsteel/chest.vox rename to assets/voxygen/voxel/armor/mail/bloodsteel/chest.vox diff --git a/assets/voxygen/voxel/armor/bloodsteel/foot.vox b/assets/voxygen/voxel/armor/mail/bloodsteel/foot.vox similarity index 100% rename from assets/voxygen/voxel/armor/bloodsteel/foot.vox rename to assets/voxygen/voxel/armor/mail/bloodsteel/foot.vox diff --git a/assets/voxygen/voxel/armor/bloodsteel/hand.vox b/assets/voxygen/voxel/armor/mail/bloodsteel/hand.vox similarity index 100% rename from assets/voxygen/voxel/armor/bloodsteel/hand.vox rename to assets/voxygen/voxel/armor/mail/bloodsteel/hand.vox diff --git a/assets/voxygen/voxel/armor/bloodsteel/pants.vox b/assets/voxygen/voxel/armor/mail/bloodsteel/pants.vox similarity index 100% rename from assets/voxygen/voxel/armor/bloodsteel/pants.vox rename to assets/voxygen/voxel/armor/mail/bloodsteel/pants.vox diff --git a/assets/voxygen/voxel/armor/bloodsteel/shoulder.vox b/assets/voxygen/voxel/armor/mail/bloodsteel/shoulder.vox similarity index 100% rename from assets/voxygen/voxel/armor/bloodsteel/shoulder.vox rename to assets/voxygen/voxel/armor/mail/bloodsteel/shoulder.vox diff --git a/assets/voxygen/voxel/armor/bronze/back.vox b/assets/voxygen/voxel/armor/mail/bronze/back.vox similarity index 100% rename from assets/voxygen/voxel/armor/bronze/back.vox rename to assets/voxygen/voxel/armor/mail/bronze/back.vox diff --git a/assets/voxygen/voxel/armor/bronze/belt.vox b/assets/voxygen/voxel/armor/mail/bronze/belt.vox similarity index 100% rename from assets/voxygen/voxel/armor/bronze/belt.vox rename to assets/voxygen/voxel/armor/mail/bronze/belt.vox diff --git a/assets/voxygen/voxel/armor/bronze/chest.vox b/assets/voxygen/voxel/armor/mail/bronze/chest.vox similarity index 100% rename from assets/voxygen/voxel/armor/bronze/chest.vox rename to assets/voxygen/voxel/armor/mail/bronze/chest.vox diff --git a/assets/voxygen/voxel/armor/bronze/foot.vox b/assets/voxygen/voxel/armor/mail/bronze/foot.vox similarity index 100% rename from assets/voxygen/voxel/armor/bronze/foot.vox rename to assets/voxygen/voxel/armor/mail/bronze/foot.vox diff --git a/assets/voxygen/voxel/armor/bronze/hand.vox b/assets/voxygen/voxel/armor/mail/bronze/hand.vox similarity index 100% rename from assets/voxygen/voxel/armor/bronze/hand.vox rename to assets/voxygen/voxel/armor/mail/bronze/hand.vox diff --git a/assets/voxygen/voxel/armor/bronze/pants.vox b/assets/voxygen/voxel/armor/mail/bronze/pants.vox similarity index 100% rename from assets/voxygen/voxel/armor/bronze/pants.vox rename to assets/voxygen/voxel/armor/mail/bronze/pants.vox diff --git a/assets/voxygen/voxel/armor/bronze/shoulder.vox b/assets/voxygen/voxel/armor/mail/bronze/shoulder.vox similarity index 100% rename from assets/voxygen/voxel/armor/bronze/shoulder.vox rename to assets/voxygen/voxel/armor/mail/bronze/shoulder.vox diff --git a/assets/voxygen/voxel/armor/cobalt/back.vox b/assets/voxygen/voxel/armor/mail/cobalt/back.vox similarity index 100% rename from assets/voxygen/voxel/armor/cobalt/back.vox rename to assets/voxygen/voxel/armor/mail/cobalt/back.vox diff --git a/assets/voxygen/voxel/armor/cobalt/belt.vox b/assets/voxygen/voxel/armor/mail/cobalt/belt.vox similarity index 100% rename from assets/voxygen/voxel/armor/cobalt/belt.vox rename to assets/voxygen/voxel/armor/mail/cobalt/belt.vox diff --git a/assets/voxygen/voxel/armor/cobalt/chest.vox b/assets/voxygen/voxel/armor/mail/cobalt/chest.vox similarity index 100% rename from assets/voxygen/voxel/armor/cobalt/chest.vox rename to assets/voxygen/voxel/armor/mail/cobalt/chest.vox diff --git a/assets/voxygen/voxel/armor/cobalt/foot.vox b/assets/voxygen/voxel/armor/mail/cobalt/foot.vox similarity index 100% rename from assets/voxygen/voxel/armor/cobalt/foot.vox rename to assets/voxygen/voxel/armor/mail/cobalt/foot.vox diff --git a/assets/voxygen/voxel/armor/cobalt/hand.vox b/assets/voxygen/voxel/armor/mail/cobalt/hand.vox similarity index 100% rename from assets/voxygen/voxel/armor/cobalt/hand.vox rename to assets/voxygen/voxel/armor/mail/cobalt/hand.vox diff --git a/assets/voxygen/voxel/armor/cobalt/pants.vox b/assets/voxygen/voxel/armor/mail/cobalt/pants.vox similarity index 100% rename from assets/voxygen/voxel/armor/cobalt/pants.vox rename to assets/voxygen/voxel/armor/mail/cobalt/pants.vox diff --git a/assets/voxygen/voxel/armor/cobalt/shoulder.vox b/assets/voxygen/voxel/armor/mail/cobalt/shoulder.vox similarity index 100% rename from assets/voxygen/voxel/armor/cobalt/shoulder.vox rename to assets/voxygen/voxel/armor/mail/cobalt/shoulder.vox diff --git a/assets/voxygen/voxel/armor/iron/back.vox b/assets/voxygen/voxel/armor/mail/iron/back.vox similarity index 100% rename from assets/voxygen/voxel/armor/iron/back.vox rename to assets/voxygen/voxel/armor/mail/iron/back.vox diff --git a/assets/voxygen/voxel/armor/iron/belt.vox b/assets/voxygen/voxel/armor/mail/iron/belt.vox similarity index 100% rename from assets/voxygen/voxel/armor/iron/belt.vox rename to assets/voxygen/voxel/armor/mail/iron/belt.vox diff --git a/assets/voxygen/voxel/armor/iron/chest.vox b/assets/voxygen/voxel/armor/mail/iron/chest.vox similarity index 100% rename from assets/voxygen/voxel/armor/iron/chest.vox rename to assets/voxygen/voxel/armor/mail/iron/chest.vox diff --git a/assets/voxygen/voxel/armor/iron/foot.vox b/assets/voxygen/voxel/armor/mail/iron/foot.vox similarity index 100% rename from assets/voxygen/voxel/armor/iron/foot.vox rename to assets/voxygen/voxel/armor/mail/iron/foot.vox diff --git a/assets/voxygen/voxel/armor/iron/hand.vox b/assets/voxygen/voxel/armor/mail/iron/hand.vox similarity index 100% rename from assets/voxygen/voxel/armor/iron/hand.vox rename to assets/voxygen/voxel/armor/mail/iron/hand.vox diff --git a/assets/voxygen/voxel/armor/iron/pants.vox b/assets/voxygen/voxel/armor/mail/iron/pants.vox similarity index 100% rename from assets/voxygen/voxel/armor/iron/pants.vox rename to assets/voxygen/voxel/armor/mail/iron/pants.vox diff --git a/assets/voxygen/voxel/armor/iron/shoulder.vox b/assets/voxygen/voxel/armor/mail/iron/shoulder.vox similarity index 100% rename from assets/voxygen/voxel/armor/iron/shoulder.vox rename to assets/voxygen/voxel/armor/mail/iron/shoulder.vox diff --git a/assets/voxygen/voxel/armor/orichalcum/back.vox b/assets/voxygen/voxel/armor/mail/orichalcum/back.vox similarity index 100% rename from assets/voxygen/voxel/armor/orichalcum/back.vox rename to assets/voxygen/voxel/armor/mail/orichalcum/back.vox diff --git a/assets/voxygen/voxel/armor/orichalcum/belt.vox b/assets/voxygen/voxel/armor/mail/orichalcum/belt.vox similarity index 100% rename from assets/voxygen/voxel/armor/orichalcum/belt.vox rename to assets/voxygen/voxel/armor/mail/orichalcum/belt.vox diff --git a/assets/voxygen/voxel/armor/orichalcum/chest.vox b/assets/voxygen/voxel/armor/mail/orichalcum/chest.vox similarity index 100% rename from assets/voxygen/voxel/armor/orichalcum/chest.vox rename to assets/voxygen/voxel/armor/mail/orichalcum/chest.vox diff --git a/assets/voxygen/voxel/armor/orichalcum/foot.vox b/assets/voxygen/voxel/armor/mail/orichalcum/foot.vox similarity index 100% rename from assets/voxygen/voxel/armor/orichalcum/foot.vox rename to assets/voxygen/voxel/armor/mail/orichalcum/foot.vox diff --git a/assets/voxygen/voxel/armor/orichalcum/hand.vox b/assets/voxygen/voxel/armor/mail/orichalcum/hand.vox similarity index 100% rename from assets/voxygen/voxel/armor/orichalcum/hand.vox rename to assets/voxygen/voxel/armor/mail/orichalcum/hand.vox diff --git a/assets/voxygen/voxel/armor/orichalcum/pants.vox b/assets/voxygen/voxel/armor/mail/orichalcum/pants.vox similarity index 100% rename from assets/voxygen/voxel/armor/orichalcum/pants.vox rename to assets/voxygen/voxel/armor/mail/orichalcum/pants.vox diff --git a/assets/voxygen/voxel/armor/orichalcum/shoulder.vox b/assets/voxygen/voxel/armor/mail/orichalcum/shoulder.vox similarity index 100% rename from assets/voxygen/voxel/armor/orichalcum/shoulder.vox rename to assets/voxygen/voxel/armor/mail/orichalcum/shoulder.vox diff --git a/assets/voxygen/voxel/armor/steel/back.vox b/assets/voxygen/voxel/armor/mail/steel/back.vox similarity index 100% rename from assets/voxygen/voxel/armor/steel/back.vox rename to assets/voxygen/voxel/armor/mail/steel/back.vox diff --git a/assets/voxygen/voxel/armor/steel/belt.vox b/assets/voxygen/voxel/armor/mail/steel/belt.vox similarity index 100% rename from assets/voxygen/voxel/armor/steel/belt.vox rename to assets/voxygen/voxel/armor/mail/steel/belt.vox diff --git a/assets/voxygen/voxel/armor/steel/chest.vox b/assets/voxygen/voxel/armor/mail/steel/chest.vox similarity index 100% rename from assets/voxygen/voxel/armor/steel/chest.vox rename to assets/voxygen/voxel/armor/mail/steel/chest.vox diff --git a/assets/voxygen/voxel/armor/steel/foot.vox b/assets/voxygen/voxel/armor/mail/steel/foot.vox similarity index 100% rename from assets/voxygen/voxel/armor/steel/foot.vox rename to assets/voxygen/voxel/armor/mail/steel/foot.vox diff --git a/assets/voxygen/voxel/armor/steel/hand.vox b/assets/voxygen/voxel/armor/mail/steel/hand.vox similarity index 100% rename from assets/voxygen/voxel/armor/steel/hand.vox rename to assets/voxygen/voxel/armor/mail/steel/hand.vox diff --git a/assets/voxygen/voxel/armor/steel/pants.vox b/assets/voxygen/voxel/armor/mail/steel/pants.vox similarity index 100% rename from assets/voxygen/voxel/armor/steel/pants.vox rename to assets/voxygen/voxel/armor/mail/steel/pants.vox diff --git a/assets/voxygen/voxel/armor/steel/shoulder.vox b/assets/voxygen/voxel/armor/mail/steel/shoulder.vox similarity index 100% rename from assets/voxygen/voxel/armor/steel/shoulder.vox rename to assets/voxygen/voxel/armor/mail/steel/shoulder.vox diff --git a/assets/voxygen/voxel/armor/plate/belt.vox b/assets/voxygen/voxel/armor/plate/belt.vox deleted file mode 100644 index 274d084e72..0000000000 --- a/assets/voxygen/voxel/armor/plate/belt.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a080bd77583d9ecefbf1d0f22d83a9d30f3594ee6254af961643cf4ed2bf1b7a -size 1472 diff --git a/assets/voxygen/voxel/armor/plate/chest.vox b/assets/voxygen/voxel/armor/plate/chest.vox deleted file mode 100644 index 25d6545f45..0000000000 --- a/assets/voxygen/voxel/armor/plate/chest.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d49f753a562f0e0879609685afa3134eddcb72cf54861e56aade904caf48d159 -size 2744 diff --git a/assets/voxygen/voxel/armor/plate/foot.vox b/assets/voxygen/voxel/armor/plate/foot.vox deleted file mode 100644 index 50d3eae09b..0000000000 --- a/assets/voxygen/voxel/armor/plate/foot.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:610e5b351d62943f88893791bfe8ca20838fd3c3635219886033dba6032170f2 -size 1480 diff --git a/assets/voxygen/voxel/armor/plate/hand.vox b/assets/voxygen/voxel/armor/plate/hand.vox deleted file mode 100644 index 8f462e46a6..0000000000 --- a/assets/voxygen/voxel/armor/plate/hand.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0a73c4a4a86d5c1535923d3b59ad9ad2c94738dc3c9729805cc55f7c0e462480 -size 1240 diff --git a/assets/voxygen/voxel/armor/plate/pants.vox b/assets/voxygen/voxel/armor/plate/pants.vox deleted file mode 100644 index 6520bd653a..0000000000 --- a/assets/voxygen/voxel/armor/plate/pants.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:70f97c30c4f7a4e0602ebcaccb1b248f618def4cf2a2d81b8d5d480813659d44 -size 1912 diff --git a/assets/voxygen/voxel/armor/plate/shoulder.vox b/assets/voxygen/voxel/armor/plate/shoulder.vox deleted file mode 100644 index 133f46b364..0000000000 --- a/assets/voxygen/voxel/armor/plate/shoulder.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1ac70c920c336afa85a06ee839b94cb715ad2bac8927d95560a5b7ccf68a5882 -size 1460 diff --git a/assets/voxygen/voxel/humanoid_armor_back_manifest.ron b/assets/voxygen/voxel/humanoid_armor_back_manifest.ron index eb1a311fb3..7a641648a6 100644 --- a/assets/voxygen/voxel/humanoid_armor_back_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_back_manifest.ron @@ -20,10 +20,6 @@ vox_spec: ("armor.misc.back.short-1", (-5.0, -1.0, -11.0)), color: None ), - "Agile": ( - vox_spec: ("armor.agile.back", (-5.0, -1.0, -11.0)), - color: None - ), "Ferocious": ( vox_spec: ("armor.ferocious.back", (-5.0, -1.5, -14.0)), color: None @@ -52,20 +48,28 @@ vox_spec: ("armor.warlock.back", (-5.0, -1.5, -15.5)), color: None ), + "Rawhide": ( + vox_spec: ("armor.hide.rawhide.back", (-5.0, -1.0, -11.0)), + color: None + ), + "Leather": ( + vox_spec: ("armor.hide.leather.back", (-5.0, -1.0, -11.0)), + color: None + ), "Scale": ( - vox_spec: ("armor.scale.back", (-5.0, -2.0, -10.5)), + vox_spec: ("armor.hide.scale.back", (-5.0, -2.0, -10.5)), color: None ), "Carapace": ( - vox_spec: ("armor.carapace.back", (-5.0, -1.5, -10.5)), + vox_spec: ("armor.hide.carapace.back", (-5.0, -1.5, -10.5)), color: None ), - "Platescale": ( - vox_spec: ("armor.platescale.back", (-5.0, -4.5, -10.5)), + "Primal": ( + vox_spec: ("armor.hide.primal.back", (-5.0, -4.5, -10.5)), color: None ), "Dragonscale": ( - vox_spec: ("armor.dragonscale.back", (-7.0, -2.5, -12.0)), + vox_spec: ("armor.hide.dragonscale.back", (-7.0, -2.5, -12.0)), color: None ), "Savage": ( @@ -73,51 +77,51 @@ color: None ), "Linen": ( - vox_spec: ("armor.linen.back", (-4.0, -2.5, -8.5)), + vox_spec: ("armor.cloth.linen.back", (-4.0, -2.5, -8.5)), color: None ), "Woolen": ( - vox_spec: ("armor.woolen.back", (-5.0, -2.5, -8.5)), + vox_spec: ("armor.cloth.woolen.back", (-5.0, -2.5, -8.5)), color: None ), "Silken": ( - vox_spec: ("armor.silken.back", (-4.0, -2.5, -11.5)), + vox_spec: ("armor.cloth.silken.back", (-4.0, -2.5, -11.5)), color: None ), - "Lifecloth": ( - vox_spec: ("armor.lifecloth.back", (-5.0, -2.5, -11.0)), + "Druid": ( + vox_spec: ("armor.cloth.druid.back", (-5.0, -2.5, -11.0)), color: None ), "Moonweave": ( - vox_spec: ("armor.moonweave.back", (-4.0, -2.0, -12.5)), + vox_spec: ("armor.cloth.moonweave.back", (-4.0, -2.0, -12.5)), color: None ), "Sunsilk": ( - vox_spec: ("armor.sunsilk.back", (-5.0, -1.5, -12.5)), + vox_spec: ("armor.cloth.sunsilk.back", (-5.0, -1.5, -12.5)), color: None ), "Bronze": ( - vox_spec: ("armor.bronze.back", (-4.0, -2.5, -7.0)), + vox_spec: ("armor.mail.bronze.back", (-4.0, -2.5, -7.0)), color: None ), "Iron": ( - vox_spec: ("armor.iron.back", (-4.0, -2.5, -10.0)), + vox_spec: ("armor.mail.iron.back", (-4.0, -2.5, -10.0)), color: None ), "Steel": ( - vox_spec: ("armor.steel.back", (-4.0, -2.5, -12.0)), + vox_spec: ("armor.mail.steel.back", (-4.0, -2.5, -12.0)), color: None ), "Cobalt": ( - vox_spec: ("armor.cobalt.back", (-4.0, -2.5, -12.0)), + vox_spec: ("armor.mail.cobalt.back", (-4.0, -2.5, -12.0)), color: None ), "Bloodsteel": ( - vox_spec: ("armor.bloodsteel.back", (-3.5, -2.5, -12.0)), + vox_spec: ("armor.mail.bloodsteel.back", (-3.5, -2.5, -12.0)), color: None ), "Orichalcum": ( - vox_spec: ("armor.orichalcum.back", (-5.0, -4.5, -12.0)), + vox_spec: ("armor.mail.orichalcum.back", (-5.0, -4.5, -12.0)), color: None ), }, diff --git a/assets/voxygen/voxel/humanoid_armor_belt_manifest.ron b/assets/voxygen/voxel/humanoid_armor_belt_manifest.ron index 456913a71d..2da9ad5b3d 100644 --- a/assets/voxygen/voxel/humanoid_armor_belt_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_belt_manifest.ron @@ -28,14 +28,6 @@ vox_spec: ("armor.ferocious.belt", (-4.0, -3.5, -1.0)), color: None ), - "Plate": ( - vox_spec: ("armor.plate.belt", (-5.0, -3.5, 2.0)), - color: None - ), - "Swift": ( - vox_spec: ("armor.swift.belt", (-5.0, -3.5, 2.0)), - color: None - ), "ClothPurple": ( vox_spec: ("armor.cloth_purple.belt", (-5.0, -3.5, 2.0)), color: None @@ -52,18 +44,10 @@ vox_spec: ("armor.cultist.belt", (-5.0, -3.5, 1.0)), color: None ), - "Agile": ( - vox_spec: ("armor.agile.belt", (-5.0, -3.5, 2.0)), - color: None - ), "LeatherPlate": ( vox_spec: ("armor.leather_plate.belt", (-4.0, -4.5, 2.0)), color: None ), - "Druid": ( - vox_spec: ("armor.druid.belt", (-4.0, -3.5, -1.0)), - color: None - ), "Twigs": ( vox_spec: ("armor.twigs.belt", (-4.0, -3.5, -1.0)), color: None @@ -96,20 +80,28 @@ vox_spec: ("armor.warlock.belt", (-4.0, -3.0, 2.0)), color: None ), + "Rawhide": ( + vox_spec: ("armor.hide.rawhide.belt", (-5.0, -3.5, 2.0)), + color: None + ), + "Leather": ( + vox_spec: ("armor.hide.leather.belt", (-5.0, -3.5, 2.0)), + color: None + ), "Scale":( - vox_spec: ("armor.scale.belt", (-4.0, -3.5, 2.0)), + vox_spec: ("armor.hide.scale.belt", (-4.0, -3.5, 2.0)), color: None ), "Carapace":( - vox_spec: ("armor.carapace.belt", (-4.0, -4.0, 1.5)), + vox_spec: ("armor.hide.carapace.belt", (-4.0, -4.0, 1.5)), color: None ), - "Platescale":( - vox_spec: ("armor.platescale.belt", (-4.0, -4.0, 1.0)), + "Primal":( + vox_spec: ("armor.hide.primal.belt", (-4.0, -4.0, 1.0)), color: None ), "Dragonscale":( - vox_spec: ("armor.dragonscale.belt", (-4.0, -3.5, 1.5)), + vox_spec: ("armor.hide.dragonscale.belt", (-4.0, -3.5, 1.5)), color: None ), "Savage":( @@ -117,51 +109,51 @@ color: None ), "Linen":( - vox_spec: ("armor.linen.belt", (-4.0, -4.0, 0.0)), + vox_spec: ("armor.cloth.linen.belt", (-4.0, -4.0, 0.0)), color: None ), "Woolen":( - vox_spec: ("armor.woolen.belt", (-4.0, -4.0, 1.0)), + vox_spec: ("armor.cloth.woolen.belt", (-4.0, -4.0, 1.0)), color: None ), "Silken":( - vox_spec: ("armor.silken.belt", (-4.0, -3.5, -3.0)), + vox_spec: ("armor.cloth.silken.belt", (-4.0, -3.5, -3.0)), color: None ), - "Lifecloth":( - vox_spec: ("armor.lifecloth.belt", (-4.0, -4.0, -0.5)), + "Druid":( + vox_spec: ("armor.cloth.druid.belt", (-4.0, -4.0, -0.5)), color: None ), "Moonweave":( - vox_spec: ("armor.moonweave.belt", (-4.0, -3.5, 1.0)), + vox_spec: ("armor.cloth.moonweave.belt", (-4.0, -3.5, 1.0)), color: None ), "Sunsilk":( - vox_spec: ("armor.sunsilk.belt", (-4.0, -3.5, -2.5)), + vox_spec: ("armor.cloth.sunsilk.belt", (-4.0, -3.5, -2.5)), color: None ), "Bronze":( - vox_spec: ("armor.bronze.belt", (-4.0, -4.0, 2.0)), + vox_spec: ("armor.mail.bronze.belt", (-4.0, -4.0, 2.0)), color: None ), "Iron":( - vox_spec: ("armor.iron.belt", (-4.0, -4.0, 2.0)), + vox_spec: ("armor.mail.iron.belt", (-4.0, -4.0, 2.0)), color: None ), "Steel":( - vox_spec: ("armor.steel.belt", (-5.0, -4.0, 1.0)), + vox_spec: ("armor.mail.steel.belt", (-5.0, -4.0, 1.0)), color: None ), "Cobalt":( - vox_spec: ("armor.cobalt.belt", (-5.0, -4.0, 1.0)), + vox_spec: ("armor.mail.cobalt.belt", (-5.0, -4.0, 1.0)), color: None ), "Bloodsteel":( - vox_spec: ("armor.bloodsteel.belt", (-4.5, -3.5, 1.0)), + vox_spec: ("armor.mail.bloodsteel.belt", (-4.5, -3.5, 1.0)), color: None ), "Orichalcum":( - vox_spec: ("armor.orichalcum.belt", (-4.0, -3.5, 1.0)), + vox_spec: ("armor.mail.orichalcum.belt", (-4.0, -3.5, 1.0)), color: None ), }, diff --git a/assets/voxygen/voxel/humanoid_armor_chest_manifest.ron b/assets/voxygen/voxel/humanoid_armor_chest_manifest.ron index 41a4f1d57f..37d1d66923 100644 --- a/assets/voxygen/voxel/humanoid_armor_chest_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_chest_manifest.ron @@ -40,18 +40,10 @@ vox_spec: ("armor.misc.chest.cloth_red_kimono", (-7.0, -3.5, 2.0)), color: None ), - "Plate": ( - vox_spec: ("armor.plate.chest", (-7.0, -3.5, 2.0)), - color: None - ), "PlateRed": ( vox_spec: ("armor.misc.chest.plate_grey", (-7.0, -3.5, 2.0)), color: Some((124, 38, 46)) ), - "Swift": ( - vox_spec: ("armor.swift.chest", (-7.0, -3.5, 2.0)), - color: None - ), "LeatherBlue": ( vox_spec: ("armor.leather_blue.chest", (-7.0, -3.5, 2.0)), color: None @@ -117,10 +109,6 @@ vox_spec: ("armor.misc.chest.shirt_white", (-7.0, -3.5, 2.0)), color: Some((135, 82, 67)) ), - "Druid": ( - vox_spec: ("armor.druid.chest", (-7.0, -3.5, 2.0)), - color: None - ), "Twigs": ( vox_spec: ("armor.twigs.chest", (-7.0, -3.5, 2.0)), color: None @@ -142,10 +130,6 @@ vox_spec: ("armor.leather_plate.chest", (-8.0, -5.5, 2.0)), color: None ), - "Agile": ( - vox_spec: ("armor.agile.chest", (-7.0, -3.5, 2.0)), - color: None - ), "Tarasque":( vox_spec: ("armor.tarasque.chest", (-8.0, -4.5, 2.0)), color: None @@ -166,72 +150,80 @@ vox_spec: ("armor.warlock.chest", (-7.0, -3.5, 0.5)), color: None ), + "Rawhide": ( + vox_spec: ("armor.hide.rawhide.chest", (-7.0, -3.5, 2.0)), + color: None + ), + "Leather": ( + vox_spec: ("armor.hide.leather.chest", (-7.0, -3.5, 2.0)), + color: None + ), "Scale": ( - vox_spec: ("armor.scale.chest", (-7.0, -3.5, 2.0)), + vox_spec: ("armor.hide.scale.chest", (-7.0, -3.5, 2.0)), color: None ), "Carapace": ( - vox_spec: ("armor.carapace.chest", (-7.0, -3.5, 1.5)), + vox_spec: ("armor.hide.carapace.chest", (-7.0, -3.5, 1.5)), color: None ), - "Platescale": ( - vox_spec: ("armor.platescale.chest", (-7.0, -3.5, 0.5)), + "Primal": ( + vox_spec: ("armor.hide.primal.chest", (-7.0, -3.5, 0.5)), color: None ), "Dragonscale": ( - vox_spec: ("armor.dragonscale.chest", (-7.0, -3.5, 1.5)), + vox_spec: ("armor.hide.dragonscale.chest", (-7.0, -3.5, 1.5)), color: None ), "Savage": ( - vox_spec: ("armor.savage.chest", (-7.0, -4.0, 1.0)), + vox_spec: ("armor.hide.savage.chest", (-7.0, -4.0, 1.0)), color: None ), "Linen": ( - vox_spec: ("armor.linen.chest", (-7.0, -4.0, 2.0)), + vox_spec: ("armor.cloth.linen.chest", (-7.0, -4.0, 2.0)), color: None ), "Woolen": ( - vox_spec: ("armor.woolen.chest", (-7.0, -4.0, 1.0)), + vox_spec: ("armor.cloth.woolen.chest", (-7.0, -4.0, 1.0)), color: None ), "Silken": ( - vox_spec: ("armor.silken.chest", (-7.0, -4.0, 1.0)), + vox_spec: ("armor.cloth.silken.chest", (-7.0, -4.0, 1.0)), color: None ), - "Lifecloth": ( - vox_spec: ("armor.lifecloth.chest", (-7.0, -4.0, 2.0)), + "Druid": ( + vox_spec: ("armor.cloth.druid.chest", (-7.0, -4.0, 2.0)), color: None ), "Moonweave": ( - vox_spec: ("armor.moonweave.chest", (-7.0, -4.0, 1.0)), + vox_spec: ("armor.cloth.moonweave.chest", (-7.0, -4.0, 1.0)), color: None ), "Sunsilk": ( - vox_spec: ("armor.sunsilk.chest", (-7.0, -4.0, 1.0)), + vox_spec: ("armor.cloth.sunsilk.chest", (-7.0, -4.0, 1.0)), color: None ), "Bronze": ( - vox_spec: ("armor.bronze.chest", (-7.0, -4.0, 2.0)), + vox_spec: ("armor.mail.bronze.chest", (-7.0, -4.0, 2.0)), color: None ), "Iron": ( - vox_spec: ("armor.iron.chest", (-7.0, -4.0, 2.0)), + vox_spec: ("armor.mail.iron.chest", (-7.0, -4.0, 2.0)), color: None ), "Steel": ( - vox_spec: ("armor.steel.chest", (-8.0, -4.0, 1.0)), + vox_spec: ("armor.mail.steel.chest", (-8.0, -4.0, 1.0)), color: None ), "Cobalt": ( - vox_spec: ("armor.cobalt.chest", (-8.0, -4.0, 1.0)), + vox_spec: ("armor.mail.cobalt.chest", (-8.0, -4.0, 1.0)), color: None ), "Bloodsteel": ( - vox_spec: ("armor.bloodsteel.chest", (-7.5, -4.0, 1.0)), + vox_spec: ("armor.mail.bloodsteel.chest", (-7.5, -4.0, 1.0)), color: None ), "Orichalcum": ( - vox_spec: ("armor.orichalcum.chest", (-7.0, -4.0, 1.0)), + vox_spec: ("armor.mail.orichalcum.chest", (-7.0, -4.0, 1.0)), color: None ), }, diff --git a/assets/voxygen/voxel/humanoid_armor_foot_manifest.ron b/assets/voxygen/voxel/humanoid_armor_foot_manifest.ron index 378887fcc4..5895fd0204 100644 --- a/assets/voxygen/voxel/humanoid_armor_foot_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_foot_manifest.ron @@ -16,14 +16,6 @@ vox_spec: ("armor.misc.foot.dark_jester_elf", (-2.5, -3.0, -2.0)), color: None ), - "Plate": ( - vox_spec: ("armor.plate.foot", (-2.5, -3.5, -2.0)), - color: None - ), - "Swift": ( - vox_spec: ("armor.swift.foot", (-2.5, -3.5, -2.0)), - color: None - ), "ClothPurple": ( vox_spec: ("armor.cloth_purple.foot", (-2.5, -3.5, -2.0)), color: None @@ -52,18 +44,10 @@ vox_spec: ("armor.leather_plate.foot", (-2.5, -3.5, -2.0)), color: None ), - "Agile": ( - vox_spec: ("armor.agile.foot", (-2.5, -3.5, -2.0)), - color: None - ), "Jackalope": ( vox_spec: ("armor.misc.foot.jackalope", (-2.5, -3.5, -2.0)), color: None ), - "Druid": ( - vox_spec: ("armor.druid.foot", (-2.5, -3.5, -2.0)), - color: None - ), "Twigs": ( vox_spec: ("armor.twigs.foot", (-2.5, -3.5, -2.0)), color: None @@ -96,20 +80,28 @@ vox_spec: ("armor.warlock.foot", (-2.5, -3.5, -2.0)), color: None ), + "Rawhide": ( + vox_spec: ("armor.hide.rawhide.foot", (-2.5, -3.5, -2.0)), + color: None + ), + "Leather": ( + vox_spec: ("armor.hide.leather.foot", (-2.5, -3.5, -2.0)), + color: None + ), "Scale": ( - vox_spec: ("armor.scale.foot", (-2.5, -3.5, -2.0)), + vox_spec: ("armor.hide.scale.foot", (-2.5, -3.5, -2.0)), color: None ), "Carapace": ( - vox_spec: ("armor.carapace.foot", (-2.5, -3.5, -2.0)), + vox_spec: ("armor.hide.carapace.foot", (-2.5, -3.5, -2.0)), color: None ), - "Platescale": ( - vox_spec: ("armor.platescale.foot", (-2.5, -3.5, -2.0)), + "Primal": ( + vox_spec: ("armor.hide.primal.foot", (-2.5, -3.5, -2.0)), color: None ), "Dragonscale": ( - vox_spec: ("armor.dragonscale.foot", (-2.5, -5.5, -2.0)), + vox_spec: ("armor.hide.dragonscale.foot", (-2.5, -5.5, -2.0)), color: None ), "Savage": ( @@ -117,51 +109,51 @@ color: None ), "Linen": ( - vox_spec: ("armor.linen.foot", (-2.5, -3.5, -2.0)), + vox_spec: ("armor.cloth.linen.foot", (-2.5, -3.5, -2.0)), color: None ), "Woolen": ( - vox_spec: ("armor.woolen.foot", (-2.5, -3.5, -2.0)), + vox_spec: ("armor.cloth.woolen.foot", (-2.5, -3.5, -2.0)), color: None ), "Silken": ( - vox_spec: ("armor.silken.foot", (-2.5, -3.5, -2.0)), + vox_spec: ("armor.cloth.silken.foot", (-2.5, -3.5, -2.0)), color: None ), - "Lifecloth": ( - vox_spec: ("armor.lifecloth.foot", (-2.5, -3.5, -2.0)), + "Druid": ( + vox_spec: ("armor.cloth.druid.foot", (-2.5, -3.5, -2.0)), color: None ), "Moonweave": ( - vox_spec: ("armor.moonweave.foot", (-2.5, -3.5, -2.0)), + vox_spec: ("armor.cloth.moonweave.foot", (-2.5, -3.5, -2.0)), color: None ), "Sunsilk": ( - vox_spec: ("armor.sunsilk.foot", (-2.5, -3.5, -2.0)), + vox_spec: ("armor.cloth.sunsilk.foot", (-2.5, -3.5, -2.0)), color: None ), "Bronze": ( - vox_spec: ("armor.bronze.foot", (-2.5, -3.5, -2.0)), + vox_spec: ("armor.mail.bronze.foot", (-2.5, -3.5, -2.0)), color: None ), "Iron": ( - vox_spec: ("armor.iron.foot", (-2.5, -3.5, -2.0)), + vox_spec: ("armor.mail.iron.foot", (-2.5, -3.5, -2.0)), color: None ), "Steel": ( - vox_spec: ("armor.steel.foot", (-2.5, -3.5, -2.0)), + vox_spec: ("armor.mail.steel.foot", (-2.5, -3.5, -2.0)), color: None ), "Cobalt": ( - vox_spec: ("armor.cobalt.foot", (-2.5, -3.5, -2.0)), + vox_spec: ("armor.mail.cobalt.foot", (-2.5, -3.5, -2.0)), color: None ), "Bloodsteel": ( - vox_spec: ("armor.bloodsteel.foot", (-2.5, -3.5, -2.0)), + vox_spec: ("armor.mail.bloodsteel.foot", (-2.5, -3.5, -2.0)), color: None ), "Orichalcum": ( - vox_spec: ("armor.orichalcum.foot", (-2.5, -3.5, -2.0)), + vox_spec: ("armor.mail.orichalcum.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 691bc31b8e..f214417191 100644 --- a/assets/voxygen/voxel/humanoid_armor_hand_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_hand_manifest.ron @@ -40,26 +40,6 @@ color: None ) ), - "Plate": ( - left: ( - vox_spec: ("armor.plate.hand", (-1.5, -1.5, -2.5)), - color: None - ), - right: ( - vox_spec: ("armor.plate.hand", (-1.5, -1.5, -2.5)), - color: None - ) - ), - "Swift": ( - left: ( - vox_spec: ("armor.swift.hand", (-1.5, -1.5, -2.5)), - color: None - ), - right: ( - vox_spec: ("armor.swift.hand", (-1.5, -1.5, -2.5)), - color: None - ) - ), "ClothPurple": ( left: ( vox_spec: ("armor.cloth_purple.hand", (-1.5, -1.5, -2.5)), @@ -110,26 +90,6 @@ color: None ) ), - "Agile": ( - left: ( - vox_spec: ("armor.agile.hand", (-1.5, -1.5, -2.5)), - color: None - ), - right: ( - vox_spec: ("armor.agile.hand", (-1.5, -1.5, -2.5)), - color: None - ) - ), - "Druid": ( - left: ( - vox_spec: ("armor.druid.hand", (-1.5, -1.5, -2.5)), - color: None - ), - right: ( - vox_spec: ("armor.druid.hand", (-1.5, -1.5, -2.5)), - color: None - ) - ), "Twigs": ( left: ( vox_spec: ("armor.twigs.hand", (-1.5, -1.5, -2.5)), @@ -210,43 +170,63 @@ color: None ) ), - "Scale": ( + "Rawhide": ( left: ( - vox_spec: ("armor.scale.hand", (-3.5, -1.5, -2.5)), + vox_spec: ("armor.hide.rawhide.hand", (-1.5, -1.5, -2.5)), color: None ), right: ( - vox_spec: ("armor.scale.hand", (-1.5, -1.5, -2.5)), + vox_spec: ("armor.hide.rawhide.hand", (-1.5, -1.5, -2.5)), + color: None + ) + ), + "Leather": ( + left: ( + vox_spec: ("armor.hide.leather.hand", (-1.5, -1.5, -2.5)), + color: None + ), + right: ( + vox_spec: ("armor.hide.leather.hand", (-1.5, -1.5, -2.5)), + color: None + ) + ), + "Scale": ( + left: ( + vox_spec: ("armor.hide.scale.hand", (-3.5, -1.5, -2.5)), + color: None + ), + right: ( + vox_spec: ("armor.hide.scale.hand", (-1.5, -1.5, -2.5)), color: None ) ), "Carapace": ( left: ( - vox_spec: ("armor.carapace.hand", (-3.5, -2.5, -3.0)), + vox_spec: ("armor.hide.carapace.hand", (-3.5, -2.5, -3.0)), color: None ), right: ( - vox_spec: ("armor.carapace.hand", (-1.5, -2.5, -3.0)), + vox_spec: ("armor.hide.carapace.hand", (-1.5, -2.5, -3.0)), color: None ) ), - "Platescale": ( + "Primal": ( left: ( - vox_spec: ("armor.platescale.hand", (-3.5, -3.5, -4.0)), + vox_spec: ("armor.hide.primal.hand", (-3.5, -3.5, -4.0)), color: None ), right: ( - vox_spec: ("armor.platescale.hand", (-1.5, -3.5, -4.0)), + vox_spec: ("armor.hide.primal.hand", (-1.5, -3.5, -4.0)), color: None ) ), "Dragonscale": ( left: ( - vox_spec: ("armor.dragonscale.hand", (-5.0, -1.5, -3.5)), + vox_spec: ("armor.hide.dragonscale.hand", (-5.0, -1.5, -3.5)), color: None ), right: ( - vox_spec: ("armor.dragonscale.hand", (-2.0, -1.5, -3.5)), + vox_spec: ("armor.hide.dragonscale.hand", (-2.0, -1.5, -3.5)), color: None ) ), @@ -262,121 +242,121 @@ ), "Linen": ( left: ( - vox_spec: ("armor.linen.hand", (-1.5, -2.0, -3.0)), + vox_spec: ("armor.cloth.linen.hand", (-1.5, -2.0, -3.0)), color: None ), right: ( - vox_spec: ("armor.linen.hand", (-1.5, -2.0, -3.0)), + vox_spec: ("armor.cloth.linen.hand", (-1.5, -2.0, -3.0)), color: None ) ), "Woolen": ( left: ( - vox_spec: ("armor.woolen.hand", (-2.5, -2.5, -3.5)), + vox_spec: ("armor.cloth.woolen.hand", (-2.5, -2.5, -3.5)), color: None ), right: ( - vox_spec: ("armor.woolen.hand", (-2.5, -2.5, -3.5)), + vox_spec: ("armor.cloth.woolen.hand", (-2.5, -2.5, -3.5)), color: None ) ), "Silken": ( left: ( - vox_spec: ("armor.silken.hand", (-2.5, -2.5, -4.0)), + vox_spec: ("armor.cloth.silken.hand", (-2.5, -2.5, -4.0)), color: None ), right: ( - vox_spec: ("armor.silken.hand", (-1.5, -2.5, -4.0)), + vox_spec: ("armor.cloth.silken.hand", (-1.5, -2.5, -4.0)), color: None ) ), - "Lifecloth": ( + "Druid": ( left: ( - vox_spec: ("armor.lifecloth.hand", (-2.5, -1.0, -3.0)), + vox_spec: ("armor.cloth.druid.hand", (-2.5, -1.0, -3.0)), color: None ), right: ( - vox_spec: ("armor.lifecloth.hand", (-1.5, -1.0, -3.0)), + vox_spec: ("armor.cloth.druid.hand", (-1.5, -1.0, -3.0)), color: None ) ), "Moonweave": ( left: ( - vox_spec: ("armor.moonweave.hand", (-2.5, -2.0, -4.0)), + vox_spec: ("armor.cloth.moonweave.hand", (-2.5, -2.0, -4.0)), color: None ), right: ( - vox_spec: ("armor.moonweave.hand", (-1.5, -2.0, -4.0)), + vox_spec: ("armor.cloth.moonweave.hand", (-1.5, -2.0, -4.0)), color: None ) ), "Sunsilk": ( left: ( - vox_spec: ("armor.sunsilk.hand", (-2.5, -2.5, -4.0)), + vox_spec: ("armor.cloth.sunsilk.hand", (-2.5, -2.5, -4.0)), color: None ), right: ( - vox_spec: ("armor.sunsilk.hand", (-1.5, -2.5, -4.0)), + vox_spec: ("armor.cloth.sunsilk.hand", (-1.5, -2.5, -4.0)), color: None ) ), "Bronze": ( left: ( - vox_spec: ("armor.bronze.hand", (-2.5, -2.0, -3.0)), + vox_spec: ("armor.mail.bronze.hand", (-2.5, -2.0, -3.0)), color: None ), right: ( - vox_spec: ("armor.bronze.hand", (-1.5, -2.0, -3.0)), + vox_spec: ("armor.mail.bronze.hand", (-1.5, -2.0, -3.0)), color: None ) ), "Iron": ( left: ( - vox_spec: ("armor.iron.hand", (-2.5, -1.0, -3.0)), + vox_spec: ("armor.mail.iron.hand", (-2.5, -1.0, -3.0)), color: None ), right: ( - vox_spec: ("armor.iron.hand", (-1.5, -1.0, -3.0)), + vox_spec: ("armor.mail.iron.hand", (-1.5, -1.0, -3.0)), color: None ) ), "Steel": ( left: ( - vox_spec: ("armor.steel.hand", (-2.5, -1.0, -4.0)), + vox_spec: ("armor.mail.steel.hand", (-2.5, -1.0, -4.0)), color: None ), right: ( - vox_spec: ("armor.steel.hand", (-1.5, -1.0, -4.0)), + vox_spec: ("armor.mail.steel.hand", (-1.5, -1.0, -4.0)), color: None ) ), "Cobalt": ( left: ( - vox_spec: ("armor.cobalt.hand", (-2.5, -2.0, -4.0)), + vox_spec: ("armor.mail.cobalt.hand", (-2.5, -2.0, -4.0)), color: None ), right: ( - vox_spec: ("armor.cobalt.hand", (-1.5, -2.0, -4.0)), + vox_spec: ("armor.mail.cobalt.hand", (-1.5, -2.0, -4.0)), color: None ) ), "Bloodsteel": ( left: ( - vox_spec: ("armor.bloodsteel.hand", (-3.5, -1.0, -4.0)), + vox_spec: ("armor.mail.bloodsteel.hand", (-3.5, -1.0, -4.0)), color: None ), right: ( - vox_spec: ("armor.bloodsteel.hand", (-0.5, -1.0, -4.0)), + vox_spec: ("armor.mail.bloodsteel.hand", (-0.5, -1.0, -4.0)), color: None ) ), "Orichalcum": ( left: ( - vox_spec: ("armor.orichalcum.hand", (-4.5, -2.0, -4.0)), + vox_spec: ("armor.mail.orichalcum.hand", (-4.5, -2.0, -4.0)), color: None ), right: ( - vox_spec: ("armor.orichalcum.hand", (-1.5, -2.0, -4.0)), + vox_spec: ("armor.mail.orichalcum.hand", (-1.5, -2.0, -4.0)), color: None ) ), diff --git a/assets/voxygen/voxel/humanoid_armor_pants_manifest.ron b/assets/voxygen/voxel/humanoid_armor_pants_manifest.ron index 924e524fb1..68c3edbb01 100644 --- a/assets/voxygen/voxel/humanoid_armor_pants_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_pants_manifest.ron @@ -36,18 +36,10 @@ vox_spec: ("armor.ferocious.pants", (-5.0, -3.5, 1.0)), color: None ), - "Plate": ( - vox_spec: ("armor.plate.pants", (-5.0, -3.5, 1.0)), - color: None - ), "PlateRed": ( vox_spec: ("armor.misc.pants.plate_grey", (-5.0, -3.5, 1.0)), color: Some((124, 38, 46)) ), - "Swift": ( - vox_spec: ("armor.swift.pants", (-5.0, -3.5, 1.0)), - color: None - ), "ClothPurple": ( vox_spec: ("armor.cloth_purple.pants", (-5.0, -3.5, 0.0)), color: None @@ -80,14 +72,6 @@ vox_spec: ("armor.leather_plate.pants", (-5.0, -4.5, 1.0)), color: None ), - "Agile": ( - vox_spec: ("armor.agile.pants", (-5.0, -3.5, 1.0)), - color: None - ), - "Druid": ( - vox_spec: ("armor.druid.pants", (-5.0, -3.5, -1.0)), - color: None - ), "Twigs": ( vox_spec: ("armor.twigs.pants", (-5.0, -3.5, 0.0)), color: None @@ -124,20 +108,28 @@ vox_spec: ("armor.warlock.pants", (-5.0, -4.0, -2.0)), color: None ), + "Rawhide": ( + vox_spec: ("armor.hide.rawhide.pants", (-5.0, -3.5, 1.0)), + color: None + ), + "Leather": ( + vox_spec: ("armor.hide.leather.pants", (-5.0, -3.5, 1.0)), + color: None + ), "Scale": ( - vox_spec: ("armor.scale.pants", (-5.0, -4.0, 0.0)), + vox_spec: ("armor.hide.scale.pants", (-5.0, -4.0, 0.0)), color: None ), "Carapace": ( - vox_spec: ("armor.carapace.pants", (-6.0, -4.0, 0.5)), + vox_spec: ("armor.hide.carapace.pants", (-6.0, -4.0, 0.5)), color: None ), - "Platescale": ( - vox_spec: ("armor.platescale.pants", (-6.0, -4.0, 0.0)), + "Primal": ( + vox_spec: ("armor.hide.primal.pants", (-6.0, -4.0, 0.0)), color: None ), "Dragonscale": ( - vox_spec: ("armor.dragonscale.pants", (-5.0, -3.5, -1.5)), + vox_spec: ("armor.hide.dragonscale.pants", (-5.0, -3.5, -1.5)), color: None ), "Savage": ( @@ -145,51 +137,51 @@ color: None ), "Linen": ( - vox_spec: ("armor.linen.pants", (-5.0, -4.0, 0.5)), + vox_spec: ("armor.cloth.linen.pants", (-5.0, -4.0, 0.5)), color: None ), "Woolen": ( - vox_spec: ("armor.woolen.pants", (-6.0, -5.0, 0.5)), + vox_spec: ("armor.cloth.woolen.pants", (-6.0, -5.0, 0.5)), color: None ), "Silken": ( - vox_spec: ("armor.silken.pants", (-5.0, -4.0, 0.5)), + vox_spec: ("armor.cloth.silken.pants", (-5.0, -4.0, 0.5)), color: None ), - "Lifecloth": ( - vox_spec: ("armor.lifecloth.pants", (-5.0, -4.0, 0.5)), + "Druid": ( + vox_spec: ("armor.cloth.druid.pants", (-5.0, -4.0, 0.5)), color: None ), "Moonweave": ( - vox_spec: ("armor.moonweave.pants", (-6.0, -5.5, 0.5)), + vox_spec: ("armor.cloth.moonweave.pants", (-6.0, -5.5, 0.5)), color: None ), "Sunsilk": ( - vox_spec: ("armor.sunsilk.pants", (-6.0, -5.0, 0.5)), + vox_spec: ("armor.cloth.sunsilk.pants", (-6.0, -5.0, 0.5)), color: None ), "Bronze": ( - vox_spec: ("armor.bronze.pants", (-5.0, -4.0, 1.0)), + vox_spec: ("armor.mail.bronze.pants", (-5.0, -4.0, 1.0)), color: None ), "Iron": ( - vox_spec: ("armor.iron.pants", (-5.0, -4.0, 1.5)), + vox_spec: ("armor.mail.iron.pants", (-5.0, -4.0, 1.5)), color: None ), "Steel": ( - vox_spec: ("armor.steel.pants", (-6.0, -4.0, 0.0)), + vox_spec: ("armor.mail.steel.pants", (-6.0, -4.0, 0.0)), color: None ), "Cobalt": ( - vox_spec: ("armor.cobalt.pants", (-6.0, -5.0, 0.5)), + vox_spec: ("armor.mail.cobalt.pants", (-6.0, -5.0, 0.5)), color: None ), "Bloodsteel": ( - vox_spec: ("armor.bloodsteel.pants", (-6.5, -4.0, 0.5)), + vox_spec: ("armor.mail.bloodsteel.pants", (-6.5, -4.0, 0.5)), color: None ), "Orichalcum": ( - vox_spec: ("armor.orichalcum.pants", (-6.0, -4.0, 0.5)), + vox_spec: ("armor.mail.orichalcum.pants", (-6.0, -4.0, 0.5)), color: None ), }, diff --git a/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron b/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron index e0381e7fad..14ee0f67ea 100644 --- a/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron @@ -51,26 +51,6 @@ color: None ) ), - "Plate": ( - left: ( - vox_spec: ("armor.plate.shoulder", (-3.6, -3.5, -0.0)), - color: None - ), - right: ( - vox_spec: ("armor.plate.shoulder", (-2.6, -3.5, 0.0)), - color: None - ) - ), - "Swift": ( - left: ( - vox_spec: ("armor.swift.shoulder", (-3.2, -3.5, 0.0)), - color: None - ), - right: ( - vox_spec: ("armor.swift.shoulder", (-1.4, -3.5, 0.0)), - color: None - ) - ), "ClothPurple": ( left: ( vox_spec: ("armor.cloth_purple.shoulder", (-3.2, -3.5, 0.0)), @@ -121,16 +101,6 @@ color: None ) ), - "Agile": ( - left: ( - vox_spec: ("armor.agile.shoulder", (-5.0, -3.8, -0.9)), - color: None - ), - right: ( - vox_spec: ("armor.agile.shoulder", (-1.0, -3.8, -0.9)), - color: None - ) - ), "Twigs": ( left: ( vox_spec: ("armor.twigs.shoulder", (-5.0, -4.5 , -1.0)), @@ -231,16 +201,6 @@ color: None ) ), - "Druid": ( - left: ( - vox_spec: ("armor.druid.shoulder", (-4.0, -4.5 , -3.0)), - color: None - ), - right: ( - vox_spec: ("armor.druid.shoulder", (-2.0, -4.5, -3.0)), - color: None - ) - ), "Tarasque": ( left: ( vox_spec: ("armor.tarasque.shoulder", (-5.0, -3.5 , 0.0)), @@ -291,43 +251,63 @@ color: None ) ), - "Scale": ( + "Rawhide": ( left: ( - vox_spec: ("armor.scale.shoulder", (-5.5, -4.0 , -0.5)), + vox_spec: ("armor.hide.rawhide.shoulder", (-5.0, -3.8, -0.9)), color: None ), right: ( - vox_spec: ("armor.scale.shoulder", (-0.5, -4.0, -0.5)), + vox_spec: ("armor.hide.rawhide.shoulder", (-1.0, -3.8, -0.9)), + color: None + ) + ), + "Leather": ( + left: ( + vox_spec: ("armor.hide.leather.shoulder", (-3.2, -3.5, 0.0)), + color: None + ), + right: ( + vox_spec: ("armor.hide.leather.shoulder", (-1.4, -3.5, 0.0)), + color: None + ) + ), + "Scale": ( + left: ( + vox_spec: ("armor.hide.scale.shoulder", (-5.5, -4.0 , -0.5)), + color: None + ), + right: ( + vox_spec: ("armor.hide.scale.shoulder", (-0.5, -4.0, -0.5)), color: None ) ), "Carapace": ( left: ( - vox_spec: ("armor.carapace.shoulder", (-6.0, -4.0 , -2.0)), + vox_spec: ("armor.hide.carapace.shoulder", (-6.0, -4.0 , -2.0)), color: None ), right: ( - vox_spec: ("armor.carapace.shoulder", (-1.0, -4.0, -2.0)), + vox_spec: ("armor.hide.carapace.shoulder", (-1.0, -4.0, -2.0)), color: None ) ), - "Platescale": ( + "Primal": ( left: ( - vox_spec: ("armor.platescale.shoulder", (-6.0, -4.0 , -3.0)), + vox_spec: ("armor.hide.primal.shoulder", (-6.0, -4.0 , -3.0)), color: None ), right: ( - vox_spec: ("armor.platescale.shoulder", (-1.0, -4.0, -3.0)), + vox_spec: ("armor.hide.primal.shoulder", (-1.0, -4.0, -3.0)), color: None ) ), "Dragonscale": ( left: ( - vox_spec: ("armor.dragonscale.shoulder", (-9.0, -3.5 , -1.0)), + vox_spec: ("armor.hide.dragonscale.shoulder", (-9.0, -3.5 , -1.0)), color: None ), right: ( - vox_spec: ("armor.dragonscale.shoulder", (0.0, -3.5, -1.0)), + vox_spec: ("armor.hide.dragonscale.shoulder", (0.0, -3.5, -1.0)), color: None ) ), @@ -343,121 +323,121 @@ ), "Linen": ( left: ( - vox_spec: ("armor.linen.shoulder", (-3.5, -4.0 , -1.0)), + vox_spec: ("armor.cloth.linen.shoulder", (-3.5, -4.0 , -1.0)), color: None ), right: ( - vox_spec: ("armor.linen.shoulder", (-0.5, -4.0, -1.0)), + vox_spec: ("armor.cloth.linen.shoulder", (-0.5, -4.0, -1.0)), color: None ) ), "Woolen": ( left: ( - vox_spec: ("armor.woolen.shoulder", (-5.5, -4.0 , -3.0)), + vox_spec: ("armor.cloth.woolen.shoulder", (-5.5, -4.0 , -3.0)), color: None ), right: ( - vox_spec: ("armor.woolen.shoulder", (-0.5, -4.0, -3.0)), + vox_spec: ("armor.cloth.woolen.shoulder", (-0.5, -4.0, -3.0)), color: None ) ), "Silken": ( left: ( - vox_spec: ("armor.silken.shoulder", (-5.0, -4.0 , -2.0)), + vox_spec: ("armor.cloth.silken.shoulder", (-5.0, -4.0 , -2.0)), color: None ), right: ( - vox_spec: ("armor.silken.shoulder", (-1.0, -4.0, -2.0)), + vox_spec: ("armor.cloth.silken.shoulder", (-1.0, -4.0, -2.0)), color: None ) ), - "Lifecloth": ( + "Druid": ( left: ( - vox_spec: ("armor.lifecloth.shoulder", (-4.5, -4.0 , -3.5)), + vox_spec: ("armor.cloth.druid.shoulder", (-4.5, -4.0 , -3.5)), color: None ), right: ( - vox_spec: ("armor.lifecloth.shoulder", (-1.5, -4.0, -3.5)), + vox_spec: ("armor.cloth.druid.shoulder", (-1.5, -4.0, -3.5)), color: None ) ), "Moonweave": ( left: ( - vox_spec: ("armor.moonweave.shoulder", (-4.5, -4.0 , -3.0)), + vox_spec: ("armor.cloth.moonweave.shoulder", (-4.5, -4.0 , -3.0)), color: None ), right: ( - vox_spec: ("armor.moonweave.shoulder", (-1.5, -4.0, -3.0)), + vox_spec: ("armor.cloth.moonweave.shoulder", (-1.5, -4.0, -3.0)), color: None ) ), "Sunsilk": ( left: ( - vox_spec: ("armor.sunsilk.shoulder", (-6.5, -4.0 , -2.0)), + vox_spec: ("armor.cloth.sunsilk.shoulder", (-6.5, -4.0 , -2.0)), color: None ), right: ( - vox_spec: ("armor.sunsilk.shoulder", (-0.5, -4.0, -2.0)), + vox_spec: ("armor.cloth.sunsilk.shoulder", (-0.5, -4.0, -2.0)), color: None ) ), "Bronze": ( left: ( - vox_spec: ("armor.bronze.shoulder", (-4.5, -4.0 , 0.0)), + vox_spec: ("armor.mail.bronze.shoulder", (-4.5, -4.0 , 0.0)), color: None ), right: ( - vox_spec: ("armor.bronze.shoulder", (-1.5, -4.0, 0.0)), + vox_spec: ("armor.mail.bronze.shoulder", (-1.5, -4.0, 0.0)), color: None ) ), "Iron": ( left: ( - vox_spec: ("armor.iron.shoulder", (-5.5, -4.0 , -1.0)), + vox_spec: ("armor.mail.iron.shoulder", (-5.5, -4.0 , -1.0)), color: None ), right: ( - vox_spec: ("armor.iron.shoulder", (-0.5, -4.0, -1.0)), + vox_spec: ("armor.mail.iron.shoulder", (-0.5, -4.0, -1.0)), color: None ) ), "Steel": ( left: ( - vox_spec: ("armor.steel.shoulder", (-5.5, -3.0 , -2.0)), + vox_spec: ("armor.mail.steel.shoulder", (-5.5, -3.0 , -2.0)), color: None ), right: ( - vox_spec: ("armor.steel.shoulder", (-1.5, -3.0, -2.0)), + vox_spec: ("armor.mail.steel.shoulder", (-1.5, -3.0, -2.0)), color: None ) ), "Cobalt": ( left: ( - vox_spec: ("armor.cobalt.shoulder", (-5.5, -4.0 , -1.0)), + vox_spec: ("armor.mail.cobalt.shoulder", (-5.5, -4.0 , -1.0)), color: None ), right: ( - vox_spec: ("armor.cobalt.shoulder", (-1.5, -4.0, -1.0)), + vox_spec: ("armor.mail.cobalt.shoulder", (-1.5, -4.0, -1.0)), color: None ) ), "Bloodsteel": ( left: ( - vox_spec: ("armor.bloodsteel.shoulder", (-6.5, -5.0 , -3.0)), + vox_spec: ("armor.mail.bloodsteel.shoulder", (-6.5, -5.0 , -3.0)), color: None ), right: ( - vox_spec: ("armor.bloodsteel.shoulder", (-1.5, -5.0, -3.0)), + vox_spec: ("armor.mail.bloodsteel.shoulder", (-1.5, -5.0, -3.0)), color: None ) ), "Orichalcum": ( left: ( - vox_spec: ("armor.orichalcum.shoulder", (-7.5, -3.0 , -2.0)), + vox_spec: ("armor.mail.orichalcum.shoulder", (-7.5, -3.0 , -2.0)), color: None ), right: ( - vox_spec: ("armor.orichalcum.shoulder", (-1.5, -3.0, -2.0)), + vox_spec: ("armor.mail.orichalcum.shoulder", (-1.5, -3.0, -2.0)), color: None ) ), diff --git a/server/src/rtsim/entity.rs b/server/src/rtsim/entity.rs index 5a066a7f0e..940297025d 100644 --- a/server/src/rtsim/entity.rs +++ b/server/src/rtsim/entity.rs @@ -91,7 +91,7 @@ impl Entity { let back = match rng.gen_range(0..5) { 0 => Some(comp::Item::new_from_asset_expect( - "common.items.armor.agile.back", + "common.items.armor.hide.rawhide.back", )), 1 => Some(comp::Item::new_from_asset_expect( "common.items.armor.misc.back.backpack", @@ -127,7 +127,7 @@ impl Entity { "common.items.npc_armor.pants.leather_blue", )); let shoulder = Some(comp::Item::new_from_asset_expect( - "common.items.armor.swift.shoulder", + "common.items.armor.hide.leather.shoulder", )); LoadoutBuilder::build_loadout(self.get_body(), Some(main_tool), None, None)