From 8dbdaa875976c6abee39a547ff1dd4ab82660de9 Mon Sep 17 00:00:00 2001 From: Sam Date: Wed, 24 Feb 2021 18:53:00 -0500 Subject: [PATCH 1/5] Swords --- .../items/weapons/sword/bloodsteel-0.ron | 16 ++ .../items/weapons/sword/bloodsteel-1.ron | 16 ++ .../items/weapons/sword/bloodsteel-2.ron | 16 ++ .../common/items/weapons/sword/bronze-0.ron | 16 ++ .../common/items/weapons/sword/bronze-1.ron | 16 ++ .../common/items/weapons/sword/bronze-2.ron | 16 ++ .../common/items/weapons/sword/caladbolg.ron | 16 ++ .../common/items/weapons/sword/cobalt-0.ron | 16 ++ .../common/items/weapons/sword/cobalt-1.ron | 16 ++ .../common/items/weapons/sword/cobalt-2.ron | 16 ++ .../common/items/weapons/sword/cobalt-3.ron | 16 ++ .../{cultist_purp_2h-0.ron => cultist.ron} | 0 .../{frost_cleaver_2h-0.ron => frost-0.ron} | 0 .../{frost_cleaver_2h-1.ron => frost-1.ron} | 0 .../weapons/sword/greatsword_2h_dam-0.ron | 16 -- .../weapons/sword/greatsword_2h_dam-1.ron | 16 -- .../weapons/sword/greatsword_2h_dam-2.ron | 16 -- .../weapons/sword/greatsword_2h_fine-0.ron | 16 -- .../weapons/sword/greatsword_2h_fine-2.ron | 16 -- .../weapons/sword/greatsword_2h_orn-0.ron | 16 -- .../weapons/sword/greatsword_2h_orn-1.ron | 16 -- .../weapons/sword/greatsword_2h_orn-2.ron | 16 -- .../weapons/sword/greatsword_2h_simple-0.ron | 16 -- .../weapons/sword/greatsword_2h_simple-1.ron | 16 -- .../weapons/sword/greatsword_2h_simple-2.ron | 16 -- assets/common/items/weapons/sword/iron-0.ron | 16 ++ assets/common/items/weapons/sword/iron-1.ron | 16 ++ assets/common/items/weapons/sword/iron-10.ron | 16 ++ assets/common/items/weapons/sword/iron-2.ron | 16 ++ assets/common/items/weapons/sword/iron-3.ron | 16 ++ assets/common/items/weapons/sword/iron-4.ron | 16 ++ assets/common/items/weapons/sword/iron-5.ron | 16 ++ .../sword/{long_2h_fine-2.ron => iron-6.ron} | 8 +- assets/common/items/weapons/sword/iron-7.ron | 16 ++ assets/common/items/weapons/sword/iron-8.ron | 16 ++ assets/common/items/weapons/sword/iron-9.ron | 16 ++ .../items/weapons/sword/long_2h_dam-0.ron | 16 -- .../items/weapons/sword/long_2h_dam-2.ron | 16 -- .../items/weapons/sword/long_2h_dam-3.ron | 16 -- .../items/weapons/sword/long_2h_dam-4.ron | 16 -- .../items/weapons/sword/long_2h_dam-5.ron | 16 -- .../items/weapons/sword/long_2h_fine-0.ron | 16 -- .../items/weapons/sword/long_2h_fine-1.ron | 16 -- .../items/weapons/sword/long_2h_fine-3.ron | 16 -- .../items/weapons/sword/long_2h_fine-4.ron | 16 -- .../items/weapons/sword/long_2h_fine-5.ron | 16 -- .../items/weapons/sword/long_2h_orn-0.ron | 16 -- .../items/weapons/sword/long_2h_orn-1.ron | 16 -- .../items/weapons/sword/long_2h_orn-2.ron | 16 -- .../items/weapons/sword/long_2h_orn-3.ron | 16 -- .../items/weapons/sword/long_2h_orn-4.ron | 16 -- .../items/weapons/sword/long_2h_orn-5.ron | 16 -- .../items/weapons/sword/long_2h_simple-0.ron | 16 -- .../items/weapons/sword/long_2h_simple-1.ron | 16 -- .../items/weapons/sword/long_2h_simple-2.ron | 16 -- .../items/weapons/sword/long_2h_simple-3.ron | 16 -- .../items/weapons/sword/long_2h_simple-4.ron | 16 -- .../items/weapons/sword/long_2h_simple-5.ron | 16 -- .../items/weapons/sword/short_sword_0.ron | 16 -- .../sword/{starter_sword.ron => starter.ron} | 4 +- .../{greatsword_2h_fine-1.ron => steel-0.ron} | 8 +- assets/common/items/weapons/sword/steel-1.ron | 16 ++ assets/common/items/weapons/sword/steel-2.ron | 16 ++ assets/common/items/weapons/sword/steel-3.ron | 16 ++ assets/common/items/weapons/sword/steel-4.ron | 16 ++ assets/common/items/weapons/sword/steel-5.ron | 16 ++ assets/common/items/weapons/sword/steel-6.ron | 16 ++ assets/common/items/weapons/sword/steel-7.ron | 16 ++ assets/common/items/weapons/sword/steel-8.ron | 16 ++ assets/common/items/weapons/sword/stone-0.ron | 16 ++ assets/common/items/weapons/sword/stone-1.ron | 16 ++ assets/common/items/weapons/sword/stone-2.ron | 16 ++ .../sword/{long_2h_dam-1.ron => wood-0.ron} | 8 +- assets/common/items/weapons/sword/wood-1.ron | 16 ++ .../sword/{wood_sword.ron => wood-2.ron} | 6 +- .../weapons/sword/zweihander_sword_0.ron | 16 -- .../loot_tables/loot_table_cave_large.ron | 29 +- .../loot_tables/loot_table_cultists.ron | 79 +++--- .../loot_tables/loot_table_humanoids.ron | 4 +- .../loot_tables/loot_table_mindflayer.ron | 2 +- .../loot_tables/loot_table_miniboss.ron | 2 +- .../loot_tables/loot_table_villager.ron | 4 +- .../loot_tables/loot_table_weapon_common.ron | 19 +- .../loot_tables/loot_table_weapon_rare.ron | 18 +- .../loot_table_weapon_uncommon.ron | 41 +-- assets/common/recipe_book.ron | 2 +- assets/voxygen/item_image_manifest.ron | 254 +++++++++--------- .../voxel/humanoid_main_weapon_manifest.ron | 172 ++++++------ .../voxel/weapon/sword/bloodsteel-0.vox | Bin 0 -> 1444 bytes .../{long_2h_dam-2.vox => bloodsteel-1.vox} | Bin 1400 -> 1404 bytes .../voxel/weapon/sword/bloodsteel-2.vox | Bin 0 -> 1672 bytes .../{greatsword_2h_dam-0.vox => bronze-0.vox} | Bin 1504 -> 1656 bytes .../sword/{long_2h_orn-4.vox => bronze-1.vox} | Bin 1392 -> 1616 bytes .../{long_2h_simple-3.vox => bronze-2.vox} | Bin 1404 -> 1580 bytes .../voxygen/voxel/weapon/sword/caladbolg.vox | Bin 0 -> 1972 bytes .../voxygen/voxel/weapon/sword/cobalt-0.vox | Bin 0 -> 1420 bytes .../voxygen/voxel/weapon/sword/cobalt-1.vox | Bin 0 -> 1872 bytes .../sword/{long_2h_dam-5.vox => cobalt-2.vox} | Bin 1400 -> 1592 bytes .../voxygen/voxel/weapon/sword/cobalt-3.vox | Bin 0 -> 1640 bytes .../{cultist_purp_2h-0.vox => cultist.vox} | Bin .../{frost_cleaver-0.vox => frost-0.vox} | Bin .../{frost_cleaver-1.vox => frost-1.vox} | Bin .../weapon/sword/greatsword_2h_dam-1.vox | Bin 1544 -> 0 bytes .../weapon/sword/greatsword_2h_fine-0.vox | Bin 1600 -> 0 bytes .../weapon/sword/greatsword_2h_fine-1.vox | Bin 1640 -> 0 bytes .../weapon/sword/greatsword_2h_orn-0.vox | Bin 1544 -> 0 bytes .../weapon/sword/greatsword_2h_orn-2.vox | Bin 1624 -> 0 bytes .../weapon/sword/greatsword_2h_simple-0.vox | Bin 1528 -> 0 bytes .../weapon/sword/greatsword_2h_simple-1.vox | Bin 1568 -> 0 bytes assets/voxygen/voxel/weapon/sword/iron-0.vox | Bin 0 -> 1600 bytes assets/voxygen/voxel/weapon/sword/iron-1.vox | Bin 0 -> 2144 bytes assets/voxygen/voxel/weapon/sword/iron-10.vox | Bin 0 -> 1844 bytes assets/voxygen/voxel/weapon/sword/iron-2.vox | Bin 0 -> 1420 bytes assets/voxygen/voxel/weapon/sword/iron-3.vox | Bin 0 -> 1428 bytes ...{greatsword_2h_simple-2.vox => iron-4.vox} | Bin 1608 -> 1656 bytes .../sword/{long_2h_orn-0.vox => iron-5.vox} | Bin 1372 -> 1396 bytes .../sword/{zweihander_2h-0.vox => iron-6.vox} | Bin 1452 -> 1452 bytes .../{greatsword_2h_fine-2.vox => iron-7.vox} | Bin 1680 -> 1928 bytes assets/voxygen/voxel/weapon/sword/iron-8.vox | Bin 0 -> 1532 bytes .../sword/{long_2h_dam-0.vox => iron-9.vox} | Bin 1348 -> 1340 bytes .../voxel/weapon/sword/long_2h_dam-1.vox | Bin 1376 -> 0 bytes .../voxel/weapon/sword/long_2h_dam-3.vox | Bin 1368 -> 0 bytes .../voxel/weapon/sword/long_2h_dam-4.vox | Bin 1388 -> 0 bytes .../voxel/weapon/sword/long_2h_fine-0.vox | Bin 1404 -> 0 bytes .../voxel/weapon/sword/long_2h_fine-1.vox | Bin 1436 -> 0 bytes .../voxel/weapon/sword/long_2h_fine-2.vox | Bin 1460 -> 0 bytes .../voxel/weapon/sword/long_2h_fine-3.vox | Bin 1448 -> 0 bytes .../voxel/weapon/sword/long_2h_fine-4.vox | Bin 1424 -> 0 bytes .../voxel/weapon/sword/long_2h_fine-5.vox | Bin 1460 -> 0 bytes .../voxel/weapon/sword/long_2h_orn-1.vox | Bin 1404 -> 0 bytes .../voxel/weapon/sword/long_2h_orn-2.vox | Bin 1428 -> 0 bytes .../voxel/weapon/sword/long_2h_orn-3.vox | Bin 1416 -> 0 bytes .../voxel/weapon/sword/long_2h_orn-5.vox | Bin 1428 -> 0 bytes .../voxel/weapon/sword/long_2h_simple-1.vox | Bin 1392 -> 0 bytes .../voxel/weapon/sword/long_2h_simple-2.vox | Bin 1416 -> 0 bytes .../voxel/weapon/sword/long_2h_simple-4.vox | Bin 1380 -> 0 bytes .../voxel/weapon/sword/long_2h_simple-5.vox | Bin 1416 -> 0 bytes .../voxygen/voxel/weapon/sword/rusty_2h.vox | Bin 1596 -> 0 bytes .../voxygen/voxel/weapon/sword/short_2h-0.vox | Bin 1508 -> 0 bytes .../{greatsword_2h_dam-2.vox => starter.vox} | Bin 1580 -> 1580 bytes assets/voxygen/voxel/weapon/sword/steel-0.vox | Bin 0 -> 1720 bytes assets/voxygen/voxel/weapon/sword/steel-1.vox | Bin 0 -> 1592 bytes assets/voxygen/voxel/weapon/sword/steel-2.vox | Bin 0 -> 1712 bytes assets/voxygen/voxel/weapon/sword/steel-3.vox | Bin 0 -> 1572 bytes assets/voxygen/voxel/weapon/sword/steel-4.vox | Bin 0 -> 1872 bytes .../{long_2h_simple-0.vox => steel-5.vox} | Bin 1360 -> 1376 bytes .../{greatsword_2h_orn-1.vox => steel-6.vox} | Bin 1584 -> 1616 bytes assets/voxygen/voxel/weapon/sword/steel-7.vox | Bin 0 -> 2056 bytes assets/voxygen/voxel/weapon/sword/steel-8.vox | Bin 0 -> 1468 bytes assets/voxygen/voxel/weapon/sword/stone-0.vox | Bin 0 -> 2488 bytes assets/voxygen/voxel/weapon/sword/stone-1.vox | Bin 0 -> 1624 bytes assets/voxygen/voxel/weapon/sword/stone-2.vox | Bin 0 -> 1976 bytes assets/voxygen/voxel/weapon/sword/wood-0.vox | Bin 0 -> 1676 bytes assets/voxygen/voxel/weapon/sword/wood-1.vox | Bin 0 -> 2080 bytes .../sword/{wood_ore_2h.vox => wood-2.vox} | Bin assets/voxygen/voxel/weapon/sword/wood_2h.vox | Bin 1520 -> 0 bytes common/src/bin/csv_export/main.rs | 8 +- common/src/comp/inventory/loadout_builder.rs | 2 +- common/src/comp/inventory/test.rs | 2 +- .../down.sql | 1 + .../up.sql | 86 ++++++ server/src/rtsim/entity.rs | 6 +- .../audio/sfx/event_mapper/combat/tests.rs | 2 +- voxygen/src/menu/char_selection/ui/mod.rs | 2 +- world/src/site/dungeon/mod.rs | 35 +-- world/src/site/settlement/mod.rs | 2 +- 166 files changed, 962 insertions(+), 932 deletions(-) create mode 100644 assets/common/items/weapons/sword/bloodsteel-0.ron create mode 100644 assets/common/items/weapons/sword/bloodsteel-1.ron create mode 100644 assets/common/items/weapons/sword/bloodsteel-2.ron create mode 100644 assets/common/items/weapons/sword/bronze-0.ron create mode 100644 assets/common/items/weapons/sword/bronze-1.ron create mode 100644 assets/common/items/weapons/sword/bronze-2.ron create mode 100644 assets/common/items/weapons/sword/caladbolg.ron create mode 100644 assets/common/items/weapons/sword/cobalt-0.ron create mode 100644 assets/common/items/weapons/sword/cobalt-1.ron create mode 100644 assets/common/items/weapons/sword/cobalt-2.ron create mode 100644 assets/common/items/weapons/sword/cobalt-3.ron rename assets/common/items/weapons/sword/{cultist_purp_2h-0.ron => cultist.ron} (100%) rename assets/common/items/weapons/sword/{frost_cleaver_2h-0.ron => frost-0.ron} (100%) rename assets/common/items/weapons/sword/{frost_cleaver_2h-1.ron => frost-1.ron} (100%) delete mode 100644 assets/common/items/weapons/sword/greatsword_2h_dam-0.ron delete mode 100644 assets/common/items/weapons/sword/greatsword_2h_dam-1.ron delete mode 100644 assets/common/items/weapons/sword/greatsword_2h_dam-2.ron delete mode 100644 assets/common/items/weapons/sword/greatsword_2h_fine-0.ron delete mode 100644 assets/common/items/weapons/sword/greatsword_2h_fine-2.ron delete mode 100644 assets/common/items/weapons/sword/greatsword_2h_orn-0.ron delete mode 100644 assets/common/items/weapons/sword/greatsword_2h_orn-1.ron delete mode 100644 assets/common/items/weapons/sword/greatsword_2h_orn-2.ron delete mode 100644 assets/common/items/weapons/sword/greatsword_2h_simple-0.ron delete mode 100644 assets/common/items/weapons/sword/greatsword_2h_simple-1.ron delete mode 100644 assets/common/items/weapons/sword/greatsword_2h_simple-2.ron create mode 100644 assets/common/items/weapons/sword/iron-0.ron create mode 100644 assets/common/items/weapons/sword/iron-1.ron create mode 100644 assets/common/items/weapons/sword/iron-10.ron create mode 100644 assets/common/items/weapons/sword/iron-2.ron create mode 100644 assets/common/items/weapons/sword/iron-3.ron create mode 100644 assets/common/items/weapons/sword/iron-4.ron create mode 100644 assets/common/items/weapons/sword/iron-5.ron rename assets/common/items/weapons/sword/{long_2h_fine-2.ron => iron-6.ron} (54%) create mode 100644 assets/common/items/weapons/sword/iron-7.ron create mode 100644 assets/common/items/weapons/sword/iron-8.ron create mode 100644 assets/common/items/weapons/sword/iron-9.ron delete mode 100644 assets/common/items/weapons/sword/long_2h_dam-0.ron delete mode 100644 assets/common/items/weapons/sword/long_2h_dam-2.ron delete mode 100644 assets/common/items/weapons/sword/long_2h_dam-3.ron delete mode 100644 assets/common/items/weapons/sword/long_2h_dam-4.ron delete mode 100644 assets/common/items/weapons/sword/long_2h_dam-5.ron delete mode 100644 assets/common/items/weapons/sword/long_2h_fine-0.ron delete mode 100644 assets/common/items/weapons/sword/long_2h_fine-1.ron delete mode 100644 assets/common/items/weapons/sword/long_2h_fine-3.ron delete mode 100644 assets/common/items/weapons/sword/long_2h_fine-4.ron delete mode 100644 assets/common/items/weapons/sword/long_2h_fine-5.ron delete mode 100644 assets/common/items/weapons/sword/long_2h_orn-0.ron delete mode 100644 assets/common/items/weapons/sword/long_2h_orn-1.ron delete mode 100644 assets/common/items/weapons/sword/long_2h_orn-2.ron delete mode 100644 assets/common/items/weapons/sword/long_2h_orn-3.ron delete mode 100644 assets/common/items/weapons/sword/long_2h_orn-4.ron delete mode 100644 assets/common/items/weapons/sword/long_2h_orn-5.ron delete mode 100644 assets/common/items/weapons/sword/long_2h_simple-0.ron delete mode 100644 assets/common/items/weapons/sword/long_2h_simple-1.ron delete mode 100644 assets/common/items/weapons/sword/long_2h_simple-2.ron delete mode 100644 assets/common/items/weapons/sword/long_2h_simple-3.ron delete mode 100644 assets/common/items/weapons/sword/long_2h_simple-4.ron delete mode 100644 assets/common/items/weapons/sword/long_2h_simple-5.ron delete mode 100644 assets/common/items/weapons/sword/short_sword_0.ron rename assets/common/items/weapons/sword/{starter_sword.ron => starter.ron} (74%) rename assets/common/items/weapons/sword/{greatsword_2h_fine-1.ron => steel-0.ron} (54%) create mode 100644 assets/common/items/weapons/sword/steel-1.ron create mode 100644 assets/common/items/weapons/sword/steel-2.ron create mode 100644 assets/common/items/weapons/sword/steel-3.ron create mode 100644 assets/common/items/weapons/sword/steel-4.ron create mode 100644 assets/common/items/weapons/sword/steel-5.ron create mode 100644 assets/common/items/weapons/sword/steel-6.ron create mode 100644 assets/common/items/weapons/sword/steel-7.ron create mode 100644 assets/common/items/weapons/sword/steel-8.ron create mode 100644 assets/common/items/weapons/sword/stone-0.ron create mode 100644 assets/common/items/weapons/sword/stone-1.ron create mode 100644 assets/common/items/weapons/sword/stone-2.ron rename assets/common/items/weapons/sword/{long_2h_dam-1.ron => wood-0.ron} (56%) create mode 100644 assets/common/items/weapons/sword/wood-1.ron rename assets/common/items/weapons/sword/{wood_sword.ron => wood-2.ron} (78%) delete mode 100644 assets/common/items/weapons/sword/zweihander_sword_0.ron create mode 100644 assets/voxygen/voxel/weapon/sword/bloodsteel-0.vox rename assets/voxygen/voxel/weapon/sword/{long_2h_dam-2.vox => bloodsteel-1.vox} (60%) create mode 100644 assets/voxygen/voxel/weapon/sword/bloodsteel-2.vox rename assets/voxygen/voxel/weapon/sword/{greatsword_2h_dam-0.vox => bronze-0.vox} (50%) rename assets/voxygen/voxel/weapon/sword/{long_2h_orn-4.vox => bronze-1.vox} (52%) rename assets/voxygen/voxel/weapon/sword/{long_2h_simple-3.vox => bronze-2.vox} (50%) create mode 100644 assets/voxygen/voxel/weapon/sword/caladbolg.vox create mode 100644 assets/voxygen/voxel/weapon/sword/cobalt-0.vox create mode 100644 assets/voxygen/voxel/weapon/sword/cobalt-1.vox rename assets/voxygen/voxel/weapon/sword/{long_2h_dam-5.vox => cobalt-2.vox} (58%) create mode 100644 assets/voxygen/voxel/weapon/sword/cobalt-3.vox rename assets/voxygen/voxel/weapon/sword/{cultist_purp_2h-0.vox => cultist.vox} (100%) rename assets/voxygen/voxel/weapon/sword/{frost_cleaver-0.vox => frost-0.vox} (100%) rename assets/voxygen/voxel/weapon/sword/{frost_cleaver-1.vox => frost-1.vox} (100%) delete mode 100644 assets/voxygen/voxel/weapon/sword/greatsword_2h_dam-1.vox delete mode 100644 assets/voxygen/voxel/weapon/sword/greatsword_2h_fine-0.vox delete mode 100644 assets/voxygen/voxel/weapon/sword/greatsword_2h_fine-1.vox delete mode 100644 assets/voxygen/voxel/weapon/sword/greatsword_2h_orn-0.vox delete mode 100644 assets/voxygen/voxel/weapon/sword/greatsword_2h_orn-2.vox delete mode 100644 assets/voxygen/voxel/weapon/sword/greatsword_2h_simple-0.vox delete mode 100644 assets/voxygen/voxel/weapon/sword/greatsword_2h_simple-1.vox create mode 100644 assets/voxygen/voxel/weapon/sword/iron-0.vox create mode 100644 assets/voxygen/voxel/weapon/sword/iron-1.vox create mode 100644 assets/voxygen/voxel/weapon/sword/iron-10.vox create mode 100644 assets/voxygen/voxel/weapon/sword/iron-2.vox create mode 100644 assets/voxygen/voxel/weapon/sword/iron-3.vox rename assets/voxygen/voxel/weapon/sword/{greatsword_2h_simple-2.vox => iron-4.vox} (70%) rename assets/voxygen/voxel/weapon/sword/{long_2h_orn-0.vox => iron-5.vox} (70%) rename assets/voxygen/voxel/weapon/sword/{zweihander_2h-0.vox => iron-6.vox} (70%) rename assets/voxygen/voxel/weapon/sword/{greatsword_2h_fine-2.vox => iron-7.vox} (50%) create mode 100644 assets/voxygen/voxel/weapon/sword/iron-8.vox rename assets/voxygen/voxel/weapon/sword/{long_2h_dam-0.vox => iron-9.vox} (66%) delete mode 100644 assets/voxygen/voxel/weapon/sword/long_2h_dam-1.vox delete mode 100644 assets/voxygen/voxel/weapon/sword/long_2h_dam-3.vox delete mode 100644 assets/voxygen/voxel/weapon/sword/long_2h_dam-4.vox delete mode 100644 assets/voxygen/voxel/weapon/sword/long_2h_fine-0.vox delete mode 100644 assets/voxygen/voxel/weapon/sword/long_2h_fine-1.vox delete mode 100644 assets/voxygen/voxel/weapon/sword/long_2h_fine-2.vox delete mode 100644 assets/voxygen/voxel/weapon/sword/long_2h_fine-3.vox delete mode 100644 assets/voxygen/voxel/weapon/sword/long_2h_fine-4.vox delete mode 100644 assets/voxygen/voxel/weapon/sword/long_2h_fine-5.vox delete mode 100644 assets/voxygen/voxel/weapon/sword/long_2h_orn-1.vox delete mode 100644 assets/voxygen/voxel/weapon/sword/long_2h_orn-2.vox delete mode 100644 assets/voxygen/voxel/weapon/sword/long_2h_orn-3.vox delete mode 100644 assets/voxygen/voxel/weapon/sword/long_2h_orn-5.vox delete mode 100644 assets/voxygen/voxel/weapon/sword/long_2h_simple-1.vox delete mode 100644 assets/voxygen/voxel/weapon/sword/long_2h_simple-2.vox delete mode 100644 assets/voxygen/voxel/weapon/sword/long_2h_simple-4.vox delete mode 100644 assets/voxygen/voxel/weapon/sword/long_2h_simple-5.vox delete mode 100644 assets/voxygen/voxel/weapon/sword/rusty_2h.vox delete mode 100644 assets/voxygen/voxel/weapon/sword/short_2h-0.vox rename assets/voxygen/voxel/weapon/sword/{greatsword_2h_dam-2.vox => starter.vox} (83%) create mode 100644 assets/voxygen/voxel/weapon/sword/steel-0.vox create mode 100644 assets/voxygen/voxel/weapon/sword/steel-1.vox create mode 100644 assets/voxygen/voxel/weapon/sword/steel-2.vox create mode 100644 assets/voxygen/voxel/weapon/sword/steel-3.vox create mode 100644 assets/voxygen/voxel/weapon/sword/steel-4.vox rename assets/voxygen/voxel/weapon/sword/{long_2h_simple-0.vox => steel-5.vox} (61%) rename assets/voxygen/voxel/weapon/sword/{greatsword_2h_orn-1.vox => steel-6.vox} (59%) create mode 100644 assets/voxygen/voxel/weapon/sword/steel-7.vox create mode 100644 assets/voxygen/voxel/weapon/sword/steel-8.vox create mode 100644 assets/voxygen/voxel/weapon/sword/stone-0.vox create mode 100644 assets/voxygen/voxel/weapon/sword/stone-1.vox create mode 100644 assets/voxygen/voxel/weapon/sword/stone-2.vox create mode 100644 assets/voxygen/voxel/weapon/sword/wood-0.vox create mode 100644 assets/voxygen/voxel/weapon/sword/wood-1.vox rename assets/voxygen/voxel/weapon/sword/{wood_ore_2h.vox => wood-2.vox} (100%) delete mode 100644 assets/voxygen/voxel/weapon/sword/wood_2h.vox create mode 100644 server/src/migrations/2021-02-24-230149_weapon-replacements/down.sql create mode 100644 server/src/migrations/2021-02-24-230149_weapon-replacements/up.sql diff --git a/assets/common/items/weapons/sword/bloodsteel-0.ron b/assets/common/items/weapons/sword/bloodsteel-0.ron new file mode 100644 index 0000000000..428ca6b41c --- /dev/null +++ b/assets/common/items/weapons/sword/bloodsteel-0.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Bloodsteel Flamberge", + description: "Infused with blood.", + kind: Tool(( + kind: Sword, + hands: Two, + stats: Direct(( + equip_time_millis: 300, + power: 1.8, + poise_strength: 0.4, + speed: 1.0, + )), + )), + quality: High, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/bloodsteel-1.ron b/assets/common/items/weapons/sword/bloodsteel-1.ron new file mode 100644 index 0000000000..dd939deac9 --- /dev/null +++ b/assets/common/items/weapons/sword/bloodsteel-1.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Fierce Katana", + description: "Infused with blood.", + kind: Tool(( + kind: Sword, + hands: Two, + stats: Direct(( + equip_time_millis: 300, + power: 1.6, + poise_strength: 0.4, + speed: 1.2, + )), + )), + quality: High, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/bloodsteel-2.ron b/assets/common/items/weapons/sword/bloodsteel-2.ron new file mode 100644 index 0000000000..b99e7bea1d --- /dev/null +++ b/assets/common/items/weapons/sword/bloodsteel-2.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Sharktooth", + description: "Infused with blood.", + kind: Tool(( + kind: Sword, + hands: Two, + stats: Direct(( + equip_time_millis: 300, + power: 2.0, + poise_strength: 0.4, + speed: 0.8, + )), + )), + quality: High, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/bronze-0.ron b/assets/common/items/weapons/sword/bronze-0.ron new file mode 100644 index 0000000000..62cf323676 --- /dev/null +++ b/assets/common/items/weapons/sword/bronze-0.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Brass Beast", + description: "Forged with bronze.", + kind: Tool(( + kind: Sword, + hands: Two, + stats: Direct(( + equip_time_millis: 300, + power: 1.1, + poise_strength: 0.4, + speed: 0.9, + )), + )), + quality: Moderate, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/bronze-1.ron b/assets/common/items/weapons/sword/bronze-1.ron new file mode 100644 index 0000000000..33ff213600 --- /dev/null +++ b/assets/common/items/weapons/sword/bronze-1.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Bronze Longsword", + description: "Forged with bronze.", + kind: Tool(( + kind: Sword, + hands: Two, + stats: Direct(( + equip_time_millis: 300, + power: 0.9, + poise_strength: 0.4, + speed: 1.1, + )), + )), + quality: Moderate, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/bronze-2.ron b/assets/common/items/weapons/sword/bronze-2.ron new file mode 100644 index 0000000000..fef68bd678 --- /dev/null +++ b/assets/common/items/weapons/sword/bronze-2.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Jagged Longblade", + description: "Forged with bronze.", + kind: Tool(( + kind: Sword, + hands: Two, + stats: Direct(( + equip_time_millis: 300, + power: 1.0, + poise_strength: 0.4, + speed: 1.0, + )), + )), + quality: Moderate, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/caladbolg.ron b/assets/common/items/weapons/sword/caladbolg.ron new file mode 100644 index 0000000000..39c8b13bb2 --- /dev/null +++ b/assets/common/items/weapons/sword/caladbolg.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Caladborg", + description: "You sense an eldritch presence watching you.", + kind: Tool(( + kind: Sword, + hands: Two, + stats: Direct(( + equip_time_millis: 300, + power: 2.5, + poise_strength: 0.4, + speed: 0.8, + )), + )), + quality: Legendary, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/cobalt-0.ron b/assets/common/items/weapons/sword/cobalt-0.ron new file mode 100644 index 0000000000..d09631b9f3 --- /dev/null +++ b/assets/common/items/weapons/sword/cobalt-0.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Cobalt Claymore", + description: "Forged with cobalt.", + kind: Tool(( + kind: Sword, + hands: Two, + stats: Direct(( + equip_time_millis: 300, + power: 1.5, + poise_strength: 0.4, + speed: 1.1, + )), + )), + quality: High, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/cobalt-1.ron b/assets/common/items/weapons/sword/cobalt-1.ron new file mode 100644 index 0000000000..e5806380a5 --- /dev/null +++ b/assets/common/items/weapons/sword/cobalt-1.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Cobalt Greatsword", + description: "Forged with cobalt.", + kind: Tool(( + kind: Sword, + hands: Two, + stats: Direct(( + equip_time_millis: 300, + power: 1.8, + poise_strength: 0.4, + speed: 0.8, + )), + )), + quality: High, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/cobalt-2.ron b/assets/common/items/weapons/sword/cobalt-2.ron new file mode 100644 index 0000000000..e4847fa2cc --- /dev/null +++ b/assets/common/items/weapons/sword/cobalt-2.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Cobalt Longsword", + description: "Forged with cobalt.", + kind: Tool(( + kind: Sword, + hands: Two, + stats: Direct(( + equip_time_millis: 300, + power: 1.6, + poise_strength: 0.4, + speed: 1.0, + )), + )), + quality: High, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/cobalt-3.ron b/assets/common/items/weapons/sword/cobalt-3.ron new file mode 100644 index 0000000000..bd836c2f85 --- /dev/null +++ b/assets/common/items/weapons/sword/cobalt-3.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Cobalt Towerblade", + description: "Forged with cobalt.", + kind: Tool(( + kind: Sword, + hands: Two, + stats: Direct(( + equip_time_millis: 300, + power: 1.7, + poise_strength: 0.4, + speed: 0.9, + )), + )), + quality: High, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/cultist_purp_2h-0.ron b/assets/common/items/weapons/sword/cultist.ron similarity index 100% rename from assets/common/items/weapons/sword/cultist_purp_2h-0.ron rename to assets/common/items/weapons/sword/cultist.ron diff --git a/assets/common/items/weapons/sword/frost_cleaver_2h-0.ron b/assets/common/items/weapons/sword/frost-0.ron similarity index 100% rename from assets/common/items/weapons/sword/frost_cleaver_2h-0.ron rename to assets/common/items/weapons/sword/frost-0.ron diff --git a/assets/common/items/weapons/sword/frost_cleaver_2h-1.ron b/assets/common/items/weapons/sword/frost-1.ron similarity index 100% rename from assets/common/items/weapons/sword/frost_cleaver_2h-1.ron rename to assets/common/items/weapons/sword/frost-1.ron diff --git a/assets/common/items/weapons/sword/greatsword_2h_dam-0.ron b/assets/common/items/weapons/sword/greatsword_2h_dam-0.ron deleted file mode 100644 index cec3a97ad6..0000000000 --- a/assets/common/items/weapons/sword/greatsword_2h_dam-0.ron +++ /dev/null @@ -1,16 +0,0 @@ -ItemDef( - name: "Damaged Greatsword", - description: "The blade has been chipped quite a few times.", - kind: Tool(( - kind: Sword, - hands: Two, - stats: Direct(( - equip_time_millis: 500, - power: 0.8, - poise_strength: 1.1, - speed: 1.0, - )), - )), - quality: Common, - tags: [], -) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/greatsword_2h_dam-1.ron b/assets/common/items/weapons/sword/greatsword_2h_dam-1.ron deleted file mode 100644 index 47f454b417..0000000000 --- a/assets/common/items/weapons/sword/greatsword_2h_dam-1.ron +++ /dev/null @@ -1,16 +0,0 @@ -ItemDef( - name: "Damaged Greatsword", - description: "The blade has been chipped quite a few times.", - kind: Tool(( - kind: Sword, - hands: Two, - stats: Direct(( - equip_time_millis: 500, - power: 0.8, - poise_strength: 0.5, - speed: 1.0, - )), - )), - quality: Common, - tags: [], -) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/greatsword_2h_dam-2.ron b/assets/common/items/weapons/sword/greatsword_2h_dam-2.ron deleted file mode 100644 index a4b00f52eb..0000000000 --- a/assets/common/items/weapons/sword/greatsword_2h_dam-2.ron +++ /dev/null @@ -1,16 +0,0 @@ -ItemDef( - name: "Damaged Greatsword", - description: "The blade has been chipped quite a few times.", - kind: Tool(( - kind: Sword, - hands: Two, - stats: Direct(( - equip_time_millis: 500, - power: 0.8, - poise_strength: 0.9, - speed: 1.0, - )), - )), - quality: Common, - tags: [], -) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/greatsword_2h_fine-0.ron b/assets/common/items/weapons/sword/greatsword_2h_fine-0.ron deleted file mode 100644 index 0bf3dea87b..0000000000 --- a/assets/common/items/weapons/sword/greatsword_2h_fine-0.ron +++ /dev/null @@ -1,16 +0,0 @@ -ItemDef( - name: "Fine Greatsword", - description: "It\'s been polished and sharpened recently.", - kind: Tool(( - kind: Sword, - hands: Two, - stats: Direct(( - equip_time_millis: 500, - power: 1.4, - poise_strength: 1.6, - speed: 1.0, - )), - )), - quality: Moderate, - tags: [], -) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/greatsword_2h_fine-2.ron b/assets/common/items/weapons/sword/greatsword_2h_fine-2.ron deleted file mode 100644 index beb4200568..0000000000 --- a/assets/common/items/weapons/sword/greatsword_2h_fine-2.ron +++ /dev/null @@ -1,16 +0,0 @@ -ItemDef( - name: "Fine Greatsword", - description: "It\'s been polished and sharpened recently.", - kind: Tool(( - kind: Sword, - hands: Two, - stats: Direct(( - equip_time_millis: 500, - power: 1.4, - poise_strength: 1.7, - speed: 1.0, - )), - )), - quality: Moderate, - tags: [], -) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/greatsword_2h_orn-0.ron b/assets/common/items/weapons/sword/greatsword_2h_orn-0.ron deleted file mode 100644 index 70ee016351..0000000000 --- a/assets/common/items/weapons/sword/greatsword_2h_orn-0.ron +++ /dev/null @@ -1,16 +0,0 @@ -ItemDef( - name: "Ornamented Greatsword", - description: "The sword\'s almost a work of art.", - kind: Tool(( - kind: Sword, - hands: Two, - stats: Direct(( - equip_time_millis: 500, - power: 1.7, - poise_strength: 1.4, - speed: 1.0, - )), - )), - quality: Moderate, - tags: [], -) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/greatsword_2h_orn-1.ron b/assets/common/items/weapons/sword/greatsword_2h_orn-1.ron deleted file mode 100644 index 70ee016351..0000000000 --- a/assets/common/items/weapons/sword/greatsword_2h_orn-1.ron +++ /dev/null @@ -1,16 +0,0 @@ -ItemDef( - name: "Ornamented Greatsword", - description: "The sword\'s almost a work of art.", - kind: Tool(( - kind: Sword, - hands: Two, - stats: Direct(( - equip_time_millis: 500, - power: 1.7, - poise_strength: 1.4, - speed: 1.0, - )), - )), - quality: Moderate, - tags: [], -) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/greatsword_2h_orn-2.ron b/assets/common/items/weapons/sword/greatsword_2h_orn-2.ron deleted file mode 100644 index a150fbe41c..0000000000 --- a/assets/common/items/weapons/sword/greatsword_2h_orn-2.ron +++ /dev/null @@ -1,16 +0,0 @@ -ItemDef( - name: "Ornamented Greatsword", - description: "The sword\'s almost a work of art.", - kind: Tool(( - kind: Sword, - hands: Two, - stats: Direct(( - equip_time_millis: 500, - power: 1.7, - poise_strength: 1.1, - speed: 1.0, - )), - )), - quality: Moderate, - tags: [], -) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/greatsword_2h_simple-0.ron b/assets/common/items/weapons/sword/greatsword_2h_simple-0.ron deleted file mode 100644 index a2d14a9373..0000000000 --- a/assets/common/items/weapons/sword/greatsword_2h_simple-0.ron +++ /dev/null @@ -1,16 +0,0 @@ -ItemDef( - name: "Simple Greatsword", - description: "It\'s been well used.", - kind: Tool(( - kind: Sword, - hands: Two, - stats: Direct(( - equip_time_millis: 500, - power: 1.1, - poise_strength: 1.5, - speed: 1.0, - )), - )), - quality: Common, - tags: [], -) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/greatsword_2h_simple-1.ron b/assets/common/items/weapons/sword/greatsword_2h_simple-1.ron deleted file mode 100644 index a2d14a9373..0000000000 --- a/assets/common/items/weapons/sword/greatsword_2h_simple-1.ron +++ /dev/null @@ -1,16 +0,0 @@ -ItemDef( - name: "Simple Greatsword", - description: "It\'s been well used.", - kind: Tool(( - kind: Sword, - hands: Two, - stats: Direct(( - equip_time_millis: 500, - power: 1.1, - poise_strength: 1.5, - speed: 1.0, - )), - )), - quality: Common, - tags: [], -) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/greatsword_2h_simple-2.ron b/assets/common/items/weapons/sword/greatsword_2h_simple-2.ron deleted file mode 100644 index dc1b9c8d92..0000000000 --- a/assets/common/items/weapons/sword/greatsword_2h_simple-2.ron +++ /dev/null @@ -1,16 +0,0 @@ -ItemDef( - name: "Simple Greatsword", - description: "It\'s been well used.", - kind: Tool(( - kind: Sword, - hands: Two, - stats: Direct(( - equip_time_millis: 500, - power: 1.1, - poise_strength: 1.4, - speed: 1.0, - )), - )), - quality: Common, - tags: [], -) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/iron-0.ron b/assets/common/items/weapons/sword/iron-0.ron new file mode 100644 index 0000000000..e7a856c3a6 --- /dev/null +++ b/assets/common/items/weapons/sword/iron-0.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Buccaneer's Blade", + description: "Forged with iron.", + kind: Tool(( + kind: Sword, + hands: Two, + stats: Direct(( + equip_time_millis: 300, + power: 1.25, + poise_strength: 0.4, + speed: 0.95, + )), + )), + quality: Moderate, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/iron-1.ron b/assets/common/items/weapons/sword/iron-1.ron new file mode 100644 index 0000000000..5ded191f68 --- /dev/null +++ b/assets/common/items/weapons/sword/iron-1.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Embedded Greatsword", + description: "Forged with iron.", + kind: Tool(( + kind: Sword, + hands: Two, + stats: Direct(( + equip_time_millis: 300, + power: 1.45, + poise_strength: 0.4, + speed: 0.75, + )), + )), + quality: Moderate, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/iron-10.ron b/assets/common/items/weapons/sword/iron-10.ron new file mode 100644 index 0000000000..4ac727086d --- /dev/null +++ b/assets/common/items/weapons/sword/iron-10.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Warlord's Blade", + description: "Forged with iron.", + kind: Tool(( + kind: Sword, + hands: Two, + stats: Direct(( + equip_time_millis: 300, + power: 1.35, + poise_strength: 0.4, + speed: 0.85, + )), + )), + quality: Moderate, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/iron-2.ron b/assets/common/items/weapons/sword/iron-2.ron new file mode 100644 index 0000000000..418dee3cb5 --- /dev/null +++ b/assets/common/items/weapons/sword/iron-2.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Iron Claymore", + description: "Forged with iron.", + kind: Tool(( + kind: Sword, + hands: Two, + stats: Direct(( + equip_time_millis: 300, + power: 1.1, + poise_strength: 0.4, + speed: 1.1, + )), + )), + quality: Moderate, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/iron-3.ron b/assets/common/items/weapons/sword/iron-3.ron new file mode 100644 index 0000000000..2514580b95 --- /dev/null +++ b/assets/common/items/weapons/sword/iron-3.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Iron Flamberge", + description: "Forged with iron.", + kind: Tool(( + kind: Sword, + hands: Two, + stats: Direct(( + equip_time_millis: 300, + power: 1.15, + poise_strength: 0.4, + speed: 1.05, + )), + )), + quality: Moderate, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/iron-4.ron b/assets/common/items/weapons/sword/iron-4.ron new file mode 100644 index 0000000000..3ece8d76a1 --- /dev/null +++ b/assets/common/items/weapons/sword/iron-4.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Iron Greatsword", + description: "Forged with iron.", + kind: Tool(( + kind: Sword, + hands: Two, + stats: Direct(( + equip_time_millis: 300, + power: 1.3, + poise_strength: 0.4, + speed: 0.9, + )), + )), + quality: Moderate, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/iron-5.ron b/assets/common/items/weapons/sword/iron-5.ron new file mode 100644 index 0000000000..1c4e6c48c5 --- /dev/null +++ b/assets/common/items/weapons/sword/iron-5.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Iron Longsword", + description: "Forged with iron.", + kind: Tool(( + kind: Sword, + hands: Two, + stats: Direct(( + equip_time_millis: 300, + power: 1.05, + poise_strength: 0.4, + speed: 1.15, + )), + )), + quality: Moderate, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/long_2h_fine-2.ron b/assets/common/items/weapons/sword/iron-6.ron similarity index 54% rename from assets/common/items/weapons/sword/long_2h_fine-2.ron rename to assets/common/items/weapons/sword/iron-6.ron index 87e666fa4e..22bac342b5 100644 --- a/assets/common/items/weapons/sword/long_2h_fine-2.ron +++ b/assets/common/items/weapons/sword/iron-6.ron @@ -1,13 +1,13 @@ ItemDef( - name: "Fine Longsword", - description: "It shines when you hold it up to the light.", + name: "Iron Zweihander", + description: "Forged with iron.", kind: Tool(( kind: Sword, hands: Two, stats: Direct(( - equip_time_millis: 500, + equip_time_millis: 300, power: 1.2, - poise_strength: 1.3, + poise_strength: 0.4, speed: 1.0, )), )), diff --git a/assets/common/items/weapons/sword/iron-7.ron b/assets/common/items/weapons/sword/iron-7.ron new file mode 100644 index 0000000000..8fa2ad1022 --- /dev/null +++ b/assets/common/items/weapons/sword/iron-7.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Noble Greatsword", + description: "Forged with iron.", + kind: Tool(( + kind: Sword, + hands: Two, + stats: Direct(( + equip_time_millis: 300, + power: 1.4, + poise_strength: 0.4, + speed: 0.8, + )), + )), + quality: Moderate, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/iron-8.ron b/assets/common/items/weapons/sword/iron-8.ron new file mode 100644 index 0000000000..0f88d130dc --- /dev/null +++ b/assets/common/items/weapons/sword/iron-8.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Royal Longsword", + description: "Forged with iron.", + kind: Tool(( + kind: Sword, + hands: Two, + stats: Direct(( + equip_time_millis: 300, + power: 1.0, + poise_strength: 0.4, + speed: 1.2, + )), + )), + quality: Moderate, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/iron-9.ron b/assets/common/items/weapons/sword/iron-9.ron new file mode 100644 index 0000000000..2bb8b84033 --- /dev/null +++ b/assets/common/items/weapons/sword/iron-9.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Swift Katana", + description: "Forged with iron.", + kind: Tool(( + kind: Sword, + hands: Two, + stats: Direct(( + equip_time_millis: 300, + power: 0.95, + poise_strength: 0.4, + speed: 1.25, + )), + )), + quality: Moderate, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/long_2h_dam-0.ron b/assets/common/items/weapons/sword/long_2h_dam-0.ron deleted file mode 100644 index 178263d311..0000000000 --- a/assets/common/items/weapons/sword/long_2h_dam-0.ron +++ /dev/null @@ -1,16 +0,0 @@ -ItemDef( - name: "Damaged Longsword", - description: "It\'s slightly cracked.", - kind: Tool(( - kind: Sword, - hands: Two, - stats: Direct(( - equip_time_millis: 500, - power: 0.6, - poise_strength: 0.5, - speed: 1.0, - )), - )), - quality: Low, - tags: [], -) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/long_2h_dam-2.ron b/assets/common/items/weapons/sword/long_2h_dam-2.ron deleted file mode 100644 index 178263d311..0000000000 --- a/assets/common/items/weapons/sword/long_2h_dam-2.ron +++ /dev/null @@ -1,16 +0,0 @@ -ItemDef( - name: "Damaged Longsword", - description: "It\'s slightly cracked.", - kind: Tool(( - kind: Sword, - hands: Two, - stats: Direct(( - equip_time_millis: 500, - power: 0.6, - poise_strength: 0.5, - speed: 1.0, - )), - )), - quality: Low, - tags: [], -) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/long_2h_dam-3.ron b/assets/common/items/weapons/sword/long_2h_dam-3.ron deleted file mode 100644 index 178263d311..0000000000 --- a/assets/common/items/weapons/sword/long_2h_dam-3.ron +++ /dev/null @@ -1,16 +0,0 @@ -ItemDef( - name: "Damaged Longsword", - description: "It\'s slightly cracked.", - kind: Tool(( - kind: Sword, - hands: Two, - stats: Direct(( - equip_time_millis: 500, - power: 0.6, - poise_strength: 0.5, - speed: 1.0, - )), - )), - quality: Low, - tags: [], -) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/long_2h_dam-4.ron b/assets/common/items/weapons/sword/long_2h_dam-4.ron deleted file mode 100644 index 178263d311..0000000000 --- a/assets/common/items/weapons/sword/long_2h_dam-4.ron +++ /dev/null @@ -1,16 +0,0 @@ -ItemDef( - name: "Damaged Longsword", - description: "It\'s slightly cracked.", - kind: Tool(( - kind: Sword, - hands: Two, - stats: Direct(( - equip_time_millis: 500, - power: 0.6, - poise_strength: 0.5, - speed: 1.0, - )), - )), - quality: Low, - tags: [], -) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/long_2h_dam-5.ron b/assets/common/items/weapons/sword/long_2h_dam-5.ron deleted file mode 100644 index 178263d311..0000000000 --- a/assets/common/items/weapons/sword/long_2h_dam-5.ron +++ /dev/null @@ -1,16 +0,0 @@ -ItemDef( - name: "Damaged Longsword", - description: "It\'s slightly cracked.", - kind: Tool(( - kind: Sword, - hands: Two, - stats: Direct(( - equip_time_millis: 500, - power: 0.6, - poise_strength: 0.5, - speed: 1.0, - )), - )), - quality: Low, - tags: [], -) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/long_2h_fine-0.ron b/assets/common/items/weapons/sword/long_2h_fine-0.ron deleted file mode 100644 index 87e666fa4e..0000000000 --- a/assets/common/items/weapons/sword/long_2h_fine-0.ron +++ /dev/null @@ -1,16 +0,0 @@ -ItemDef( - name: "Fine Longsword", - description: "It shines when you hold it up to the light.", - kind: Tool(( - kind: Sword, - hands: Two, - stats: Direct(( - equip_time_millis: 500, - power: 1.2, - poise_strength: 1.3, - speed: 1.0, - )), - )), - quality: Moderate, - tags: [], -) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/long_2h_fine-1.ron b/assets/common/items/weapons/sword/long_2h_fine-1.ron deleted file mode 100644 index 87e666fa4e..0000000000 --- a/assets/common/items/weapons/sword/long_2h_fine-1.ron +++ /dev/null @@ -1,16 +0,0 @@ -ItemDef( - name: "Fine Longsword", - description: "It shines when you hold it up to the light.", - kind: Tool(( - kind: Sword, - hands: Two, - stats: Direct(( - equip_time_millis: 500, - power: 1.2, - poise_strength: 1.3, - speed: 1.0, - )), - )), - quality: Moderate, - tags: [], -) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/long_2h_fine-3.ron b/assets/common/items/weapons/sword/long_2h_fine-3.ron deleted file mode 100644 index ee077f7f7f..0000000000 --- a/assets/common/items/weapons/sword/long_2h_fine-3.ron +++ /dev/null @@ -1,16 +0,0 @@ -ItemDef( - name: "Fine Longsword", - description: "It shines when you hold it up to the light.", - kind: Tool(( - kind: Sword, - hands: Two, - stats: Direct(( - equip_time_millis: 500, - power: 1.2, - poise_strength: 1.1, - speed: 1.0, - )), - )), - quality: Moderate, - tags: [], -) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/long_2h_fine-4.ron b/assets/common/items/weapons/sword/long_2h_fine-4.ron deleted file mode 100644 index 87e666fa4e..0000000000 --- a/assets/common/items/weapons/sword/long_2h_fine-4.ron +++ /dev/null @@ -1,16 +0,0 @@ -ItemDef( - name: "Fine Longsword", - description: "It shines when you hold it up to the light.", - kind: Tool(( - kind: Sword, - hands: Two, - stats: Direct(( - equip_time_millis: 500, - power: 1.2, - poise_strength: 1.3, - speed: 1.0, - )), - )), - quality: Moderate, - tags: [], -) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/long_2h_fine-5.ron b/assets/common/items/weapons/sword/long_2h_fine-5.ron deleted file mode 100644 index d2a110603f..0000000000 --- a/assets/common/items/weapons/sword/long_2h_fine-5.ron +++ /dev/null @@ -1,16 +0,0 @@ -ItemDef( - name: "Fine Longsword", - description: "It shines when you hold it up to the light.", - kind: Tool(( - kind: Sword, - hands: Two, - stats: Direct(( - equip_time_millis: 500, - power: 1.2, - poise_strength: 1.4, - speed: 1.0, - )), - )), - quality: Moderate, - tags: [], -) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/long_2h_orn-0.ron b/assets/common/items/weapons/sword/long_2h_orn-0.ron deleted file mode 100644 index 7e29776c36..0000000000 --- a/assets/common/items/weapons/sword/long_2h_orn-0.ron +++ /dev/null @@ -1,16 +0,0 @@ -ItemDef( - name: "Ornamented Longsword", - description: "It\'s probably the weapon of some noble.", - kind: Tool(( - kind: Sword, - hands: Two, - stats: Direct(( - equip_time_millis: 500, - power: 1.5, - poise_strength: 1.0, - speed: 1.0, - )), - )), - quality: Moderate, - tags: [], -) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/long_2h_orn-1.ron b/assets/common/items/weapons/sword/long_2h_orn-1.ron deleted file mode 100644 index 2504d7cc97..0000000000 --- a/assets/common/items/weapons/sword/long_2h_orn-1.ron +++ /dev/null @@ -1,16 +0,0 @@ -ItemDef( - name: "Ornamented Longsword", - description: "It\'s probably the weapon of some noble.", - kind: Tool(( - kind: Sword, - hands: Two, - stats: Direct(( - equip_time_millis: 500, - power: 1.5, - poise_strength: 1.1, - speed: 1.0, - )), - )), - quality: Moderate, - tags: [], -) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/long_2h_orn-2.ron b/assets/common/items/weapons/sword/long_2h_orn-2.ron deleted file mode 100644 index 7e29776c36..0000000000 --- a/assets/common/items/weapons/sword/long_2h_orn-2.ron +++ /dev/null @@ -1,16 +0,0 @@ -ItemDef( - name: "Ornamented Longsword", - description: "It\'s probably the weapon of some noble.", - kind: Tool(( - kind: Sword, - hands: Two, - stats: Direct(( - equip_time_millis: 500, - power: 1.5, - poise_strength: 1.0, - speed: 1.0, - )), - )), - quality: Moderate, - tags: [], -) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/long_2h_orn-3.ron b/assets/common/items/weapons/sword/long_2h_orn-3.ron deleted file mode 100644 index 7e29776c36..0000000000 --- a/assets/common/items/weapons/sword/long_2h_orn-3.ron +++ /dev/null @@ -1,16 +0,0 @@ -ItemDef( - name: "Ornamented Longsword", - description: "It\'s probably the weapon of some noble.", - kind: Tool(( - kind: Sword, - hands: Two, - stats: Direct(( - equip_time_millis: 500, - power: 1.5, - poise_strength: 1.0, - speed: 1.0, - )), - )), - quality: Moderate, - tags: [], -) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/long_2h_orn-4.ron b/assets/common/items/weapons/sword/long_2h_orn-4.ron deleted file mode 100644 index 2504d7cc97..0000000000 --- a/assets/common/items/weapons/sword/long_2h_orn-4.ron +++ /dev/null @@ -1,16 +0,0 @@ -ItemDef( - name: "Ornamented Longsword", - description: "It\'s probably the weapon of some noble.", - kind: Tool(( - kind: Sword, - hands: Two, - stats: Direct(( - equip_time_millis: 500, - power: 1.5, - poise_strength: 1.1, - speed: 1.0, - )), - )), - quality: Moderate, - tags: [], -) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/long_2h_orn-5.ron b/assets/common/items/weapons/sword/long_2h_orn-5.ron deleted file mode 100644 index 2504d7cc97..0000000000 --- a/assets/common/items/weapons/sword/long_2h_orn-5.ron +++ /dev/null @@ -1,16 +0,0 @@ -ItemDef( - name: "Ornamented Longsword", - description: "It\'s probably the weapon of some noble.", - kind: Tool(( - kind: Sword, - hands: Two, - stats: Direct(( - equip_time_millis: 500, - power: 1.5, - poise_strength: 1.1, - speed: 1.0, - )), - )), - quality: Moderate, - tags: [], -) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/long_2h_simple-0.ron b/assets/common/items/weapons/sword/long_2h_simple-0.ron deleted file mode 100644 index ebec54d098..0000000000 --- a/assets/common/items/weapons/sword/long_2h_simple-0.ron +++ /dev/null @@ -1,16 +0,0 @@ -ItemDef( - name: "Simple Longsword", - description: "It was well maintained by it\'s previous owner.", - kind: Tool(( - kind: Sword, - hands: Two, - stats: Direct(( - equip_time_millis: 500, - power: 0.9, - poise_strength: 0.8, - speed: 1.0, - )), - )), - quality: Common, - tags: [], -) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/long_2h_simple-1.ron b/assets/common/items/weapons/sword/long_2h_simple-1.ron deleted file mode 100644 index ebec54d098..0000000000 --- a/assets/common/items/weapons/sword/long_2h_simple-1.ron +++ /dev/null @@ -1,16 +0,0 @@ -ItemDef( - name: "Simple Longsword", - description: "It was well maintained by it\'s previous owner.", - kind: Tool(( - kind: Sword, - hands: Two, - stats: Direct(( - equip_time_millis: 500, - power: 0.9, - poise_strength: 0.8, - speed: 1.0, - )), - )), - quality: Common, - tags: [], -) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/long_2h_simple-2.ron b/assets/common/items/weapons/sword/long_2h_simple-2.ron deleted file mode 100644 index 85dc373e74..0000000000 --- a/assets/common/items/weapons/sword/long_2h_simple-2.ron +++ /dev/null @@ -1,16 +0,0 @@ -ItemDef( - name: "Simple Longsword", - description: "It was well maintained by it\'s previous owner.", - kind: Tool(( - kind: Sword, - hands: Two, - stats: Direct(( - equip_time_millis: 500, - power: 0.9, - poise_strength: 1.0, - speed: 1.0, - )), - )), - quality: Common, - tags: [], -) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/long_2h_simple-3.ron b/assets/common/items/weapons/sword/long_2h_simple-3.ron deleted file mode 100644 index ebec54d098..0000000000 --- a/assets/common/items/weapons/sword/long_2h_simple-3.ron +++ /dev/null @@ -1,16 +0,0 @@ -ItemDef( - name: "Simple Longsword", - description: "It was well maintained by it\'s previous owner.", - kind: Tool(( - kind: Sword, - hands: Two, - stats: Direct(( - equip_time_millis: 500, - power: 0.9, - poise_strength: 0.8, - speed: 1.0, - )), - )), - quality: Common, - tags: [], -) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/long_2h_simple-4.ron b/assets/common/items/weapons/sword/long_2h_simple-4.ron deleted file mode 100644 index ebec54d098..0000000000 --- a/assets/common/items/weapons/sword/long_2h_simple-4.ron +++ /dev/null @@ -1,16 +0,0 @@ -ItemDef( - name: "Simple Longsword", - description: "It was well maintained by it\'s previous owner.", - kind: Tool(( - kind: Sword, - hands: Two, - stats: Direct(( - equip_time_millis: 500, - power: 0.9, - poise_strength: 0.8, - speed: 1.0, - )), - )), - quality: Common, - tags: [], -) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/long_2h_simple-5.ron b/assets/common/items/weapons/sword/long_2h_simple-5.ron deleted file mode 100644 index ebec54d098..0000000000 --- a/assets/common/items/weapons/sword/long_2h_simple-5.ron +++ /dev/null @@ -1,16 +0,0 @@ -ItemDef( - name: "Simple Longsword", - description: "It was well maintained by it\'s previous owner.", - kind: Tool(( - kind: Sword, - hands: Two, - stats: Direct(( - equip_time_millis: 500, - power: 0.9, - poise_strength: 0.8, - speed: 1.0, - )), - )), - quality: Common, - tags: [], -) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/short_sword_0.ron b/assets/common/items/weapons/sword/short_sword_0.ron deleted file mode 100644 index 2e63e32189..0000000000 --- a/assets/common/items/weapons/sword/short_sword_0.ron +++ /dev/null @@ -1,16 +0,0 @@ -ItemDef( - name: "Vicious Gladius", - description: "There\'s blood encrusted on the blade.", - kind: Tool(( - kind: Sword, - hands: Two, - stats: Direct(( - equip_time_millis: 400, - power: 0.75, - poise_strength: 0.8, - speed: 1.0, - )), - )), - quality: Common, - tags: [], -) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/starter_sword.ron b/assets/common/items/weapons/sword/starter.ron similarity index 74% rename from assets/common/items/weapons/sword/starter_sword.ron rename to assets/common/items/weapons/sword/starter.ron index 53f1048edc..aebc6711c7 100644 --- a/assets/common/items/weapons/sword/starter_sword.ron +++ b/assets/common/items/weapons/sword/starter.ron @@ -1,6 +1,6 @@ ItemDef( - name: "Battered Sword", - description: "Held together by Rust and hope.", + name: "Damaged Greatsword", + description: "The blade could snap at any moment...", kind: Tool(( kind: Sword, hands: Two, diff --git a/assets/common/items/weapons/sword/greatsword_2h_fine-1.ron b/assets/common/items/weapons/sword/steel-0.ron similarity index 54% rename from assets/common/items/weapons/sword/greatsword_2h_fine-1.ron rename to assets/common/items/weapons/sword/steel-0.ron index 560fde56e6..9916779b2e 100644 --- a/assets/common/items/weapons/sword/greatsword_2h_fine-1.ron +++ b/assets/common/items/weapons/sword/steel-0.ron @@ -1,13 +1,13 @@ ItemDef( - name: "Fine Greatsword", - description: "It\'s been polished and sharpened recently.", + name: "Butterfly Sword", + description: "Forged with steel.", kind: Tool(( kind: Sword, hands: Two, stats: Direct(( - equip_time_millis: 500, + equip_time_millis: 300, power: 1.4, - poise_strength: 1.5, + poise_strength: 0.4, speed: 1.0, )), )), diff --git a/assets/common/items/weapons/sword/steel-1.ron b/assets/common/items/weapons/sword/steel-1.ron new file mode 100644 index 0000000000..d5900b53e9 --- /dev/null +++ b/assets/common/items/weapons/sword/steel-1.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Nomad's Longblade", + description: "Forged with steel.", + kind: Tool(( + kind: Sword, + hands: Two, + stats: Direct(( + equip_time_millis: 300, + power: 1.45, + poise_strength: 0.4, + speed: 0.95, + )), + )), + quality: Moderate, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/steel-2.ron b/assets/common/items/weapons/sword/steel-2.ron new file mode 100644 index 0000000000..45b4c63880 --- /dev/null +++ b/assets/common/items/weapons/sword/steel-2.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Ornamental Longsword", + description: "Forged with steel.", + kind: Tool(( + kind: Sword, + hands: Two, + stats: Direct(( + equip_time_millis: 300, + power: 1.25, + poise_strength: 0.4, + speed: 1.15, + )), + )), + quality: Moderate, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/steel-3.ron b/assets/common/items/weapons/sword/steel-3.ron new file mode 100644 index 0000000000..0e831d6528 --- /dev/null +++ b/assets/common/items/weapons/sword/steel-3.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Seven-Branched Sword", + description: "Forged with steel.", + kind: Tool(( + kind: Sword, + hands: Two, + stats: Direct(( + equip_time_millis: 300, + power: 1.5, + poise_strength: 0.4, + speed: 0.9, + )), + )), + quality: Moderate, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/steel-4.ron b/assets/common/items/weapons/sword/steel-4.ron new file mode 100644 index 0000000000..a790d74d81 --- /dev/null +++ b/assets/common/items/weapons/sword/steel-4.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Steel Greatsword", + description: "Forged with steel.", + kind: Tool(( + kind: Sword, + hands: Two, + stats: Direct(( + equip_time_millis: 300, + power: 1.55, + poise_strength: 0.4, + speed: 0.85, + )), + )), + quality: Moderate, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/steel-5.ron b/assets/common/items/weapons/sword/steel-5.ron new file mode 100644 index 0000000000..b1124aecfe --- /dev/null +++ b/assets/common/items/weapons/sword/steel-5.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Steel Katana", + description: "Forged with steel.", + kind: Tool(( + kind: Sword, + hands: Two, + stats: Direct(( + equip_time_millis: 300, + power: 1.2, + poise_strength: 0.4, + speed: 1.2, + )), + )), + quality: Moderate, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/steel-6.ron b/assets/common/items/weapons/sword/steel-6.ron new file mode 100644 index 0000000000..c47ebf7fc1 --- /dev/null +++ b/assets/common/items/weapons/sword/steel-6.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Steel Longsword", + description: "Forged with steel.", + kind: Tool(( + kind: Sword, + hands: Two, + stats: Direct(( + equip_time_millis: 300, + power: 1.3, + poise_strength: 0.4, + speed: 1.1, + )), + )), + quality: Moderate, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/steel-7.ron b/assets/common/items/weapons/sword/steel-7.ron new file mode 100644 index 0000000000..69f6d04cef --- /dev/null +++ b/assets/common/items/weapons/sword/steel-7.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Steel Towerblade", + description: "Forged with steel.", + kind: Tool(( + kind: Sword, + hands: Two, + stats: Direct(( + equip_time_millis: 300, + power: 1.6, + poise_strength: 0.4, + speed: 0.8, + )), + )), + quality: Moderate, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/steel-8.ron b/assets/common/items/weapons/sword/steel-8.ron new file mode 100644 index 0000000000..5e6b1f0c3d --- /dev/null +++ b/assets/common/items/weapons/sword/steel-8.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Steel Zweihander", + description: "Forged with steel.", + kind: Tool(( + kind: Sword, + hands: Two, + stats: Direct(( + equip_time_millis: 300, + power: 1.35, + poise_strength: 0.4, + speed: 1.05, + )), + )), + quality: Moderate, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/stone-0.ron b/assets/common/items/weapons/sword/stone-0.ron new file mode 100644 index 0000000000..882f171508 --- /dev/null +++ b/assets/common/items/weapons/sword/stone-0.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Ancient Greatsword", + description: "Covered in stone.", + kind: Tool(( + kind: Sword, + hands: Two, + stats: Direct(( + equip_time_millis: 300, + power: 1.0, + poise_strength: 0.4, + speed: 0.8, + )), + )), + quality: Low, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/stone-1.ron b/assets/common/items/weapons/sword/stone-1.ron new file mode 100644 index 0000000000..34a451e84b --- /dev/null +++ b/assets/common/items/weapons/sword/stone-1.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Flint Sword", + description: "Chiseled from flint.", + kind: Tool(( + kind: Sword, + hands: Two, + stats: Direct(( + equip_time_millis: 300, + power: 0.8, + poise_strength: 0.4, + speed: 1.0, + )), + )), + quality: Low, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/stone-2.ron b/assets/common/items/weapons/sword/stone-2.ron new file mode 100644 index 0000000000..439590f4c0 --- /dev/null +++ b/assets/common/items/weapons/sword/stone-2.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Ritual Greatsword", + description: "Chiseled from stone.", + kind: Tool(( + kind: Sword, + hands: Two, + stats: Direct(( + equip_time_millis: 300, + power: 0.9, + poise_strength: 0.4, + speed: 0.9, + )), + )), + quality: Low, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/long_2h_dam-1.ron b/assets/common/items/weapons/sword/wood-0.ron similarity index 56% rename from assets/common/items/weapons/sword/long_2h_dam-1.ron rename to assets/common/items/weapons/sword/wood-0.ron index 178263d311..25b3896332 100644 --- a/assets/common/items/weapons/sword/long_2h_dam-1.ron +++ b/assets/common/items/weapons/sword/wood-0.ron @@ -1,13 +1,13 @@ ItemDef( - name: "Damaged Longsword", - description: "It\'s slightly cracked.", + name: "Bladed Branch", + description: "Grown in the shape of a sword.", kind: Tool(( kind: Sword, hands: Two, stats: Direct(( - equip_time_millis: 500, + equip_time_millis: 300, power: 0.6, - poise_strength: 0.5, + poise_strength: 0.4, speed: 1.0, )), )), diff --git a/assets/common/items/weapons/sword/wood-1.ron b/assets/common/items/weapons/sword/wood-1.ron new file mode 100644 index 0000000000..8a575e4de7 --- /dev/null +++ b/assets/common/items/weapons/sword/wood-1.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Oaken Greatsword", + description: "Carved from an oak.", + kind: Tool(( + kind: Sword, + hands: Two, + stats: Direct(( + equip_time_millis: 300, + power: 0.8, + poise_strength: 0.4, + speed: 0.8, + )), + )), + quality: Low, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/wood_sword.ron b/assets/common/items/weapons/sword/wood-2.ron similarity index 78% rename from assets/common/items/weapons/sword/wood_sword.ron rename to assets/common/items/weapons/sword/wood-2.ron index f94591932e..d8b33e4728 100644 --- a/assets/common/items/weapons/sword/wood_sword.ron +++ b/assets/common/items/weapons/sword/wood-2.ron @@ -6,11 +6,11 @@ ItemDef( hands: Two, stats: Direct(( equip_time_millis: 400, - power: 0.8, + power: 0.5, poise_strength: 0.5, - speed: 1.0, + speed: 1.1, )), )), - quality: Moderate, + quality: Low, tags: [], ) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/zweihander_sword_0.ron b/assets/common/items/weapons/sword/zweihander_sword_0.ron deleted file mode 100644 index c15a257ef4..0000000000 --- a/assets/common/items/weapons/sword/zweihander_sword_0.ron +++ /dev/null @@ -1,16 +0,0 @@ -ItemDef( - name: "Sturdy Zweihander", - description: "It\'s a big sword, and sharp too.", - kind: Tool(( - kind: Sword, - hands: Two, - stats: Direct(( - equip_time_millis: 500, - power: 1.5, - poise_strength: 1.9, - speed: 1.0, - )), - )), - quality: Moderate, - tags: [], -) \ No newline at end of file diff --git a/assets/common/loot_tables/loot_table_cave_large.ron b/assets/common/loot_tables/loot_table_cave_large.ron index bb5f5a7043..fa0b8a83c0 100644 --- a/assets/common/loot_tables/loot_table_cave_large.ron +++ b/assets/common/loot_tables/loot_table_cave_large.ron @@ -9,18 +9,23 @@ (0.05, "common.items.glider.glider_moth"), (0.05, "common.items.armor.ring.ring_gold_0"), // swords - (0.07, "common.items.weapons.sword.greatsword_2h_fine-1"), - (0.07, "common.items.weapons.sword.greatsword_2h_fine-2"), - (0.08, "common.items.weapons.sword.long_2h_orn-0"), - (0.08, "common.items.weapons.sword.long_2h_orn-1"), - (0.08, "common.items.weapons.sword.long_2h_orn-2"), - (0.08, "common.items.weapons.sword.long_2h_orn-3"), - (0.08, "common.items.weapons.sword.long_2h_orn-4"), - (0.08, "common.items.weapons.sword.long_2h_orn-5"), - (0.20, "common.items.weapons.sword.zweihander_sword_0"), - (0.10, "common.items.weapons.sword.greatsword_2h_orn-0"), - (0.10, "common.items.weapons.sword.greatsword_2h_orn-1"), - (0.10, "common.items.weapons.sword.greatsword_2h_orn-2"), + (0.03, "common.items.weapons.sword.steel-0"), + (0.03, "common.items.weapons.sword.steel-1"), + (0.03, "common.items.weapons.sword.steel-2"), + (0.03, "common.items.weapons.sword.steel-3"), + (0.03, "common.items.weapons.sword.steel-4"), + (0.03, "common.items.weapons.sword.steel-5"), + (0.03, "common.items.weapons.sword.steel-6"), + (0.03, "common.items.weapons.sword.steel-7"), + (0.03, "common.items.weapons.sword.steel-8"), + (0.02, "common.items.weapons.sword.cobalt-0"), + (0.02, "common.items.weapons.sword.cobalt-1"), + (0.02, "common.items.weapons.sword.cobalt-2"), + (0.02, "common.items.weapons.sword.cobalt-3"), + (0.01, "common.items.weapons.sword.bloodsteel-0"), + (0.01, "common.items.weapons.sword.bloodsteel-1"), + (0.01, "common.items.weapons.sword.bloodsteel-2"), + (0.001, "common.items.weapons.sword.caladbolg"), // axes (0.02, "common.items.weapons.axe.bloodsteel_axe-0"), (0.02, "common.items.weapons.axe.bloodsteel_axe-1"), diff --git a/assets/common/loot_tables/loot_table_cultists.ron b/assets/common/loot_tables/loot_table_cultists.ron index 49308df576..522067b488 100644 --- a/assets/common/loot_tables/loot_table_cultists.ron +++ b/assets/common/loot_tables/loot_table_cultists.ron @@ -69,18 +69,16 @@ (0.001, "common.items.armor.back.backpack_0"), (0.1, "common.items.armor.bag.heavy_seabag"), // Common Weapons - // swords - (0.4, "common.items.weapons.sword.wood_sword"), - (0.3, "common.items.weapons.sword.long_2h_dam-0"), - (0.3, "common.items.weapons.sword.long_2h_dam-1"), - (0.3, "common.items.weapons.sword.long_2h_dam-2"), - (0.3, "common.items.weapons.sword.long_2h_dam-3"), - (0.3, "common.items.weapons.sword.long_2h_dam-4"), - (0.3, "common.items.weapons.sword.long_2h_dam-5"), - (0.25, "common.items.weapons.sword.short_sword_0"), - (0.1, "common.items.weapons.sword.greatsword_2h_dam-0"), - (0.1, "common.items.weapons.sword.greatsword_2h_dam-1"), - (0.1, "common.items.weapons.sword.greatsword_2h_dam-2"), + // swords + (0.10, "common.items.weapons.sword.wood-0"), + (0.10, "common.items.weapons.sword.wood-1"), + (0.10, "common.items.weapons.sword.wood-2"), + (0.10, "common.items.weapons.sword.stone-0"), + (0.10, "common.items.weapons.sword.stone-1"), + (0.10, "common.items.weapons.sword.stone-2"), + (0.15, "common.items.weapons.sword.bronze-0"), + (0.15, "common.items.weapons.sword.bronze-1"), + (0.15, "common.items.weapons.sword.bronze-2"), // axes (0.20, "common.items.weapons.axe.orc_axe-0"), (0.10, "common.items.weapons.axe.worn_iron_axe-0"), @@ -106,24 +104,26 @@ (0.25, "common.items.weapons.bow.wood_shortbow-1"), // Uncommon Weapons // swords - (0.05, "common.items.weapons.sword.long_2h_simple-0"), - (0.05, "common.items.weapons.sword.long_2h_simple-1"), - (0.05, "common.items.weapons.sword.long_2h_simple-2"), - (0.05, "common.items.weapons.sword.long_2h_simple-3"), - (0.05, "common.items.weapons.sword.long_2h_simple-4"), - (0.05, "common.items.weapons.sword.long_2h_simple-5"), - (0.10, "common.items.weapons.sword.greatsword_2h_simple-0"), - (0.10, "common.items.weapons.sword.greatsword_2h_simple-1"), - (0.10, "common.items.weapons.sword.greatsword_2h_simple-2"), - (0.06, "common.items.weapons.sword.long_2h_fine-0"), - (0.06, "common.items.weapons.sword.long_2h_fine-1"), - (0.06, "common.items.weapons.sword.long_2h_fine-2"), - (0.06, "common.items.weapons.sword.long_2h_fine-3"), - (0.06, "common.items.weapons.sword.long_2h_fine-4"), - (0.06, "common.items.weapons.sword.long_2h_fine-5"), - (0.07, "common.items.weapons.sword.greatsword_2h_fine-0"), - (0.07, "common.items.weapons.sword.greatsword_2h_fine-1"), - (0.07, "common.items.weapons.sword.greatsword_2h_fine-2"), + (0.04, "common.items.weapons.sword.iron-0"), + (0.04, "common.items.weapons.sword.iron-1"), + (0.04, "common.items.weapons.sword.iron-2"), + (0.04, "common.items.weapons.sword.iron-3"), + (0.04, "common.items.weapons.sword.iron-4"), + (0.04, "common.items.weapons.sword.iron-5"), + (0.04, "common.items.weapons.sword.iron-6"), + (0.04, "common.items.weapons.sword.iron-7"), + (0.04, "common.items.weapons.sword.iron-8"), + (0.04, "common.items.weapons.sword.iron-9"), + (0.04, "common.items.weapons.sword.iron-10"), + (0.03, "common.items.weapons.sword.steel-0"), + (0.03, "common.items.weapons.sword.steel-1"), + (0.03, "common.items.weapons.sword.steel-2"), + (0.03, "common.items.weapons.sword.steel-3"), + (0.03, "common.items.weapons.sword.steel-4"), + (0.03, "common.items.weapons.sword.steel-5"), + (0.03, "common.items.weapons.sword.steel-6"), + (0.03, "common.items.weapons.sword.steel-7"), + (0.03, "common.items.weapons.sword.steel-8"), // axes (0.15, "common.items.weapons.axe.bronze_axe-0"), (0.15, "common.items.weapons.axe.bronze_axe-1"), @@ -173,21 +173,18 @@ (0.20, "common.items.weapons.bow.leafy_longbow-0"), // Rare Weapons // swords - (0.08, "common.items.weapons.sword.long_2h_orn-0"), - (0.08, "common.items.weapons.sword.long_2h_orn-1"), - (0.08, "common.items.weapons.sword.long_2h_orn-2"), - (0.08, "common.items.weapons.sword.long_2h_orn-3"), - (0.08, "common.items.weapons.sword.long_2h_orn-4"), - (0.08, "common.items.weapons.sword.long_2h_orn-5"), - (0.20, "common.items.weapons.sword.zweihander_sword_0"), - (0.10, "common.items.weapons.sword.greatsword_2h_orn-0"), - (0.10, "common.items.weapons.sword.greatsword_2h_orn-1"), - (0.10, "common.items.weapons.sword.greatsword_2h_orn-2"), + (0.20, "common.items.weapons.sword.cobalt-0"), + (0.20, "common.items.weapons.sword.cobalt-1"), + (0.20, "common.items.weapons.sword.cobalt-2"), + (0.20, "common.items.weapons.sword.cobalt-3"), + (0.10, "common.items.weapons.sword.bloodsteel-0"), + (0.10, "common.items.weapons.sword.bloodsteel-1"), + (0.10, "common.items.weapons.sword.bloodsteel-2"), + (0.001, "common.items.weapons.sword.caladbolg"), // axes (0.20, "common.items.weapons.axe.bloodsteel_axe-0"), (0.20, "common.items.weapons.axe.bloodsteel_axe-1"), (0.20, "common.items.weapons.axe.bloodsteel_axe-2"), - (0.30, "common.items.weapons.axe.cobalt_axe-0"), (0.10, "common.items.weapons.axe.malachite_axe-0"), // healing staff (0.25, "common.items.weapons.sceptre.staff_nature"), diff --git a/assets/common/loot_tables/loot_table_humanoids.ron b/assets/common/loot_tables/loot_table_humanoids.ron index 7d626d1423..bf98129ae0 100644 --- a/assets/common/loot_tables/loot_table_humanoids.ron +++ b/assets/common/loot_tables/loot_table_humanoids.ron @@ -15,7 +15,9 @@ (0.10, "common.items.food.apple_stick"), (0.10, "common.items.food.mushroom_stick"), // Weapons - (0.15, "common.items.weapons.sword.wood_sword"), + (0.10, "common.items.weapons.sword.wood-0"), + (0.10, "common.items.weapons.sword.wood-1"), + (0.10, "common.items.weapons.sword.wood-2"), (0.10, "common.items.weapons.axe.worn_iron_axe-0"), (0.10, "common.items.weapons.axe.worn_iron_axe-1"), (0.10, "common.items.weapons.axe.worn_iron_axe-2"), diff --git a/assets/common/loot_tables/loot_table_mindflayer.ron b/assets/common/loot_tables/loot_table_mindflayer.ron index ae58752df7..1f8469c089 100644 --- a/assets/common/loot_tables/loot_table_mindflayer.ron +++ b/assets/common/loot_tables/loot_table_mindflayer.ron @@ -10,7 +10,7 @@ // weapons (1, "common.items.weapons.staff.cultist_staff"), (1, "common.items.weapons.hammer.cultist_purp_2h-0"), - (1, "common.items.weapons.sword.cultist_purp_2h-0"), + (1, "common.items.weapons.sword.cultist"), (0.25, "common.items.crafting_ing.mindflayer_bag_damaged"), (0.01, "common.items.weapons.sceptre.root_evil"), // misc diff --git a/assets/common/loot_tables/loot_table_miniboss.ron b/assets/common/loot_tables/loot_table_miniboss.ron index e44409bf28..763756cba4 100644 --- a/assets/common/loot_tables/loot_table_miniboss.ron +++ b/assets/common/loot_tables/loot_table_miniboss.ron @@ -11,7 +11,7 @@ // weapons (1, "common.items.weapons.staff.cultist_staff"), (1, "common.items.weapons.hammer.cultist_purp_2h-0"), - (1, "common.items.weapons.sword.cultist_purp_2h-0"), + (1, "common.items.weapons.sword.cultist"), // misc (0.25, "common.items.boss_drops.lantern"), ] diff --git a/assets/common/loot_tables/loot_table_villager.ron b/assets/common/loot_tables/loot_table_villager.ron index 44258d60e1..158b8eed81 100644 --- a/assets/common/loot_tables/loot_table_villager.ron +++ b/assets/common/loot_tables/loot_table_villager.ron @@ -29,7 +29,9 @@ (0.10, "common.items.food.apple_stick"), (0.10, "common.items.food.mushroom_stick"), // Weapons - (0.15, "common.items.weapons.sword.wood_sword"), + (0.15, "common.items.weapons.sword.wood-0"), + (0.15, "common.items.weapons.sword.wood-1"), + (0.15, "common.items.weapons.sword.wood-2"), (0.10, "common.items.weapons.axe.worn_iron_axe-0"), (0.10, "common.items.weapons.axe.worn_iron_axe-1"), (0.10, "common.items.weapons.axe.worn_iron_axe-2"), diff --git a/assets/common/loot_tables/loot_table_weapon_common.ron b/assets/common/loot_tables/loot_table_weapon_common.ron index 5d320157ac..84e2fdc0d3 100644 --- a/assets/common/loot_tables/loot_table_weapon_common.ron +++ b/assets/common/loot_tables/loot_table_weapon_common.ron @@ -1,17 +1,12 @@ [ // swords - (0.15, "common.items.weapons.sword.starter_sword"), - (0.15, "common.items.weapons.sword.wood_sword"), - (0.07, "common.items.weapons.sword.long_2h_dam-0"), - (0.07, "common.items.weapons.sword.long_2h_dam-1"), - (0.07, "common.items.weapons.sword.long_2h_dam-2"), - (0.07, "common.items.weapons.sword.long_2h_dam-3"), - (0.07, "common.items.weapons.sword.long_2h_dam-4"), - (0.07, "common.items.weapons.sword.long_2h_dam-5"), - (0.10, "common.items.weapons.sword.short_sword_0"), - (0.06, "common.items.weapons.sword.greatsword_2h_dam-0"), - (0.06, "common.items.weapons.sword.greatsword_2h_dam-1"), - (0.06, "common.items.weapons.sword.greatsword_2h_dam-2"), + (0.15, "common.items.weapons.sword.starter"), + (0.10, "common.items.weapons.sword.wood-0"), + (0.10, "common.items.weapons.sword.wood-1"), + (0.10, "common.items.weapons.sword.wood-2"), + (0.05, "common.items.weapons.sword.stone-0"), + (0.05, "common.items.weapons.sword.stone-1"), + (0.05, "common.items.weapons.sword.stone-2"), // axes (0.30, "common.items.weapons.axe.starter_axe"), (0.20, "common.items.weapons.axe.orc_axe-0"), diff --git a/assets/common/loot_tables/loot_table_weapon_rare.ron b/assets/common/loot_tables/loot_table_weapon_rare.ron index 8a8cb6715c..df0c9c4b9e 100644 --- a/assets/common/loot_tables/loot_table_weapon_rare.ron +++ b/assets/common/loot_tables/loot_table_weapon_rare.ron @@ -1,15 +1,13 @@ [ // swords - (0.08, "common.items.weapons.sword.long_2h_orn-0"), - (0.08, "common.items.weapons.sword.long_2h_orn-1"), - (0.08, "common.items.weapons.sword.long_2h_orn-2"), - (0.08, "common.items.weapons.sword.long_2h_orn-3"), - (0.08, "common.items.weapons.sword.long_2h_orn-4"), - (0.08, "common.items.weapons.sword.long_2h_orn-5"), - (0.20, "common.items.weapons.sword.zweihander_sword_0"), - (0.10, "common.items.weapons.sword.greatsword_2h_orn-0"), - (0.10, "common.items.weapons.sword.greatsword_2h_orn-1"), - (0.10, "common.items.weapons.sword.greatsword_2h_orn-2"), + (0.20, "common.items.weapons.sword.cobalt-0"), + (0.20, "common.items.weapons.sword.cobalt-1"), + (0.20, "common.items.weapons.sword.cobalt-2"), + (0.20, "common.items.weapons.sword.cobalt-3"), + (0.10, "common.items.weapons.sword.bloodsteel-0"), + (0.10, "common.items.weapons.sword.bloodsteel-1"), + (0.10, "common.items.weapons.sword.bloodsteel-2"), + (0.01, "common.items.weapons.sword.caladbolg"), // axes (0.20, "common.items.weapons.axe.bloodsteel_axe-0"), (0.20, "common.items.weapons.axe.bloodsteel_axe-1"), diff --git a/assets/common/loot_tables/loot_table_weapon_uncommon.ron b/assets/common/loot_tables/loot_table_weapon_uncommon.ron index 33ce82c3e5..bf60c01102 100644 --- a/assets/common/loot_tables/loot_table_weapon_uncommon.ron +++ b/assets/common/loot_tables/loot_table_weapon_uncommon.ron @@ -1,23 +1,28 @@ [ // swords - (0.05, "common.items.weapons.sword.long_2h_simple-0"), - (0.05, "common.items.weapons.sword.long_2h_simple-1"), - (0.05, "common.items.weapons.sword.long_2h_simple-2"), - (0.05, "common.items.weapons.sword.long_2h_simple-3"), - (0.05, "common.items.weapons.sword.long_2h_simple-4"), - (0.05, "common.items.weapons.sword.long_2h_simple-5"), - (0.10, "common.items.weapons.sword.greatsword_2h_simple-0"), - (0.10, "common.items.weapons.sword.greatsword_2h_simple-1"), - (0.10, "common.items.weapons.sword.greatsword_2h_simple-2"), - (0.06, "common.items.weapons.sword.long_2h_fine-0"), - (0.06, "common.items.weapons.sword.long_2h_fine-1"), - (0.06, "common.items.weapons.sword.long_2h_fine-2"), - (0.06, "common.items.weapons.sword.long_2h_fine-3"), - (0.06, "common.items.weapons.sword.long_2h_fine-4"), - (0.06, "common.items.weapons.sword.long_2h_fine-5"), - (0.07, "common.items.weapons.sword.greatsword_2h_fine-0"), - (0.07, "common.items.weapons.sword.greatsword_2h_fine-1"), - (0.07, "common.items.weapons.sword.greatsword_2h_fine-2"), + (0.15, "common.items.weapons.sword.bronze-0"), + (0.15, "common.items.weapons.sword.bronze-1"), + (0.15, "common.items.weapons.sword.bronze-2"), + (0.04, "common.items.weapons.sword.iron-0"), + (0.04, "common.items.weapons.sword.iron-1"), + (0.04, "common.items.weapons.sword.iron-2"), + (0.04, "common.items.weapons.sword.iron-3"), + (0.04, "common.items.weapons.sword.iron-4"), + (0.04, "common.items.weapons.sword.iron-5"), + (0.04, "common.items.weapons.sword.iron-6"), + (0.04, "common.items.weapons.sword.iron-7"), + (0.04, "common.items.weapons.sword.iron-8"), + (0.04, "common.items.weapons.sword.iron-9"), + (0.04, "common.items.weapons.sword.iron-10"), + (0.03, "common.items.weapons.sword.steel-0"), + (0.03, "common.items.weapons.sword.steel-1"), + (0.03, "common.items.weapons.sword.steel-2"), + (0.03, "common.items.weapons.sword.steel-3"), + (0.03, "common.items.weapons.sword.steel-4"), + (0.03, "common.items.weapons.sword.steel-5"), + (0.03, "common.items.weapons.sword.steel-6"), + (0.03, "common.items.weapons.sword.steel-7"), + (0.03, "common.items.weapons.sword.steel-8"), // axes (0.15, "common.items.weapons.axe.bronze_axe-0"), (0.15, "common.items.weapons.axe.bronze_axe-1"), diff --git a/assets/common/recipe_book.ron b/assets/common/recipe_book.ron index 974602a42a..918c2cc83a 100644 --- a/assets/common/recipe_book.ron +++ b/assets/common/recipe_book.ron @@ -243,7 +243,7 @@ ], ), "Forest Spirit": ( - ("common.items.weapons.sword.wood_sword", 1), + ("common.items.weapons.sword.wood-2", 1), [ (Item("common.items.crafting_ing.leather_scraps"), 4), (Item("common.items.crafting_ing.twigs"), 10), diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron index ec45a3fbf1..59983a57a8 100644 --- a/assets/voxygen/item_image_manifest.ron +++ b/assets/voxygen/item_image_manifest.ron @@ -103,177 +103,169 @@ (0.0, 0.0, -4.0), (-120.0, 90.0, 0.0), 1.1, ), // Swords - Tool("common.items.weapons.sword.frost_cleaver_2h-0"): VoxTrans( - "voxel.weapon.sword.frost_cleaver-0", - (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.40, + Tool("common.items.weapons.sword.bloodsteel-0"): VoxTrans( + "voxel.weapons.sword.bloodsteel-0", + (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool("common.items.weapons.sword.frost_cleaver_2h-1"): VoxTrans( - "voxel.weapon.sword.frost_cleaver-1", - (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.40, + Tool("common.items.weapons.sword.bloodsteel-1"): VoxTrans( + "voxel.weapons.sword.bloodsteel-1", + (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool("common.items.weapons.sword.short_sword_0"): VoxTrans( - "voxel.weapon.sword.short_2h-0", - (-3.0, 3.0, 0.0), (-135.0, 90.0, 0.0), 1.60, + Tool("common.items.weapons.sword.bloodsteel-2"): VoxTrans( + "voxel.weapons.sword.bloodsteel-2", + (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool("common.items.weapons.sword.starter_sword"): VoxTrans( - "voxel.weapon.sword.rusty_2h", - (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.3, + Tool("common.items.weapons.sword.bronze-0"): VoxTrans( + "voxel.weapons.sword.bronze-0", + (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool("common.items.weapons.sword.zweihander_sword_0"): VoxTrans( - "voxel.weapon.sword.zweihander_2h-0", - (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + Tool("common.items.weapons.sword.bronze-1"): VoxTrans( + "voxel.weapons.sword.bronze-1", + (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool("common.items.weapons.sword.wood_sword"): VoxTrans( - "voxel.weapon.sword.wood_ore_2h", - (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + Tool("common.items.weapons.sword.bronze-2"): VoxTrans( + "voxel.weapons.sword.bronze-2", + (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool("common.items.weapons.sword.greatsword_2h_dam-0"): VoxTrans( - "voxel.weapon.sword.greatsword_2h_dam-0", - (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, + Tool("common.items.weapons.sword.caladbolg"): VoxTrans( + "voxel.weapons.sword.caladbolg", + (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool("common.items.weapons.sword.greatsword_2h_dam-1"): VoxTrans( - "voxel.weapon.sword.greatsword_2h_dam-1", - (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, + Tool("common.items.weapons.sword.cobalt-0"): VoxTrans( + "voxel.weapons.sword.cobalt-0", + (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool("common.items.weapons.sword.greatsword_2h_dam-2"): VoxTrans( - "voxel.weapon.sword.greatsword_2h_dam-2", - (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, + Tool("common.items.weapons.sword.cobalt-1"): VoxTrans( + "voxel.weapons.sword.cobalt-1", + (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool("common.items.weapons.sword.greatsword_2h_simple-0"): VoxTrans( - "voxel.weapon.sword.greatsword_2h_simple-0", - (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, + Tool("common.items.weapons.sword.cobalt-2"): VoxTrans( + "voxel.weapons.sword.cobalt-2", + (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool("common.items.weapons.sword.greatsword_2h_simple-1"): VoxTrans( - "voxel.weapon.sword.greatsword_2h_simple-1", - (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, + Tool("common.items.weapons.sword.cobalt-3"): VoxTrans( + "voxel.weapons.sword.cobalt-3", + (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool("common.items.weapons.sword.greatsword_2h_simple-2"): VoxTrans( - "voxel.weapon.sword.greatsword_2h_simple-2", - (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, + Tool("common.items.weapons.sword.cultist"): VoxTrans( + "voxel.weapons.sword.cultist", + (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool("common.items.weapons.sword.greatsword_2h_orn-0"): VoxTrans( - "voxel.weapon.sword.greatsword_2h_orn-0", - (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, + Tool("common.items.weapons.sword.frost-0"): VoxTrans( + "voxel.weapons.sword.frost-0", + (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool("common.items.weapons.sword.greatsword_2h_orn-1"): VoxTrans( - "voxel.weapon.sword.greatsword_2h_orn-1", - (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, + Tool("common.items.weapons.sword.frost-1"): VoxTrans( + "voxel.weapons.sword.frost-1", + (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool("common.items.weapons.sword.greatsword_2h_orn-2"): VoxTrans( - "voxel.weapon.sword.greatsword_2h_orn-2", - (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, + Tool("common.items.weapons.sword.iron-0"): VoxTrans( + "voxel.weapons.sword.iron-0", + (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool("common.items.weapons.sword.greatsword_2h_fine-0"): VoxTrans( - "voxel.weapon.sword.greatsword_2h_fine-0", - (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, + Tool("common.items.weapons.sword.iron-1"): VoxTrans( + "voxel.weapons.sword.iron-1", + (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool("common.items.weapons.sword.greatsword_2h_fine-1"): VoxTrans( - "voxel.weapon.sword.greatsword_2h_fine-1", - (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, + Tool("common.items.weapons.sword.iron-10"): VoxTrans( + "voxel.weapons.sword.iron-10", + (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool("common.items.weapons.sword.greatsword_2h_fine-2"): VoxTrans( - "voxel.weapon.sword.greatsword_2h_fine-2", - (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, + Tool("common.items.weapons.sword.iron-2"): VoxTrans( + "voxel.weapons.sword.iron-2", + (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool("common.items.weapons.sword.long_2h_dam-0"): VoxTrans( - "voxel.weapon.sword.long_2h_dam-0", - (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, + Tool("common.items.weapons.sword.iron-3"): VoxTrans( + "voxel.weapons.sword.iron-3", + (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool("common.items.weapons.sword.long_2h_dam-1"): VoxTrans( - "voxel.weapon.sword.long_2h_dam-1", - (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, + Tool("common.items.weapons.sword.iron-4"): VoxTrans( + "voxel.weapons.sword.iron-4", + (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool("common.items.weapons.sword.long_2h_dam-2"): VoxTrans( - "voxel.weapon.sword.long_2h_dam-2", - (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, + Tool("common.items.weapons.sword.iron-5"): VoxTrans( + "voxel.weapons.sword.iron-5", + (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool("common.items.weapons.sword.long_2h_dam-3"): VoxTrans( - "voxel.weapon.sword.long_2h_dam-3", - (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, + Tool("common.items.weapons.sword.iron-6"): VoxTrans( + "voxel.weapons.sword.iron-6", + (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool("common.items.weapons.sword.long_2h_dam-4"): VoxTrans( - "voxel.weapon.sword.long_2h_dam-4", - (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, + Tool("common.items.weapons.sword.iron-7"): VoxTrans( + "voxel.weapons.sword.iron-7", + (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool("common.items.weapons.sword.long_2h_dam-5"): VoxTrans( - "voxel.weapon.sword.long_2h_dam-5", - (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, + Tool("common.items.weapons.sword.iron-8"): VoxTrans( + "voxel.weapons.sword.iron-8", + (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool("common.items.weapons.sword.long_2h_simple-0"): VoxTrans( - "voxel.weapon.sword.long_2h_simple-0", - (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, + Tool("common.items.weapons.sword.iron-9"): VoxTrans( + "voxel.weapons.sword.iron-9", + (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool("common.items.weapons.sword.long_2h_simple-1"): VoxTrans( - "voxel.weapon.sword.long_2h_simple-1", - (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, + Tool("common.items.weapons.sword.starter"): VoxTrans( + "voxel.weapons.sword.starter", + (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool("common.items.weapons.sword.long_2h_simple-2"): VoxTrans( - "voxel.weapon.sword.long_2h_simple-2", - (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, + Tool("common.items.weapons.sword.steel-0"): VoxTrans( + "voxel.weapons.sword.steel-0", + (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool("common.items.weapons.sword.long_2h_simple-3"): VoxTrans( - "voxel.weapon.sword.long_2h_simple-3", - (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, + Tool("common.items.weapons.sword.steel-1"): VoxTrans( + "voxel.weapons.sword.steel-1", + (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool("common.items.weapons.sword.long_2h_simple-4"): VoxTrans( - "voxel.weapon.sword.long_2h_simple-4", - (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, + Tool("common.items.weapons.sword.steel-2"): VoxTrans( + "voxel.weapons.sword.steel-2", + (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool("common.items.weapons.sword.long_2h_simple-5"): VoxTrans( - "voxel.weapon.sword.long_2h_simple-5", - (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, + Tool("common.items.weapons.sword.steel-3"): VoxTrans( + "voxel.weapons.sword.steel-3", + (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool("common.items.weapons.sword.long_2h_orn-0"): VoxTrans( - "voxel.weapon.sword.long_2h_orn-0", - (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, + Tool("common.items.weapons.sword.steel-4"): VoxTrans( + "voxel.weapons.sword.steel-4", + (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool("common.items.weapons.sword.long_2h_orn-1"): VoxTrans( - "voxel.weapon.sword.long_2h_orn-1", - (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, + Tool("common.items.weapons.sword.steel-5"): VoxTrans( + "voxel.weapons.sword.steel-5", + (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool("common.items.weapons.sword.long_2h_orn-2"): VoxTrans( - "voxel.weapon.sword.long_2h_orn-2", - (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, + Tool("common.items.weapons.sword.steel-6"): VoxTrans( + "voxel.weapons.sword.steel-6", + (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool("common.items.weapons.sword.long_2h_orn-3"): VoxTrans( - "voxel.weapon.sword.long_2h_orn-3", - (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, + Tool("common.items.weapons.sword.steel-7"): VoxTrans( + "voxel.weapons.sword.steel-7", + (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool("common.items.weapons.sword.long_2h_orn-4"): VoxTrans( - "voxel.weapon.sword.long_2h_orn-4", - (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, + Tool("common.items.weapons.sword.steel-8"): VoxTrans( + "voxel.weapons.sword.steel-8", + (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool("common.items.weapons.sword.long_2h_orn-5"): VoxTrans( - "voxel.weapon.sword.long_2h_orn-5", - (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, + Tool("common.items.weapons.sword.stone-0"): VoxTrans( + "voxel.weapons.sword.stone-0", + (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool("common.items.weapons.sword.long_2h_fine-0"): VoxTrans( - "voxel.weapon.sword.long_2h_fine-0", - (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, + Tool("common.items.weapons.sword.stone-1"): VoxTrans( + "voxel.weapons.sword.stone-1", + (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool("common.items.weapons.sword.long_2h_fine-1"): VoxTrans( - "voxel.weapon.sword.long_2h_fine-1", - (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, + Tool("common.items.weapons.sword.stone-2"): VoxTrans( + "voxel.weapons.sword.stone-2", + (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool("common.items.weapons.sword.long_2h_fine-2"): VoxTrans( - "voxel.weapon.sword.long_2h_fine-2", - (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, + Tool("common.items.weapons.sword.wood-0"): VoxTrans( + "voxel.weapons.sword.wood-0", + (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool("common.items.weapons.sword.long_2h_fine-3"): VoxTrans( - "voxel.weapon.sword.long_2h_fine-3", - (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, + Tool("common.items.weapons.sword.wood-1"): VoxTrans( + "voxel.weapons.sword.wood-1", + (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool("common.items.weapons.sword.long_2h_fine-4"): VoxTrans( - "voxel.weapon.sword.long_2h_fine-4", - (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, - ), - Tool("common.items.weapons.sword.long_2h_fine-5"): VoxTrans( - "voxel.weapon.sword.long_2h_fine-5", - (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, - ), - Tool("common.items.weapons.sword.cultist_purp_2h-0"): VoxTrans( - "voxel.weapon.sword.cultist_purp_2h-0", - (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, + Tool("common.items.weapons.sword.wood-2"): VoxTrans( + "voxel.weapons.sword.wood-2", + (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), Tool("common.items.debug.admin_sword"): VoxTrans( "voxel.weapon.sword.frost_cleaver-1", diff --git a/assets/voxygen/voxel/humanoid_main_weapon_manifest.ron b/assets/voxygen/voxel/humanoid_main_weapon_manifest.ron index a36258c555..a3fc00748b 100644 --- a/assets/voxygen/voxel/humanoid_main_weapon_manifest.ron +++ b/assets/voxygen/voxel/humanoid_main_weapon_manifest.ron @@ -1,174 +1,166 @@ ({ //Swords - "common.items.weapons.sword.starter_sword": ( - vox_spec: ("weapon.sword.rusty_2h", (-1.5, -6.5, -4.0)), + "common.items.weapons.sword.bloodsteel-0": ( + vox_spec: ("weapons.sword.bloodsteel-0", (-2.0, -4.5, -7.5)), color: None ), - "common.items.weapons.sword.wood_sword": ( - vox_spec: ("weapon.sword.wood_ore_2h", (-1.5, -6.5, -4.0)), + "common.items.weapons.sword.bloodsteel-1": ( + vox_spec: ("weapons.sword.bloodsteel-1", (-2.0, -4.5, -7.5)), color: None ), - "common.items.weapons.sword.zweihander_sword_0": ( - vox_spec: ("weapon.sword.zweihander_2h-0", (-1.5, -6.5, -4.0)), + "common.items.weapons.sword.bloodsteel-2": ( + vox_spec: ("weapons.sword.bloodsteel-2", (-2.0, -4.5, -7.5)), color: None ), - "common.items.weapons.sword.short_sword_0": ( - vox_spec: ("weapon.sword.short_2h-0", (-1.5, -6.5, -1.0)), + "common.items.weapons.sword.bronze-0": ( + vox_spec: ("weapons.sword.bronze-0", (-2.0, -4.5, -7.5)), color: None ), - "common.items.weapons.sword.greatsword_2h_dam-0": ( - vox_spec: ("weapon.sword.greatsword_2h_dam-0", (-1.0, -4.5, -6.5)), + "common.items.weapons.sword.bronze-1": ( + vox_spec: ("weapons.sword.bronze-1", (-2.0, -4.5, -7.5)), color: None ), - "common.items.weapons.sword.greatsword_2h_dam-1": ( - vox_spec: ("weapon.sword.greatsword_2h_dam-1", (-1.0, -4.5, -6.5)), + "common.items.weapons.sword.bronze-2": ( + vox_spec: ("weapons.sword.bronze-2", (-2.0, -4.5, -7.5)), color: None ), - "common.items.weapons.sword.greatsword_2h_dam-2": ( - vox_spec: ("weapon.sword.greatsword_2h_dam-2", (-1.0, -4.5, -6.5)), + "common.items.weapons.sword.caladbolg": ( + vox_spec: ("weapons.sword.caladbolg", (-2.0, -4.5, -7.5)), color: None ), - "common.items.weapons.sword.greatsword_2h_simple-0": ( - vox_spec: ("weapon.sword.greatsword_2h_simple-0", (-1.0, -4.5, -6.5)), + "common.items.weapons.sword.cobalt-0": ( + vox_spec: ("weapons.sword.cobalt-0", (-2.0, -4.5, -7.5)), color: None ), - "common.items.weapons.sword.greatsword_2h_simple-1": ( - vox_spec: ("weapon.sword.greatsword_2h_simple-1", (-1.0, -4.5, -6.5)), + "common.items.weapons.sword.cobalt-1": ( + vox_spec: ("weapons.sword.cobalt-1", (-2.0, -4.5, -7.5)), color: None ), - "common.items.weapons.sword.greatsword_2h_simple-2": ( - vox_spec: ("weapon.sword.greatsword_2h_simple-2", (-1.0, -4.5, -6.5)), + "common.items.weapons.sword.cobalt-2": ( + vox_spec: ("weapons.sword.cobalt-2", (-2.0, -4.5, -7.5)), color: None ), - "common.items.weapons.sword.greatsword_2h_orn-0": ( - vox_spec: ("weapon.sword.greatsword_2h_orn-0", (-1.0, -4.5, -7.5)), + "common.items.weapons.sword.cobalt-3": ( + vox_spec: ("weapons.sword.cobalt-3", (-2.0, -4.5, -7.5)), color: None ), - "common.items.weapons.sword.greatsword_2h_orn-1": ( - vox_spec: ("weapon.sword.greatsword_2h_orn-1", (-1.0, -4.5, -7.5)), + "common.items.weapons.sword.cultist": ( + vox_spec: ("weapons.sword.cultist", (-2.0, -4.5, -7.5)), color: None ), - "common.items.weapons.sword.greatsword_2h_orn-2": ( - vox_spec: ("weapon.sword.greatsword_2h_orn-2", (-1.0, -4.5, -7.5)), + "common.items.weapons.sword.frost-0": ( + vox_spec: ("weapons.sword.frost-0", (-2.0, -4.5, -7.5)), color: None ), - "common.items.weapons.sword.greatsword_2h_fine-0": ( - vox_spec: ("weapon.sword.greatsword_2h_fine-0", (-2.0, -6.5, -8.0)), + "common.items.weapons.sword.frost-1": ( + vox_spec: ("weapons.sword.frost-1", (-2.0, -4.5, -7.5)), color: None ), - "common.items.weapons.sword.greatsword_2h_fine-1": ( - vox_spec: ("weapon.sword.greatsword_2h_fine-1", (-2.0, -6.5, -8.0)), + "common.items.weapons.sword.iron-0": ( + vox_spec: ("weapons.sword.iron-0", (-2.0, -4.5, -7.5)), color: None ), - "common.items.weapons.sword.greatsword_2h_fine-2": ( - vox_spec: ("weapon.sword.greatsword_2h_fine-2", (-2.0, -6.5, -8.0)), + "common.items.weapons.sword.iron-1": ( + vox_spec: ("weapons.sword.iron-1", (-2.0, -4.5, -7.5)), color: None ), - "common.items.weapons.sword.long_2h_dam-0": ( - vox_spec: ("weapon.sword.long_2h_dam-0", (-1.0, -3.5, -5.0)), + "common.items.weapons.sword.iron-10": ( + vox_spec: ("weapons.sword.iron-10", (-2.0, -4.5, -7.5)), color: None ), - "common.items.weapons.sword.long_2h_dam-1": ( - vox_spec: ("weapon.sword.long_2h_dam-1", (-1.0, -3.5, -5.0)), + "common.items.weapons.sword.iron-2": ( + vox_spec: ("weapons.sword.iron-2", (-2.0, -4.5, -7.5)), color: None ), - "common.items.weapons.sword.long_2h_dam-2": ( - vox_spec: ("weapon.sword.long_2h_dam-2", (-1.0, -3.5, -5.0)), + "common.items.weapons.sword.iron-3": ( + vox_spec: ("weapons.sword.iron-3", (-2.0, -4.5, -7.5)), color: None ), - "common.items.weapons.sword.long_2h_dam-3": ( - vox_spec: ("weapon.sword.long_2h_dam-3", (-1.0, -3.5, -5.0)), + "common.items.weapons.sword.iron-4": ( + vox_spec: ("weapons.sword.iron-4", (-2.0, -4.5, -7.5)), color: None ), - "common.items.weapons.sword.long_2h_dam-4": ( - vox_spec: ("weapon.sword.long_2h_dam-4", (-1.0, -3.5, -5.0)), + "common.items.weapons.sword.iron-5": ( + vox_spec: ("weapons.sword.iron-5", (-2.0, -4.5, -7.5)), color: None ), - "common.items.weapons.sword.long_2h_dam-5": ( - vox_spec: ("weapon.sword.long_2h_dam-5", (-1.0, -3.5, -5.0)), + "common.items.weapons.sword.iron-6": ( + vox_spec: ("weapons.sword.iron-6", (-2.0, -4.5, -7.5)), color: None ), - "common.items.weapons.sword.long_2h_simple-0": ( - vox_spec: ("weapon.sword.long_2h_simple-0", (-1.0, -3.5, -5.0)), + "common.items.weapons.sword.iron-7": ( + vox_spec: ("weapons.sword.iron-7", (-2.0, -4.5, -7.5)), color: None ), - "common.items.weapons.sword.long_2h_simple-1": ( - vox_spec: ("weapon.sword.long_2h_simple-1", (-1.0, -3.5, -5.0)), + "common.items.weapons.sword.iron-8": ( + vox_spec: ("weapons.sword.iron-8", (-2.0, -4.5, -7.5)), color: None ), - "common.items.weapons.sword.long_2h_simple-2": ( - vox_spec: ("weapon.sword.long_2h_simple-2", (-1.0, -3.5, -5.0)), + "common.items.weapons.sword.iron-9": ( + vox_spec: ("weapons.sword.iron-9", (-2.0, -4.5, -7.5)), color: None ), - "common.items.weapons.sword.long_2h_simple-3": ( - vox_spec: ("weapon.sword.long_2h_simple-3", (-1.0, -3.5, -5.0)), + "common.items.weapons.sword.starter": ( + vox_spec: ("weapons.sword.starter", (-2.0, -4.5, -7.5)), color: None ), - "common.items.weapons.sword.long_2h_simple-4": ( - vox_spec: ("weapon.sword.long_2h_simple-4", (-1.0, -3.5, -5.0)), + "common.items.weapons.sword.steel-0": ( + vox_spec: ("weapons.sword.steel-0", (-2.0, -4.5, -7.5)), color: None ), - "common.items.weapons.sword.long_2h_simple-5": ( - vox_spec: ("weapon.sword.long_2h_simple-5", (-1.0, -3.5, -5.0)), + "common.items.weapons.sword.steel-1": ( + vox_spec: ("weapons.sword.steel-1", (-2.0, -4.5, -7.5)), color: None ), - "common.items.weapons.sword.long_2h_orn-0": ( - vox_spec: ("weapon.sword.long_2h_orn-0", (-1.0, -3.5, -6.0)), + "common.items.weapons.sword.steel-2": ( + vox_spec: ("weapons.sword.steel-2", (-2.0, -4.5, -7.5)), color: None ), - "common.items.weapons.sword.long_2h_orn-1": ( - vox_spec: ("weapon.sword.long_2h_orn-1", (-1.0, -3.5, -6.0)), + "common.items.weapons.sword.steel-3": ( + vox_spec: ("weapons.sword.steel-3", (-2.0, -4.5, -7.5)), color: None ), - "common.items.weapons.sword.long_2h_orn-2": ( - vox_spec: ("weapon.sword.long_2h_orn-2", (-1.0, -3.5, -6.0)), + "common.items.weapons.sword.steel-4": ( + vox_spec: ("weapons.sword.steel-4", (-2.0, -4.5, -7.5)), color: None ), - "common.items.weapons.sword.long_2h_orn-3": ( - vox_spec: ("weapon.sword.long_2h_orn-3", (-1.0, -3.5, -6.0)), + "common.items.weapons.sword.steel-5": ( + vox_spec: ("weapons.sword.steel-5", (-2.0, -4.5, -7.5)), color: None ), - "common.items.weapons.sword.long_2h_orn-4": ( - vox_spec: ("weapon.sword.long_2h_orn-4", (-1.0, -3.5, -6.0)), + "common.items.weapons.sword.steel-6": ( + vox_spec: ("weapons.sword.steel-6", (-2.0, -4.5, -7.5)), color: None ), - "common.items.weapons.sword.long_2h_orn-5": ( - vox_spec: ("weapon.sword.long_2h_orn-5", (-1.0, -3.5, -6.0)), + "common.items.weapons.sword.steel-7": ( + vox_spec: ("weapons.sword.steel-7", (-2.0, -4.5, -7.5)), color: None ), - "common.items.weapons.sword.long_2h_fine-0": ( - vox_spec: ("weapon.sword.long_2h_fine-0", (-2.0, -4.5, -6.0)), + "common.items.weapons.sword.steel-8": ( + vox_spec: ("weapons.sword.steel-8", (-2.0, -4.5, -7.5)), color: None ), - "common.items.weapons.sword.long_2h_fine-1": ( - vox_spec: ("weapon.sword.long_2h_fine-1", (-2.0, -4.5, -6.0)), + "common.items.weapons.sword.stone-0": ( + vox_spec: ("weapons.sword.stone-0", (-2.0, -4.5, -7.5)), color: None ), - "common.items.weapons.sword.long_2h_fine-2": ( - vox_spec: ("weapon.sword.long_2h_fine-2", (-2.0, -4.5, -6.0)), + "common.items.weapons.sword.stone-1": ( + vox_spec: ("weapons.sword.stone-1", (-2.0, -4.5, -7.5)), color: None ), - "common.items.weapons.sword.long_2h_fine-3": ( - vox_spec: ("weapon.sword.long_2h_fine-3", (-2.0, -4.5, -6.0)), + "common.items.weapons.sword.stone-2": ( + vox_spec: ("weapons.sword.stone-2", (-2.0, -4.5, -7.5)), color: None ), - "common.items.weapons.sword.long_2h_fine-4": ( - vox_spec: ("weapon.sword.long_2h_fine-4", (-2.0, -4.5, -6.0)), + "common.items.weapons.sword.wood-0": ( + vox_spec: ("weapons.sword.wood-0", (-2.0, -4.5, -7.5)), color: None ), - "common.items.weapons.sword.long_2h_fine-5": ( - vox_spec: ("weapon.sword.long_2h_fine-5", (-2.0, -4.5, -6.0)), + "common.items.weapons.sword.wood-1": ( + vox_spec: ("weapons.sword.wood-1", (-2.0, -4.5, -7.5)), color: None ), - "common.items.weapons.sword.cultist_purp_2h-0": ( - vox_spec: ("weapon.sword.cultist_purp_2h-0", (-2.0, -4.5, -7.5)), - color: None - ), - "common.items.weapons.sword.frost_cleaver_2h-0": ( - vox_spec: ("weapon.sword.frost_cleaver-0", (-2.0, -4.5, -7.5)), - color: None - ), - "common.items.weapons.sword.frost_cleaver_2h-1": ( - vox_spec: ("weapon.sword.frost_cleaver-1", (-2.0, -4.5, -7.5)), + "common.items.weapons.sword.wood-2": ( + vox_spec: ("weapons.sword.wood-2", (-2.0, -4.5, -7.5)), color: None ), // 1h Swords diff --git a/assets/voxygen/voxel/weapon/sword/bloodsteel-0.vox b/assets/voxygen/voxel/weapon/sword/bloodsteel-0.vox new file mode 100644 index 0000000000000000000000000000000000000000..2cd6a826c75364edd76b161618f12744da83b682 GIT binary patch literal 1444 zcmbu8ZA@Eb6vxlgdoL{%SfTGNgRX-?%QEC$1hEY2D3eWA#jQhJ$Z#W-xHN`rq*=06 zmjJ;b5>^ut(KKkxa4Se`_W>J5a0yu!T#Sh!WHEmCgE7W0e@~fyWAlSg^2_s_m;brv zIrrY~<0l={MAX^hJH{JLC`5i=z?+>mcu7nqQ^=e=74V%AeBkvOBc$wvkhF0j)Jc({ zPN)=hk{F?=6GGk-6$&Lu=ChI$CrO=D@maOAQ-Wk-EyaaQNg?G#g{<5aYSv1euS)AP zR)w6dW#t@^6taqK>8_CFRUuiULb9;l%(1Dh1O-M}{M6dU)*eaIGu z>&hm^z;KS7zE3uzWwICzlgU~Q*X3QwP&}l)A!9&(Roa0?5TzKt!B7p8$ezK6wCt6<%8Bt z&~*~bgM@N#DGuHuXo7^C2thwVFnvX+>C~cQP=~-3Jw})JqAg75nj-Wq5H3AnZI=y& z15Ol&-Kbmgz#cNdIc|eHR)os+QkZ)P#a9RirwL6f1bT&^Kdb>w<$~e{jFjeK{uv`4 zK5qv)_MwpoKITW}S7z!WVc|nUYMyZKHrpP;oR{$J3BuMnLV)dy-Gqs=>>nbux(L0` z5{B9cf344;tHy=_uM@*vWti@-Lip8sOrLMXWPb~=F^BT~CNxzQ;phux=F?RVJhTjfg z;=Lf2=C5IMbp~3k78ZRT91aI6T~5>;I)LY@T<|tk;`oaVn0U7U3!ggi(>*t~?w8|Z ze&$k)uyKd*%MXO%figrR)mXdPir;?rBQ&PN_?HIUeqhBGik^D^D9`0d_s93M*iNPX z_x-D@tMNhoEGjDJ&^U4x)`%7BpAjCOCLk7r%jLq5-;X!j+d+|G7(+%Z-+25EFWYSR zVssQ!eSK(doW$9&Yq0d1asTTQEC;NZrfzZ*B3`#mu+u6-WBAQlmVq=Cm(zMBkA zH4V>@63YoJq2L6fodC)SG^v;=W}0=_l&AopM9%^Ok4!N$Y2|GH=tVc^Qq2-|w4; MZr9v*Iwl_d2d9B$P5=M^ delta 407 zcmW;IJ5Iwu5XSMD*>(Jg^Kk4uc_`e09#K$O0$d=WkeV9NQiVH2Lg_gIN8k?JfCI!8 zN`k^atn_JqJG(oUyi0zP#eFrKzKO`qWqC`H$3Wz+oL{Af4a<>`oRZnYygXOHx+dns zwK^qItAw>GX^?>YpM{ay;f_^8H4AHV^qjBM1*Ea4#D#0|JaCT25%rjy)M^nmTC0yX zYB7%Y>SLVX1ScEyW8CCpP5LQL>8H50QP;v$YvVRL62Xn+TJfQNXgh$Mo&>!RR_WfBkE=BfVtnDf|IuINiLm0zttl~hxF>RnAv4&ojNn94Pz_O6Q zgn(o^aM@}i&dn@~;o=~3(U^b+34sto=AtHMA;$R0FY?6?e);=%a&9$Ds>e9nbQHCUU? zMS01)$QGv5!aPjA+DpF@`q|TJ3($|>QtixB%o+=s ztC%WEs5OvQu_x40!Z?AH+6w7g!Ws)1%RFOF!@=3f91g~H@Z7=Loa91`5lpB$lPUqu z6;z0}5PgE|J(yN&kW7d%gY1{_jR1Z9J>oZDr)j$hpb6$+^juk#ncEZ)|Q7>tEMNCMG5@H#diyH*ezd<;$3vnZdbp z=P*7#j%+rI^R1sfR>MaRpsTA3_C^=#cdtV9jrE9(u7N~tkj`AlSPA5s3-&Dn_ddbW zXeE|S3356G1^oiYpulxjP`f1$oA%ieKkUHUGv#RM6SNHpUcVqXc!zA87lDp27WGx3 zZn_b^ZYRP6UQ|s4QGLAf!%-!7O>3*y`#hzSPw^1Mf|AtHF%D`*G{ z{M8oK9TY}-_O7y+58pD|lIGt<)ZjE8-lP;`V8N}x2mLM5hjm}Mi{#ON~ z`vq6t6|9X^qP1!fcGoROcgq^YYHQKa+>C*E9Mi{-BmPnoI$zt0zOG$3c_@wEH{%#Q z+KK7OW0<{q27bREiz|X~I-RJFgi*KrDXd)?L3CX;wmrWFgKzn9;iE8qxKV}q+e`5Q zb52hPZha~E`CCD6#}Z`wYjExS2K@G8JGxKWG4P2K7w>p5kKkkb-}9`Xr$vzEclodW zZ+vqW`1RU9{nynuprJYXNdI*K@4x%6a-pNvhk=cYF}-I6YHDh5YV{~qRF9$l#1VM< zJ-9wDnA;@)?`|X#K~GN)UVPyaq`w!X-KCfrx&Ip;^78Hk0yuSa2ocZxMNYeRu;%(Gz)pxO@Hu=5&uX=OizCCa#<78K;5&F; zi}iRkuk3<*VgnMQqgwc?=AeOkluPkmArv>K5zi_MVA$5?G~(k%0~l81Z%Xx9qdsla zCZ&e9Phe4Nm=f$RQz(qEA!lNqG^$&8T8h(8f`LrlRnP4uXh@K#)Egi1E7v<)f29gi-!h+MX+G(xg4X@qIa`bS|J0rfJCf=uox z;3(lJ;ytiWfli^E=C~^~5*P;ctZO{vG?nu%>V^#*wZpn@HDnyvMPMgk4rfP!T{(Ml z_U5d_*`?>$mPRuqT!FJnZHkSt5jG$`WSAIS5Kr(eu{E};^>7n0NI h^zc`I=;Fnb{rUT|{QT?Y>G|~S^ZEYM^M}^I*nhkWTonKS delta 490 zcmWlVOHKko5Qe+Ds)1pKr=SQTpeJ$Rf`#_NM3I#%SKfg`m>3t{f@^pPuQ03(5Ao|s zzW(d4SEuK<_{mp~aWVaH&fVS2?-BPMoO_rrZ;NF36l!n{i|6J1O9=R0)8Vs?ST&08 zqm?KYq6_4zSt;5-Na*jyP~W3&Q8aP25v5m|)7mO}O-p(Qu^ELBJxg86>1^vPE4`)q z6f!SXi$0{~#2yuD4o$gAn&G05E}IZfwqohBOZ*re<1coiU?X%yel;W*5}bpSVgnk% z&i0~UrzrS3`8st7b$pJ`k75vVe1R|U5DI2IuWPWUfp4%U`6j-JZ_?kQzjc%+;|MJh zZHC$`fY9EE@8COsVjW%tzKid&095(qCn#6~uhXrlBLK9S(2`5o{(N5NhT(ew zwN<4yf{TONpi&(~wJutqMJ?7q`?Xq+-ZHB8sHfCa2L%vfB|XfxQww_#4* zLBYmsNHcx>5I@CFU<@NDVF(%P8Rtznr-g6T>R@HG6voeYYV%4x>@=kMct&9?GVBEL zIn3yh(kC#+^FrrRFJS%X_z0>mwP>i z#X-Xivb}~jnxh@Gix$ws_hEo9VF)AYF*-q~d-c^pb;X4j_>4>1gv`+nbnylBYBMD; z0gS((NhRK^@dwN(NM&JXB$SjgqyccjxAu}=%WK5biyP7KhSxJ*D9!jD^;OF+pI4{b W>*ZxPD8CwgV*Rf4X@KN z4Ug#t4R6p*8s4N^G`vN(f7Re^xdS}s*IRoIfA0lbs{jB1 diff --git a/assets/voxygen/voxel/weapon/sword/long_2h_simple-3.vox b/assets/voxygen/voxel/weapon/sword/bronze-2.vox similarity index 50% rename from assets/voxygen/voxel/weapon/sword/long_2h_simple-3.vox rename to assets/voxygen/voxel/weapon/sword/bronze-2.vox index 83ed8d79ca3df2d518b8a52eef54472d03dcbf8c..940e8a0d91386e79ce6678f803f33d9cc8a23191 100644 GIT binary patch delta 583 zcmW-eJ#G|15QXbi_s;Ck?Ej8;yaN(K2oZ1rXAoFu10b-3i~}TgcYZ=LpVkURC7+|sT7_vP%g~Ejp5e{VpB*uj2 z@daWe_J|2*&`9i8io87X>No;SG>*Xp@D*_e=G7}j#v2(&T!9=gk+=r@U1XebQ$7CB ey_T16UY>rwdwaV3@cQ)U_UiQT?c%Wv-~B%a{!Z)w delta 402 zcmW;IIZne+6h`5D-@VS@II}Y{C>x-s4N?@j2$n!XAr&RN@B%22*a00~8WzE3(uOb` z+tTO%JlmB&l2cqfQ;u%Tq-*>klBwIUZDNcFMh8XCNWH;x*be`@e19n0X?MQLpr75DLp!=!AJC%hL7n94WH1{Z?!2q jV`uD~owH{+$Hnn(eX|s=exkhZufmJIetNq9vZwG5fdyS_ diff --git a/assets/voxygen/voxel/weapon/sword/caladbolg.vox b/assets/voxygen/voxel/weapon/sword/caladbolg.vox new file mode 100644 index 0000000000000000000000000000000000000000..118baccd224cd02328b01b00fcb4fb8de57b9254 GIT binary patch literal 1972 zcmbtTZA_JA7`~tP>%8X!IKbf?&f!zU6f{dw%~@P zXP_~pEkkIGHPjS|)!MY?oavl%#H!6X*P3(v>+quqY+PM${;9O}qj$S@-_P~j_j}*> z^*m4Y`c1i=BC@uuVjYc~afwt_)Rg<21wWne64QxIn`9D?6nLg{u~dAxDu3Qa0k z#-y@>G0{9z%1))9Hm+R33FYzMSX ziZIU4+$8#m8Tp7$Ua+sgN8mVK-mB}8`xlUnBn6<<7BV)?rV{OlX z(m9h(Yw&-z2TCJMJFYpio8;V{xY(X4jZivgHr)@D!5;0j31tT+mGZ=u&iM`YX0RVK zi@oMDjT_w>+H$QBdnM*O={}sN{tO_p@-NLHPZPHox17N zPp6JLb=9e_>17X`+3*f1)8N|kK$$_-3(`+x?GSyQnL&-s0J-$2GN`BF=$J|_OrP2q z)Wb|67vVnjF_Won#$IJOTKe}YGn2fdcM>hnLFaku852sQW}1&kAQC5)mP9Sc+2m|; zHaVM|<|mT5pF)nlP2Z-k1qkY=yW>hD6lZqP+Ju|hE1rQ+SK)mWUtFBE#}n5K-;`z& zmTyYv3w@!l>E029vwT+ZLL<{(O4U*Vl*9(NWyIc@vi}U&iq8FwUMmi{9Q|bai#%T*VhpMd#rrG&D58Um8S7 z?Lw6AT84t|#gK9nQtyHEq(H6(;a@8V?H0@~pNTma1a`e3p;eIDE(i_?7OeGR^=?0E z4yNM$;Vi6d5ma^v-a0SXe}}o15oFipA-|;%#Y3gYhz5{%Jc7c$9L&2u6QNo`{z1W< zPQj8Z0(p(~n{7x(B4jXtqcfAy|9l!omu3K~r=dgy6~qt31EQlzaQ;KVxBY?}7r8DK z^pp#}+$gxWLr}wYQ?;Od8~H}TiUPs25y8?t!Nm2`s9X?1U3ngwD`%l|`+T&#z6hN= zSK#FKGT>GZW={`d$^0CwSw0Kfs~4euwV?G4L3d1WrA<(r9YIB5K5C2SBD!)hstbdt zTaba{t7c$m>vO2tP=@+9*P*3h3yvMwf#!E>(0;fcL;XiEa`iOwrx#*#Z44I&f%H%& ziswFq7v~qCe91hle|a(5-^;}LGkN&wMj`Iqo{f)LbEr>n>ubR;-wT@SW}&OK2-nW7 zz;Ab}5IyF{@y`Odcqfc|$a(7gTVD_~t`u}pmw%fd-*p4`ul?`&i;9YHVo^6XZ0teF z(L)HghH<@DFuFwm-ra(N0yH)@Vt>;hq_r7o(KHO7dVGclBD_1<**I~y1ItQIV%xDJ zNZ%U5?ayamxF(E~xw%j1@5H_O${;pZ-9mIHu>Vv)T0b4a2ZLAf(KjPl*l-lf4s~PA zCs$B)VFab6rTCexh)v*k=p%yrUp?;cKJV9m?ei7F`Tl9~BY6i;+52nkzJ2@f&aRdx d@|_sxeQtX@hDVPc;o-xFe|z6;ZEa4D`~fV+@nQe~ literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/weapon/sword/cobalt-0.vox b/assets/voxygen/voxel/weapon/sword/cobalt-0.vox new file mode 100644 index 0000000000000000000000000000000000000000..7412ec24678e76682f1eb7be559bbaf3e6f2f475 GIT binary patch literal 1420 zcma)*Z%mt26voe`eOYON73d$@0%eR1TILvk1|o=M(2O!c8H!tnXk@sNN?aPVFw!j9 zs!NbC5eb`#jG-aKnBi8C2>XC!A-IGr3ogdQ5V9D*`@tCFm&d2feUeRY^2>A2J@?#m z&VBFO{?f7BF%fC53$#$APZMbi1pUczgF{D*B$pgJ9t<=pPB>bL(&sEFePWl=XH&JX z((5_TT2y)$aS{i~q|Z)l#7Zn&%b=!{G-4(@iH`B9)D)7;Jqff;R3q&qs)6hXD=m9b zX<0F)xrmcENG8|pR2$VwwU7*wPSS{(>?Elqg(MTxtkR6sq*>7$!b%g`ingvxX*tX# zF_pmeBvVW&p2~whhjA4Q8D?xd)2~E9b1TSRZ z!})A9Lyr zigw#jQ|iW%7YfncUWrhXAo{vs;yuCAM}mqRCj#Dl?Dal_=SmNt-D^WnxeG&w_h7EG z7{Qn85PGu(kuxVSc>Wan-wk5;gAnGXFJb-8I7}uJTv=}9=H{ZrlZT4^dwGrr{+bea z^LJtR{VdE}&%;l5z1X-{gwL3BZc4CrTky*dg8rUDT#c4tJ4_t&J>cHyff(Iw~ zbf>1^@p$0o-Fa(#kZ3=wVJqgZJo<*`old;g^)`G>EvT&?!O6i($n3P^-q(9DA9P@Z zclP-HALoznd$BQw<85mQp9aodnMU-BIb4q2!KdG?B^qgFqGxJOD_U!rnf6h7Y zIZfMkmJEu>mimURB&l^pb~MCeX~yB_BaB@}?A#S^NHYO`-w?_UCX^FQDU0k2Cd3XT zl%lQeS*4vB*ggAs&35#rzm1eKYdOr~$g29BvnU>2rUPjVlPK<`1zAumv zQ|qNAmC^CMq-EH#XOu7|UQ#)Ml+uLb=WN1pxej+mY4wJ32yHQDagOP8nA5Y$(aig} zR^P0c9y>Q_kwts7!?X?OB*pQ#Zj;YWTC|m&Ma_()^3u7Ug-K;*+Qqap88@*IW6b-! zYsxO7zkq%YkxjdhV9pH_oMSH{*yH9BoMjgfY1fpSN1yZT2tiFZpFZc>hD|-=&SLte zjy+B(v4o(eQ$kMTKDj0*oj%v#WRMH5D`x?D5jjLIAZL;zIprO>IprO>IprO>IprO>Ipr zw~%Meb9T-C&6!cd&-t#|KQ&yQl|@?_utufNDU~s&EZP=r%h(I9s{mnz$b^+iHefEm zngDA9><=2y4l))reLVXBVey{?2#fzJKq#&wNGP6tkWl<5LBhv-=TA#+-}Gd?*nd9@ z85?|%{zKqGqNt{1_9;2h97#bSFg@(`Xi^1Mbw6(P%R2N3g?ne+ixE|5r zb&!|?X$?X~7DBFs5!xciJtSBjE60k@1pZb*dXFHhUl9I8ux5*g&4)sWAI-wslZDvW zEodANyfQ9$J;~n22#Q)tQPy37>WMlOv}dEVFM^7(VpLu&NA7Mx*-^oYK|$@5K%S?5 zmme~a0lAco6XlsW_izqUj~4)&7o$c54aAScuf#y7VEkRd*XIN?7wOjtMq+|5whM0U z7sTmzHVOLoGTtHB5EblsRM4?e@aNUDXj~IPORN-Kjmt2&Z#BAKSc|~}8*pY{J&+i| z@+D!^t}eziPb|Z}rnP9@Ea-VrF#M`u>K#FKQ3MSYW!PQ4673t;p{XK_mNfM}-iq$FW}G~-A6w(rd?X@c4T;b!i&S2M(jNZwS33^A_)p{WH(J&j-D4_Q+p| CaMvIJ literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/weapon/sword/long_2h_dam-5.vox b/assets/voxygen/voxel/weapon/sword/cobalt-2.vox similarity index 58% rename from assets/voxygen/voxel/weapon/sword/long_2h_dam-5.vox rename to assets/voxygen/voxel/weapon/sword/cobalt-2.vox index 181a035c3180c9f4407001521ca6ccc1d5b3152e..c504dc233b96bdf5a6fabd7d8f26281859ba97e1 100644 GIT binary patch delta 607 zcmW-fJBt)S6h`ZI*S-Cip7(oZ6@%Tx$iE*Ll&7ZQ%y;X3s(YI9wyIyfxP0)!($0@T5?}eYm{3 z-u)8_o(~{W93;ttxV%kLGR+znQ?jEt#?mD$U=FiZ(ltzBLVHY(YJP?^2C$;;la8#& z9$6kFXCp7~#BW;BvsQdc?b-y~DJ_U!cjA*qya#368Y$ws75&?T^LY@xM>}s4YNwpx zi!RYR78#35CiXh#<7O5068f-!0nA|tGZ?`X#xUu`Hb+qebwhndjbJ<==PhKs4O`QP zpdzRUDuRljt?r~&40X%G?NJOv#ZdE*C?Z;PQsk{zc_)gX_L$dWGX$-o4?*jb2-<*t z1Z_wnXd@Cq8@ij()5+KAP&KT4T~Zn6bXm~5-MGDfZQO5K;i~D0UHj2#5s}` zN@>IITKe>lJs$rv{tADC@+IG1d=SyYCVPa?n?v-R?QTQ6!BXIYbFh8gWtWTq>mG=4 zYgVpV&KlPE$Pz;rdzN9xI{RZ;V;>#aEE<+o%Q8YdZCOpu>VRIElj0GX99WinR?W${ zjhxQXM#ODMtcm1oRU$l?99UhCt-0ei+ye{A5U#wSO5S3 diff --git a/assets/voxygen/voxel/weapon/sword/cobalt-3.vox b/assets/voxygen/voxel/weapon/sword/cobalt-3.vox new file mode 100644 index 0000000000000000000000000000000000000000..c17b452d08017af68af3d3aed9960df7523cabf8 GIT binary patch literal 1640 zcmah|ZA_JA7`~tP<8bgG-{*sKg1$iYkkh&1m+SFK>+O~J$o!Oe?;veHr%Z!1JgQv*VkL2Tc%3w4bR82soWVm&7i ze!UW1Zyi8?_Yn-8j-v0KFop-aFh6q+tGBMe;c&o{mV)f;Y!n4@P*(T?_7n#Y+FOK! zuk6O~yPGikSq^@^osau>3-AeN&QA+gz7zcMlc2A23&saZuym~ofBn{oo}px1_#z!Q z?q%RUvYvYWaekNoJ3oG$03Iwo`}}?{YVvc@QdWqb>fLD0ccHV?hYR~QW4?78N=iy_ zY3BsC6-}c2{8?lSWMFwpuy#ZM-rYbTfZpC-y!PrGWS|eu9w!zqKm3QMy}UbqKQ0Z9 zqN02R?L+6_X?5f7SDUdA&cF!2S=nRrtvsvO;l>s8#DG(mXE5;jJU*Dag^#~q#g6Xt zs5m=;{h!`Mwce=p R79WlMS7W`;r@e31$iGCXYz6=T literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/weapon/sword/cultist_purp_2h-0.vox b/assets/voxygen/voxel/weapon/sword/cultist.vox similarity index 100% rename from assets/voxygen/voxel/weapon/sword/cultist_purp_2h-0.vox rename to assets/voxygen/voxel/weapon/sword/cultist.vox diff --git a/assets/voxygen/voxel/weapon/sword/frost_cleaver-0.vox b/assets/voxygen/voxel/weapon/sword/frost-0.vox similarity index 100% rename from assets/voxygen/voxel/weapon/sword/frost_cleaver-0.vox rename to assets/voxygen/voxel/weapon/sword/frost-0.vox diff --git a/assets/voxygen/voxel/weapon/sword/frost_cleaver-1.vox b/assets/voxygen/voxel/weapon/sword/frost-1.vox similarity index 100% rename from assets/voxygen/voxel/weapon/sword/frost_cleaver-1.vox rename to assets/voxygen/voxel/weapon/sword/frost-1.vox diff --git a/assets/voxygen/voxel/weapon/sword/greatsword_2h_dam-1.vox b/assets/voxygen/voxel/weapon/sword/greatsword_2h_dam-1.vox deleted file mode 100644 index de7b204e18941228a0e3ec5c9bb716e587721759..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1544 zcmbu8e@NVQ7{{OQuT4EQ^?vA`n|Hgp^mJ_bW14Aprq?=`yPPH4%_L&7iH!~kaUz55 za$sUPC(fW{8X}RiP3$NFEtc3s#xSWML?Ze>CHiBt-o3w!V2ri?=mW3s^SnQw=XpLq zzMoHH=%{B{MCz)7hiT+@L!==X4kVg_O(St+H#vGN9Q;P1!xk|=YW$|6Zx1PY)*VIP zMr(w`h~H4Q6MZN9cHC7o6Z)E$vAZ@E&4jTU^R&2-s+qBF_IVg%gj6+tLo~ClXH)d} zO_eBm=3PaPR~4P{2DL_?af(8O+MIKn+3#izu0>6tpTN4rps!lC6wLxfCx(SOkvfq& zk#TBBQIn{XsELup@nq^`>SWd?>SK%}Ix&cvLQQmHn3grPRNBB|0%ot86Hm zlh(PV7({h(+{H5^2GMwan$9&5O&CWsW#h=fXRAavf27F7!~|AXSFyCTgt@sn#9}c_ zO-*5Zd>kVqBe)v;?4b>}Il+agd>8$czoWIjNX@!j9FaGlAM& zC>KGHd{2HQL!E-@OMdr>NzzOzu2&#R8<|hRmHG(^f zS5RNWbT6|g*p{M`;z6uNQfnOw9qmZGgz5Pd~3`lew1 zT|r5f3&Ff>G?nZ_drcV{^Bia`&P4ygJ(z9YkMN6CXnXZAx+BNYclIQ@-Uwr$rwy}{ z7qD{U3M>{2GOVfacswZZc~P?OaXeM%L!hDnq36ml@YW7Yf9S=JH}kM|DIH%6rel8FgZDT(Ejv0N!1n&xekV4!rRE3?$kGd%GR6%lH1_Sr_k4Ru(Sy z456}o5GVRBAfq`Qw?5s2SlEd{p4o%vZ^oImjx{W!{ShHESE`~CQtOOZH&KcKA$*1x#7zIEQO{~G5LgxMan_<{W<4;i~Z)_kMp STfD#TpB(djKI(llNB#!m2$h5Y diff --git a/assets/voxygen/voxel/weapon/sword/greatsword_2h_fine-0.vox b/assets/voxygen/voxel/weapon/sword/greatsword_2h_fine-0.vox deleted file mode 100644 index 31aaaacd57987944d8ab53344ea63d7edf2a7a0e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1600 zcmbtTZAhJE7{1SQ-VgPtQ;!}$r_Q;=Zoue(vY~c%P@f z=4A4yh*XtURMSY7AyQZ2^9EajpGH_bl{k6ISFvj&;nzbbJz+=bF}unLhcamOX!3*| z(S!U-kJwWNweI>;85XBCUDQ$3gc(I1xu^8_9c6|yj@*o-rPkx!=y7DW7&}{6%)~yVab(*X%fOQ72-azWWY9$W8l3>3Wfqvz1_(ivDu-|3| z`E8twjq|o~4t8ogwVm2-%_WEkBmxNflo8ZzH*EAXpCQaCjJGkK+O*bKgT`5CoPoyP zHTJBrSB*Vt{6`w+t2uX19DAU2Q zqvG>NVzjRVt*xyH^SDsda1`D*O5h$Zgm`sGOAurt0DKeop@(qKgzoVwIhPpX9XATF}5}iiOnfU?aDy@ya(}Zkw_Vg zL&j7RvRBd&-5^N4D99QW6fX(nW#;b;fQ*Df<|5Ib7LMsBqp7nHdLjZX>M%LUsj*HN1nhh}dI zI&0H0+LVK?R|+tCt_;IXrNG(*G7q{?oRfs(&!(fPz5p$ig5FmJ<8KL;-V@{}#-So3 z6%F}^(N=5P~kHGg*DOz5uMpx@;4D_5u=bJtZ^|fGr`ZCsUUx< zK#VgS$;rvccBdf!@Dq4C#|>|BHfo+P#L(LbnEfaPKid-b2hQUuFaqC_zHj(t${>M0%f9oILjssiE|GWR(++18K7{`(9 z2^95TLTqm=Rwe}-rv>2Mb-UeYZ*RwoFU&!DI}z0ug@tSP|6xxY?@nSOuJnzdq-Ypt z1}-C}F&cM2JA?&aEQUF=hv#qYv(7qIw}!TJz=dnm=>2#e@6O%E`(Ll)Xlp-8E{)^( zhfAotxekxVgP&Q71Q7TG_I1J5m-p-2;{EzBKc671?_rA{xNhMQz6bYOZ`68=53cG_IUzgjYIRF3v diff --git a/assets/voxygen/voxel/weapon/sword/greatsword_2h_fine-1.vox b/assets/voxygen/voxel/weapon/sword/greatsword_2h_fine-1.vox deleted file mode 100644 index 0ece6bcddc29c1080fb6b5a990e2b26fdb271502..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1640 zcmbu8ZAhJE7{{-3pXWu-(e3zleA|3qdUS00GR-tQrl)mWYR)CwnMuTC6B~(yIMKmo zj!Z0P;tX1*Ard*;#H0wc7-AC{!=!=`iHP&HzVyLa|Nc)S7-OvuJ@DiD|F8SLujjg- z=e`?ikEe`^NOifthCz-QBK7`&FU&H0G-Bxta{NTVpP?xDyh)V4=dLnh|4>HUjxu9+ zl;+-126KAKwlWf^Cv zq1TgHpXf=9MBmFkh-THcdU0}%^EagvjoJ*O4};Q)Ms0@Ehtm^{+T2CIi=JrI=5G4k z^hBdJUGy$`qEVX>^bzz#qc$VyBmY!7(WuQR`Y3v$QJc~9(ey;4)*L~lJ9?C2v^#=g zga(z3+DPYK(zqw0r!uB)i_S4!ag6A;9%WdVwMsW@lo3*+^pIL*gwluBC~*drgat)s zEvJ)ptr!-xnU0{1+Qz(%@3zz1>FxA(s}~0eB_V`k%5e194I9U8Tt^s{Ni<>z`yhtS zck1lHU=Id+u+!V=HF}LYef#L)XUhLRKs+l`Q&ZU3*ud)QDi#+Pv9Pd!nVA_(PEKNM zYz)`@pFNb(zD~5YwZY|eqonZ=e6N5x_jWFiu>?1rma5PMdTw=J0 zL3pnqYDnPzL{L!eMAcar0vDq2*1}#?b_?o81h32r&fVeKx&$P(q#>g_8-?>;B(_H* zZ7>1ZQ_09($wX|UAmf5y|EQpJNg&7g{;m+n$S%lSH2O0mF#UK8Hl9iZs!~xR0zdhV z{6a=L1+(u8zMdA`xy&1xxP;3X>Ax z&(1(&;Q_Q)7Na5Cjh2E$3?ANx`KE&iyiktTmut}7b`k^UPowL#0EYTnF+Y6?>o>2$ z>2xA4Dgr4fDaiGtq42v3#upzy4T{_5l|LKaR$YJMq{=@+0>@#_#fP`^Puqz}E8r-hY06J}wuH z<6!OtO8PG%zBe8#lY)(t0`Tm5JRWp(bl~~t<{-UYh-r_(!j*gf@O%Q#PErys_l=;e zWEiIgE+MWd7Pmj$hlM~qhWX7N{QlNFtJaD7HME}r&Rv;C??>}^d+sLQ`)VDB+WJv; zaU4fJSVH~vb$GpA{KQrygy47B*9BW&-0N?P=j*@5c?DrT4@P{?yv0Mt?w@PjQR^<= QpZjNxbw3|b%7 diff --git a/assets/voxygen/voxel/weapon/sword/greatsword_2h_orn-0.vox b/assets/voxygen/voxel/weapon/sword/greatsword_2h_orn-0.vox deleted file mode 100644 index 86d0844eca93c868d0d05fda5ec0093df6b0236a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1544 zcmbu8eMnt(9LB%r{LaxkuWr}3t6n#CcP_m;wtSgpnqAY|x-Rd{S+d=kL`*iZ(M3X> z=wQ1!FtMD8GiaHHNaSo2yA**IOKc)zm{brV5&d5f{jpY0&tU{(to26+KIeI!@9*ur z{C>^Bqd8+D(oo|MP~GeeBL}p^r>q*Q>e`y9W>GfphWM*R0>nY4B%*3SEQ<+o$)C^+M>rQ4T zGclcajvRWbMhxpmicC*WV`F0jtE;P6TwFvn8pZ7FET*QWFg`wxEB;R&$XI_j!r?F+ zUMDJB4#M|JH9Qj)5T6O@h=WWfL6)6xGzij83krRC*mqT6>kuSF1j)k!=SPCl20Q9c zI}kdTj5ngYP}eJH92LAgCpdG9V;fz_YIh^Iw*X}eUSxKrz&+$b!E`o?R`QV6BFH@_ z*f%DqS`x_fT))Q#8Ql(<#l{nvK>co1ioj34B|nqVZo%B!f-h$TH?A>z z1(QC(r$+>vCj}wq?qDJ&B%ILm2Mwz{1Q0tY5zjyWNiTpL;`z8l})D8S~;LcGg07p4Vkp9_BaM$prqkMT$emao*}mmiwY zIq1O9hbg#rD+8Oze(3v;^Sk`p`{U~gU~Bn*zkf+d2`-jT;6TwNDhJLZBa(rYDZ$2Z z0l0TP9uK;@y725X^N>gnQae)-y>#~}M{r{B0@7R4aP#B6h=wvS z!f$r}_qY04a~*41L+2^r%%vGbK3Kq;^Vjjt7wb3}9zgZ^2^@ZJ2~Ahm;q`j)BOgU< z1iwSA3${MH`+Qs6U;ow4BM9rdU-2F577u8Ip@(k-*$bw>UGmQ=hCZV%a>`U*)_c_U3zntYP$ zn{!}dIVaAbWf~%pvrX($1X>KSiHu=VL5M{3fBn-R_VVp}8o?NA{n3HXeZHUH^PK0L z^W5iY3>@=}iAZflbsZb23KMCl4*H{P;bjsB$t1^)2dfhl1FwtrkBaCuEJwgF72EJS z!wL(CW-Z*Vvt|lgi~Sb+%sRs~1BNzO4`0xz>bIRW}qgSkmUPTO3 z2MoKlcGM|*e!Jg(wn2p0wJ@UWxo!4r8x}D$*b;LuTcRR=H_XUi42x)H6-AGNVG+%& zqUq6eqM20;J%&y+v)W1DNhg|FIq6P1(ab8A9!n>hS;f)g{xmG2nN>VJo=!BgN}wmu ziDp)b^u#|5i)d!$qPyrsGpi(e5}jyfl}slV(L|-tiA6L~ZaT4uCMxwe!z32bMD3yz zi)f;D(}_hiQE6N|Vi8SLI-OWV6Xl^3i)hdG(ZkPFh-GgKk?HAaY;0^`b#)bsi;D<_ zLYSSM#njXk#>dBTz50`fGS=UP_V#u-eJ+$X9fJS0a(E|7Abt&Li-1hVL6%)`)(Vo& z2y*>d*ndOdXcI*D3F3zZu8#zTwUMYf<3#X$Jl+iLMpciXepK-4oZ#$T-dpcRT5AR} zdvZ{;;6rLh0y2i&$eB(@-bxmdngp5W1^dSYWlI8ik>Z^%z%v`a8|MeyZ};Py?rPcZ2he0o%{c}ftZcQp!zPqN-AsPqb&pAd9b z3AR_Rp}x?KR(}S%>$5S|l8>I3iZOP&5+f}Yz}h5o_qtG)pN=C>XQQRD7;QCzzLy0P zZwQv&78IqqQJs^CrlJGrs478Yjti}YsTexE4-3r)5qzNnZLid!r~L#5&z(Z|>p=|n zw_#!C64q~BLu6zmlH+6H@pzEu%|OwC$M9sn7yhz51fDIy@Wox2dp`r;-Oj=0om{-j zXD&<&);<^f__d(BH5=o71z5gbiJ!l3K*yjHLmwvK=G_!*BK?uyKhAaex9`VS6TsH; z|Nj1hf&yGFp1{GpNt6y;KuTWY%yq%mXZPN3i~H-p`gsIlUk|qUmUWwl Z^xZ$!KBM+oyubF(J@)y0)cNK;@)sL_qJ#hd diff --git a/assets/voxygen/voxel/weapon/sword/greatsword_2h_simple-0.vox b/assets/voxygen/voxel/weapon/sword/greatsword_2h_simple-0.vox deleted file mode 100644 index daa394c7fdebfa8233e9afb8f4f529e04f72039c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1528 zcmbu8Z%CbG7{>4SecpFFdej~N9rd`WJ9FvLvE`p>rr9w)t>bd$EZNRXA|{)-kw}OW z8Ehv9CYCdC25n~=B9XIAPKP4UVu(#-43i2%B&zTEr4P&P>UtZ&7;Am#fgjg>-S6|< z&!6{sn(B{ajfzNJmH!Y$elzbIO(3Ih|X9!>4{3A5|v6NDve5%>rc%fDxFHyb}CUj?rH{68C0S&sYGQ_ ziP}je%1tGDG;2j~Xa+GE>vnoOG=rFo^%(jXdSWuxxgW(fE8!TTG%8Vgy=D-ls6-i5 zqD(4LTc|{Br4nVM+UiA*+7LwyVn%J~^g6vxuhVNnG{U^5qIAt5R(=cF8ntowzzbDk z{Qdi6a&i)@tE*UATEg7i93qhjrl+SdF)@L$u`yipfBslT`?}H5(E*3oiSp+C@SUoJ zCsYRUnUMBq$an%|!3js5Amy|m-Dk!eAqxQ4|fpdv?H?jjY zy@G}j!J9LJGj}+)!G(-AH?n*4P!jecy)y~!K^O8SGf}XZgOp}L_Bp|xQ9;GLKwjni zJvPWl9Aq{L{W7cZls*o8Kq8$AuV7;P;??`x$PJz0(6)+%6m9QnJP zs3^?D!RK?)+Ej}6T0!u2LFjG4{QH8E3>W-)*=R1=i_V%dH03$bR-BH(1G^D!*@wU@ zRcL?X5PCa~Vc_fu^t=_oP+vR3Qx~vu^D^vqJ5m$lk(HH&0*@Odd!NFyg&z1S3Q+%I z8HV23j+v`&{CF!5Yq#_95$6m~3YNbT{PLZkr!5y_!6GbNtH$p?HKKFCfx%CbaN|xI z){yzc{g3fn{%!yGHUz9M{O|o26&2xPX$boY#!=pX9%;ceEKUekj|srL>+yKd)zyWU zUz&vkdyw3jjL4-2|M0AfcPAqQ7yCv~Sw4*80~e6ml7icx?M5V!hGCxBqvvn+vuYh} zTt??f;LN2d1V0Yrz1f@i@aq-q@90P6`4A3XnMdRG6?nZ~{LH0@jo=Tc6~X$K57xKN o`}JSn`3hmRM-@LXZ}FIK5BIg+sPz^f&iymSdY?~v-y9=<0o3r4P5=M^ diff --git a/assets/voxygen/voxel/weapon/sword/greatsword_2h_simple-1.vox b/assets/voxygen/voxel/weapon/sword/greatsword_2h_simple-1.vox deleted file mode 100644 index b0663e2d0f080e639b2ab37d0a7be962f729c824..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1568 zcmbu8Z%AEb9LIm>Ip?@Lue$4>d)4cv?#`uG$CiJlnP%7Ywyw*Wvt+w7iI{9+Bayf` zk->IzU}8CwJA;;Kh(yjdu}cwXF~lY^hDik_64Cp7(~GV8_C1bZjI~~L;KT3x`JLxE zf1Y!m=7wY05fQ1c4jf^TxEPV9K+qp&2@jpv$R2X+crfsj#=s*)v~AlrHC;7m28m%d ziDC70_J}Ub1~bu3R-(rcYn*jX+tiemt=_fB)3rGOHAN%AcA+OlIYzJL$w^RxY}WPE2N%N+$*}iAtjrgP266(}_V$qTF0FVi41P z_voQ#s>Rs)%rZGSiM6#gEH5u(etsU&XcW`a)0mi;!06~Gt_D7PD3QKybar;a;d7y) zQ2o~NElxDgS$j?Db>3($8mZLe}h4zvR3?ABx zxz+;+zEF*hSB{{!^8^OYokGv+K@9bEU~cLnR&QK^-EK!(aw4*`vr*{vpmhIZc(TX~ ze`O&Wo-N1Fn>#V{p$9+Q%*Xnz0=&BF zyWp zzctRf*72qlbe#syUY;CJY& vf{ickJ>LfZum3vFT?p%Vu;P36Ego|2{;}2`wf5ruy?^Fd`}0xzn{(uErRko0 diff --git a/assets/voxygen/voxel/weapon/sword/iron-0.vox b/assets/voxygen/voxel/weapon/sword/iron-0.vox new file mode 100644 index 0000000000000000000000000000000000000000..46aaa6c44fecee830e6df38a25c88b835ac5eb6f GIT binary patch literal 1600 zcmbu8eMsG96vxl=d%0d;=j&Cko0_@ws%-f(muaTyZRt{TmTY$>5tB`9Bog98gv}h7 zSZ3l3T24bGa<+*{BhW&`CNhRe1R*jb{I~w;kGt8o@6!mzF#4khKAiKM=bZDL=lp)B zzUE}|h=^2`R#a0+mP4ej!siXq8!nRsk^|)ADPP3{MTM)IC_CnXGNX5u+V59Z#GlF} zRw$Gi24xXb+rw!Krk-$Lnfs{6GA43YnNhpS)-c|RE?YYwOx| zE!>;*wKV#DjIoHxI74>Ck{x9eQ+5okYXTfQ%4tw4N}HI(+EL=9pH-twyV|e7wQIcC1j+%Oki|$6xS=h+LMvq4z#wmBD}Khcefj8rt_A3|Gs0qQecXwFN( zz_EjvYdj3!E2U_8qZ(bUr_tYi7M*YVFxcCIxv9%oU%HCm;9$f>MIbpj8QGo`2s)e7G1`-h8;?yS?fw2|1nuR5QTFBE-jDCcfUV{K{r=qCTuhbU!r|<36!u+0d`~=9 zCIlO&1>nEy@p#bQ-j0`FnuYXqBBm_{^H&~z!)`bKoy0_Z*gK5k!XcdLzl^xXSls#Y zAm)AX7-G*J@4xobxlYxsq3s-S;mQ7i`^nSl<@^k^eg95JIoVCGJ&Ydui{pM}75->REi$_D?=NpL)Kxx3~A4 HZ^p=9#tx=) literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/weapon/sword/iron-1.vox b/assets/voxygen/voxel/weapon/sword/iron-1.vox new file mode 100644 index 0000000000000000000000000000000000000000..6cfc825b6983b03352c045a71897f4f57e377488 GIT binary patch literal 2144 zcmbtVZD^KN7{1SW&Uv2qYahDrY1^EdZi+UiF4JsFm(7nYT@8ITiBMFQG)62PQ_!Vi zVyVeokj)umMrtZ+D1kOaOcBvFVh|z`^}gVr`qK|Hudbs7B1S)Y;Nm*>ea^YB`@Y|E zZw+TBZFF=z1ehzK!`SiT}&Gum*$&sQSK>P}_VuriuZXO;1i z$`Za#DvvNioA4BUDk(OUP$s%Xsc1rJA{M<_QD=*Cah%n2bO#x$(eupfr?8}=e#-T`X~oSxGsEcYz+ ze8)U*sp&iBc}rd2G2>Zk`;Mt?sb#5csb#5c8P8JNQY&C@efHUB?0~)Z+0%eM@STR! zW`BIA;c{W`e5b)00`}E+8m!N!hEENj8a_3AYWURfso}eNc*eRu@Sb(`GnOR`<6FW| z(-MYxSi%&O2{V>VXzpqHHGLkT>GO!d$FCcv9BNP!Ddsp*)N)SnClakPuZnb0=O_~E2BWI|c~Himm{ z);K527Q9#`fB&86>FL4H&=9U(y^8ba&!fM;AIFa$$I+ul(b?IF6E$Bw5gj`=p{c0} z>6O`-y=n%k-3R2ny8T$m;UkIiz ziDKc#bi}u1;QjumFuzT(^q}C)lY-4Rcz0<&3N{pDTw5t-_Eln3b0&)S=A*Qy5M`Gq zAZL|e+&01F4#AuY0(q7Cts%(4RLGf3?4B?Jz0YJ}==o8=!ZDaFf*Rs`;%DOECc(*% z1OvT-E2n8!3c9NWXO{_XtrNs)Z)yZHKpUQ zYUUI)&!2^c(rj#)J_>smj7Q()Ubc+tG-=-klh{co@-W z6uB8AP*hZevXWxVoboiDn^uDAIc2DOX%_aqHyS686l3^GDQ;b#giom1*CV+0wcw}k z1g#q;qO-jmmrl&XuRqkIc~3g_ex8ZbH}Y@`g-@>kS=K*a(8<31TmAU93%GOVf7f4L zUXJ}0U6@+djoG`mBd%aE-uNv-qobk)M7&sk& u;@+cY-Hf_feAM?(JU5?izHi>ViGhIuoI7_8$BrGtkt0X2Yu7G!NB#mQ8!lG> literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/weapon/sword/iron-10.vox b/assets/voxygen/voxel/weapon/sword/iron-10.vox new file mode 100644 index 0000000000000000000000000000000000000000..8c7f5c9a8260cba67679f57c905dddc9191073fd GIT binary patch literal 1844 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 literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/weapon/sword/greatsword_2h_simple-2.vox b/assets/voxygen/voxel/weapon/sword/iron-4.vox similarity index 70% rename from assets/voxygen/voxel/weapon/sword/greatsword_2h_simple-2.vox rename to assets/voxygen/voxel/weapon/sword/iron-4.vox index 5a4a97cc1556e7162ef51bbad518786db5c16bab..29fee574c1b361de0de7cfe7572418cbf34e5372 100644 GIT binary patch delta 208 zcmWlREe--f4256Ynf+tUdJ>isticfk62UBrZ~!ESz^%b-NVo^#5*QM$GLC>4TJg27 zU()xiKXtS35A6-WcD)I@a2%W2Zow9Tiw!O#xjc}Qo?NE*0Ix1D6N$O$k3?}CNEAnr z#K`p4KPlpP?&gv0Nfaw21zKP(Q^bY)`$Qda5y>m466IB5L1YJYNYD(+j6~di$+wRs MzeI*%xK6UwAGQ=NZU6uP delta 160 zcmeytbAm@O%s)b58Uq7^ucN0QkYX^IC@3Gm!USS6Ff@P&CeDwHEbRV_EX+X62E?rX z46Hygb|7X3iOKwCWCmguCVxg|AZB3%ii0pvEi+IbGl&1g27N_;CXgm(AO;!82*eCP e3=(4lVrCZqjTdqlH|H>&VP>8&W5#4_Hd_GvZy?tI diff --git a/assets/voxygen/voxel/weapon/sword/long_2h_orn-0.vox b/assets/voxygen/voxel/weapon/sword/iron-5.vox similarity index 70% rename from assets/voxygen/voxel/weapon/sword/long_2h_orn-0.vox rename to assets/voxygen/voxel/weapon/sword/iron-5.vox index 25d9cec1b3ad0ac3f3dd84a793ee7f28f9ce16ee..3008fe16b66d7b30d3f59dff149a64977a977ba0 100644 GIT binary patch delta 357 zcmW-cOHKk&5Jlg8RZT*ezW|w+}?eK5S|~_8xTG|^J3S;+@kH<`}$s&ID{u8Zypp-ijs66lJpQGf>OGd z-BgO?m(0l=e`S7_Pml5eoWMRD!(J^Po#fqGvALHQ_|A@S^(P-vwCiXLGBJE{lvybY z)C|7nbF#RRIZEg?=uJ5J0gP#{sc{-N$~r(zq@10%l38!5}e>?Qs^YI1(B)+)rAG zXFZU3r`Krc*BS%u+0ixj$sqAjrK(qu=ng8ZD~VmTG5ggG^ZI&X+mQf+3S8g8C+=yen4496h%Z{7%~D|I6Z~` wtP}E@9eM~mtL=Tk;mFsBF2I~3io%2~ydX;aDZJpgJMQU&ulTlY(<3za0e93c!2kdN diff --git a/assets/voxygen/voxel/weapon/sword/greatsword_2h_fine-2.vox b/assets/voxygen/voxel/weapon/sword/iron-7.vox similarity index 50% rename from assets/voxygen/voxel/weapon/sword/greatsword_2h_fine-2.vox rename to assets/voxygen/voxel/weapon/sword/iron-7.vox index ffc04f3772c662ba446f02ccd2c00684a04e32ee..628726ca778aa1bdf8c11b6d4664983a4d1e1cf2 100644 GIT binary patch delta 737 zcmW-fyDmjR6o%)_%(|R7+i}0&iBhj5L{5Q(L{O@g`rRstM56Qz9>EKE1*+X@IUL{E z$;!Xh?8*PFSu=OlZFl?Z_c%t-0zfvFB2u-AkHr?dwYq5@9lnj zvudJ-CgxTXt<~ILKi6rxAM^B2OjG@sR=#4MBA;Y!5}iQH+Qe^6fh_X_zP=&*q14jblZWQZEgL!U9t z_M_8WM)MlxGw3SjsG!1{tP|`NniV{Rrldk?LVyZzp&0=xG%2uzre&_igp&y7!s(=# za#~>`!UTkAC=kV10VyEGT=}N}6@ao|fhrI!`vEH;#ZQ4NFa@q0NP#OX1+K8P2Cl#i zhygJm&iD<8GX(=;K%5B~5Ch_j&wv;ZXS4>yfEW-1Vn7Ut0Wly3!wQ3jj0TN{jRQEm z+6$-vig7XI?i@4cJ{>dXjvX`S&K)!79XM~sc^j$CGa{U56PbwZro~!|Je3ea3D$ym d6V#iNgWa9~SIVP&xrJfn{)0dGLy+WCceffmiFn4AUfa!6eMO1E|17R%=tv|02wzcUt4Pje{?$8jnb?NS}R|wmBbdQFxtxxx92-`Mj zC=8gFos)Sc=7!BJf9!$ z&-Z!iYmTN36H!%}r9UObT=KnAdYd;R%1OjL>Xh(hMP0n#Y8U z-BdKwB_X4sXb~YHcR(0T8$!lx3Ku1DEoA&dp{YD~u&oQLY zgPDCex7-yL#CnPASIzenm31;g<-7*thN7~MYUCJflcq^U>b;2oNn=RizNuSlniNvc zBWi?HS%a>V^-9()jWsI!3CVFZ^F1LrwvjP&95at53&XwQJSxXjxptL%Ck(`SiE}U- zv5n#J$e~xuwtg!Azwz;L1cN~=FE3+mZVrJ!08>*_7#kad-|xp&&-dFh+|!A+wl-K@ zHWW7;fcyPYI7f;=ZVlAJ+D2nRi#AxR2#KwP9Cs%6UL%-V2vI&l+yKG$Euo;wg34Aa zyl3O^NnjT$x(T&Ig!iTir|+B#8LM&Yar$?fq-?{^@3JQcZ1nMiCPWSk}J z9VV2_6X-3@-(>;~MT2JI(VH2Ai5C(Od^s7Y+>K%)c$i3J< zKJWc@LU8mEDj*bqz@%jwN*M)@k1OzTV`iEy6e0Ne(aG_@irNx6d z(RUt6jfuGZ-5vzIb_{aQp6tJVPLFl0ZUyb9fYTQz;JY%5PiGeJ#gD5v(AJC6b0awX z)jaC1t-|GU;Vzd#CI?6(^Am*rJvriTHU3!G-uC!e{f+8x@$tR? N;_2`6S?`;D=wFS?k%j;O literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/weapon/sword/long_2h_dam-0.vox b/assets/voxygen/voxel/weapon/sword/iron-9.vox similarity index 66% rename from assets/voxygen/voxel/weapon/sword/long_2h_dam-0.vox rename to assets/voxygen/voxel/weapon/sword/iron-9.vox index 46bed4239fba78f75d0901f2562dd2cb7f590415..68bea04aabc64be8e666ba3bc7d693f35f55c98d 100644 GIT binary patch delta 309 zcmW-bJx;?=5QN|C+HvCiI!;1NK%zwA0yGqqDS!?Iu8{-e300aX&;EvCj|Dy0h3!h-h8=PT z#(b3GQ+%|Ob@3DYv=Hrz`dxS5TgD T-H38@e81M0ds&vRS8?$N+8sw5 delta 318 zcmW-dO;W-@5JtOu1|}H-A&DUVmPghq5E zMv4zfT&{huZUp1rT&V55>!>f1x&yQIFLE>3C%UgG7ST8T&I z5s!oVj{by;Oz?_+MZdzQ^rtxKXZQ>!eT~<@YBm3v<8!hZ)Rr9|H$eK9LCaE`KG*u= L-Z#4P`6>PZS?flQ diff --git a/assets/voxygen/voxel/weapon/sword/long_2h_dam-1.vox b/assets/voxygen/voxel/weapon/sword/long_2h_dam-1.vox deleted file mode 100644 index 474c279e668a6c7c09f127c03b4e4a7e50a00e9f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1376 zcmbu8e@NVQ7{{OQ-MPDYYNwuedO9_8>FL<=$28N{ncmj9Idhh5HfYaUz55 za$sUP6KBve4Ux#%CUz8o7DH?zW0+JBA`$)H{G&f?_3F8eV2ri?=mT$_*YkXy=kxh~ zKHtyNSa&pYL_}&U1Bcbfp(v4tK+qo(adenfR#m#{=&@iR%}~&>UuCjbZyRPqC7Xs= zHw{CzO=D4N@6K6mhAEO`suQ&)lXcT%j`)^3!yKjBRwribrdTxJY*s({55t_I@~EGx zN>lCFG)y+Nw%dlqwq;mc%G-7Q?OTQ^S~(iS60L0CGR$^mwWb*5808qPja80S>(+Rj za-7zePP}rwa=dbaa>Ad6B|$k+YZH~#nw-i`WvA9ADJSVV zZe^FU>&}q_&sU1&?lsBeGe191I2>krdYXxe2}Vapxf1yNp&IG!qP@Kx zhtEZM(_Z|q@54J*hWMk9wrFHL0a zoct$TR1{`#@VQ)C8cS)b5kjvBV{Zxz?+PX99s+sUG?nb8qq>a7JQuCSsSF(0$z1au zf-hFm_Ud7J+KxbVa_EIw zB-Bk(M-t&n_x|BokG`GsbT0M|v#)%J6a5!RZgz9?vz>&4DGceIJ$V0-yvSO|8dm5y z1!pcz5&C$JcV@5i{@1JQZSP~>`7sWDxIn|zReU}lKkKK6O~vn+SA~r)?|t8fzOVn9 k*DfS79<=f9#){NPj-6zqLmG2HQSvK>z>% diff --git a/assets/voxygen/voxel/weapon/sword/long_2h_dam-3.vox b/assets/voxygen/voxel/weapon/sword/long_2h_dam-3.vox deleted file mode 100644 index a8529a73fc8824c500993700dc0aa1358255f1f8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1368 zcmbu8e@LBW6vvP6d++A_wX0sQdfn8SORtVCe@ruNUDMmTE_ZX5YP# z+s%QAVJfz?O~Z`Gu*a*-P(5+Ousb&lGhIngpCr|`2Mk-JvLg^-i&8y#%P@DVzAX@; zIZd19HFs^AX4FQ6Y3*ST7?w2?HNR`iuth~0*52DRcDrII5sKZVIZVx`){NFT#U8C% z(w1S5*);62N}RG&HMjaWFiiI!hMA(IYP>^r>x?mKV{}bxv1u)~SY1m{|2Wm-be^oW z?NqDSt$I=v$HuY4&sK`<@9U9?i3wI$S6NzGVs37Za5&7=)D+|6qR-twL-_NE{Gcp9;mb z(bSxE5WJAc+u_|*cMEkx!fVsQxjPzL=O(=+i|p<^N@l&JwL8h`cat}fLBV1U$&Etx z1!3Q?P%$saOS*qoBr+6-%sA=IiD&YOBvzkJgPJ{*i{MwjSAJE7I)&-?gl{H=TQ_v> z6~=tR7srIP(?U?^oejdkDb+iKDv!|gq|i|3+GC;WJeX zHdn&(82OL6s3^?f$TPV#H|A>2^Fz$t%~1%s;9lrLH{RC zZrn*_jf_XuKce^YZ}s!-D6B91@A`|1inv@l%7KD0%6l)88cJnxTv$CRpl{dX@zBxH z!3)pNAfYaj+LH)hx%UsxyY=m)r*pYyh(qOroa(zoN>ehoKif+D|o$Le%7N%q{8o*E5iDh_s+Mj n@9V$TwF|MvgO(puw|L0f{k~R@TD^F`_D_t}pO5Nqjgh|qmXB>- diff --git a/assets/voxygen/voxel/weapon/sword/long_2h_dam-4.vox b/assets/voxygen/voxel/weapon/sword/long_2h_dam-4.vox deleted file mode 100644 index 87d556e3114cfdcbe8aafd03ff276258feef5947..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1388 zcmbtTZA_b06h8NTU)GKSEA)$&tzczBVcFzkAc9zgI?H60p@elvj2YQTU2GcDu!bzz zDoc={3`tiLw+>80j0`tY8;uEQ7J?&WS+G$PLx?f{7k>Do!#$qY#bjCL{NYWWJm)<3 zo^$Tk>Gt-NM2V=Q#dCy-da{VRJU(}h>hO>m8it+GbIj){7i{qGFeF8@DP*xJq&-_g z&fgMJ{yiZVGUu^xX5P)Lzb7Os+eM6BY#00~WW_7wEXEEm$r{#;4BK5H%U)76TawIq zCCj!XX|_mGYe-(9vc$P$1IKH$Lam*}u{)RrGcl9`u1B1U*GO8nwVOiGW`xW&m7N)( zWHWS(9M&w`LdxYB6R$V1ZQd5LjbnI^ih<{MvR-&sNZG7qLny|KkaQ5T3M1#wVLgX+ z3p2;doJ-DQKbQ08G4z~!SLW!U7g|X9`^qShNFbd~V`XIp3kwTKrBaxkoyGL@G-9zB zu6e$AB%;HE2m}JqyUb|pJqY((&2YvWK<+G%KN~bv09rCb-$AgPCRDo1unG$! z2!?Tj`7=UohYszh_3)iD;Jwryv<(qDCkb!P5zgG<*iIYl0}hl9RiG~ELQ&8N$CwQj ziDFbOm%-9YC_P8m7bP?;66jT~AJ&2<^FZ@PjFjbL=4lhs&lLgfPoR+q{7>)$<2T0S zAYtx9!nZSoTQ}Hu5vJUPFOL$|PZE6W4|WsAPp}>$v^oiW&k#awgv|0~bk^E1;C3L~ zS&nFbHHKcRNAy%HCi+`|)hSdyX+~3ZF%Capj{fd?_}dAQ*9q}=2#X&O>g+anDoW8? zw;#c_26R`LF;H8Cu|s>2>^lJ8D=qN9aRftw;}|`A65+Rf7$5c{IdcJPH!nk{)1lCi zkCKuSR5=}}+y4}vt#-oQR0Z#g4H$oSH|DN7@YAgdtlzH0$6Pa+Agq2(`1N~2c%U4y zNDY>*wc_`myAT}JW9(BSZrrhA9mS75e~j$^ z+n?`6%4fv{-`T_WudY*b9qU>}@Dy<7(hMS>B=P?IO?>pt8V&|V(0o3Q!&es3b$tyk zmkYn}R!GahACT7w8(-bu-v7a!FAiBbFWasACP F^cP|&ajpOW diff --git a/assets/voxygen/voxel/weapon/sword/long_2h_fine-0.vox b/assets/voxygen/voxel/weapon/sword/long_2h_fine-0.vox deleted file mode 100644 index a99826ebc99011e2340a1b9955c6ea335c3b3d1a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1404 zcmbu8Z%Ex$7{?!f_jl*@@2>x@dfn8_rB}z6)9FmJYkFJPrRFTz?o1*kQ*0y>;zS19 z&4G#KOq@Z>G(;k2o0t@V7DH?zW0+JBA`x-l)|*}k_38O-1Y@lAq644%J?A;+`Tov1 z_dHGYCo;!Gq_)yury^~3kw$;O7i|r+nM#C`p`17w@E-}&j<#Cs#|#gN=?K}(u#h2< zN<_#AcZ7^xiro46irLU3G?OS2a~_ zs)oibKT&U0d&G`mk5rWt7{_BFHLx>3q3B!WxQ=zCfikh=d z0v8f^dvPz-eL};i@Y1ul%Zv_6T$D3E#{Jw{GazD@^)? zFOCaaXM})`dzysd(;DvpaEa`7`vs5n#B#gN2z(Y}~v`R8$lx32|g*W>VnEqWHiQJax!}ue^Zz z=SmrVYY%fDW%1*!JhpD<^MQVIVOm)KO8DhFp|?Gk@n9h<*Q)sKr$)L4oeX`F$c;Ox zY?1NE^N;Jj{M-5Yb^^9n{`dI{3k$hiGQq)uNy-K;k{V29bxPPgC7^HDTvz$@^b#aJX}Tii;B*`*4}Y>l=8zUVhfCh(qBIY#YM%m-qI!t?%o< k=CuT|+Jnju8n<}J-2H2<8ntTi{@6b`R((FIzBNbw22wqCIRF3v diff --git a/assets/voxygen/voxel/weapon/sword/long_2h_fine-1.vox b/assets/voxygen/voxel/weapon/sword/long_2h_fine-1.vox deleted file mode 100644 index f6da0d80a63861bc63776fa75fcfe9a742f5a1d7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1436 zcmbu8e@L8l9LGQReDCJzsXKq&dFQ6iTzWdT{4vcmJJV~OOU>ED-Ap1To7m`(IGo5} zyBwKV&WST<-84iZXPaC{5oj^QCNhQ{6@*Ac+`sitf7p+A?`I=oqxz3AE+$5EOc@O^ z&78o*$25aErfG~a#|(O%?V3pseFquG`rS5?bwyWtA7zLsy`OL%;XFoR;#xH0j%Lkh zB8{XXHP-cc9lvWvCzHkO+SZJ_ne1&%#gp;BY9>-8&=a7UNM)g0=%h-dC(=okL{FlV zDw&>4C)G~+PCBWqbn9Q5iBu`{6gsI=>8W&5rP0&=)J&vGr>E0Nl|j#-lgdW7{h^si zWvAQeq{^gc(lfV@9D26y?xJ&fXJ=;-jYhGywuYspB}5_-%+JqbW@ZLcQ&YI+{q&)k z9O{SP?}ycGLv`mtcwVc8D^vyXm>|6gkm*#&iVfB#f&H|g*i(Rg*9GQYK~hkVHYTur zEGTcXpz*X7zH@1KJF*)MgM!ux!K({`Gj}+))rst$Jme1+p(5-?R$n^uMx7{{%|Xd( z0qmWE{BweRlY*LMfxN`$511hn$&kf#3>Tze?uiUUpUwgr_n=w?UglfoXJ(>buy9H6 z)tung4c@y2(;mTRM+BQE1wP*Qw+qHjupSW9y98ZN3IYv+?bR!2Eq9{FlZS!ULQHm- zV(@4sCQsF4yt@uqpGNUxHq?~n;P5kr=x(n>Z=)divLN(^VEJ7^MYa>(qI`5#>_=Zi z721nz=qb;_=%Kv`cO8K5#X9u9(u_g>ag3ZjiGkOB7#r$EcIwsrKK0?u5XL-4~e-dVhf_rBb~LH{sn&xdgMgJrZ`-+m@Gpe7(`)mJ<(a-0j&Ns)% E-$z-0K>z>% diff --git a/assets/voxygen/voxel/weapon/sword/long_2h_fine-2.vox b/assets/voxygen/voxel/weapon/sword/long_2h_fine-2.vox deleted file mode 100644 index 29ba5d685751b3e106a7edffa48b5befcc3a54a5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1460 zcmbu8Z%kWN7{=e;(~d%c6-ry$Zh**y!m`Pqfe2y|>MRqGp=2vaj2YPoE;hsvM#z$_ zvIGgrkg%FK8JLC`8Eym{jR|NLf+J*Ekf@0v#2C}B`o$0U=kd8)OqONN58mXtzu$e& zx#!+{?m2DE$8sh`q_H;8M93ABNNXVIPu4GZ7@0&Sn>lto7zi0CJlge>F(EESb6gn> zam}2>B*ry^Ij(7pGRF;io$Z=Q4}BMz!1|pwl66H_dLLzoE4`ml;+k+Q;aJ9mX3e;( zNi&*ABdJJ@b$#4DJDPDXleMF%L^APL%|xmsdJ;4fsVsC0om9#6WICx*=qYqkrP5RB zq}om2O(&I=Zv9I$kt&UzMkiG|J)KS}8{PJ&W+GJvJ%dgvJKatvm4oj1Lo<=eNq5po zl}XQ}lgdSR{jQlv<)*vor1H=`bkEMw!_U;-`5Bz{Xf%q=%}uPWtzl_t39(oVb8~Z; znVCT(62aBLrw`2JP(MPU5Uf52syYtA|5^>aQRe zdNYta>PBHS8^x>naCQjt&I$HU3aXa{@*$y0S0@2UmXr&08%1JxzjIP!D>y4otx(;x`HESP#ju>6jo zJj;zhVIDfl51_Zc5^aSJbeDNBdUzieI}alGLM?h;X~JNr9V2H?V&L^4#)f*ZIC}vb zH!j0su^`iyhMb%n6nk?~e&8`YS>lDix){yRR$}bUJ($0ei|=n1V(V5B-sdwHqk{D> z1V4Qv80aoQBwUJ>t9AJ0hgS5CSTXuh2CmFaFd>*c_3#&7N&2|B}cD-IN`uh6t{BsMC@Br++cEm2-{fB4WTsv7=xHvR{ znyPV}7`cGVPA6`CvJbJK3*(%#`{!Tpr;l~KbsfE@fHRk75&m!yZ!g@ydtYwgP-qx6 z=cjPwgJrZ{+knsK!;gFwF*EoLYD2L7`Q7*1=KA`tc5XrF$Nj{2tm}C|+r54DJ*w}; Rdu#vPqwmj$?Qh;Ae*^akh7$k) diff --git a/assets/voxygen/voxel/weapon/sword/long_2h_fine-3.vox b/assets/voxygen/voxel/weapon/sword/long_2h_fine-3.vox deleted file mode 100644 index 35e5d14e2ab465d9db110205fdde422ff5dbdc7a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1448 zcmbu8e@NVQ7{{Oce81m$dg{(!r+02@mrGB_mOrMMW@mb>bE!E?wwp2U z4(82y(pbY@IyED8TNw_L!v5*R#hmkw(rxU?xpcEf^zTY1Ml|#6XT-4HMq)`Ei6^^> zog|P%_AtkDjam$?iDO68EfEV*2GNKv#I%ZN4NBMRm2S}PqK#@$5*<+z6VVK7MAM08 zjacYg=v(NkD6)%CQ`D5HDPkd3jb8u)4a6#l=O0 z!(q(M&SH9c8WR%}xa$A>p^OjoqN}S5cCQ2FEr;NHqY|FUGKkNBbjCoY5+TbD*y{wT zrv>@G9PGa)uyzXKf`X(Gf#Xv_ah(mdr|k%wOTs(hy{PFIG>!>gpA($9&9RLxWOTTZ z-Jge&1uxROli?nAAup7Pf|VSkwg|G%3HFZ*DwYKDGUxBJLdN1D^T`;@Nx;mLDcE=> z9jJW_XxypxPs7eM-<% zBiLTKg2rMOI(%;QHRfWxy%7Dclw$l;HAdU3fVC;)Kkh(9VJ40|n~V15Qgqe|g0BiD z-x4gnCn(8q!Jn6nmXZVLt|>!vo&z1l=@>q|4-2ga5qPNzov+oSzv~2s&Yncyn*odr zbYfxV0@iO_fz4(^T2cbCva(R%aiiqG6L`AN17Ae}8lEr1$lH4`_mLYv-ps@1t$cjI zITu2LwXX!fd?)DZ$i+mk2+LQi@!L;L=pM3T_>*K@zwN{(G9S7B37*Tp?H}Jx0$a=f zd;dj6MYvcxiGu}GC?7lzXV8h2X~D(`0eE*k9uInYdhp^4^N?U4Qo2(RzI^W=o^|o= zWMtstz!)maN6|KP0cowNxb@jSgab~D^2{DQf3wc)b-ZZ}-KT&vmuC?CcmeOu-@yA{ zuj5eHAS%yK;>d?fXu7rzuh)y8xfHPy`~huUu=VA=^=tiAN9UDM*afug@V)o diff --git a/assets/voxygen/voxel/weapon/sword/long_2h_fine-4.vox b/assets/voxygen/voxel/weapon/sword/long_2h_fine-4.vox deleted file mode 100644 index f8011b769e8670a5a71fde0a850525884ac31d35..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1424 zcmbu8e@NVA9LGQRe7`qOPu=PL&^tFZbLr{W^2apO>`bq9Zfa`Db~A~XY+|EBLY&B8 zyBwHU&WSTuwM526-%boYfw=~0%#Z&?>BJn*br?4%a4#!KBuONh>?SsnvZLvy zn29Je(TFa@u!?9+O4l2eZl>Ku8`q>HKBgogrkO1zWu-GZdBz&KA^QjD={t;A)AV9t$Kauf1!Te>x zm$QOfH|YBW(|*CHErP96f*}3AHo@pg>b-(mub|@zL2sR4XZ0$YOFiiF=b*ni9}}I$ z7#9rPowZr7pjW0aOCNHbheeFyIv4}Nig-gVEJu9S*8bpf?Twh9Y9ZA z1=^O+v^EK#xxe)`Q6Bs^s3jMDIF*?|d#o3G4xOo*;s}6UIbOG+L z8>=&d%@YFf?s~mm^!E1R=yMB@a6gdG;k9KMM3jx^l< zcpsucH^$hr`}=R?8EYMHT}RJp;Ov!Igg;osTMIYw&KDav6dFSHg()0)ZyBxEH{kR6 z@B=?ZECjzo+YoGjcK7?XdB6TE&L;?C+;8zMb%O`Q?#(scsPPu>)&8k5-si*KH*4fC Dqb+;@ diff --git a/assets/voxygen/voxel/weapon/sword/long_2h_fine-5.vox b/assets/voxygen/voxel/weapon/sword/long_2h_fine-5.vox deleted file mode 100644 index dcd9020146abd95423e28afcb56d08be83c82255..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1460 zcmbu8e@NVQ7{{Oce81m$dg{(!r+04Z%%!Je%OBHBvopQcxzwB`+i4Op*~CVNggBAG zb~!MyoQX4NyJ?6-&Ni{52(%bt6B)y#f)I&_`?vn-54ZL1{cQweto279c=0@+=lg!1 z&yVltX=yx~H7+9c)xHKAxnhVk`~2QmbHbsMXp%{e9`pMG7CIcQL>Z24rKQ|cTE@20 z6aQ2i(c_`ColrW_b~B#9SS&J0j6H^=gyV8jfO%2yGVyLl^SQ1C#$xdP? z2_%s^o<-*#wHVeg;X0a)mT0libW6lSltDD23o)%CTBFkS2BjOcJ7}XCl|)CB#6&d1 z8qsv3StAzu7Wx+YDvInNj48&H8B@eUtjx8>M1*nCqasHRJzxFz&)~gJPfufGV*{(J zt5{rIL^vGA?CdP2rlv44F@dYT&mYP7KraG;0PG$ID%uXh`(_o~p>l}VfON$`CKDmc z4%q7jsiy=5-dyavCa`u1;(~&t5rN}VK}o$0b*Jp`pH0HM;oYe17c`9t-k1}dzRlbw z7cx4tk<*`#(ghFFyOWVU>_Yx@CJI+_k=iE6IV;#VE~s1*$SYjG&k7lfhs-BqFgF1+ zPo-ev*>s?84=P09Bj1x>$yl#o?gPO$GlHAfIrj)Ay@D@}2sTd${G9i;2u6-G-Xo}S z3)-I+^wbKrS1zHc#Dz|8Hu{?KFy2vw{#VN|ezFFm9o4|vBnqBzpt2|vho8$sM@t#H z>IA{p1fjPDOYaLxGhFcH=b){0Ke}tn(UR{#XGuDS5ADT5`vLf0u144E4d@TFV(82X z^u6WB$UqksX3k^%#wFNnHl!sbAS){ih3;&W?tc=`6uIH8EJWiAH=^ze8P{(+v5Cybo_~V(@^9zI zw;^C_`G23kxVRV>%0f6$IEjkEb8rToSeX)Rvvp@*)6;{OUYv&n`;gL|g7C%r z|L}~9Zzm%I7Y4>qRWXX=L+6p!o{C$a?M2w{#3=9V;rlmrX02n*Yv?`+oW3}N;KvJi zZ~g{8{CXV+1B0kK7sBDoOK85f4v)u!pScyW68r&eU9k1#{rzq6ef`&Wwjj*$u*DCI an>^y%gIcpk&0c&k_D_!4pO5Qr=Ez^}Hikj~ diff --git a/assets/voxygen/voxel/weapon/sword/long_2h_orn-1.vox b/assets/voxygen/voxel/weapon/sword/long_2h_orn-1.vox deleted file mode 100644 index befda529be9a472823eb97ce36ea59dcf01d7681..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1404 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 diff --git a/assets/voxygen/voxel/weapon/sword/long_2h_simple-2.vox b/assets/voxygen/voxel/weapon/sword/long_2h_simple-2.vox deleted file mode 100644 index fca4808b5b0ba1abc594694aac5e9da6159f1fdd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1416 zcmbu8e@NVA9LGQ3=g#fssXM)2-nprnOHap^Kc<;xXL_x3Ip-|dZYB|vO|H>#jKhfx zw#$Ku<(%9uXqm<#k+V(gC;}~p*hI!KsUSom`al2a5Bu@%{cQweto26^ym-H!U*GTd zdA`rn(RwUDCL%2j{=*D8n(V&m6Lg?B3FpiD}|orrJT@ z0nNx%sq|DjQ<>>zI#Z?5)96fh6}&(9;7Ok#R^8k3Wgh{xl&?*H_m#0Gj13WZ?tI#Anr0KV7j;Tf-i z_);LjRLDdYWYGaji@>!KSVshoj|G)2W;CC%AaKEox01Wj)Gufo z6TCJfICqzG+uX?QDL`R=399D2$O+p}FziN2A`fLtMR0Zs3NHxu#sqZ>0(pt=?=wNh zG9a@y3>IZ#>Pb7+p2-24A49DO{N!8mGa2g@%v=$CH6^%xlXb6P!YBCbs9^n+Ai#QW zhhXF++arQTkD%)*L8M8rwR8<_m2UL-3eeY9j97O$`d_X_>~teWyBmO&36wtWKwWtr z4n13p?v82%n+4HV1mkA~3-1W3a^3Kk6r!_gAHq#F=qPcZr!oh_2lrsEYd-=<8W4Q- zF#1C$Fm(PD`rZg&WFUySsY_VBbq!{-8QIoMeNW)&au0lUWoUiA1|x6o z!psK+`2KbY*6)uyA z{c-NgzpWo%j{_Tv|9kxv6&1K#J&yfl6Q~`$2v^jFrAfis2?2O^JsuAtkqBOVVHOhY zgFS3V^6I^Rc;3yklbegn17oPK9mUC^OUUkW;?5^~kPNsm$~}8<|MhYDvyQi~Abc7) zcXbNU59jdq>@B?eLkVc)ecy$WIXy!LKl^3N}8!_k9~YU;ow5 jTL`^8nD~zEIuGf)f2@8-^}Bd~+dp&k`}wH*%{lTHD#3d2 diff --git a/assets/voxygen/voxel/weapon/sword/long_2h_simple-4.vox b/assets/voxygen/voxel/weapon/sword/long_2h_simple-4.vox deleted file mode 100644 index cecfd85b630340789573fb5e514971c0c3aeab3e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1380 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 diff --git a/assets/voxygen/voxel/weapon/sword/short_2h-0.vox b/assets/voxygen/voxel/weapon/sword/short_2h-0.vox deleted file mode 100644 index 3befa618eace5070d717485daf1380f7f1285105..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1508 zcmchWTTEP46o%J6%$YOHFfhYhV4%Xt#m<0f1>U*WS9z98gY^!IdU}GdR0;2>Lp4~iz(feP`W#z z=~l{4%9+HI5UWu4QI;O1XLHX=D68J1tc){=&5XCkH0m04F>O|3NKC)3Q&x<%4=JmS zqz|cd+8wmpO&@dHjF_?*G0}-ZIgNgcnInriY}{QumqT)?8{cVWjMYIsgSd&G_=uNy zh?8WJ>>*{?DJHI2P!J<4wFQ4X`e^n|cSF?9CMevAypWs&T-X7+CQD0_*A zWD+NF5I1qfm2T&GGmpW!*odNR;VjI)Eu5D|Sz;RRrm=TraE1nB42^K+TQw~)rIw4=~+v1A& z5jYVMp6$p(L4OfSl4Yn_iXeZ`i=y#7l+6{Q;`UDD92b_w?%rT6O^kVqUC??(=z|#B$Y}~p6hr@wfj~l^Y5EbDf)a-f+&sB!e z(olgzFV$n>ogG-XT7;kOlwtE;IX+>{r8&XfZw0^nAQ)g%A#h(N`SD z%lj80sbTmAeOSKq=o^mY@$D28;O){W?A%O0- zVaKlQei5k&R@c(VSC&Y9bvTp|AMmpgE+UKAwL4sW$e_dTZ2V_)jw)MP%%C+)H~o~T z5_eSDmPM6a#+Bi0Q<4xc+S%wtnTJVzqoW_%apIY)(@#B_`*GbN(TBw|^cGM5tx zL`IvzH8GtRmFc4&x0&4ICp-}`T|)+;%oT0QNexcsH50j(PQ+s~rMX>!x-iA88~vsec!o{P1y5_yJow3gAb4;E`_v0s|p zG`VSV)8wYP-_E`{*c*!)HTi4m(A1-;OH-ewPEEa5CeKs5owc#pUx$-mFD>>^JH|!x zyq$3zcFrfn4DGrogrS|E3t?#1pD@T*9>7K4H7Yh*LbQ9-cmOqSu--ejz7!NQe(^+x zhlepgKaZK28Qi#W1Cx`JxOC|fhK7bPFff42)!#0O{^K2JZEZzzr5ELUHzM@zX5g7(#d=6}G>ai>8K6XxS#{ep4`bNO1FGL1~sB)%k0%w{$%sRb^<%_oBHZ6Q{PW#YE#X z2)`CY%UiYRYTbjLBm2?$UKqW{TQD(l0&~;n;C8#QHjs_N!a~#rOHsQ1X*^$)hfu`^ z?0C5hz3;EUl`jMMYPnf! z+C3i@uxe@j&ryGsV1RXboPPW`2rS-upue%=!V~p>@b>&;^%oZxqowLP3JO9fKY0wk zZXa$B3Fh|*z`L85mxuQDb_9csknT>TMba>N=3x(y_<47-vhd0AJ_G`V*w=Fc8I9?< z`^{QRhJ84lo&BHsZ!SNLS6>;!?)q6o4giPGjG+6%1U?#@#%JHpVPoq_Y(6%K?O)tP z{na^CR#xIZsfdHXU$D&y7Oy|#x5)eTf9rgLh=2dKxL=Fkrk7rObZ`8P#^2(jbN|GP Mzt1PVZ=R9A0pkCr82|tP literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/weapon/sword/steel-1.vox b/assets/voxygen/voxel/weapon/sword/steel-1.vox new file mode 100644 index 0000000000000000000000000000000000000000..b7e6beaba3903e21d294588ce8390f45f047ec8b GIT binary patch literal 1592 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 literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/weapon/sword/long_2h_simple-0.vox b/assets/voxygen/voxel/weapon/sword/steel-5.vox similarity index 61% rename from assets/voxygen/voxel/weapon/sword/long_2h_simple-0.vox rename to assets/voxygen/voxel/weapon/sword/steel-5.vox index ea58d5a5651f59ac5f036a4638039a55a38b96bc..40e677d23c644eb65769a0c01839ae0d7a6bf296 100644 GIT binary patch delta 396 zcmW-dyG{a85QgWUvkS{|UG8#GAHc>3U|C~gLL%B3w4me#D74$knivvl9>Ii1u(DF# zz*nGMgyX*!f4*;K&P;K>{U1MgxSyP_L}Yw5x+CQFEvUsV<&2p;K8<=v+afm%w0eZ8 zCXmwv+D(A&9@-&$?Dh9RpWgX}2{;dq&=a!Fx}CsO=&b`xi>z3fGFjuj8d)dnWa9uW z#~hYel*l3%8}ud@n`Du_0$JEWbqIAB%%LWP(Fn$2SR2;r?EsISiPWUbGVTyg>fTP+ zQ>ANmF8|E!U~;^D=~H}4hR59qKnO{rAz(sLWiS+#2%6{H{N|dEa?c|6o%!61^+U6R n!N9IwUzT4^V|n3vz3p~u*Xy-iEEYD7V>_G8>~uP{>F@pl%i~)2 delta 360 zcmW-dJ5Iwu5I|?f>-ZDrLtbS@GXNGKrDaR|Cp8~|C0e2*M~3sBKQ!vWkz z0`oS-+xKR7s{Kws()_+!&$lA7yeU^m7H@g6iHIv$KRlM1`fHI}Fc-BNXsaRaf%(}g z!RA|W5VdmH3o1QW*m0ExA@nNYT|MG`wAWw?$8Z8OINflZ!8u&O_0k zoc(Fot~8uis?k}4s0>0Bk$$fZ86)J27Q8gQ*jF85B@Z$k&J zAmOetY`P>P=#ga5CmzB8(zSXzH%!@Vt%fP%(wNSps8m0#)TV_RrVLYtDf6t;tzpXM zoXIi5)C^Oeu4AxPr7hG`yD?l@hd=62lu(?YU2?`_J#xlnnDTut9k4ziPstgp4apg? zW#k!3BYuRAQJ%r*)bk`Zp>9%1GcAh>VVdG;0+vA&*aCOFug`gooI)w(GJc+b_l8>2DjB_^_)_=zFe0?T0Ra&y9VU~Hh1^ycgb@~5BW!1Tk%FErewVouT?47>Un3g zM1l$(93uBR*ECA8W~Ihivr0VhTB+PK<;|^3-rB0Sb{q%}{uXP0ibL!WEf|VFaR|D0@D2_^*Dl`0 zA?Vt}dpHDL`*y>`k(~ZtOfB1i`FnR+3 diff --git a/assets/voxygen/voxel/weapon/sword/steel-7.vox b/assets/voxygen/voxel/weapon/sword/steel-7.vox new file mode 100644 index 0000000000000000000000000000000000000000..896529dc0a78e000fd1ce018eb25f6b0b5bd415f GIT binary patch literal 2056 zcmb7@e`u9e7{{M;-t+$0otyh{cemaB^rq>iX>&TWIos5mO;ekzq0=P7Ut>wzh@oQ$ zx)e;TxyD>*@|Qsh@(q_(;~KEn?9b4ZB9$d;}3)nD5Le|PPllK|!VQ_6MvmFx8> z*X==mf4| zq2Km5j2&Y0ier!J6Jz>>In93B38sW-_SGI^qJ*9V*69^DfKatn6F?KC=}{ygKCyEg zf!O`Am(rm>luvXzNo!U?^0ZPUNTL#_uvvM9Ey|0wD2Mnt(@GPkfVqNZJGFfBZ;n;9&GFhW~RF`{k zvznEYPUtgfB#Skw$GpouxY?}H=WuK|HXM64pTgcz=2JO`v0?0`Fh7&za6QImCi6MW zQ{80tWbD`+&*|7a)#bUpT#gx=B+kpFkLu3gbIRpAU~Cv`#vav8AA`wb5dV{&p5*RNm4#fuj)K0b~!XUA-xC`jrMq<0D; z9}AXjNW{8*DX2e`jDW#=G5}47m`-vAL-jc`^f&6*<7VStu7lHTjPGLb~@0 z&b=%6YD94DJja!S!MNbF&4Sx|1oa&6uM>3cWWH6fx=8RuR8SEUOkX{Xnk7**#A9fy znTMWTi_!klGW6_Sjjml)z>Pu7e=LF(iwm&+nR(b%w+xNz1RXC62Hp@{dPh)}A4PTX zY-}%Eh?X_WQCA#6!;&1FSUU$}I~Jk-g(@_@vJve~+i?8g9<;q)kIo~F7#lf?iOZ*v zo12R{vkDLnhfz`#L)pT|@$}*%#8;GH)3eLb`DQN8eGtPB*NSob=6v*X&9Py@jV}a0 ze=BHfn1|kuQd~K^8h3xJMa%INocJh=^S82b8wHO%|Bj~wt!o6md@lcXeta_k+`01i z`OC^HP_Zihzt3M$A~SSoqNMw?5lzYwZoR>;(>- z8bQa0V|e?*WxV(01eP`(!^*=0SpWVd)Q(P|va%9CaVruK{03)2aOd;;`@6&M>%Z!} sgs{JVD!yml@`&1l-nzOv*t_^(?youae%kvzIy(B${ocKMx1A$@0uU?bj{pDw literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/weapon/sword/steel-8.vox b/assets/voxygen/voxel/weapon/sword/steel-8.vox new file mode 100644 index 0000000000000000000000000000000000000000..1060cc232a3373b7b829915fc2708e8f3ada0685 GIT binary patch literal 1468 zcmbu8T}<0m7{=ez_TLW*tUz06%a@D^g=GlxA%a*2bt@Z8hLWvgXv}aUNSs6`BaLRO zEjNzm`AQRM3k3a%afeG!5=ag?c03s9S2Vaz5~XF&D$Tg4v@EK&qBH~T zOxm89(%i(gq_hl@PTNU!FlHxdB$az9R2$hvThIDr<|L6s_R&$T)C6K7X8NWTWyo4m zhD_oi?x-@jNCru#@1#12ourXel0s}`7fB{b-zq~Q`&dZ=v8;$@j)~s9Bt~;g8T5-{ z;4HH_s!Y`Qo}#Uz%^Vev>Dj}S#9YIQ($O|1%_@UwQ5lTvr%`pBqj+ATkE_s^m@=xU za9=bP)5W2!V}Bjz>)2Np?{DEOizTX*F{;c7Q6==nM7U=$MUNiXUoVDxuRy>R3WacY zL~w9o4ZH1s;&;0ptE_*Xa4ocSxklrE4zaZEVb_Z6z_JTwk!vSo-RaJdlh<`1mTl{$=3zT z9|$V5-3S!rqoZ;k`WmazUgSh~xd+1s_F%rV1i@$P(eq*pLT684=&jQjcr}Q~yFHkn zxrEId6R=vX$Vf{;Zf-70y?LnI_b8q$^TJw>O`@c93N?cl;R?I3{)OPq34XfM)9`w|C@-tP;ieWycmR$*2No{he}^wS9C+ik zH__JIj=Gu=oEo}>jLvl2`eqLnf-b!6@%-!g$MX&!jN*9P2Kvqb=P%D7{N+5}kKVv1 zE1Re|JBYfAlQ{I*GTN?g!sqkhE{`H+foZh+g}zV8>Cxo8q#4y z%(P<0kPTT=YohC5R*ZzI>oS7xYxsRJXdEfJ% z_wzaL?+zb$c-5>@YTu5b{S@lucBKvt1%q*a;Lj0JqKkNVBp5p84g9sVQerxq+H|zU zb+okW2*kt!O^9wAHIeqvw6%?D>f+)}?c%&ow6sYy#U*&AF72VV?W0;c=pQ5EquNq; ziO^WW=TU^H&`2V*F5YcSg7$&8NqS<32)Iy%DW?$q~;-Qc)ZON6GmhetotYNHa8mBosbC`Ht z3;UxK(d^AJx98o~#nOj1&3xLnF&ArdKJhd9{y4ArSc%njgnS75@{(^Ld|PEx-NqI< zW0L!l|lb{kp2UH3EAXs^*;8!@gnqFt4BYK*V8 zjO`rJK1L{Qm30c_vD(y9W#9C(wU*c#_bE-j)8sxyZu8tf+6?c7yx2TBt~G_wmVS~a zzuAW2otDm)aaGpHHbjy<=hz2hT#@fn<~-y`Ds`i4%#os=qpa}VE8MpV>*eYu!Z=f+ ztyI@G%l%=T6uCD!`eYhH7%6jKSewu$Mc-6IOOd_teIlN_PS#FRPct^nxEjB)9B1`; z2v-b@_2(>+=l4SCisZT25>q4(8Tyn0@lv=0UiZ=_x$}OePUcAxDI(v{uFM?d!4~Sq zu&%G|eH~%g4`(&j_eGdA&uN|sN8Mz2CM@AH^yl6Q;b(V*$?-jjh~KFy-{13Bpa$V7cso&a|jRg;hV!- z@Yo}}@!cbPF@H?q`i~SgcU3XeyBe*{>oKuwD~5ZEIJ&8ZGkfmBVt6lthjw7>8~br$ zyou9Kd<#>L1vq3Vd8WeXMUc?>mO9` z5mx@&{5yLT!Y?RH?oyZ|FaK$NygLuvx$)2Ww{2XBz4x!hVa`AHfWq{s`oHJz>+8dF zTjp`^hV$q@^%N@86})pnVY#UQ?ru*{4<;uk@!(gkLQPMhFj2tL^L(p8g(s@qovtoC zcX9^X`_JLg)6bwBmhk>-cVQ{0;2b&oH2>bu=NdV53lm3x$DhB5>7Om)hgaXm3%|OJ z`^HaU`&0AS`;+T9bmcY%1_tmawxXg0{tmg#-FWlk{_b$U{?|RfLipdOC4NV{$7kGq Y(${~Z{#*Q{?O!qe`}}X;H)GU405(j%6951J literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/weapon/sword/stone-1.vox b/assets/voxygen/voxel/weapon/sword/stone-1.vox new file mode 100644 index 0000000000000000000000000000000000000000..19386b78f8ea53fba2e3ecbf7d3fa5716d585edb GIT binary patch literal 1624 zcmb7@e@LBG9LB%rec!8BuRpHd>(zVxnbY*@*z(6T(@fL5O_y8FlI_k(zo=5ziULPh=3AnKxyFt(ISFM zi*M8RG`3wS*2B#{Yfv;(Q`(hgXTRwciE2|?1Z$DRNuNv{^fAOnJS2g&XyT%GQ{$+K zB&l8LsU#t&!k9si4=O!|8cX7co$VxQ6iFe;Y`ck#KAP&HItka-6WNYv7d?{d2nfBl z=RE<9Ug^xQTj`lw4-aa(;uz-F!`hTCRMTrj=X`@TOHdi9Bq5-Tw031Mn-N1|NgT1W zo{ddAn~Fg-c|h|H!|KU zShy+pc24l%9@|xdX`kTB(}JClz|VGXvtTs9dXJ#SD`Ft3swW0)5t&ILPcRZPP~+hU~?%t>jeYn1yk<`R^JztqfB^SK%ITV|_-jeNF)0U9Z=Ro}M1Oa(odo(1(QX1T5cr{2yNS z@b09g;l|)ND$B{s7e)~)!5`4K1iN27&bQ0^^Qf6p=B=hNOd=g40Uj%Wb@ literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/weapon/sword/stone-2.vox b/assets/voxygen/voxel/weapon/sword/stone-2.vox new file mode 100644 index 0000000000000000000000000000000000000000..9a1e968b17323eb91bbc10000c04ff396914d7c0 GIT binary patch literal 1976 zcma)*ZERFU6o${t{n+hpS^Bx{ZcAG$2wM;=g<@?jtx&KaV68T=thNWrGmM69h=Gy)>2P1FQ5gdl_vtc@R0(img>>o5PlzJoC#h#xn3@}4vIotblH z?rqz!v20L8)-^V-r^q`Vk=EvDQ>IDySj0<8$;M65<{f5$&yPfFPf9CKT02z7O=;WD zm}thXCoLQon^=Tip;zcrmXlVtlNS1vaExB%A!#3CFMi{nlprkQIKD_@tg195F}zW9<_ds&N# zy+VZh>e_E)@vZC6=tWBHxT>9NWLb!+U zOq7S~aDQcc;>wee)Rw`U6sj`y+g4Ore5Z-U-gI$7*@ZEsJaM5i78tJ?7jE#+9 zYHA9XFJH#lvu80eF@X~&PGEF&6hlKpINAL1Z5iB`Mn^{nvKoS@jV(pfGxdlJ*Fc&a zNXiEp$$?x5B5R$XV7p*`(_Ab#E%2rUGx`L%{es{Jf+g$xSRM}`x;qyyPt3x~UO~%% zV9P1N&TE|85=Kd~9J6~XP(9v&qRu>&9}J^ntQ3_O=b|7cn7v!DU{FwZP9TqR{~j-7 zAOJa&hy8Q2ar~ZqOx<4uthocVB4{SxkYC6^T5#$$!RZ}!_~M0HTzaV#f@ zz?BiqzcYxo)psMlp$bp7EyHtLR^j>fwK%l59p?@Ss!PIXu9%Hj^+I&6tU+5v5XmJ) zIJkNa#^Z|+eYg>+C)T64V>1rydJ69i^`d`Y3ggFL#N_#7@caEJ%*{qwSs5xL<)~hG z7w%geK~r5NHms^a|K4JpdaE4YU8=zKtMl;&_Z%M+T=`7!^Vfo&_4?e z(D%4tc!&J2{;R60aCq4;7FCX*cK;rP`a-xkDwx_V0KeTxB!celZannh8Ax9b@;mb} zag=w}B-j<^w^LGr!}|tMUwZ^w54?!Ncmb|{I0qBa5RUN7ZashFGiz;Xy@JkmVCT`} z=zDt{ubw%N*FT@c(vJP8-!qK0Z=OTz=}9y+G~g$eB3^>uVNLSe_~g&}rulvS*L(hi iFwd=uZ#izb&AXeu<{vfx;>}}!%`yMyzy05wBYyy<1DEsw literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/weapon/sword/wood-0.vox b/assets/voxygen/voxel/weapon/sword/wood-0.vox new file mode 100644 index 0000000000000000000000000000000000000000..1ca57beff7cad862d07c553215ddb116275314b6 GIT binary patch literal 1676 zcmbtTTTEP46y4|EJHumu4zGckfq_n`FwjtW6hsg~m{RCGM3l5sB*v6jf=vl&2qmQ2 zB8`ZxfP`XVMKFXIDI!4?Ujr3VXS{ft%I8*S`i6~+paqM`c@rXvkZ;VjN5m34iDyVcVpj2v5 z8Byf1LCuJwKasEol}e$Hel3|iGoYDVPYMXF=rKWMaRo$+qK+na2E@#@xLM1}SSxE} zGS0MdgolV{eirLRai3_$Fi+QmnpsOvAY8;A#<>GZ%b+!=owSyqFkTty)XB7FUPe$f z`gF6$bjF)L8)0X!9$K?z8o{$^W)J4NdG73>#ypLED_cO$VIxl=Pi0&zbqY0mGtA!DmysD(x;LyWtS8L1avv*uvAT(jkWz%Ojxb+w zKViNwPnajHp*RP{e<(b=a2^(F3$>NnN-Z(8CM;fM7@UuVbLIWebaE4loIXPWPc=MI zE5;vJO6KO~u(Pv+&CN}$t*v2obrlN>3z(gq#njXkt~Y-CKuiwxp}V^q_8JE&+YZ71 zVl{lz6%fA#(iIDtNrG%RU=Iq?P74bBxj3*Si0%@^4+@e;1&$8{r9m5-PTLW=kc`(> zGf_VvXr2%}zbH6&hq=uzcsjkv8OTT3N)6mSDezu)A%89lMK^Pi)+WfgAUH57s9G1u z)7-y58ZwapSx&)lZX)I%PQ}h+ZlGx|Dn-ypd_(+9O!NsB-xMsJt-=>CSK`*I)%fc5 z3Vc6NiQQ|55vdXMwF*X03jBG3P@&*VgB>r0lkm%@y=X3Vq0{e0e{&utJBl&zOgSb` z)nUA&7TB6W!9EA7inDO^@jP_2mZPglF!-!s`mA964MCa5g~t3Gw3QX2r@jKM`3`iJ zx^cN-KUUfgBJyM{x}FPRp!);lmXeeI)~n?|Sjwt$f_QU4XZ_=gOR5>odVmUkmy>^Ds47f{p8S`1OYt z^o-bX`TZ1pbjOLi$okv)XL<#7K0*5y;R|PYE!Fd<&j>m(sp$Sx1j^pIW zC8W2f;r567u^Mq=oHM(B{$`w6>v+o+dQJi7uFhldy%k(pzJa$s-^QWtVN_q7#?g1y z(XzCSnwlE?$W|npz;DpE1-qa8+21bj*MF_^6~g@PxA>NR6AxIsH`aWk=3Bhi_g9Yj LKL71~Ge>?0Zlq)i literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/weapon/sword/wood-1.vox b/assets/voxygen/voxel/weapon/sword/wood-1.vox new file mode 100644 index 0000000000000000000000000000000000000000..41be92fd6185b5ee6d88e2bb486882f5c7d4ae2b GIT binary patch literal 2080 zcmbu8e@sF7pf5fx=j9DiIH{wC!Fr~ztPQW?ZarxGWFN}SAQWn{*c6Ql;? zN=KM0*r*KRWU+=gT-P8@HskDO&hlz=63WP7E}yylgi?{1aw93F^67(^e%ATh zlqNRECcRih6Fa~-jWN;mW~arKna-GKdbHCSXD}w3UhNFVnOu)(dbX)1JzJh{Vh0&# zF(#V6?W|^H(z8W0ecQyOSBq$3=deD+nCKAeLkVT(vYzPNgtCblPAH3LViPluG10^( zCVRGsCU!p8<38EMTrZcO7~&=+mJm!=sS@yfCJWqL^}uxPA%G2~m0c4<7!QQp62ViJQiE#7(CX zH-k#tOui>>kV@Pv=82n4C2kItxFITWb6H2+Fg2VK(`{ASPKxcLcRixC#W8cP+iEZ; z+DRHjEN8?Z%F^u9Cd^x`vmN$MENjHzTH@uj$$6Ylly%nLDvs8(T}c%G;RRXAU`jzKlN^;{qO@uif(J{(_MEYG`-o_+LBHGLyO zls4$qpepvF*t0Me)+zescc?-&EMY8+302u1s`bgl9WyhkZm?=T!)#b?R7A!p=ST!!FyCjgO`29f_GL`|k5W$%{3T3 zRETr$l;OK;6}WwKCEnsUXJ-UAJ`?=>wP3Jk1tx~8aOG?azx~jG{-Z%0dq0GaZbfh# zC4cKbRxa57uwbA`Fu{HKr~dKfB(QkpfA?QiRfXdlCb6b+3bjWLA~GDo)oH=PHUW5c z%gf6#Fff28HeP@X4dW1+S+jg{kwpDCr@Me-C4YT;WFO*d>-rjj-dYFBsRZ&2_5I>(a_L5t7bsl;M~m6yA{U3V2)MyylcBhElPqSvV6(V1hHOoP z*{X|3n23bU#0}99V&-rom1z8cWFgCvWm#}BCQ6pY7{B_#7{C4fANI{;_|cR6^1ko$ zyth6*XYk-*|BQ(Ab@UuyBfqF313i)MB7MLokBZ4phmS;hzEs%Z^9CtJ#+ag7;)-gG z8&oZ!sKxA;kS#8naO_~;$vLI8Ev9H{RME7kVkDD3UrQJ?EoLxk2_Z!@#zbRlrb3PL z3&}(UF{OZG;du&k20iDa3MwaWOvz&`U*AJN$3qq>BNtVYo6J;1R^q)h2ieI+#Z*GP ztFe%GEFdG9$VFx3As~flZ{HKn9O7)OH@${W3pKRD`gz%R#}y-MX;gSG1J~!VRf+TUIhw+jaV?MQ8CRKC_1bg3s>k!AhxR_- zA^Dqso3ysJB9qDB;gn$C$1;tr`jbrCkK~tX@y(cY*oVDTo-lq4j|oMi`g8?+}d;-rj1kv4IkAp9?Ve*}FEPfimPq#zZ zxLb!$cxG;1aOXS0uRjRV!?n1SZN%EOPW Result<(), Box> { { match item.kind() { comp::item::ItemKind::Tool(tool) => { - let power = tool.base_power().to_string(); - let poise_strength = tool.base_poise_strength().to_string(); - let speed = tool.base_speed().to_string(); - let equip_time = tool.equip_time().subsec_millis().to_string(); + let power = tool.base_power(&[]).to_string(); + let poise_strength = tool.base_poise_strength(&[]).to_string(); + let speed = tool.base_speed(&[]).to_string(); + let equip_time = tool.equip_time(&[]).subsec_millis().to_string(); let kind = get_tool_kind(&tool.kind); let hands = get_tool_hands(&tool); diff --git a/common/src/comp/inventory/loadout_builder.rs b/common/src/comp/inventory/loadout_builder.rs index f35adcb522..979be8bab6 100644 --- a/common/src/comp/inventory/loadout_builder.rs +++ b/common/src/comp/inventory/loadout_builder.rs @@ -24,7 +24,7 @@ use rand::Rng; /// // Build a loadout with character starter defaults and a specific sword with default sword abilities /// let loadout = LoadoutBuilder::new() /// .defaults() -/// .active_item(Some(Item::new_from_asset_expect("common.items.weapons.sword.zweihander_sword_0"))) +/// .active_item(Some(Item::new_from_asset_expect("common.items.weapons.sword.steel-8"))) /// .build(); /// ``` #[derive(Clone)] diff --git a/common/src/comp/inventory/test.rs b/common/src/comp/inventory/test.rs index 8f6f749046..d35aefadea 100644 --- a/common/src/comp/inventory/test.rs +++ b/common/src/comp/inventory/test.rs @@ -173,7 +173,7 @@ fn can_swap_equipped_bag_into_only_empty_slot_provided_by_itself_should_return_f fn unequip_items_both_hands() { let mut inv = Inventory::new_empty(); - let sword = Item::new_from_asset_expect("common.items.weapons.sword.zweihander_sword_0"); + let sword = Item::new_from_asset_expect("common.items.weapons.sword.steel-8"); inv.replace_loadout_item(EquipSlot::Mainhand, Some(sword.clone())); inv.replace_loadout_item(EquipSlot::Offhand, Some(sword.clone())); diff --git a/server/src/migrations/2021-02-24-230149_weapon-replacements/down.sql b/server/src/migrations/2021-02-24-230149_weapon-replacements/down.sql new file mode 100644 index 0000000000..291a97c5ce --- /dev/null +++ b/server/src/migrations/2021-02-24-230149_weapon-replacements/down.sql @@ -0,0 +1 @@ +-- This file should undo anything in `up.sql` \ No newline at end of file diff --git a/server/src/migrations/2021-02-24-230149_weapon-replacements/up.sql b/server/src/migrations/2021-02-24-230149_weapon-replacements/up.sql new file mode 100644 index 0000000000..136f75cda0 --- /dev/null +++ b/server/src/migrations/2021-02-24-230149_weapon-replacements/up.sql @@ -0,0 +1,86 @@ +UPDATE item +SET item_definition_id = 'common.items.weapons.sword.stone-0' WHERE item_definition_id = 'common.items.weapons.sword.greatsword_2h_dam-0'; +UPDATE item +SET item_definition_id = 'common.items.weapons.sword.stone-0' WHERE item_definition_id = 'common.items.weapons.sword.greatsword_2h_dam-1'; +UPDATE item +SET item_definition_id = 'common.items.weapons.sword.stone-0' WHERE item_definition_id = 'common.items.weapons.sword.greatsword_2h_dam-2'; +UPDATE item +SET item_definition_id = 'common.items.weapons.sword.iron-7' WHERE item_definition_id = 'common.items.weapons.sword.greatsword_2h_fine-0'; +UPDATE item +SET item_definition_id = 'common.items.weapons.sword.iron-7' WHERE item_definition_id = 'common.items.weapons.sword.greatsword_2h_fine-1'; +UPDATE item +SET item_definition_id = 'common.items.weapons.sword.iron-7' WHERE item_definition_id = 'common.items.weapons.sword.greatsword_2h_fine-2'; +UPDATE item +SET item_definition_id = 'common.items.weapons.sword.iron-1' WHERE item_definition_id = 'common.items.weapons.sword.greatsword_2h_orn-0'; +UPDATE item +SET item_definition_id = 'common.items.weapons.sword.iron-1' WHERE item_definition_id = 'common.items.weapons.sword.greatsword_2h_orn-1'; +UPDATE item +SET item_definition_id = 'common.items.weapons.sword.iron-1' WHERE item_definition_id = 'common.items.weapons.sword.greatsword_2h_orn-2'; +UPDATE item +SET item_definition_id = 'common.items.weapons.sword.iron-4' WHERE item_definition_id = 'common.items.weapons.sword.greatsword_2h_simple-0'; +UPDATE item +SET item_definition_id = 'common.items.weapons.sword.iron-4' WHERE item_definition_id = 'common.items.weapons.sword.greatsword_2h_simple-1'; +UPDATE item +SET item_definition_id = 'common.items.weapons.sword.iron-4' WHERE item_definition_id = 'common.items.weapons.sword.greatsword_2h_simple-2'; +UPDATE item +SET item_definition_id = 'common.items.weapons.sword.stone-1' WHERE item_definition_id = 'common.items.weapons.sword.long_2h_dam-0'; +UPDATE item +SET item_definition_id = 'common.items.weapons.sword.stone-1' WHERE item_definition_id = 'common.items.weapons.sword.long_2h_dam-1'; +UPDATE item +SET item_definition_id = 'common.items.weapons.sword.stone-1' WHERE item_definition_id = 'common.items.weapons.sword.long_2h_dam-2'; +UPDATE item +SET item_definition_id = 'common.items.weapons.sword.stone-1' WHERE item_definition_id = 'common.items.weapons.sword.long_2h_dam-3'; +UPDATE item +SET item_definition_id = 'common.items.weapons.sword.stone-1' WHERE item_definition_id = 'common.items.weapons.sword.long_2h_dam-4'; +UPDATE item +SET item_definition_id = 'common.items.weapons.sword.stone-1' WHERE item_definition_id = 'common.items.weapons.sword.long_2h_dam-5'; +UPDATE item +SET item_definition_id = 'common.items.weapons.sword.iron-8' WHERE item_definition_id = 'common.items.weapons.sword.long_2h_fine-0'; +UPDATE item +SET item_definition_id = 'common.items.weapons.sword.iron-8' WHERE item_definition_id = 'common.items.weapons.sword.long_2h_fine-1'; +UPDATE item +SET item_definition_id = 'common.items.weapons.sword.iron-8' WHERE item_definition_id = 'common.items.weapons.sword.long_2h_fine-2'; +UPDATE item +SET item_definition_id = 'common.items.weapons.sword.iron-8' WHERE item_definition_id = 'common.items.weapons.sword.long_2h_fine-3'; +UPDATE item +SET item_definition_id = 'common.items.weapons.sword.iron-8' WHERE item_definition_id = 'common.items.weapons.sword.long_2h_fine-4'; +UPDATE item +SET item_definition_id = 'common.items.weapons.sword.iron-8' WHERE item_definition_id = 'common.items.weapons.sword.long_2h_fine-5'; +UPDATE item +SET item_definition_id = 'common.items.weapons.sword.steel-2' WHERE item_definition_id = 'common.items.weapons.sword.long_2h_orn-0'; +UPDATE item +SET item_definition_id = 'common.items.weapons.sword.steel-2' WHERE item_definition_id = 'common.items.weapons.sword.long_2h_orn-1'; +UPDATE item +SET item_definition_id = 'common.items.weapons.sword.steel-2' WHERE item_definition_id = 'common.items.weapons.sword.long_2h_orn-2'; +UPDATE item +SET item_definition_id = 'common.items.weapons.sword.steel-2' WHERE item_definition_id = 'common.items.weapons.sword.long_2h_orn-3'; +UPDATE item +SET item_definition_id = 'common.items.weapons.sword.steel-2' WHERE item_definition_id = 'common.items.weapons.sword.long_2h_orn-4'; +UPDATE item +SET item_definition_id = 'common.items.weapons.sword.steel-2' WHERE item_definition_id = 'common.items.weapons.sword.long_2h_orn-5'; +UPDATE item +SET item_definition_id = 'common.items.weapons.sword.iron-5' WHERE item_definition_id = 'common.items.weapons.sword.long_2h_simple-0'; +UPDATE item +SET item_definition_id = 'common.items.weapons.sword.iron-5' WHERE item_definition_id = 'common.items.weapons.sword.long_2h_simple-1'; +UPDATE item +SET item_definition_id = 'common.items.weapons.sword.iron-5' WHERE item_definition_id = 'common.items.weapons.sword.long_2h_simple-2'; +UPDATE item +SET item_definition_id = 'common.items.weapons.sword.iron-5' WHERE item_definition_id = 'common.items.weapons.sword.long_2h_simple-3'; +UPDATE item +SET item_definition_id = 'common.items.weapons.sword.iron-5' WHERE item_definition_id = 'common.items.weapons.sword.long_2h_simple-4'; +UPDATE item +SET item_definition_id = 'common.items.weapons.sword.iron-5' WHERE item_definition_id = 'common.items.weapons.sword.long_2h_simple-5'; +UPDATE item +SET item_definition_id = 'common.items.weapons.sword.steel-8' WHERE item_definition_id = 'common.items.weapons.sword.zweihander_sword_0'; +UPDATE item +SET item_definition_id = 'common.items.weapons.sword.wood-2' WHERE item_definition_id = 'common.items.weapons.sword.wood_sword'; +UPDATE item +SET item_definition_id = 'common.items.weapons.sword.starter' WHERE item_definition_id = 'common.items.weapons.sword.starter_sword'; +UPDATE item +SET item_definition_id = 'common.items.weapons.sword.wood-0' WHERE item_definition_id = 'common.items.weapons.sword.short_sword_0'; +UPDATE item +SET item_definition_id = 'common.items.weapons.sword.cultist' WHERE item_definition_id = 'common.items.weapons.sword.cultist_purp_2h-0'; +UPDATE item +SET item_definition_id = 'common.items.weapons.sword.frost-0' WHERE item_definition_id = 'common.items.weapons.sword.frost_cleaver_2h-0'; +UPDATE item +SET item_definition_id = 'common.items.weapons.sword.frost-1' WHERE item_definition_id = 'common.items.weapons.sword.frost_cleaver_2h-1'; diff --git a/server/src/rtsim/entity.rs b/server/src/rtsim/entity.rs index 3d4e506fc7..cc263948bf 100644 --- a/server/src/rtsim/entity.rs +++ b/server/src/rtsim/entity.rs @@ -66,9 +66,9 @@ impl Entity { let mut rng = self.rng(PERM_LOADOUT); let main_tool = comp::Item::new_from_asset_expect( (&[ - "common.items.weapons.sword.wood_sword", - "common.items.weapons.sword.starter_sword", - "common.items.weapons.sword.short_sword_0", + "common.items.weapons.sword.wood-2", + "common.items.weapons.sword.starter", + "common.items.weapons.sword.wood-0", "common.items.weapons.bow.starter_bow", "common.items.weapons.bow.leafy_longbow-0", ]) diff --git a/voxygen/src/audio/sfx/event_mapper/combat/tests.rs b/voxygen/src/audio/sfx/event_mapper/combat/tests.rs index af3f53eadc..096a0e942a 100644 --- a/voxygen/src/audio/sfx/event_mapper/combat/tests.rs +++ b/voxygen/src/audio/sfx/event_mapper/combat/tests.rs @@ -102,7 +102,7 @@ fn maps_basic_melee() { fn matches_ability_stage() { let loadout = LoadoutBuilder::new() .active_item(Some(Item::new_from_asset_expect( - "common.items.weapons.sword.starter_sword", + "common.items.weapons.sword.starter", ))) .build(); let inventory = Inventory::new_with_loadout(loadout); diff --git a/voxygen/src/menu/char_selection/ui/mod.rs b/voxygen/src/menu/char_selection/ui/mod.rs index 8fbf62aa1e..e9dcf49b29 100644 --- a/voxygen/src/menu/char_selection/ui/mod.rs +++ b/voxygen/src/menu/char_selection/ui/mod.rs @@ -52,7 +52,7 @@ const STARTER_HAMMER: &str = "common.items.weapons.hammer.starter_hammer"; const STARTER_BOW: &str = "common.items.weapons.bow.starter_bow"; const STARTER_AXE: &str = "common.items.weapons.axe.starter_axe"; const STARTER_STAFF: &str = "common.items.weapons.staff.starter_staff"; -const STARTER_SWORD: &str = "common.items.weapons.sword.starter_sword"; +const STARTER_SWORD: &str = "common.items.weapons.sword.starter"; const STARTER_SCEPTRE: &str = "common.items.weapons.sceptre.starter_sceptre"; // TODO: what does this comment mean? // // Use in future MR to make this a starter weapon diff --git a/world/src/site/dungeon/mod.rs b/world/src/site/dungeon/mod.rs index 5ba43459ee..0bee816343 100644 --- a/world/src/site/dungeon/mod.rs +++ b/world/src/site/dungeon/mod.rs @@ -615,8 +615,7 @@ impl Floor { .with_main_tool(comp::Item::new_from_asset_expect( match dynamic_rng.gen_range(0..6) { 0 => "common.items.weapons.axe.starter_axe", - 1 => "common.items.weapons.sword.starter_sword", - 2 => "common.items.weapons.sword.starter_sword", + 1..=2 => "common.items.weapons.sword.starter", 3 => "common.items.weapons.hammer.starter_hammer", 4 => "common.items.weapons.staff.starter_staff", _ => "common.items.weapons.bow.starter_bow", @@ -632,8 +631,7 @@ impl Floor { .with_main_tool(comp::Item::new_from_asset_expect( match dynamic_rng.gen_range(0..6) { 0 => "common.items.weapons.axe.worn_iron_axe-0", - 1 => "common.items.weapons.sword.zweihander_sword_0", - 2 => "common.items.weapons.sword.zweihander_sword_0", + 1..=2 => "common.items.weapons.sword.steel-8", 3 => "common.items.weapons.hammer.worn_iron_hammer-0", 4 => "common.items.weapons.staff.bone_staff", _ => "common.items.weapons.bow.wood_shortbow-1", @@ -649,8 +647,8 @@ impl Floor { .with_main_tool(comp::Item::new_from_asset_expect( match dynamic_rng.gen_range(0..6) { 0 => "common.items.weapons.axe.bronze_axe-0", - 1 => "common.items.weapons.sword.greatsword_2h_simple-0", - 2 => "common.items.weapons.sword.cultist_purp_2h-0", + 1 => "common.items.weapons.sword.iron-4", + 2 => "common.items.weapons.sword.cultist", 3 => "common.items.weapons.hammer.bronze_hammer-0", 4 => "common.items.weapons.staff.bone_staff", _ => "common.items.weapons.bow.wood_longbow-0", @@ -666,8 +664,7 @@ impl Floor { .with_main_tool(comp::Item::new_from_asset_expect( match dynamic_rng.gen_range(0..6) { 0 => "common.items.weapons.axe.steel_axe-0", - 1 => "common.items.weapons.sword.long_2h_orn-0", - 2 => "common.items.weapons.sword.long_2h_orn-0", + 1..=2 => "common.items.weapons.sword.steel-2", 3 => "common.items.weapons.hammer.cobalt_hammer-0", 4 => "common.items.weapons.staff.amethyst_staff", _ => "common.items.weapons.bow.horn_longbow-0", @@ -683,8 +680,7 @@ impl Floor { .with_main_tool(comp::Item::new_from_asset_expect( match dynamic_rng.gen_range(0..6) { 0 => "common.items.weapons.axe.malachite_axe-0", - 1 => "common.items.weapons.sword.cultist_purp_2h-0", - 2 => "common.items.weapons.sword.cultist_purp_2h-0", + 1..=2 => "common.items.weapons.sword.cultist", 3 => "common.items.weapons.hammer.cultist_purp_2h-0", 4 => "common.items.weapons.staff.cultist_staff", _ => "common.items.weapons.bow.horn_longbow-0", @@ -717,8 +713,7 @@ impl Floor { .with_main_tool(comp::Item::new_from_asset_expect( match dynamic_rng.gen_range(0..5) { 0 => "common.items.weapons.axe.malachite_axe-0", - 1 => "common.items.weapons.sword.cultist_purp_2h-0", - 2 => "common.items.weapons.sword.cultist_purp_2h-0", + 1..=2 => "common.items.weapons.sword.cultist", 3 => "common.items.weapons.hammer.cultist_purp_2h-0", _ => "common.items.weapons.bow.horn_longbow-0", }, @@ -789,12 +784,7 @@ impl Floor { .with_main_tool(comp::Item::new_from_asset_expect( match dynamic_rng.gen_range(0..6) { 0 => "common.items.weapons.axe.worn_iron_axe-0", - 1 => { - "common.items.weapons.sword.zweihander_sword_0" - }, - 2 => { - "common.items.weapons.sword.zweihander_sword_0" - }, + 1..=2 => "common.items.weapons.sword.steel-8", 3 => { "common.items.weapons.hammer.worn_iron_hammer-0" }, @@ -838,8 +828,7 @@ impl Floor { .with_main_tool(comp::Item::new_from_asset_expect( match dynamic_rng.gen_range(0..6) { 0 => "common.items.weapons.axe.steel_axe-0", - 1 => "common.items.weapons.sword.long_2h_orn-0", - 2 => "common.items.weapons.sword.long_2h_orn-0", + 1..=2 => "common.items.weapons.sword.steel-2", 3 => "common.items.weapons.hammer.cobalt_hammer-0", 4 => "common.items.weapons.staff.amethyst_staff", _ => "common.items.weapons.bow.horn_longbow-0", @@ -862,8 +851,7 @@ impl Floor { .with_main_tool(comp::Item::new_from_asset_expect( match dynamic_rng.gen_range(0..6) { 0 => "common.items.weapons.axe.malachite_axe-0", - 1 => "common.items.weapons.sword.cultist_purp_2h-0", - 2 => "common.items.weapons.sword.cultist_purp_2h-0", + 1..=2 => "common.items.weapons.sword.cultist", 3 => "common.items.weapons.hammer.cultist_purp_2h-0", 4 => "common.items.weapons.staff.cultist_staff", @@ -1017,8 +1005,7 @@ impl Floor { .with_main_tool(comp::Item::new_from_asset_expect( match dynamic_rng.gen_range(0..6) { 0 => "common.items.weapons.axe.malachite_axe-0", - 1 => "common.items.weapons.sword.cultist_purp_2h-0", - 2 => "common.items.weapons.sword.cultist_purp_2h-0", + 1..=2 => "common.items.weapons.sword.cultist", 3 => { "common.items.weapons.hammer.cultist_purp_2h-0" }, diff --git a/world/src/site/settlement/mod.rs b/world/src/site/settlement/mod.rs index 35fdeea176..ee2c443324 100644 --- a/world/src/site/settlement/mod.rs +++ b/world/src/site/settlement/mod.rs @@ -930,7 +930,7 @@ impl Settlement { match dynamic_rng.gen_range(0..5) { 0 => entity .with_main_tool(Item::new_from_asset_expect( - "common.items.weapons.sword.greatsword_2h_simple-0", + "common.items.weapons.sword.iron-4", )) .with_name("Guard") .with_level(dynamic_rng.gen_range(10..15)) From 8af4966ae1e5c682fca7254e6866fd1f9c49960b Mon Sep 17 00:00:00 2001 From: Sam Date: Wed, 24 Feb 2021 19:11:41 -0500 Subject: [PATCH 2/5] Axes --- .../items/weapons/axe/bloodsteel_axe-2.ron | 6 +++--- .../common/items/weapons/axe/bronze_axe-2.ron | 16 ++++++++++++++++ .../common/items/weapons/axe/cobalt_axe-1.ron | 16 ++++++++++++++++ assets/common/items/weapons/axe/parashu.ron | 16 ++++++++++++++++ .../loot_tables/loot_table_cave_large.ron | 1 + .../loot_tables/loot_table_cultists.ron | 3 ++- .../loot_tables/loot_table_weapon_rare.ron | 2 ++ .../loot_table_weapon_uncommon.ron | 1 + assets/voxygen/item_image_manifest.ron | 12 ++++++++++++ .../voxel/humanoid_main_weapon_manifest.ron | 12 ++++++++++++ .../voxel/weapon/axe/2haxe_bloodsteel-2.vox | Bin 1492 -> 1976 bytes .../voxel/weapon/axe/2haxe_bronze-2.vox | Bin 0 -> 1492 bytes .../voxel/weapon/axe/2haxe_cobalt-1.vox | Bin 0 -> 1808 bytes .../voxel/weapon/axe/2haxe_malachite-0.vox | Bin 56276 -> 2032 bytes assets/voxygen/voxel/weapon/axe/parashu.vox | Bin 0 -> 1912 bytes 15 files changed, 81 insertions(+), 4 deletions(-) create mode 100644 assets/common/items/weapons/axe/bronze_axe-2.ron create mode 100644 assets/common/items/weapons/axe/cobalt_axe-1.ron create mode 100644 assets/common/items/weapons/axe/parashu.ron create mode 100644 assets/voxygen/voxel/weapon/axe/2haxe_bronze-2.vox create mode 100644 assets/voxygen/voxel/weapon/axe/2haxe_cobalt-1.vox create mode 100644 assets/voxygen/voxel/weapon/axe/parashu.vox diff --git a/assets/common/items/weapons/axe/bloodsteel_axe-2.ron b/assets/common/items/weapons/axe/bloodsteel_axe-2.ron index 563e000679..ca005ed334 100644 --- a/assets/common/items/weapons/axe/bloodsteel_axe-2.ron +++ b/assets/common/items/weapons/axe/bloodsteel_axe-2.ron @@ -1,13 +1,13 @@ ItemDef( - name: "Tribal Axe", - description: "Some tribes call for metal alloys to be formed in the blood of an animal carcass to ensure the resultant axe is honed for striking their enemy\'s veins.", + name: "Skull Axe", + description: "Infused with blood.", kind: Tool(( kind: Axe, hands: Two, stats: Direct(( equip_time_millis: 400, power: 1.6, - poise_strength: 1.4, + poise_strength: 1.8, speed: 1.0, )), )), diff --git a/assets/common/items/weapons/axe/bronze_axe-2.ron b/assets/common/items/weapons/axe/bronze_axe-2.ron new file mode 100644 index 0000000000..bb2c6ef8c1 --- /dev/null +++ b/assets/common/items/weapons/axe/bronze_axe-2.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Tribal Axe", + description: "Stained with the blood of its wielder's enemies.", + kind: Tool(( + kind: Axe, + hands: Two, + stats: Direct(( + equip_time_millis: 400, + power: 1.0, + poise_strength: 1.4, + speed: 1.0, + )), + )), + quality: High, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/axe/cobalt_axe-1.ron b/assets/common/items/weapons/axe/cobalt_axe-1.ron new file mode 100644 index 0000000000..8607fcf969 --- /dev/null +++ b/assets/common/items/weapons/axe/cobalt_axe-1.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Cobalt Cleaver", + description: "Forged with cobalt.", + kind: Tool(( + kind: Axe, + hands: Two, + stats: Direct(( + equip_time_millis: 400, + power: 1.8, + poise_strength: 1.0, + speed: 1.0, + )), + )), + quality: High, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/axe/parashu.ron b/assets/common/items/weapons/axe/parashu.ron new file mode 100644 index 0000000000..932c189188 --- /dev/null +++ b/assets/common/items/weapons/axe/parashu.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Parashu", + description: "Said to be able to cleave the heavens.", + kind: Tool(( + kind: Axe, + hands: Two, + stats: Direct(( + equip_time_millis: 400, + power: 2.5, + poise_strength: 1.8, + speed: 0.8, + )), + )), + quality: Legendary, + tags: [], +) \ No newline at end of file diff --git a/assets/common/loot_tables/loot_table_cave_large.ron b/assets/common/loot_tables/loot_table_cave_large.ron index fa0b8a83c0..ea8f9d5fe5 100644 --- a/assets/common/loot_tables/loot_table_cave_large.ron +++ b/assets/common/loot_tables/loot_table_cave_large.ron @@ -31,6 +31,7 @@ (0.02, "common.items.weapons.axe.bloodsteel_axe-1"), (0.02, "common.items.weapons.axe.bloodsteel_axe-2"), (0.01, "common.items.weapons.axe.cobalt_axe-0"), + (0.01, "common.items.weapons.axe.cobalt_axe-1"), (0.001, "common.items.weapons.axe.malachite_axe-0"), (0.04, "common.items.weapons.axe.iron_axe-7"), (0.04, "common.items.weapons.axe.iron_axe-8"), diff --git a/assets/common/loot_tables/loot_table_cultists.ron b/assets/common/loot_tables/loot_table_cultists.ron index 522067b488..c8c40292ca 100644 --- a/assets/common/loot_tables/loot_table_cultists.ron +++ b/assets/common/loot_tables/loot_table_cultists.ron @@ -127,6 +127,7 @@ // axes (0.15, "common.items.weapons.axe.bronze_axe-0"), (0.15, "common.items.weapons.axe.bronze_axe-1"), + (0.15, "common.items.weapons.axe.bronze_axe-2"), (0.04, "common.items.weapons.axe.iron_axe-0"), (0.04, "common.items.weapons.axe.iron_axe-1"), (0.04, "common.items.weapons.axe.iron_axe-2"), @@ -185,7 +186,7 @@ (0.20, "common.items.weapons.axe.bloodsteel_axe-0"), (0.20, "common.items.weapons.axe.bloodsteel_axe-1"), (0.20, "common.items.weapons.axe.bloodsteel_axe-2"), - (0.10, "common.items.weapons.axe.malachite_axe-0"), + (0.001, "common.items.weapons.axe.parashu"), // healing staff (0.25, "common.items.weapons.sceptre.staff_nature"), // staves diff --git a/assets/common/loot_tables/loot_table_weapon_rare.ron b/assets/common/loot_tables/loot_table_weapon_rare.ron index df0c9c4b9e..d75e12fa71 100644 --- a/assets/common/loot_tables/loot_table_weapon_rare.ron +++ b/assets/common/loot_tables/loot_table_weapon_rare.ron @@ -13,7 +13,9 @@ (0.20, "common.items.weapons.axe.bloodsteel_axe-1"), (0.20, "common.items.weapons.axe.bloodsteel_axe-2"), (0.30, "common.items.weapons.axe.cobalt_axe-0"), + (0.30, "common.items.weapons.axe.cobalt_axe-1"), (0.10, "common.items.weapons.axe.malachite_axe-0"), + (0.01, "common.items.weapons.axe.parashu"), // healing staff (0.15, "common.items.weapons.sceptre.loops0"), (0.10, "common.items.weapons.sceptre.fork0"), diff --git a/assets/common/loot_tables/loot_table_weapon_uncommon.ron b/assets/common/loot_tables/loot_table_weapon_uncommon.ron index bf60c01102..cf8ede00b8 100644 --- a/assets/common/loot_tables/loot_table_weapon_uncommon.ron +++ b/assets/common/loot_tables/loot_table_weapon_uncommon.ron @@ -26,6 +26,7 @@ // axes (0.15, "common.items.weapons.axe.bronze_axe-0"), (0.15, "common.items.weapons.axe.bronze_axe-1"), + (0.15, "common.items.weapons.axe.bronze_axe-2"), (0.04, "common.items.weapons.axe.iron_axe-0"), (0.04, "common.items.weapons.axe.iron_axe-1"), (0.04, "common.items.weapons.axe.iron_axe-2"), diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron index 59983a57a8..c3180f8354 100644 --- a/assets/voxygen/item_image_manifest.ron +++ b/assets/voxygen/item_image_manifest.ron @@ -397,6 +397,10 @@ "voxel.weapon.axe.2haxe_bronze-1", (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, ), + Tool("common.items.weapons.axe.bronze_axe-2"): VoxTrans( + "voxel.weapon.axe.2haxe_bronze-2", + (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + ), Tool("common.items.weapons.axe.iron_axe-0"): VoxTrans( "voxel.weapon.axe.2haxe_iron-0", (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, @@ -481,10 +485,18 @@ "voxel.weapon.axe.2haxe_cobalt-0", (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, ), + Tool("common.items.weapons.axe.cobalt_axe-1"): VoxTrans( + "voxel.weapon.axe.2haxe_cobalt-1", + (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + ), Tool("common.items.weapons.axe.malachite_axe-0"): VoxTrans( "voxel.weapon.axe.2haxe_malachite-0", (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, ), + Tool("common.items.weapons.axe.parashu"): VoxTrans( + "voxel.weapon.axe.parashu", + (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + ), // 1h Axes Tool("common.items.weapons.axe_1h.bloodsteel-0"): VoxTrans( "voxel.weapon.axe_1h.bloodsteel-0", diff --git a/assets/voxygen/voxel/humanoid_main_weapon_manifest.ron b/assets/voxygen/voxel/humanoid_main_weapon_manifest.ron index a3fc00748b..2dd1d86377 100644 --- a/assets/voxygen/voxel/humanoid_main_weapon_manifest.ron +++ b/assets/voxygen/voxel/humanoid_main_weapon_manifest.ron @@ -289,6 +289,10 @@ vox_spec: ("weapon.axe.2haxe_bronze-1", (-1.5, -3.0, -5.5)), color: None ), + "common.items.weapons.axe.bronze_axe-2": ( + vox_spec: ("weapon.axe.2haxe_bronze-2", (-1.5, -3.0, -5.5)), + color: None + ), "common.items.weapons.axe.iron_axe-0": ( vox_spec: ("weapon.axe.2haxe_iron-0", (-1.5, -5.0, -5.5)), color: None @@ -373,10 +377,18 @@ vox_spec: ("weapon.axe.2haxe_cobalt-0", (-1.5, -5.0, -5.5)), color: None ), + "common.items.weapons.axe.cobalt_axe-1": ( + vox_spec: ("weapon.axe.2haxe_cobalt-1", (-1.5, -5.0, -5.5)), + color: None + ), "common.items.weapons.axe.malachite_axe-0": ( vox_spec: ("weapon.axe.2haxe_malachite-0", (-1.5, -5.0, -6.0)), color: None ), + "common.items.weapons.axe.parashu": ( + vox_spec: ("weapon.axe.parashu", (-1.5, -5.0, -6.0)), + color: None + ), // 1h Axes "common.items.weapons.axe_1h.bloodsteel-0": ( vox_spec: ("weapon.axe_1h.bloodsteel-0", (-1.5, -5.0, -6.0)), diff --git a/assets/voxygen/voxel/weapon/axe/2haxe_bloodsteel-2.vox b/assets/voxygen/voxel/weapon/axe/2haxe_bloodsteel-2.vox index bdc33b04eba892d5027f4f9d69f9a36831a2033a..edd95735aeccdd375bafaf4bcd250d0842d84e00 100644 GIT binary patch delta 1023 zcmXYvJ#W-N5QcYVZSVT?e0To10|`Z&Y$j{Va!)&%*);7SvEU-7L?#V zxOjWHyPgAlzky_{PJB6uPbabW260#)g6u|Ic@UTP;)6+Cau9Dh&o<%?XxoX)_BY}U z1&dxRWWkakzFqbrEd?>fieC=mJ-HA%H;HKn3FlnMJ-$QKA>ag`d{}1R116I%2T5`O zd00=9ujrPXVnq#k1>y_Di_IWWgYbHiggm#NG~RUTH@#$VDb|uNAjG(1~jHUwkY=dw+XxLoo zJY8FNN}h>Uo#9bpt36|?4hot0YSNh)0g34#swV@nI6Ct+g7u)lcq}lk!Ef-fGa_n% z#xuu^mUBxCdj~|5=E}q?9?XNVCfsxIOFH3oDQgJm605*));pgrSc9P>1twu4z=T*} zn2uqJ=5EA1KH5NCgGl=EhkUT7=jr%HKe|s(%8S%6ov1dv1k0VvAwnfA_{*Y5eR9aO0%iZY6~j@ij`1y5f$?01!$=D1we{q zDg8pr1CXVmrlH{#Xn6(md8AM0+%xyyvHU&%lWyL;zIbpgA}?PwuMqheiY%Jdd^8js z3xmG}7t2+1r5Mh8&`{RmWUWqGgNnz488jMlrPfxR*{TO;zo@rpfCgx|!Gst`1314@ z@0aSLrTS>4E~bvD6Y7LIr4QVQxe>aD?rl}GOEp=m7F$Hs@n<@|?UN zFUSkBO+i?&V9bIsjbp+wk3dYFkW0xx$pF}r`|^kSa;GsqAxpWJik^xdu+>@v2rK>$ z3I@dE!3-Kf4Ce_0DZ^5;pk@JB2gpSVipTqUX9kTRh6GaP-2RRF{ayFXezMcq zq&o{f`?seD{fGH+_d96vJ11p-FuC1N&Y$$vVb(nkAErll5BsM__xeRM?-t=-J3GGL cow;}E^z>Ojn@;-a^ONqYYs{mM-9Pv1KU_6lF#rGn diff --git a/assets/voxygen/voxel/weapon/axe/2haxe_bronze-2.vox b/assets/voxygen/voxel/weapon/axe/2haxe_bronze-2.vox new file mode 100644 index 0000000000000000000000000000000000000000..bdc33b04eba892d5027f4f9d69f9a36831a2033a GIT binary patch literal 1492 zcmbW0Z%CV06vod@%$u0_Cnho0Xf=zvnmBc8{ad%Ci&?AA73=1jw3E3t{z1xy6s-~p z)ve4GJLkl9u-2tRWR$vAoJ{+{N|911rMNN%LrN)QU-w~*eS7vKV;{z-gI)OX-1D4s z?tSll-?#J75%;W!wC!(xjUu-UA|1`)U`jmT(3AMwNsffV%~OgKj(3SNNRMdJqcn-= zsAA-t=;CUM`--uOC`}hrMxyDjD5IX5L`|X^s0OOWJkg9{Wi*DAW(p~zDXg?)#>tG$ zjLnQKtRq?q`%)YO<#X}wC97EyYlrO``^DM{~DDm|ifM4!%QNvEGq-%8&~-%8I) z&&vJ`_GhpzgI)&rAjyo)^u@+{8|#VQ#=PyOGTPQuGUsM`7Uspy8ar!<-rl25t`5;?6pyC`2QO`+!0`uub2zZE(T4cA*8J^`Sp809zwL(mbP2q3 z^^l+eGGK-VStZjm<6N20+!E@IIrU60fxWLZXc~#I5C`HQ&E5c{&_;_VEnxcaC z8NoY?f{_R8ZFeEB--E)a4>ikv!;+Oe;WEa`s zD$PP^YccG(X&7h`jK3wAJ1JQIL{O9GLbI3j z-Q5@)8^iGMFh<`CW9q{JEH9kJ*6mBMSS;9;<%HYqMupddnzConQ0Yamu>yx)smIg@ zxmf(tgCFnuuzkM-UvSUmdBMG#f+yb#M*E9#al8tf*8=$Urw$CBvtsgV2W~vb#y0Z* z_xYb(?oFJ(q`-;B%6zoGRE$Vx?Z3_+D9r!I`8$11^zY5VJ=6%?FyxzJEuhCo9p8p?}s z{M=dW>dM0XZ;G%I&c-zF?C<-pbLS-P|HXaNiM2u<_b}K8j9gg2_*cs~zjPa)-`Ya; z`x7V_nM3R4b#z?cg5U4QV*$iO@H_Ndf=8==J>MgKU;mZoUzqsMo~H5S({gctr(9y; Ho%`iaNzqhX literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/weapon/axe/2haxe_cobalt-1.vox b/assets/voxygen/voxel/weapon/axe/2haxe_cobalt-1.vox new file mode 100644 index 0000000000000000000000000000000000000000..94b8456daaef872b52d34198f0ab49fc71a0fb98 GIT binary patch literal 1808 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 diff --git a/assets/voxygen/voxel/weapon/axe/parashu.vox b/assets/voxygen/voxel/weapon/axe/parashu.vox new file mode 100644 index 0000000000000000000000000000000000000000..231686cbce40c3ca297f05be20d4b2a44cad0c9c GIT binary patch literal 1912 zcmb_beQ1<*9RJ?;xtHyEZnt}Tp4;6`T~l)};o3{vOtam2OQ$W-)pE?)xWcb}A)SJwxJCWCjUC=T+r{&R< z`pJi*8Fj@ADzSq4qiOX7^Xe-vsE58rJg=U3PThpY@~ZKSdSY31#WHF!-Yg=VQ!A9y zU?ioU3i4$+HOsQN0Ddj{# zEy5kk8D=7_rkgcXWYn}6TSAobtw_eOXtPYd6JvZJr`}4&`Eu$hQaAlP^z$;GkG#cR zs5g=YRpu^bjUm=;hG+}YC&K(e`j_W4K$}^fHNtkrRcfbQK7zbEWT)IgJ0+w-Y83UB zopP0vC)5&mEQFqaZVURft+u2`do^LBGjZpxlWR)u>k#u?nJ%chRJn@~HiVJD*j))k7SG#E>{0?bqH zq|^xIHQ=PxPgvZi5zebw+$(LYNlU3O)wKGYw80pc-%cBZmhg>I_G>byk3F+@qsUv- zn|99NtW?9?HEZ-1>*Ia6!kl-6_Y!=WE<(Zk-2U`92{`-`$q z$`a)r1PbaQyo3h1L*A$>#Ji2q7U5kHW;|nfZg<1LjE{zQ8F#&k;Di@%Swx3^<-bQJfG3pSm)j^)w6@JBR?`T1@X zzYAU8JQl$Y2k|$mP<5ytwbN@LogT=L2{{{vTz3%c7R2@oDklU_T@sWG3ChL=5z5Ya zK})xV&HIDsKODjPb4!pJ6>OUnym?V@@HS(&C9rg`8Y@QY&^p_JWHyTGV+quqTZYCP zs}S2MSaF!Srv&S+3gl(JKT-mj3_vbNadcG(Gf&&N^IQ_x`~)UNFh~4E{7MY(_2S|u zg83Q2l{13L4#C+@!MEE5clQeV)(ZwGPwb}tfM7$dU{|}~Kt^z~m$kMeFxXj*k!>}Y z+S7#5SK2VOZv*DvdlkQ(8$|tb2kV-aVaxM1*wfpFq0NHv*9Fsg!PSohtxFT=s#}4b zt*epEtU+&`gTa<0j%{3t*+8e7zyQX^#xOiQjFGqcG4bvYW@nCI;o2!!mW7I# zgQ}`3G&VM(b@h{Ywy74K>l(53g*BKcRN~^9YW(~|9q!($$7g(V_MG76cY+5$3PuKN zaB{pE*Dq|q@4xgQ`#})LzKr7Q+i~2*GW2sE@37DR+W&*od;gdIo12^QaoaQ+8qZ?w z(J{ow~<2Yyb&-~k~l8f_SzxMcIuD+g|$nFCUo|wV-7qj^A@-=+={Q{nO z`zY3rO=HXHtLVA3fR2t1+!sJf2>c0SL2&QN!}{*=zW&Y5zi{zCdlW4iA7v}*A7@)k I{P=kJ8%Fkk-~a#s literal 0 HcmV?d00001 From f4d25ff5c04c824e93310ae6f4088d7383e31df9 Mon Sep 17 00:00:00 2001 From: Sam Date: Wed, 24 Feb 2021 20:37:43 -0500 Subject: [PATCH 3/5] Bows --- assets/common/items/weapons/bow/bone-0.ron | 16 +++ assets/common/items/weapons/bow/bone-1.ron | 16 +++ .../bow/{horn_longbow-0.ron => bone-2.ron} | 6 +- assets/common/items/weapons/bow/bone-3.ron | 16 +++ assets/common/items/weapons/bow/eldwood-0.ron | 16 +++ assets/common/items/weapons/bow/eldwood-1.ron | 16 +++ assets/common/items/weapons/bow/eldwood-2.ron | 16 +++ .../common/items/weapons/bow/frostwood-0.ron | 16 +++ .../{wood_shortbow-1.ron => frostwood-1.ron} | 10 +- .../common/items/weapons/bow/frostwood-2.ron | 16 +++ .../common/items/weapons/bow/hardwood-0.ron | 16 +++ .../common/items/weapons/bow/hardwood-1.ron | 16 +++ .../{leafy_longbow-0.ron => hardwood-2.ron} | 8 +- .../common/items/weapons/bow/hardwood-3.ron | 16 +++ .../{wood_longbow-1.ron => hardwood-4.ron} | 8 +- .../common/items/weapons/bow/hardwood-5.ron | 16 +++ .../bow/{iron_longbow-0.ron => metal-0.ron} | 8 +- .../bow/{rare_longbow.ron => metal-1.ron} | 10 +- assets/common/items/weapons/bow/metal-2.ron | 16 +++ assets/common/items/weapons/bow/metal-3.ron | 16 +++ assets/common/items/weapons/bow/metal-4.ron | 16 +++ assets/common/items/weapons/bow/rawwood-0.ron | 16 +++ assets/common/items/weapons/bow/rawwood-1.ron | 16 +++ assets/common/items/weapons/bow/sagitta.ron | 16 +++ .../bow/{starter_bow.ron => starter.ron} | 0 ...{nature_ore_longbow-0.ron => velorite.ron} | 0 .../bow/{leafy_shortbow-0.ron => wood-0.ron} | 10 +- assets/common/items/weapons/bow/wood-1.ron | 16 +++ .../bow/{wood_shortbow-0.ron => wood-2.ron} | 6 +- .../bow/{wood_longbow-0.ron => wood-3.ron} | 8 +- assets/common/items/weapons/bow/wood-4.ron | 16 +++ .../loot_tables/loot_table_cave_large.ron | 16 ++- .../loot_tables/loot_table_cultists.ron | 46 +++++-- .../loot_tables/loot_table_humanoids.ron | 3 +- .../loot_tables/loot_table_villager.ron | 3 +- .../loot_tables/loot_table_weapon_common.ron | 12 +- .../loot_tables/loot_table_weapon_rare.ron | 10 +- .../loot_table_weapon_uncommon.ron | 19 ++- assets/common/recipe_book.ron | 2 +- assets/voxygen/item_image_manifest.ron | 124 ++++++++++++++---- .../voxel/humanoid_main_weapon_manifest.ron | 124 ++++++++++++++---- assets/voxygen/voxel/weapon/bow/bone-0.vox | Bin 0 -> 1424 bytes assets/voxygen/voxel/weapon/bow/bone-1.vox | Bin 0 -> 1752 bytes assets/voxygen/voxel/weapon/bow/bone-2.vox | Bin 0 -> 1460 bytes assets/voxygen/voxel/weapon/bow/bone-3.vox | Bin 0 -> 1496 bytes assets/voxygen/voxel/weapon/bow/eldwood-0.vox | Bin 0 -> 1552 bytes assets/voxygen/voxel/weapon/bow/eldwood-1.vox | Bin 0 -> 1592 bytes assets/voxygen/voxel/weapon/bow/eldwood-2.vox | Bin 0 -> 1456 bytes .../voxygen/voxel/weapon/bow/frostwood-0.vox | Bin 0 -> 1592 bytes .../voxygen/voxel/weapon/bow/frostwood-1.vox | Bin 0 -> 1512 bytes .../voxygen/voxel/weapon/bow/frostwood-2.vox | Bin 0 -> 1384 bytes .../voxygen/voxel/weapon/bow/hardwood-0.vox | Bin 0 -> 1360 bytes .../voxygen/voxel/weapon/bow/hardwood-1.vox | Bin 0 -> 1424 bytes .../voxygen/voxel/weapon/bow/hardwood-2.vox | Bin 0 -> 1392 bytes .../{shortbow_wood-0.vox => hardwood-3.vox} | Bin 1280 -> 1296 bytes .../{longbow_wood-1.vox => hardwood-4.vox} | Bin 1304 -> 1328 bytes .../voxygen/voxel/weapon/bow/hardwood-5.vox | Bin 0 -> 1480 bytes .../voxel/weapon/bow/longbow_horn-0.vox | Bin 28027 -> 0 bytes .../voxel/weapon/bow/longbow_iron-0.vox | Bin 27787 -> 0 bytes .../voxel/weapon/bow/longbow_leafy-0.vox | Bin 23910 -> 0 bytes .../voxygen/voxel/weapon/bow/longbow_rare.vox | Bin 1444 -> 0 bytes assets/voxygen/voxel/weapon/bow/metal-0.vox | Bin 0 -> 1464 bytes assets/voxygen/voxel/weapon/bow/metal-1.vox | Bin 0 -> 1420 bytes assets/voxygen/voxel/weapon/bow/metal-2.vox | Bin 0 -> 1408 bytes assets/voxygen/voxel/weapon/bow/metal-3.vox | Bin 0 -> 1544 bytes assets/voxygen/voxel/weapon/bow/metal-4.vox | Bin 0 -> 1584 bytes assets/voxygen/voxel/weapon/bow/rawwood-0.vox | Bin 0 -> 1376 bytes assets/voxygen/voxel/weapon/bow/rawwood-1.vox | Bin 0 -> 1408 bytes assets/voxygen/voxel/weapon/bow/sagitta.vox | Bin 0 -> 1856 bytes .../voxel/weapon/bow/shortbow_leafy-0.vox | Bin 27426 -> 0 bytes .../bow/{shortbow_starter.vox => starter.vox} | Bin ...{longbow_ore_nature-0.vox => velorite.vox} | Bin assets/voxygen/voxel/weapon/bow/wood-0.vox | Bin 0 -> 1336 bytes assets/voxygen/voxel/weapon/bow/wood-1.vox | Bin 0 -> 1392 bytes .../bow/{longbow_wood-0.vox => wood-2.vox} | Bin 1344 -> 1312 bytes .../bow/{shortbow_wood-1.vox => wood-3.vox} | Bin 1280 -> 1336 bytes assets/voxygen/voxel/weapon/bow/wood-4.vox | Bin 0 -> 1344 bytes .../up.sql | 22 ++++ server/src/rtsim/entity.rs | 4 +- .../audio/sfx/event_mapper/combat/tests.rs | 2 +- voxygen/src/menu/char_selection/ui/mod.rs | 2 +- world/src/site/dungeon/mod.rs | 22 ++-- world/src/site/settlement/mod.rs | 2 +- 83 files changed, 680 insertions(+), 127 deletions(-) create mode 100644 assets/common/items/weapons/bow/bone-0.ron create mode 100644 assets/common/items/weapons/bow/bone-1.ron rename assets/common/items/weapons/bow/{horn_longbow-0.ron => bone-2.ron} (65%) create mode 100644 assets/common/items/weapons/bow/bone-3.ron create mode 100644 assets/common/items/weapons/bow/eldwood-0.ron create mode 100644 assets/common/items/weapons/bow/eldwood-1.ron create mode 100644 assets/common/items/weapons/bow/eldwood-2.ron create mode 100644 assets/common/items/weapons/bow/frostwood-0.ron rename assets/common/items/weapons/bow/{wood_shortbow-1.ron => frostwood-1.ron} (55%) create mode 100644 assets/common/items/weapons/bow/frostwood-2.ron create mode 100644 assets/common/items/weapons/bow/hardwood-0.ron create mode 100644 assets/common/items/weapons/bow/hardwood-1.ron rename assets/common/items/weapons/bow/{leafy_longbow-0.ron => hardwood-2.ron} (59%) create mode 100644 assets/common/items/weapons/bow/hardwood-3.ron rename assets/common/items/weapons/bow/{wood_longbow-1.ron => hardwood-4.ron} (60%) create mode 100644 assets/common/items/weapons/bow/hardwood-5.ron rename assets/common/items/weapons/bow/{iron_longbow-0.ron => metal-0.ron} (58%) rename assets/common/items/weapons/bow/{rare_longbow.ron => metal-1.ron} (51%) create mode 100644 assets/common/items/weapons/bow/metal-2.ron create mode 100644 assets/common/items/weapons/bow/metal-3.ron create mode 100644 assets/common/items/weapons/bow/metal-4.ron create mode 100644 assets/common/items/weapons/bow/rawwood-0.ron create mode 100644 assets/common/items/weapons/bow/rawwood-1.ron create mode 100644 assets/common/items/weapons/bow/sagitta.ron rename assets/common/items/weapons/bow/{starter_bow.ron => starter.ron} (100%) rename assets/common/items/weapons/bow/{nature_ore_longbow-0.ron => velorite.ron} (100%) rename assets/common/items/weapons/bow/{leafy_shortbow-0.ron => wood-0.ron} (54%) create mode 100644 assets/common/items/weapons/bow/wood-1.ron rename assets/common/items/weapons/bow/{wood_shortbow-0.ron => wood-2.ron} (64%) rename assets/common/items/weapons/bow/{wood_longbow-0.ron => wood-3.ron} (62%) create mode 100644 assets/common/items/weapons/bow/wood-4.ron create mode 100644 assets/voxygen/voxel/weapon/bow/bone-0.vox create mode 100644 assets/voxygen/voxel/weapon/bow/bone-1.vox create mode 100644 assets/voxygen/voxel/weapon/bow/bone-2.vox create mode 100644 assets/voxygen/voxel/weapon/bow/bone-3.vox create mode 100644 assets/voxygen/voxel/weapon/bow/eldwood-0.vox create mode 100644 assets/voxygen/voxel/weapon/bow/eldwood-1.vox create mode 100644 assets/voxygen/voxel/weapon/bow/eldwood-2.vox create mode 100644 assets/voxygen/voxel/weapon/bow/frostwood-0.vox create mode 100644 assets/voxygen/voxel/weapon/bow/frostwood-1.vox create mode 100644 assets/voxygen/voxel/weapon/bow/frostwood-2.vox create mode 100644 assets/voxygen/voxel/weapon/bow/hardwood-0.vox create mode 100644 assets/voxygen/voxel/weapon/bow/hardwood-1.vox create mode 100644 assets/voxygen/voxel/weapon/bow/hardwood-2.vox rename assets/voxygen/voxel/weapon/bow/{shortbow_wood-0.vox => hardwood-3.vox} (58%) rename assets/voxygen/voxel/weapon/bow/{longbow_wood-1.vox => hardwood-4.vox} (57%) create mode 100644 assets/voxygen/voxel/weapon/bow/hardwood-5.vox delete mode 100644 assets/voxygen/voxel/weapon/bow/longbow_horn-0.vox delete mode 100644 assets/voxygen/voxel/weapon/bow/longbow_iron-0.vox delete mode 100644 assets/voxygen/voxel/weapon/bow/longbow_leafy-0.vox delete mode 100644 assets/voxygen/voxel/weapon/bow/longbow_rare.vox create mode 100644 assets/voxygen/voxel/weapon/bow/metal-0.vox create mode 100644 assets/voxygen/voxel/weapon/bow/metal-1.vox create mode 100644 assets/voxygen/voxel/weapon/bow/metal-2.vox create mode 100644 assets/voxygen/voxel/weapon/bow/metal-3.vox create mode 100644 assets/voxygen/voxel/weapon/bow/metal-4.vox create mode 100644 assets/voxygen/voxel/weapon/bow/rawwood-0.vox create mode 100644 assets/voxygen/voxel/weapon/bow/rawwood-1.vox create mode 100644 assets/voxygen/voxel/weapon/bow/sagitta.vox delete mode 100644 assets/voxygen/voxel/weapon/bow/shortbow_leafy-0.vox rename assets/voxygen/voxel/weapon/bow/{shortbow_starter.vox => starter.vox} (100%) rename assets/voxygen/voxel/weapon/bow/{longbow_ore_nature-0.vox => velorite.vox} (100%) create mode 100644 assets/voxygen/voxel/weapon/bow/wood-0.vox create mode 100644 assets/voxygen/voxel/weapon/bow/wood-1.vox rename assets/voxygen/voxel/weapon/bow/{longbow_wood-0.vox => wood-2.vox} (60%) rename assets/voxygen/voxel/weapon/bow/{shortbow_wood-1.vox => wood-3.vox} (67%) create mode 100644 assets/voxygen/voxel/weapon/bow/wood-4.vox diff --git a/assets/common/items/weapons/bow/bone-0.ron b/assets/common/items/weapons/bow/bone-0.ron new file mode 100644 index 0000000000..4e8f9ba91e --- /dev/null +++ b/assets/common/items/weapons/bow/bone-0.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Fanged Bow", + description: "There are over a dozen small fangs attached to the bow limbs", + kind: Tool(( + kind: Bow, + hands: Two, + stats: Direct(( + equip_time_millis: 400, + power: 0.9, + poise_strength: 0.8, + speed: 1.1, + )), + )), + quality: Moderate, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/bow/bone-1.ron b/assets/common/items/weapons/bow/bone-1.ron new file mode 100644 index 0000000000..74d1066e7a --- /dev/null +++ b/assets/common/items/weapons/bow/bone-1.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Horn Bow", + description: "The horns aren't from any creature you know", + kind: Tool(( + kind: Bow, + hands: Two, + stats: Direct(( + equip_time_millis: 400, + power: 1.2, + poise_strength: 0.8, + speed: 0.8, + )), + )), + quality: Moderate, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/bow/horn_longbow-0.ron b/assets/common/items/weapons/bow/bone-2.ron similarity index 65% rename from assets/common/items/weapons/bow/horn_longbow-0.ron rename to assets/common/items/weapons/bow/bone-2.ron index ee6f75c2f3..e648d6477a 100644 --- a/assets/common/items/weapons/bow/horn_longbow-0.ron +++ b/assets/common/items/weapons/bow/bone-2.ron @@ -1,12 +1,12 @@ ItemDef( - name: "Horn Bow", - description: "You don\'t recognize the creature these horns belong to.", + name: "Ritual Bow", + description: "A ceremonial weapon", kind: Tool(( kind: Bow, hands: Two, stats: Direct(( equip_time_millis: 400, - power: 1.5, + power: 1.0, poise_strength: 0.8, speed: 1.0, )), diff --git a/assets/common/items/weapons/bow/bone-3.ron b/assets/common/items/weapons/bow/bone-3.ron new file mode 100644 index 0000000000..27ac25aa26 --- /dev/null +++ b/assets/common/items/weapons/bow/bone-3.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Spinal Bow", + description: "Made with bones", + kind: Tool(( + kind: Bow, + hands: Two, + stats: Direct(( + equip_time_millis: 400, + power: 1.1, + poise_strength: 0.8, + speed: 0.9, + )), + )), + quality: Moderate, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/bow/eldwood-0.ron b/assets/common/items/weapons/bow/eldwood-0.ron new file mode 100644 index 0000000000..9aaf8790f7 --- /dev/null +++ b/assets/common/items/weapons/bow/eldwood-0.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Eldwood Bow", + description: "The wood feels old, yet still alive", + kind: Tool(( + kind: Bow, + hands: Two, + stats: Direct(( + equip_time_millis: 400, + power: 1.8, + poise_strength: 0.8, + speed: 1.0, + )), + )), + quality: High, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/bow/eldwood-1.ron b/assets/common/items/weapons/bow/eldwood-1.ron new file mode 100644 index 0000000000..863d37da3d --- /dev/null +++ b/assets/common/items/weapons/bow/eldwood-1.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Topaz Warbow", + description: "Inset with topaz", + kind: Tool(( + kind: Bow, + hands: Two, + stats: Direct(( + equip_time_millis: 400, + power: 1.6, + poise_strength: 0.8, + speed: 1.2, + )), + )), + quality: High, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/bow/eldwood-2.ron b/assets/common/items/weapons/bow/eldwood-2.ron new file mode 100644 index 0000000000..faffd799b2 --- /dev/null +++ b/assets/common/items/weapons/bow/eldwood-2.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Treant Branch", + description: "You occasionally see it twitch from your periphery", + kind: Tool(( + kind: Bow, + hands: Two, + stats: Direct(( + equip_time_millis: 400, + power: 2.0, + poise_strength: 0.8, + speed: 0.8, + )), + )), + quality: High, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/bow/frostwood-0.ron b/assets/common/items/weapons/bow/frostwood-0.ron new file mode 100644 index 0000000000..fc2eeda6af --- /dev/null +++ b/assets/common/items/weapons/bow/frostwood-0.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Eagle Bow", + description: "The design is reminiscent of a spread eagle's wings", + kind: Tool(( + kind: Bow, + hands: Two, + stats: Direct(( + equip_time_millis: 400, + power: 1.4, + poise_strength: 0.8, + speed: 1.2, + )), + )), + quality: High, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/bow/wood_shortbow-1.ron b/assets/common/items/weapons/bow/frostwood-1.ron similarity index 55% rename from assets/common/items/weapons/bow/wood_shortbow-1.ron rename to assets/common/items/weapons/bow/frostwood-1.ron index e5f1c33e58..46f8045f1c 100644 --- a/assets/common/items/weapons/bow/wood_shortbow-1.ron +++ b/assets/common/items/weapons/bow/frostwood-1.ron @@ -1,16 +1,16 @@ ItemDef( - name: "Horse Bow", - description: "Works on the ground too.", + name: "Frostwood Bow", + description: "Chill to the touch...", kind: Tool(( kind: Bow, hands: Two, stats: Direct(( equip_time_millis: 400, - power: 0.75, - poise_strength: 0.4, + power: 1.6, + poise_strength: 0.8, speed: 1.0, )), )), - quality: Common, + quality: High, tags: [], ) \ No newline at end of file diff --git a/assets/common/items/weapons/bow/frostwood-2.ron b/assets/common/items/weapons/bow/frostwood-2.ron new file mode 100644 index 0000000000..e45c34fcd3 --- /dev/null +++ b/assets/common/items/weapons/bow/frostwood-2.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Lunar Bow", + description: "Glows under the light of the moon", + kind: Tool(( + kind: Bow, + hands: Two, + stats: Direct(( + equip_time_millis: 400, + power: 1.7, + poise_strength: 0.8, + speed: 0.9, + )), + )), + quality: High, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/bow/hardwood-0.ron b/assets/common/items/weapons/bow/hardwood-0.ron new file mode 100644 index 0000000000..7614564428 --- /dev/null +++ b/assets/common/items/weapons/bow/hardwood-0.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Bramblewood Bow", + description: "Some loose brambles are still attached", + kind: Tool(( + kind: Bow, + hands: Two, + stats: Direct(( + equip_time_millis: 400, + power: 1.2, + poise_strength: 0.8, + speed: 1.0, + )), + )), + quality: Moderate, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/bow/hardwood-1.ron b/assets/common/items/weapons/bow/hardwood-1.ron new file mode 100644 index 0000000000..6cb1c52721 --- /dev/null +++ b/assets/common/items/weapons/bow/hardwood-1.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Composite Bow", + description: "It has a heavy draw weight", + kind: Tool(( + kind: Bow, + hands: Two, + stats: Direct(( + equip_time_millis: 400, + power: 1.4, + poise_strength: 0.8, + speed: 0.8, + )), + )), + quality: Moderate, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/bow/leafy_longbow-0.ron b/assets/common/items/weapons/bow/hardwood-2.ron similarity index 59% rename from assets/common/items/weapons/bow/leafy_longbow-0.ron rename to assets/common/items/weapons/bow/hardwood-2.ron index 72ee1b9ed2..0453c0d035 100644 --- a/assets/common/items/weapons/bow/leafy_longbow-0.ron +++ b/assets/common/items/weapons/bow/hardwood-2.ron @@ -1,14 +1,14 @@ ItemDef( name: "Elven Longbow", - description: "There\'s a new leaf starting to grow.", + description: "Made with exquisite craftsmanship", kind: Tool(( kind: Bow, hands: Two, stats: Direct(( equip_time_millis: 400, - power: 1.25, - poise_strength: 1.0, - speed: 1.0, + power: 1.1, + poise_strength: 0.8, + speed: 1.1, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/bow/hardwood-3.ron b/assets/common/items/weapons/bow/hardwood-3.ron new file mode 100644 index 0000000000..b915905350 --- /dev/null +++ b/assets/common/items/weapons/bow/hardwood-3.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Horse Bow", + description: "Perfect for mounted archery", + kind: Tool(( + kind: Bow, + hands: Two, + stats: Direct(( + equip_time_millis: 400, + power: 0.9, + poise_strength: 0.8, + speed: 1.3, + )), + )), + quality: Moderate, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/bow/wood_longbow-1.ron b/assets/common/items/weapons/bow/hardwood-4.ron similarity index 60% rename from assets/common/items/weapons/bow/wood_longbow-1.ron rename to assets/common/items/weapons/bow/hardwood-4.ron index d70d956963..573acf778a 100644 --- a/assets/common/items/weapons/bow/wood_longbow-1.ron +++ b/assets/common/items/weapons/bow/hardwood-4.ron @@ -1,16 +1,16 @@ ItemDef( name: "Recurve Bow", - description: "It\'s hard to pull all the way back.", + description: "It's hard to pull back all the way", kind: Tool(( kind: Bow, hands: Two, stats: Direct(( equip_time_millis: 400, power: 1.0, - poise_strength: 1.2, - speed: 1.0, + poise_strength: 0.8, + speed: 1.2, )), )), - quality: Common, + quality: Moderate, tags: [], ) \ No newline at end of file diff --git a/assets/common/items/weapons/bow/hardwood-5.ron b/assets/common/items/weapons/bow/hardwood-5.ron new file mode 100644 index 0000000000..9a60c8a114 --- /dev/null +++ b/assets/common/items/weapons/bow/hardwood-5.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Stag Bow", + description: "Made from the antlers of a stag", + kind: Tool(( + kind: Bow, + hands: Two, + stats: Direct(( + equip_time_millis: 400, + power: 1.3, + poise_strength: 0.8, + speed: 0.9, + )), + )), + quality: Moderate, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/bow/iron_longbow-0.ron b/assets/common/items/weapons/bow/metal-0.ron similarity index 58% rename from assets/common/items/weapons/bow/iron_longbow-0.ron rename to assets/common/items/weapons/bow/metal-0.ron index 0930934b58..69e5c5a6d9 100644 --- a/assets/common/items/weapons/bow/iron_longbow-0.ron +++ b/assets/common/items/weapons/bow/metal-0.ron @@ -1,13 +1,13 @@ ItemDef( - name: "Soldier\'s Bow", - description: "Has an insignia on it.", + name: "Beetlehorn Bow", + description: "Made from the horns of a small beetle", kind: Tool(( kind: Bow, hands: Two, stats: Direct(( equip_time_millis: 400, - power: 1.75, - poise_strength: 1.3, + power: 1.4, + poise_strength: 0.8, speed: 1.0, )), )), diff --git a/assets/common/items/weapons/bow/rare_longbow.ron b/assets/common/items/weapons/bow/metal-1.ron similarity index 51% rename from assets/common/items/weapons/bow/rare_longbow.ron rename to assets/common/items/weapons/bow/metal-1.ron index 3e6f048e74..bb917d2f90 100644 --- a/assets/common/items/weapons/bow/rare_longbow.ron +++ b/assets/common/items/weapons/bow/metal-1.ron @@ -1,16 +1,16 @@ ItemDef( name: "Enchanted Longbow", - description: "You can sense power resting in the bow.", + description: "You feel a faint magical aura emanating from the bow", kind: Tool(( kind: Bow, hands: Two, stats: Direct(( equip_time_millis: 400, - power: 2.0, - poise_strength: 1.0, - speed: 1.0, + power: 1.2, + poise_strength: 0.8, + speed: 1.2, )), )), - quality: Epic, + quality: Moderate, tags: [], ) \ No newline at end of file diff --git a/assets/common/items/weapons/bow/metal-2.ron b/assets/common/items/weapons/bow/metal-2.ron new file mode 100644 index 0000000000..da08553c8a --- /dev/null +++ b/assets/common/items/weapons/bow/metal-2.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Iron Longbow", + description: "Forged from iron", + kind: Tool(( + kind: Bow, + hands: Two, + stats: Direct(( + equip_time_millis: 400, + power: 1.3, + poise_strength: 0.8, + speed: 1.1, + )), + )), + quality: Moderate, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/bow/metal-3.ron b/assets/common/items/weapons/bow/metal-3.ron new file mode 100644 index 0000000000..8ef8934379 --- /dev/null +++ b/assets/common/items/weapons/bow/metal-3.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Metal Warbow", + description: "Its appearance is intimidating", + kind: Tool(( + kind: Bow, + hands: Two, + stats: Direct(( + equip_time_millis: 400, + power: 1.5, + poise_strength: 0.8, + speed: 0.9, + )), + )), + quality: Moderate, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/bow/metal-4.ron b/assets/common/items/weapons/bow/metal-4.ron new file mode 100644 index 0000000000..858bd7b5cf --- /dev/null +++ b/assets/common/items/weapons/bow/metal-4.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Soldier's Bow", + description: "Reinforced with iron", + kind: Tool(( + kind: Bow, + hands: Two, + stats: Direct(( + equip_time_millis: 400, + power: 1.6, + poise_strength: 0.8, + speed: 0.8, + )), + )), + quality: Moderate, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/bow/rawwood-0.ron b/assets/common/items/weapons/bow/rawwood-0.ron new file mode 100644 index 0000000000..bd7f5162f8 --- /dev/null +++ b/assets/common/items/weapons/bow/rawwood-0.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Oakroot Bow", + description: "The wood is blackened with dirt", + kind: Tool(( + kind: Bow, + hands: Two, + stats: Direct(( + equip_time_millis: 400, + power: 0.7, + poise_strength: 0.8, + speed: 0.9, + )), + )), + quality: Low, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/bow/rawwood-1.ron b/assets/common/items/weapons/bow/rawwood-1.ron new file mode 100644 index 0000000000..2ccb1a8cba --- /dev/null +++ b/assets/common/items/weapons/bow/rawwood-1.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Sprig Bow", + description: "It was only recently collected", + kind: Tool(( + kind: Bow, + hands: Two, + stats: Direct(( + equip_time_millis: 400, + power: 0.6, + poise_strength: 0.8, + speed: 1.0, + )), + )), + quality: Low, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/bow/sagitta.ron b/assets/common/items/weapons/bow/sagitta.ron new file mode 100644 index 0000000000..88a9e6ad6e --- /dev/null +++ b/assets/common/items/weapons/bow/sagitta.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Sagitta", + description: "Said to have slain a dragon with a single arrow", + kind: Tool(( + kind: Bow, + hands: Two, + stats: Direct(( + equip_time_millis: 400, + power: 2.5, + poise_strength: 0.8, + speed: 0.8, + )), + )), + quality: Legendary, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/bow/starter_bow.ron b/assets/common/items/weapons/bow/starter.ron similarity index 100% rename from assets/common/items/weapons/bow/starter_bow.ron rename to assets/common/items/weapons/bow/starter.ron diff --git a/assets/common/items/weapons/bow/nature_ore_longbow-0.ron b/assets/common/items/weapons/bow/velorite.ron similarity index 100% rename from assets/common/items/weapons/bow/nature_ore_longbow-0.ron rename to assets/common/items/weapons/bow/velorite.ron diff --git a/assets/common/items/weapons/bow/leafy_shortbow-0.ron b/assets/common/items/weapons/bow/wood-0.ron similarity index 54% rename from assets/common/items/weapons/bow/leafy_shortbow-0.ron rename to assets/common/items/weapons/bow/wood-0.ron index 36fb4c21e8..5bb641a6b8 100644 --- a/assets/common/items/weapons/bow/leafy_shortbow-0.ron +++ b/assets/common/items/weapons/bow/wood-0.ron @@ -1,16 +1,16 @@ ItemDef( name: "Elven Shortbow", - description: "The wood still seems alive.", + description: "Made with exquisite craftsmanship", kind: Tool(( kind: Bow, hands: Two, stats: Direct(( equip_time_millis: 400, - power: 1.0, - poise_strength: 0.4, - speed: 1.0, + power: 0.9, + poise_strength: 0.8, + speed: 0.9, )), )), - quality: Common, + quality: Low, tags: [], ) \ No newline at end of file diff --git a/assets/common/items/weapons/bow/wood-1.ron b/assets/common/items/weapons/bow/wood-1.ron new file mode 100644 index 0000000000..0654451dc9 --- /dev/null +++ b/assets/common/items/weapons/bow/wood-1.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Flatbow", + description: "The bow looks stangely flat...", + kind: Tool(( + kind: Bow, + hands: Two, + stats: Direct(( + equip_time_millis: 400, + power: 0.7, + poise_strength: 0.8, + speed: 1.1, + )), + )), + quality: Low, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/bow/wood_shortbow-0.ron b/assets/common/items/weapons/bow/wood-2.ron similarity index 64% rename from assets/common/items/weapons/bow/wood_shortbow-0.ron rename to assets/common/items/weapons/bow/wood-2.ron index 9711d3f714..812d4d062c 100644 --- a/assets/common/items/weapons/bow/wood_shortbow-0.ron +++ b/assets/common/items/weapons/bow/wood-2.ron @@ -1,16 +1,16 @@ ItemDef( name: "Hunting Bow", - description: "Strips of leather are wrapped around the handle.", + description: "You could hunt a deer with this bow", kind: Tool(( kind: Bow, hands: Two, stats: Direct(( equip_time_millis: 400, power: 0.8, - poise_strength: 0.7, + poise_strength: 0.8, speed: 1.0, )), )), - quality: Moderate, + quality: Low, tags: [], ) \ No newline at end of file diff --git a/assets/common/items/weapons/bow/wood_longbow-0.ron b/assets/common/items/weapons/bow/wood-3.ron similarity index 62% rename from assets/common/items/weapons/bow/wood_longbow-0.ron rename to assets/common/items/weapons/bow/wood-3.ron index a548fa71c7..e041a1a2aa 100644 --- a/assets/common/items/weapons/bow/wood_longbow-0.ron +++ b/assets/common/items/weapons/bow/wood-3.ron @@ -1,16 +1,16 @@ ItemDef( name: "Longbow", - description: "It\'s been well used.", + description: "Made of wood", kind: Tool(( kind: Bow, hands: Two, stats: Direct(( equip_time_millis: 400, power: 1.0, - poise_strength: 0.9, - speed: 1.0, + poise_strength: 0.8, + speed: 0.8, )), )), - quality: Common, + quality: Low, tags: [], ) \ No newline at end of file diff --git a/assets/common/items/weapons/bow/wood-4.ron b/assets/common/items/weapons/bow/wood-4.ron new file mode 100644 index 0000000000..d18abce394 --- /dev/null +++ b/assets/common/items/weapons/bow/wood-4.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Swift Shortbow", + description: "Swiftly fires arrows", + kind: Tool(( + kind: Bow, + hands: Two, + stats: Direct(( + equip_time_millis: 400, + power: 0.6, + poise_strength: 0.8, + speed: 1.2, + )), + )), + quality: Low, + tags: [], +) \ No newline at end of file diff --git a/assets/common/loot_tables/loot_table_cave_large.ron b/assets/common/loot_tables/loot_table_cave_large.ron index ea8f9d5fe5..11077acb9c 100644 --- a/assets/common/loot_tables/loot_table_cave_large.ron +++ b/assets/common/loot_tables/loot_table_cave_large.ron @@ -25,7 +25,6 @@ (0.01, "common.items.weapons.sword.bloodsteel-0"), (0.01, "common.items.weapons.sword.bloodsteel-1"), (0.01, "common.items.weapons.sword.bloodsteel-2"), - (0.001, "common.items.weapons.sword.caladbolg"), // axes (0.02, "common.items.weapons.axe.bloodsteel_axe-0"), (0.02, "common.items.weapons.axe.bloodsteel_axe-1"), @@ -62,8 +61,19 @@ (0.05, "common.items.weapons.hammer.steel_hammer-3"), (0.05, "common.items.weapons.hammer.steel_hammer-4"), (0.05, "common.items.weapons.hammer.steel_hammer-5"), - // bows - (0.001, "common.items.weapons.bow.nature_ore_longbow-0"), + // bows + (0.03, "common.items.weapons.bow.metal-0"), + (0.03, "common.items.weapons.bow.metal-1"), + (0.03, "common.items.weapons.bow.metal-2"), + (0.03, "common.items.weapons.bow.metal-3"), + (0.03, "common.items.weapons.bow.metal-4"), + (0.02, "common.items.weapons.bow.frostwood-0"), + (0.02, "common.items.weapons.bow.frostwood-1"), + (0.02, "common.items.weapons.bow.frostwood-2"), + (0.01, "common.items.weapons.bow.eldwood-0"), + (0.01, "common.items.weapons.bow.eldwood-1"), + (0.01, "common.items.weapons.bow.eldwood-2"), + (0.001, "common.items.weapons.bow.velorite"), ] diff --git a/assets/common/loot_tables/loot_table_cultists.ron b/assets/common/loot_tables/loot_table_cultists.ron index c8c40292ca..20dba99274 100644 --- a/assets/common/loot_tables/loot_table_cultists.ron +++ b/assets/common/loot_tables/loot_table_cultists.ron @@ -76,9 +76,9 @@ (0.10, "common.items.weapons.sword.stone-0"), (0.10, "common.items.weapons.sword.stone-1"), (0.10, "common.items.weapons.sword.stone-2"), - (0.15, "common.items.weapons.sword.bronze-0"), - (0.15, "common.items.weapons.sword.bronze-1"), - (0.15, "common.items.weapons.sword.bronze-2"), + (0.05, "common.items.weapons.sword.bronze-0"), + (0.05, "common.items.weapons.sword.bronze-1"), + (0.05, "common.items.weapons.sword.bronze-2"), // axes (0.20, "common.items.weapons.axe.orc_axe-0"), (0.10, "common.items.weapons.axe.worn_iron_axe-0"), @@ -99,9 +99,18 @@ (0.05, "common.items.weapons.hammer.worn_iron_hammer-1"), (0.05, "common.items.weapons.hammer.worn_iron_hammer-2"), (0.05, "common.items.weapons.hammer.worn_iron_hammer-3"), - // bows - (0.25, "common.items.weapons.bow.wood_shortbow-0"), - (0.25, "common.items.weapons.bow.wood_shortbow-1"), + // bows + (0.20, "common.items.weapons.bow.rawwood-0"), + (0.20, "common.items.weapons.bow.rawwood-1"), + (0.10, "common.items.weapons.bow.wood-0"), + (0.10, "common.items.weapons.bow.wood-1"), + (0.10, "common.items.weapons.bow.wood-2"), + (0.10, "common.items.weapons.bow.wood-3"), + (0.10, "common.items.weapons.bow.wood-4"), + (0.05, "common.items.weapons.bow.bone-0"), + (0.05, "common.items.weapons.bow.bone-1"), + (0.05, "common.items.weapons.bow.bone-2"), + (0.05, "common.items.weapons.bow.bone-3"), // Uncommon Weapons // swords (0.04, "common.items.weapons.sword.iron-0"), @@ -168,10 +177,17 @@ (0.05, "common.items.weapons.hammer.steel_hammer-4"), (0.05, "common.items.weapons.hammer.steel_hammer-5"), // bows - (0.30, "common.items.weapons.bow.leafy_shortbow-0"), - (0.25, "common.items.weapons.bow.wood_longbow-0"), - (0.25, "common.items.weapons.bow.wood_longbow-1"), - (0.20, "common.items.weapons.bow.leafy_longbow-0"), + (0.04, "common.items.weapons.bow.hardwood-0"), + (0.04, "common.items.weapons.bow.hardwood-1"), + (0.04, "common.items.weapons.bow.hardwood-2"), + (0.04, "common.items.weapons.bow.hardwood-3"), + (0.04, "common.items.weapons.bow.hardwood-4"), + (0.04, "common.items.weapons.bow.hardwood-5"), + (0.03, "common.items.weapons.bow.metal-0"), + (0.03, "common.items.weapons.bow.metal-1"), + (0.03, "common.items.weapons.bow.metal-2"), + (0.03, "common.items.weapons.bow.metal-3"), + (0.03, "common.items.weapons.bow.metal-4"), // Rare Weapons // swords (0.20, "common.items.weapons.sword.cobalt-0"), @@ -198,7 +214,11 @@ (0.1, "common.items.weapons.hammer.ramshead_hammer"), (0.001, "common.items.weapons.hammer.mjolnir"), // bows - (0.6, "common.items.weapons.bow.horn_longbow-0"), - (0.2, "common.items.weapons.bow.iron_longbow-0"), - (0.10, "common.items.weapons.bow.rare_longbow"), + (0.20, "common.items.weapons.bow.frostwood-0"), + (0.20, "common.items.weapons.bow.frostwood-1"), + (0.20, "common.items.weapons.bow.frostwood-2"), + (0.10, "common.items.weapons.bow.eldwood-0"), + (0.10, "common.items.weapons.bow.eldwood-1"), + (0.10, "common.items.weapons.bow.eldwood-2"), + (0.001, "common.items.weapons.bow.sagitta"), ] diff --git a/assets/common/loot_tables/loot_table_humanoids.ron b/assets/common/loot_tables/loot_table_humanoids.ron index bf98129ae0..67c6b966e1 100644 --- a/assets/common/loot_tables/loot_table_humanoids.ron +++ b/assets/common/loot_tables/loot_table_humanoids.ron @@ -26,5 +26,6 @@ (0.25, "common.items.weapons.sceptre.staff_nature"), (0.15, "common.items.weapons.hammer.flimsy_hammer"), (0.10, "common.items.weapons.hammer.wood_hammer-0"), - (0.25, "common.items.weapons.bow.wood_shortbow-0"), + (0.15, "common.items.weapons.bow.rawwood-0"), + (0.15, "common.items.weapons.bow.rawwood-1"), ] diff --git a/assets/common/loot_tables/loot_table_villager.ron b/assets/common/loot_tables/loot_table_villager.ron index 158b8eed81..03189946ab 100644 --- a/assets/common/loot_tables/loot_table_villager.ron +++ b/assets/common/loot_tables/loot_table_villager.ron @@ -40,5 +40,6 @@ (0.25, "common.items.weapons.sceptre.staff_nature"), (0.15, "common.items.weapons.hammer.flimsy_hammer"), (0.10, "common.items.weapons.hammer.wood_hammer-0"), - (0.25, "common.items.weapons.bow.wood_shortbow-0"), + (0.15, "common.items.weapons.bow.rawwood-0"), + (0.15, "common.items.weapons.bow.rawwood-1"), ] diff --git a/assets/common/loot_tables/loot_table_weapon_common.ron b/assets/common/loot_tables/loot_table_weapon_common.ron index 84e2fdc0d3..3362614c5b 100644 --- a/assets/common/loot_tables/loot_table_weapon_common.ron +++ b/assets/common/loot_tables/loot_table_weapon_common.ron @@ -33,7 +33,11 @@ (0.05, "common.items.weapons.hammer.worn_iron_hammer-2"), (0.05, "common.items.weapons.hammer.worn_iron_hammer-3"), // bows - (0.50, "common.items.weapons.bow.starter_bow"), - (0.25, "common.items.weapons.bow.wood_shortbow-0"), - (0.25, "common.items.weapons.bow.wood_shortbow-1"), -] \ No newline at end of file + (0.15, "common.items.weapons.bow.starter"), + (0.10, "common.items.weapons.bow.rawwood-0"), + (0.10, "common.items.weapons.bow.rawwood-1"), + (0.05, "common.items.weapons.bow.wood-0"), + (0.05, "common.items.weapons.bow.wood-1"), + (0.05, "common.items.weapons.bow.wood-2"), + (0.05, "common.items.weapons.bow.wood-3"), + (0.05, "common.items.weapons.bow.wood-4"), \ No newline at end of file diff --git a/assets/common/loot_tables/loot_table_weapon_rare.ron b/assets/common/loot_tables/loot_table_weapon_rare.ron index d75e12fa71..ee6d4db03e 100644 --- a/assets/common/loot_tables/loot_table_weapon_rare.ron +++ b/assets/common/loot_tables/loot_table_weapon_rare.ron @@ -28,7 +28,11 @@ (0.15, "common.items.weapons.hammer.ramshead_hammer"), (0.01, "common.items.weapons.hammer.mjolnir"), // bows - (0.60, "common.items.weapons.bow.horn_longbow-0"), - (0.30, "common.items.weapons.bow.iron_longbow-0"), - (0.05, "common.items.weapons.bow.rare_longbow"), + (0.20, "common.items.weapons.bow.frostwood-0"), + (0.20, "common.items.weapons.bow.frostwood-1"), + (0.20, "common.items.weapons.bow.frostwood-2"), + (0.10, "common.items.weapons.bow.eldwood-0"), + (0.10, "common.items.weapons.bow.eldwood-1"), + (0.10, "common.items.weapons.bow.eldwood-2"), + (0.01, "common.items.weapons.bow.sagitta"), ] \ No newline at end of file diff --git a/assets/common/loot_tables/loot_table_weapon_uncommon.ron b/assets/common/loot_tables/loot_table_weapon_uncommon.ron index cf8ede00b8..4ede12e596 100644 --- a/assets/common/loot_tables/loot_table_weapon_uncommon.ron +++ b/assets/common/loot_tables/loot_table_weapon_uncommon.ron @@ -69,8 +69,19 @@ (0.05, "common.items.weapons.hammer.steel_hammer-4"), (0.05, "common.items.weapons.hammer.steel_hammer-5"), // bows - (0.30, "common.items.weapons.bow.leafy_shortbow-0"), - (0.25, "common.items.weapons.bow.wood_longbow-0"), - (0.25, "common.items.weapons.bow.wood_longbow-1"), - (0.20, "common.items.weapons.bow.leafy_longbow-0"), + (0.15, "common.items.weapons.bow.bone-0"), + (0.15, "common.items.weapons.bow.bone-1"), + (0.15, "common.items.weapons.bow.bone-2"), + (0.15, "common.items.weapons.bow.bone-3"), + (0.04, "common.items.weapons.bow.hardwood-0"), + (0.04, "common.items.weapons.bow.hardwood-1"), + (0.04, "common.items.weapons.bow.hardwood-2"), + (0.04, "common.items.weapons.bow.hardwood-3"), + (0.04, "common.items.weapons.bow.hardwood-4"), + (0.04, "common.items.weapons.bow.hardwood-5"), + (0.03, "common.items.weapons.bow.metal-0"), + (0.03, "common.items.weapons.bow.metal-1"), + (0.03, "common.items.weapons.bow.metal-2"), + (0.03, "common.items.weapons.bow.metal-3"), + (0.03, "common.items.weapons.bow.metal-4"), ] \ No newline at end of file diff --git a/assets/common/recipe_book.ron b/assets/common/recipe_book.ron index 918c2cc83a..5d518f77b3 100644 --- a/assets/common/recipe_book.ron +++ b/assets/common/recipe_book.ron @@ -235,7 +235,7 @@ ], ), "Hunting Bow": ( - ("common.items.weapons.bow.wood_shortbow-0", 1), + ("common.items.weapons.bow.wood-2", 1), [ (Item("common.items.crafting_ing.leather_scraps"), 8), (Item("common.items.crafting_ing.twigs"), 6), diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron index c3180f8354..f780a72a2c 100644 --- a/assets/voxygen/item_image_manifest.ron +++ b/assets/voxygen/item_image_manifest.ron @@ -45,48 +45,128 @@ (0.0, 0.0, 0.0), (125.0, 90.0, 80.0), 1.0, ), // Bows - Tool("common.items.weapons.bow.starter_bow"): VoxTrans( - "voxel.weapon.bow.shortbow_starter", + Tool("common.items.weapons.bow.bone-0"): VoxTrans( + "voxel.weapons.bow.bone-0", (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, ), - Tool("common.items.weapons.bow.wood_shortbow-0"): VoxTrans( - "voxel.weapon.bow.shortbow_wood-0", + Tool("common.items.weapons.bow.bone-1"): VoxTrans( + "voxel.weapons.bow.bone-1", (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, ), - Tool("common.items.weapons.bow.wood_shortbow-1"): VoxTrans( - "voxel.weapon.bow.shortbow_wood-1", + Tool("common.items.weapons.bow.bone-2"): VoxTrans( + "voxel.weapons.bow.bone-2", (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, ), - Tool("common.items.weapons.bow.leafy_shortbow-0"): VoxTrans( - "voxel.weapon.bow.shortbow_leafy-0", + Tool("common.items.weapons.bow.bone-3"): VoxTrans( + "voxel.weapons.bow.bone-3", (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, ), - Tool("common.items.weapons.bow.wood_longbow-0"): VoxTrans( - "voxel.weapon.bow.longbow_wood-0", + Tool("common.items.weapons.bow.eldwood-0"): VoxTrans( + "voxel.weapons.bow.eldwood-0", (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, ), - Tool("common.items.weapons.bow.wood_longbow-1"): VoxTrans( - "voxel.weapon.bow.longbow_wood-1", + Tool("common.items.weapons.bow.eldwood-1"): VoxTrans( + "voxel.weapons.bow.eldwood-1", (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, ), - Tool("common.items.weapons.bow.leafy_longbow-0"): VoxTrans( - "voxel.weapon.bow.longbow_leafy-0", + Tool("common.items.weapons.bow.eldwood-2"): VoxTrans( + "voxel.weapons.bow.eldwood-2", (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, ), - Tool("common.items.weapons.bow.horn_longbow-0"): VoxTrans( - "voxel.weapon.bow.longbow_horn-0", + Tool("common.items.weapons.bow.frostwood-0"): VoxTrans( + "voxel.weapons.bow.frostwood-0", (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, ), - Tool("common.items.weapons.bow.iron_longbow-0"): VoxTrans( - "voxel.weapon.bow.longbow_iron-0", + Tool("common.items.weapons.bow.frostwood-1"): VoxTrans( + "voxel.weapons.bow.frostwood-1", (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, ), - Tool("common.items.weapons.bow.rare_longbow"): VoxTrans( - "voxel.weapon.bow.longbow_rare", + Tool("common.items.weapons.bow.frostwood-2"): VoxTrans( + "voxel.weapons.bow.frostwood-2", (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, ), - Tool("common.items.weapons.bow.nature_ore_longbow-0"): VoxTrans( - "voxel.weapon.bow.longbow_ore_nature-0", + Tool("common.items.weapons.bow.hardwood-0"): VoxTrans( + "voxel.weapons.bow.hardwood-0", + (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, + ), + Tool("common.items.weapons.bow.hardwood-1"): VoxTrans( + "voxel.weapons.bow.hardwood-1", + (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, + ), + Tool("common.items.weapons.bow.hardwood-2"): VoxTrans( + "voxel.weapons.bow.hardwood-2", + (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, + ), + Tool("common.items.weapons.bow.hardwood-3"): VoxTrans( + "voxel.weapons.bow.hardwood-3", + (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, + ), + Tool("common.items.weapons.bow.hardwood-4"): VoxTrans( + "voxel.weapons.bow.hardwood-4", + (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, + ), + Tool("common.items.weapons.bow.hardwood-5"): VoxTrans( + "voxel.weapons.bow.hardwood-5", + (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, + ), + Tool("common.items.weapons.bow.metal-0"): VoxTrans( + "voxel.weapons.bow.metal-0", + (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, + ), + Tool("common.items.weapons.bow.metal-1"): VoxTrans( + "voxel.weapons.bow.metal-1", + (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, + ), + Tool("common.items.weapons.bow.metal-2"): VoxTrans( + "voxel.weapons.bow.metal-2", + (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, + ), + Tool("common.items.weapons.bow.metal-3"): VoxTrans( + "voxel.weapons.bow.metal-3", + (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, + ), + Tool("common.items.weapons.bow.metal-4"): VoxTrans( + "voxel.weapons.bow.metal-4", + (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, + ), + Tool("common.items.weapons.bow.rawwood-0"): VoxTrans( + "voxel.weapons.bow.rawwood-0", + (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, + ), + Tool("common.items.weapons.bow.rawwood-1"): VoxTrans( + "voxel.weapons.bow.rawwood-1", + (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, + ), + Tool("common.items.weapons.bow.sagitta"): VoxTrans( + "voxel.weapons.bow.sagitta", + (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, + ), + Tool("common.items.weapons.bow.starter"): VoxTrans( + "voxel.weapons.bow.starter", + (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, + ), + Tool("common.items.weapons.bow.velorite"): VoxTrans( + "voxel.weapons.bow.velorite", + (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, + ), + Tool("common.items.weapons.bow.wood-0"): VoxTrans( + "voxel.weapons.bow.wood-0", + (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, + ), + Tool("common.items.weapons.bow.wood-1"): VoxTrans( + "voxel.weapons.bow.wood-1", + (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, + ), + Tool("common.items.weapons.bow.wood-2"): VoxTrans( + "voxel.weapons.bow.wood-2", + (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, + ), + Tool("common.items.weapons.bow.wood-3"): VoxTrans( + "voxel.weapons.bow.wood-3", + (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, + ), + Tool("common.items.weapons.bow.wood-4"): VoxTrans( + "voxel.weapons.bow.wood-4", (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, ), // Daggers diff --git a/assets/voxygen/voxel/humanoid_main_weapon_manifest.ron b/assets/voxygen/voxel/humanoid_main_weapon_manifest.ron index 2dd1d86377..7acbd56fd9 100644 --- a/assets/voxygen/voxel/humanoid_main_weapon_manifest.ron +++ b/assets/voxygen/voxel/humanoid_main_weapon_manifest.ron @@ -695,48 +695,128 @@ color: None ), // Bows - "common.items.weapons.bow.starter_bow": ( - vox_spec: ("weapon.bow.shortbow_starter", (-0.5, -3.0, -8.5)), + "common.items.weapons.bow.bone-0": ( + vox_spec: ("weapons.bow.bone-0", (-0.5, -3.0, -8.5)), color: None ), - "common.items.weapons.bow.wood_shortbow-0": ( - vox_spec: ("weapon.bow.shortbow_wood-0", (-0.5, -3.0, -9.5)), + "common.items.weapons.bow.bone-1": ( + vox_spec: ("weapons.bow.bone-1", (-0.5, -3.0, -8.5)), color: None ), - "common.items.weapons.bow.wood_shortbow-1": ( - vox_spec: ("weapon.bow.shortbow_wood-1", (-0.5, -3.5, -9.5)), + "common.items.weapons.bow.bone-2": ( + vox_spec: ("weapons.bow.bone-2", (-0.5, -3.0, -8.5)), color: None ), - "common.items.weapons.bow.leafy_shortbow-0": ( - vox_spec: ("weapon.bow.shortbow_leafy-0", (-0.5, -4.5, -9.0)), + "common.items.weapons.bow.bone-3": ( + vox_spec: ("weapons.bow.bone-3", (-0.5, -3.0, -8.5)), color: None ), - "common.items.weapons.bow.wood_longbow-0": ( - vox_spec: ("weapon.bow.longbow_wood-0", (-0.5, -3.5, -12.5)), + "common.items.weapons.bow.eldwood-0": ( + vox_spec: ("weapons.bow.eldwood-0", (-0.5, -3.0, -8.5)), color: None ), - "common.items.weapons.bow.wood_longbow-1": ( - vox_spec: ("weapon.bow.longbow_wood-1", (-1.5, -3.5, -12.5)), + "common.items.weapons.bow.eldwood-1": ( + vox_spec: ("weapons.bow.eldwood-1", (-0.5, -3.0, -8.5)), color: None ), - "common.items.weapons.bow.leafy_longbow-0": ( - vox_spec: ("weapon.bow.longbow_leafy-0", (-1.5, -4.5, -12.5)), + "common.items.weapons.bow.eldwood-2": ( + vox_spec: ("weapons.bow.eldwood-2", (-0.5, -3.0, -8.5)), color: None ), - "common.items.weapons.bow.horn_longbow-0": ( - vox_spec: ("weapon.bow.longbow_horn-0", (-1.5, -4.5, -17.5)), + "common.items.weapons.bow.frostwood-0": ( + vox_spec: ("weapons.bow.frostwood-0", (-0.5, -3.0, -8.5)), color: None ), - "common.items.weapons.bow.iron_longbow-0": ( - vox_spec: ("weapon.bow.longbow_iron-0", (-1.5, -4.0, -16.0)), + "common.items.weapons.bow.frostwood-1": ( + vox_spec: ("weapons.bow.frostwood-1", (-0.5, -3.0, -8.5)), color: None ), - "common.items.weapons.bow.rare_longbow": ( - vox_spec: ("weapon.bow.longbow_rare", (-1.5, -5.0, -13.5)), + "common.items.weapons.bow.frostwood-2": ( + vox_spec: ("weapons.bow.frostwood-2", (-0.5, -3.0, -8.5)), color: None ), - "common.items.weapons.bow.nature_ore_longbow-0": ( - vox_spec: ("weapon.bow.longbow_ore_nature-0", (-1.5, -4.0, -15.0)), + "common.items.weapons.bow.hardwood-0": ( + vox_spec: ("weapons.bow.hardwood-0", (-0.5, -3.0, -8.5)), + color: None + ), + "common.items.weapons.bow.hardwood-1": ( + vox_spec: ("weapons.bow.hardwood-1", (-0.5, -3.0, -8.5)), + color: None + ), + "common.items.weapons.bow.hardwood-2": ( + vox_spec: ("weapons.bow.hardwood-2", (-0.5, -3.0, -8.5)), + color: None + ), + "common.items.weapons.bow.hardwood-3": ( + vox_spec: ("weapons.bow.hardwood-3", (-0.5, -3.0, -8.5)), + color: None + ), + "common.items.weapons.bow.hardwood-4": ( + vox_spec: ("weapons.bow.hardwood-4", (-0.5, -3.0, -8.5)), + color: None + ), + "common.items.weapons.bow.hardwood-5": ( + vox_spec: ("weapons.bow.hardwood-5", (-0.5, -3.0, -8.5)), + color: None + ), + "common.items.weapons.bow.metal-0": ( + vox_spec: ("weapons.bow.metal-0", (-0.5, -3.0, -8.5)), + color: None + ), + "common.items.weapons.bow.metal-1": ( + vox_spec: ("weapons.bow.metal-1", (-0.5, -3.0, -8.5)), + color: None + ), + "common.items.weapons.bow.metal-2": ( + vox_spec: ("weapons.bow.metal-2", (-0.5, -3.0, -8.5)), + color: None + ), + "common.items.weapons.bow.metal-3": ( + vox_spec: ("weapons.bow.metal-3", (-0.5, -3.0, -8.5)), + color: None + ), + "common.items.weapons.bow.metal-4": ( + vox_spec: ("weapons.bow.metal-4", (-0.5, -3.0, -8.5)), + color: None + ), + "common.items.weapons.bow.rawwood-0": ( + vox_spec: ("weapons.bow.rawwood-0", (-0.5, -3.0, -8.5)), + color: None + ), + "common.items.weapons.bow.rawwood-1": ( + vox_spec: ("weapons.bow.rawwood-1", (-0.5, -3.0, -8.5)), + color: None + ), + "common.items.weapons.bow.sagitta": ( + vox_spec: ("weapons.bow.sagitta", (-0.5, -3.0, -8.5)), + color: None + ), + "common.items.weapons.bow.starter": ( + vox_spec: ("weapons.bow.starter", (-0.5, -3.0, -8.5)), + color: None + ), + "common.items.weapons.bow.velorite": ( + vox_spec: ("weapons.bow.velorite", (-0.5, -3.0, -8.5)), + color: None + ), + "common.items.weapons.bow.wood-0": ( + vox_spec: ("weapons.bow.wood-0", (-0.5, -3.0, -8.5)), + color: None + ), + "common.items.weapons.bow.wood-1": ( + vox_spec: ("weapons.bow.wood-1", (-0.5, -3.0, -8.5)), + color: None + ), + "common.items.weapons.bow.wood-2": ( + vox_spec: ("weapons.bow.wood-2", (-0.5, -3.0, -8.5)), + color: None + ), + "common.items.weapons.bow.wood-3": ( + vox_spec: ("weapons.bow.wood-3", (-0.5, -3.0, -8.5)), + color: None + ), + "common.items.weapons.bow.wood-4": ( + vox_spec: ("weapons.bow.wood-4", (-0.5, -3.0, -8.5)), color: None ), // Farming Equipment diff --git a/assets/voxygen/voxel/weapon/bow/bone-0.vox b/assets/voxygen/voxel/weapon/bow/bone-0.vox new file mode 100644 index 0000000000000000000000000000000000000000..be146248e8e3f2478a3efff5bae1ef64ed37df94 GIT binary patch literal 1424 zcmdT@-Ahw(7=F&q*EV&ZZqov(3kfT+l2J&5ESJd2#F;EFgrIXy#JUL)#K6L&8_Bv@ z`bIfaP0@F`PJ z74kk8X2gb;a9~6os6O&h7n+ZpN~=21RU5w46co*c(q+SlThKMex(i)rtXoi1tT)If ziB1=W!PulV9hfHlF!O%acTzXWoS(S>wF8_lKtD)7N*kjMQZqq6!8>h?+o;t}+n$Hg zLEFJN#NII*dYrq3ICI=ZAZ)=OB|ySv<@OOTtKEB!7l z<#Ksny*JBvKjcUV(%T6c=!RVBg-o1oov(TRX8%MIk~#iowaxbq>nA6=W$0X=WG|lG ex65IB{*U)crIJ)Cl>^_P(P$jV|Lxx1|Nk5C-7Z4_ literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/weapon/bow/bone-1.vox b/assets/voxygen/voxel/weapon/bow/bone-1.vox new file mode 100644 index 0000000000000000000000000000000000000000..bf6a73bb5a3a824d12d9c64aa3a00472d66ad8bd GIT binary patch literal 1752 zcmXAnyRI8I6h$|wdFXY0J(8~O!**im7x)D>6d1Qi3^MVuurAh zomv+zSh`i=AJ8w17a2)=4z+oBxaN@W-+p-cucY5!J^n$^*Gl^H@#Amv^oP#~P0+9C z!(SgC|FI1C{D+Kv(HVpEqBW!Ey|GBoTT?vi%n0dOYs!b-6c4?S86iF3-FK$A?}Uu* zTT|Wjro8KgOo4RQTE>=no7U-<-c+}pEpI!6lwxsL9Oj90y>SLCe7S&>65@w8%Y+1Yy886;$@C3`G;rKn}AdevKG#tY(t zoGG;yteN&ov06|QKgDvvngu*fZ>t6$X-*I3)SL5vPX3%4jFC-oJZH@nIaiEl)FC39 zVtvKj6MFXKi_taln)sCXl-RJQp+;Jh_7Sh@rgAW(`(IIRWtUT;m_##jJa9&?#=60D)RNzkUx=U zKpr`Sovg?s;z#_5AMsOKzz+-pe!vg-X{pEe_?|x=-{Yrp4&UKBe23xi`3=GszVL-F z{l6{G$VQQ(kphwAjKU+r6XA*QM0heDJQ1D5I#gr8aukB7&@^<-*x>Q-czFK)v>QIZf0K{W!{g!c@OXGUJo$L@DW%RN zn)Jm_M-GpJ$HC*^aq#480FQ&m!QF7c1P>(F7E*c#zeP%IXS7tAv{p(8q=J=&oy+MovMg3joKj_82)Xot3FgBqj@I-?Uhq66Ba t9onJ|YKF_@GMvxn;dD9;$K!E091g>NzaMtH-LTzmhs|a)G)+UU^b;!h%8md4 literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/weapon/bow/bone-2.vox b/assets/voxygen/voxel/weapon/bow/bone-2.vox new file mode 100644 index 0000000000000000000000000000000000000000..fc14c8d845d3f46965cc15e4829c4ece942f5212 GIT binary patch literal 1460 zcmdT^-%C?*6hG&C@9uu6bLw{I3?v1KyBbz93TdF_5*e8!jb$MObq8V4gCydEg+(vY z>S2Y#Xsnk##a?|JL=TZjkG&3xOaFtMK6im^2oeTC7e1WN`Sm&Hd>?N1dhX;KBDyv? zGYdmy57GS0Lb}s+@M%B?FaYFkEzCS(5PY`*RzZgikIhD(&Hez;ZL_aC&;B4{#vN86 zhrPZ$t3HR7a@ZHL*%PtZ+mmNqS*&^x>x#3|9QJ57t1kFK#C3-Q&@y_V(TQGTdy|4k~J25YU zo(_jKGtZjBzEObl%r3ySsLdLqryn4j1JLoiw}j*D(c^4{EjDzEaK8cwa}+?hR{?|_ zlnc!qR@^_NRCHKrQCOFoLyEz5Gp;C>Pz+Fig7ql&kHiUa_L$a<>C2O(H=mv|nT-4^ zSbLSWS^GaK(wHD=ti+n}!M$>O{`-~`h-3w*zTA-$I|ca(zF!4C1C5P?`q`^}2fSQ; zEnC&Kre9imE9<#6$xcP2E@|2On3deplq@})m(}8;BnL@WH_P(iIcA?GS-eP6ydRe@ zo8wa7xNxA^`bKWe<0)#(CC5f3l}brEotEY0WvSI_&HRU_Ir&t)C*R&blrj6ROc!3r zU}0S{XG79>m1xs&XMEk=m0G1Dg^l00J((c6iM^8VlCr(MeW>2uWi~-F5F{B1lZ?hl zu8fe(ooU~%b^lg=$|Ok*{aI~m-*LG)7nAYxmZUG8J9Nu&HUG!HVzDTtQt8MysMqU9 L=KuC?_Yd$3G5;+P literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/weapon/bow/bone-3.vox b/assets/voxygen/voxel/weapon/bow/bone-3.vox new file mode 100644 index 0000000000000000000000000000000000000000..e12fa7da70701d0791eac8e2b14f4601350a961d GIT binary patch literal 1496 zcmdT^-Ahw(7=GX1&ex`Hb023~Aax;OCDmdS(jdzvGBQz;<%JMf7l3_RsVAH_a zblEiXY?%&I7kXPRnU@u^q7k zu>&y(eGvK}^g-wm{eTLA520oVHN)r^M!zung)wg@?sOK|>VyXg@Da=#!MqX78v!51 zK2huw1=of7V%Rr^ePh@+hI1T##0zZ1;jg!k4exAtXTv)i9@y{>QMdEN33v|g(Pw=4 z)*xw(&qLX4R{j6MIcew6Ixuiz+_`0*1_kLbNwM*B%l z1xb2iB$v8LZugRmU2L7NdH&}7oK2EG`)Atbdne89v2Gbi_DSZ(l_R^HwC4YKuUsxm TrBXT8gL=JwEdRHAdw+lf!ah3I literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/weapon/bow/eldwood-0.vox b/assets/voxygen/voxel/weapon/bow/eldwood-0.vox new file mode 100644 index 0000000000000000000000000000000000000000..aefffd6a58ee66baa926839a7775625b6f951d42 GIT binary patch literal 1552 zcmdT^%}Z2q6utNNzGg<9?+-1IT1Z$)HN$gqMyD(%ks%c&nOq1#xd_{c2;!o`qK#xB zQ)-M2g)pmhJDXr2T14Qwtx)twB)9WsAu|XP20;%F=l6DzR#saV;p5Nm*rn6(5^ zEX7Jo6UTa(Vm519f;on|*2{*5K0T=%jjpGaqcQYeHg)tG-DDV7*f0{xVbg%tOp<9L zHq**s%Y@GACeuRBN+^dd3pp2bF63O$fh`w$-SBh6&kaAY>4wgeWW%#bre~8)PewUx z0o>HhW)tRYPO{mYW^Tc`1!phxUg*8hd!Ywg0Q=zWgSQXfVAF^D{FuRy*pC^&mLK;8 zFlzw00A>YS0qBCz1(6Fv2eyL9h2R&0UkH9+Glbr7lDXApJ&ZlIrq~E$PhsRE2~y6E zBWVRDr=~^HtQ>6wJC0k?9^Om0!wwd9ijb&b*d~ z`9+x+h)7kkvioU5@-qW6^JH8W3R7aYlPoNkAR@B%963+}xb(?CjL)A0FrBbK$Ohd;dTZ(|2TW<(Z6ay^-8SzwEu} zYVdIG__)0-TWf1lT3xNx9$h85g}Lmvwrp%{9MU_p40n;7@RD?dNiMXJT<;(mJ>NKA z{rvUunJ7u$=|9uf_Z>HmjH?n%Gyp9?_WH!oFG7ItK0wkwNu+qBOP7coB0EV&po@&KM~dQ* z3TRQ})Fe?TNoL3;Jpu$>G9_x89g+cubQQH)l4KCI!EQ1l*wb7xH0BxM(oiFsr z^cH{uPejcZ6Zf;bNQPaKx=WVKkrm95X*y)uj*zGYghVYM3>!Ucun9Kda{%61@C7~^ zxRY)Jrb`<3HSB84?B@KS|di{(gDa^$lC z6ElSX19OD|Jx4MEXt~kB3;jZ?J-^6gGW@U5UU^%0*5;4;bz5b*KL7nCmxSOuD1y7z9T*!6s`dlBEXOmm~w|i98Ob>{k zbegB8rg&{_t(ISXl;y95oBZwFZSHYy@ZiEz9)16cGu<|CJnO9MQ9Wb4r;YO$kMQdJ zByW7Y%MZ^BzJ|FHuM@nqw6sG%b@dnzcM9I`7koG(xFae!-YR(HME!i*=ieS5jR{U2 w{4?$Ly1mA+krwWYw{!Z;sU3IOYtR3&u23j&u~^*IgL1jNYyNNVUHt?62JDtHi~s-t literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/weapon/bow/eldwood-2.vox b/assets/voxygen/voxel/weapon/bow/eldwood-2.vox new file mode 100644 index 0000000000000000000000000000000000000000..762bb669cdd146f900359136af6e70416094433a GIT binary patch literal 1456 zcmdUvO=uHQ5Xax_$J;b*(|m1eEfhV7wp!3g5@`~!(pW;UmPSj=p&+OSiHEq!Lh+zd z#Y?e5iPmbcD21GCt^p|o#DfUA3B4Be>Rl+~KRJ|yLXirB3qNM&&3|Uzyu;33&K!9z zgt#=GoPrUrbs^HpY@(+b;8Q^t7yy}T*<_C3;L8Fs+(jZKiX)4N;JYIv`)rcFA}NYZ zD$o?1s}Uk^gcLPTx<5wZkVUE*CF)0BjghX}L|TLl4{AM8lKvv;T8yNIT0Kl!ph#-K zCIv_xS{WhTM6DSk3Pj0}&>3M;P4x6*R$rJ517{A*H1j0gI5*MXf!eMxkq7vo@uFWB zbj}dzPD@CqMbc?2O=|$^4w39G5cR*xL&vF!H4NfImu_2J}3sexM;o7U})yr2^9;hZ{JonaK;|LTf#{NTpKzuNZE; z?U=Rmqca|AtaawUzvP+_e792L%F`MT)|Pn37Q9mdpTYLRu72vGujPOHwaH(9R`^3> zr4^TRFZh1u9;f3@u5*GLA7?p}o8a7|G|!jjI5Z@9esPU&KgR5ng6GZ&F5MjAFNH>(y&Rsyp$&UOa9Plgx{SMvkQ6kZHin zc1V$Fk}^l8bjXs(F{enHSu#y%6WW5dpe<+%+CNQ(e^yBUEJ=S>@z?~EmT8hLMN(S9 zt#hQbf!m-1$PXYtfcyaR!6u*t;Twc+5WYe9hM+^xA?Ofv7=4A&R~R}B9YOCA^d3R) zkvthT?xL74ius}r>E3)X%pb%2G0Y#!6Zr~6?FABG0rnBlQ6L4Zfc+AC4!dNkfbEj1 z0LQR%um(2uJekovN$gjmo`KyPsAC{*Ag;qhhnFUR&H`DwOIFk+iSHxv4NVP*;m!ae zsO3k^Kw*6N+MrPDpI@X>DgIaJ-F??oYyU^H?%v&Oj(=b0su29JQsv6?DtA>^d4Epu zeg*gf>@6MSkKTwJoHr{kdA+hw*X5bl{3x@)lS47CagujGO>$;th-aQo@O-Jj{oR7+ zS2p?nGt@pKxNuo;>E3Dnx-!7ErAr5%jXUyk=7vO5EFO<@B9Y)^GRehak#}}>>hTXx zGW@x8m%qJ#z!#_P@bKy~k8i!<)cGLqz36N5@M?VA-sY{fHC|p^tj8W-6?_|g^}p@s zjg5^%`Cc!heS$mN1ouP*pX(5Oy+`oa+2;Nl`)@p-vIQqj{8?_}dq+LnV;wvY@8#r` g3x{Sos^|asUa3^#a=HB59n@;I-^TxTZtoB93%Kewi2wiq literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/weapon/bow/frostwood-1.vox b/assets/voxygen/voxel/weapon/bow/frostwood-1.vox new file mode 100644 index 0000000000000000000000000000000000000000..04c689eabeae9e45ceee49f0724f53528a966c94 GIT binary patch literal 1512 zcmdT^-Ahwp9DaZ2`%K;UIckB_g@lz<3n`>Qek>Uy6D8R>n@Ug-v2H>H@uI?_8_7ae zYK%rD>?(J=n_v)KMBq&~-Gxx>pO9bA*~QopBn*NMJiNc>eV^agGuZUC^s$#hh^s@% zaU9~CD#TRMO|*LipA7hbZXoTr$@hc+-yHy9mI#o%lU$O>A(^tIcn~v0QjKKEB}H;b zm9nHuvqW-@6gfkx?2;zqPKHjYk*YYPDH+lg)KY7tsV?bimP{2n8o1_=u4Ty3aHkz)DC_7 zFi{712e==4KlFa+{m|ny017}CK-~c922eK$9z@?D`Ub&6;33Qv!dxNnFzSRcdl)%k z%pS(<5!^+vUj#gY{i4`Eiv6S5KZ+a+9$E0nf=3oSvXEoLOB-I=@Y2Sejl52H-U-h; z;kSpb84_K{2c)j->0;mg>Bad&LjZOFTVlag`Ii^J$vXxlztNp5n#) zED!VuUR){i-6!aMO7QGO!TDP!`RmFcSC=m|YBqc1X%D<0u4qNko%**HVTqqO{^q^X;9{B#Zdwc%?zX3p&Hwpj% literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/weapon/bow/frostwood-2.vox b/assets/voxygen/voxel/weapon/bow/frostwood-2.vox new file mode 100644 index 0000000000000000000000000000000000000000..c860a884def6ce225cf09c86776a805b73a53896 GIT binary patch literal 1384 zcmdUvOKTHR6vxk*XOgCAnwLfgQAiQ3MU4cd7_dpk8iKL5HN<8TD5$GIK|(>huu`EL zu}T?jBf+8+W@WR@Mu>IC)y&9^1KCy%XgU6VNhB(X!8j6B}=wmy; z48{;e4JEORIHaKx;4{c^NkdtvpfZ?7Da- zvF%Br%sG`$)!u{q71ojijAEb^WMtM3F=0kzBm-S?1zo`kD4vwSOi!jJKd@-^`snbNTb9G`{M@7#06n%^WW8$9$<`Wm7J)hz^Ml!6>DA|N27C6F^@cXB zrLNzozN2TwB`RdX)Fz$wz7?og%~18l3_UR`lsE;n@N|`C=NBk93RJlUWIjAkyD!J7 zy>hiTv;U3kn#Bw_a`AYalF20Lx=yuPjhfA7H~;y0k-nP`XtZ#bt~{Ej$+cCQ-hNNH zOMcpaJ?5BUYkb++q3w+g+FD=l=9X^&-Q&Fy9}-lr*ALX&yX41!PWXUELO>UzKn zsSD2i`uFd*&qjcfXa20VzwfAaWGYJI@pGhKzkJ{>N1gdU_L-(hjYi|pH)yxphvxtG I-u55hHwSGM&j0`b literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/weapon/bow/hardwood-0.vox b/assets/voxygen/voxel/weapon/bow/hardwood-0.vox new file mode 100644 index 0000000000000000000000000000000000000000..29f5b4ef8cfb571485716a7e3d8ec366f34909d7 GIT binary patch literal 1360 zcmbu8e@xVM7{{N_{oqax@ZiovK#vP4`B5f9hzs-(m>dRrkfet>4syyE({6>xZf-i&0oq6V((}jqTp3v0I~}^I8<5einsjKg$xFy4RT<>hG{c zo40MP7TeNik&226;_*0l&j|JB=2+wXm7l#{5{X6@*QLd`EWN1nLWa)Vd2Tkg0ovl9TYqo`z{J)jV>B`+(ZUEynS^wwQ(UlB6Lg% zM{j9uI2+&2Eb`+;l+OgoiFwHz%BE-{my+vi$=oaC52*L3P&q5e^V+}PiHxKn(_T)j zO=oib3T{{BK*M8~Gyj zck^ma_xKrqMVLJ;Jf+{dD&VKJsEFgc!pc6n%5oUm_Bb>9o+h%hn(p={;)mNfdF%lF zhawEW(ap@{o6KK3hs)(+r6-+0AV5iB9_8zvpfyy*q4pgdKN4m5^;JxLkjGayidguf znD?~j%!F|BGvT{0h5oJr&JLC`cd3S-zHT9Q(#_CEUas8AVu9R;?q5?V|L^_{!r+VY z*Zs@=*@TMn*;~GjSnZ~V?jH;Wxho(}#hvR|=Y?-S6>hgF>-&|Kmh!R;B93v*?&tG7bNB?CUmIup`?IuMp674#ssDrX{a0T9!lnQ0QJhF5{xP?hSgd(e-JiLo N;y=#auiaN8zX8>jNgn_J literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/weapon/bow/hardwood-1.vox b/assets/voxygen/voxel/weapon/bow/hardwood-1.vox new file mode 100644 index 0000000000000000000000000000000000000000..f0b36f3236622debcf2b2ea35405c79983798770 GIT binary patch literal 1424 zcmdT^&ubH56#U+9vb#ysG{4&@6g?EFTGU8TiUHduSwb|H6hrKxAgBk47YT(@LAO=B z6swfgHWCa){4DJc0T!gDrxPT~7ytSCQMj&|d0H{F(NLHmZNq|h?Qimi-Cs_iQ!DVn6 z+|eP~p_9V_?(C4msgu)bkOGj>A*Z5~qNGVxpw$j3s!pn!CQXIbI;3jg8n_GGwMOKI z$88AJZIJ3-ldP%%H1vbip*bQCe4bgNVd!CKFZ^Ekz3_YCN7Votfo}xo`A~hB;ln#W zynf90L;Ilv$QMAq0P+Q(gUBC5{vh%L6vA#H>=ptKW9Kk-4ueO)Bj6G6QQQ$Aj~XP# zpaE&j$m_E+!qK}{kmtm{J6Nvg=CmpoZ|N90vAh3E95x#k|Ac zKRn=z_inSk`JD5+Z#jG3$NMj*Y-d|`(f literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/weapon/bow/hardwood-2.vox b/assets/voxygen/voxel/weapon/bow/hardwood-2.vox new file mode 100644 index 0000000000000000000000000000000000000000..56c5e49d35061cff1d03bb33a1acef75492f3411 GIT binary patch literal 1392 zcmeHHO-ox*5WVwWK8+eb677q~t6(5#AjOcjghGVML=*#N%-! zlSycrhIBfOOeTX|E{A+Rk5Z|Ga=DD1ogM7$?V(bs;OOWG)oK;BS`GDj9cO1}XfzsV zHk)X*TJSjpqE3P2xWMWyft*j^nO|TxC{PIt97hG}34umZ;G-rGoEXQ{Z4Y98FXjVx zusnGWtC1i!Vw2dKi=em|!**&GyQ@j;XP0r9dxBT_HM}lu;7xf8r@KYG-QUL7V}Yx4 zf#075@SX9)4qT1{S3!(Ujl#X)hIh>if5DH?ix47*5hQ8}EWTSrwwXooq6qcD44ktX z-04kBJbjM4+Xo07oFH61$INL9+WRlq{O}ER{+26#KejCYa2Q0&YQ^W_Vf;#^;PA}C myK;(r^(TfBL-5soC|nj$UtnK>eJ|N}9oHN9PaA0e0sa6zVN@~z literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/weapon/bow/shortbow_wood-0.vox b/assets/voxygen/voxel/weapon/bow/hardwood-3.vox similarity index 58% rename from assets/voxygen/voxel/weapon/bow/shortbow_wood-0.vox rename to assets/voxygen/voxel/weapon/bow/hardwood-3.vox index 56d7d1cac4309ea6ba416a1f0a62657049d67e5c..364a29ca84296ba82a964d18aae01262e461cd07 100644 GIT binary patch delta 303 zcmWlTy-EW?6ot?H?QS;N?9Q%X_2i31UOeUgmjS7 z@qnx#nsX?{1BxEcp|yk2Gl<3l#yA9K3K1<41biHFX-EcS#HEIxX^@(X`w$%m2!}9X yBDelM65;ik_IHEM+o7E7Zl}KN?fZxGWB)zA^uu1)-=FUIm#YKsKOVn6rIY{T?l~y{ delta 249 zcmXAj%?ZLl5QX3V#hAn-YZ|Zs5nJ%+LB)%xCqoL+5){EY1g{p9gGKm>3&Z!`?Ax8W zW|u7PHv7p#(rU3>1AT6>IVXsQ+8>U~_pi&D{n5&(lMFPytm$Mdw5^;)yI#(<@(%5L zdEY8{bm$cVZxWcm0UXdzJB1WKBuAMHpKTF2ft)}A3;YO8uW|&P< zJr3w$iYaE8VITWkIG}ETLmC>=P)>t6jyBQ(O^-OZTPkRj3VS3a83{>5;&O32oyf0W rywAU$1h%JGs;Gz+IjcZZ$n~+vU~%+rHR;sh>QJ delta 261 zcmXBOO%4G;5QgEedS)8qcg!$$EF8ho#?k^iv5_z?;0Deh5^)TPi&!{BAHyp;={)^a zb$9BSKGJNv*-h?}R*U5t6koIPb h0Rs(i$bdtJE_qurbjf){eN?@sHn-a$I=|lT;J&UKEUN$j diff --git a/assets/voxygen/voxel/weapon/bow/hardwood-5.vox b/assets/voxygen/voxel/weapon/bow/hardwood-5.vox new file mode 100644 index 0000000000000000000000000000000000000000..b63c1de74b2685a38ededb94927cc6b5e6814413 GIT binary patch literal 1480 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 diff --git a/assets/voxygen/voxel/weapon/bow/longbow_iron-0.vox b/assets/voxygen/voxel/weapon/bow/longbow_iron-0.vox deleted file mode 100644 index c1b8797950ee39710f289806ac7ced273af09a3d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 27787 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 diff --git a/assets/voxygen/voxel/weapon/bow/longbow_rare.vox b/assets/voxygen/voxel/weapon/bow/longbow_rare.vox deleted file mode 100644 index 538df2d21dfd0f11b0bdcb1cbd8d6a433b980cab..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1444 zcmc&zZD^ZS7=7-WylL9BP12-qnsm0YtFBFDt{---wp(f&*K{^rR_(TQjv|h&gyAgG zY$Xh8RGgzO%+gM9);UU%v9gso6o1q($`}k8bqqm^3{msbA0qxco>YaYQ-6BlaL#j| z&wDR-Xkf2@Mnw9%!V!|Bb&O%So8B;_q z%8A965Z%UoBG1Z}Q>vI;GOko9+0Ix8V;#(QGR{fuWbHE6CM;#FU6xZ87h_$Fb<^)A zmvgRi>T=F&a9)Gj$SIR2p)?P*hkYt|t_t??@|<4Aa~49&gR^MsGub1WZl|`hmpvhQ z&=xaoLd&yW98r47fYM7@*T?#K@cv9DGVe}fA4>t@CM=2FJD%(k^ZHdwTU#5F$t3Qc z5%iv0!AAEl_{r@?HrtQn}1@a90Pgo(-rH~~zPHu8yVM{q~cUA&@4`Nyb zSBX2scf|BD!Q$J3?1JFN71}|;`H%LxS`R+#eTo*9#7`3C4Q_XSpA3 z@nJMngNbMzW)3zX`RrEA9PUQ;jXn5beiRKG4RkbBW9Rld930w;c%LBkoM7%{!SZQA zYn2b-KrQySZpK(oJB9)VMq4T|wc{aV4m^t3t}et!B1j$`#;FsBF!5px>DS`OEWD1@ zYv*9I*-+tf!teK^vAzban;*vGP4x(MG-BYXcBEh3fW`M~@a2sF);@2*yX={n7u@_* z@a-3ZiP1WoO*LcXQa675Y7k?m9GLphjVrgjSVQ&ye*R!Eh`R!amAG>qrd7c=p9pRb zllgwl&CPg8QV?wla`6Lb7x=!jzrA6a{;H}fd_N3CqQE46MmM$tUvB|sdx6f*zuo_~ zC(hvM-X-iCyos^H!137yq%LIe*3vb+^VupMJ9-k^UYWzr_m(kuc@=+}kM;jL-+%e} h3)lbI{WzP={-ZDN$miTI?+@R4^6zo??%k6kzXH|F13woTAP_w>z39r#Ie;-my|JP z34>Y{=ZJ<`+6m4&XDKpPwi1UT*cB;bFhuGY7A-PF{VO6O{&_r^3e!#f=L_dP&-p&* zeYpcWb_J&Z^mWAI0(e&e`eVsxNl}rb6De}P$gbVV*rB39&QS5ALk1>8Mo0!ay`Vl0 zy&(>rL4(nlfx#%;s6kOOFe<_o;U+Kz5(3J|Vmsq>R+9ls1`3~WZG*qYLIHk5zbf*TBOLAS( z+bz0VuuSGE6J93sN_~SzxJQFQ`suyGy&81ovR8Q=Cb6L+1B=X{mt76Aw`$43EU2u{ zL3KzUxAe0Mn#C?Yz2sVox=CV6Mxe;NO6dr6KG9uqC~`+unb#^ino-%>TH-zg$VtlZiaF`hG(l-cX<=NLtyo|)Sd!c7ePEG z{l`>dvXoeG^VlW_=eCsbTAQEjxto&!FN$0j`Br4|2sr;bxHJb|xgdH3JRJo;*a@!f z2a}>7836N7i~TUzSp)V)+j+PPJSp}>qmRSU5XTZ4r}ot|`}kH)9q8oJ%TMt8*|m1l7gH?Ey~LGEr&#Itv)tuiFc@TAO^8jK@8JXWHH@~_amT|g z%)d~{`L{#-;!2onpVsnC=~`%eG< zhI#P^0s($ENX8T7IDcj*w~=3MA*Z{^wzk{uzx}}ze58AUyZf(l^Z@zX^c*M76!_}G zCw$}53hz%JWBcgwu0`ihQX&Ykl9^xaJU LBkoq)EjjoNQvp#) literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/weapon/bow/metal-1.vox b/assets/voxygen/voxel/weapon/bow/metal-1.vox new file mode 100644 index 0000000000000000000000000000000000000000..93efd233bb5e8c120bf399cc10922bfcace8ebed GIT binary patch literal 1420 zcmcgrZ%kWN6hG&+uRJJ&mOff2v(%2cM=^8!k%0m$LLCL^>`>gwTo&W9u?AO(AxN4f zST)Y&&1Mpqi4*5Sh*?H9QWwnEqki>+F~%=HPf?S(P5tIge);{* zJ?GqW&b_()J9haeiKw?d5*4CRm8dTg4;SVPSr$QophB=~cRbR?B4ot`%w#fikcovA zlSvt2#S&$<7;LqgY_W>A8my`&TUF7jXq&K2I8QjwU`;bQPhiu6%$mXZ`J(g1m!D*{ zK)AqQ#cPskmwiEw*`8!Be1Uo0A?70CVu^J~tV8mh66X}{OtMxYXA5j4a(0QqHkahO zq_!@8UAR>GDivKS{ko-Jw`jM)7LUn_N3_RaE|a;+MwrWG&T@&D`ijhIv6xD(7e($s zEsiQ`vDDE8InI-Qg%!!Q=4_k96b`W}{i;Pn%wDlwQC79+&h3x2lXdM%si~<6sZEH3sUx6VaA`d2tYZj|ry!+)d()zi(OunI~PfKHcymfUdk5=5B}nDFsV!s-D+TJzP7lYvd#$pC0_tzoy^j1tB?7-q1&)~372p~;x z{W2`egl|3}TpJLU_p7h3$BUE(DJJOb2T;z)`%eAwh8gkud_Mdz07PTJIDSC~wgF#n z0j9cu*4Df3zwOZzc%o|_yZf$U_#p7|)GX3xvN%5fIo|nf84o9qqV1Jw^t`u#zVplY rTYqx?o&EinUw+}*Kf4#NtgQT_FXzbR+$--d-&*pYakuZ?mP5Y-<+@C9 literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/weapon/bow/metal-2.vox b/assets/voxygen/voxel/weapon/bow/metal-2.vox new file mode 100644 index 0000000000000000000000000000000000000000..fc9c82eb155fd568e72cc3dc89240446f7867ed8 GIT binary patch literal 1408 zcmdT^O>0w85S@8nN!ldMw^X6%qDa-EMuJisu$ovxFqS6oC3aB|)P=;2ghJ^;rHY$k zl@e_usX-}ZWwXsj2#5<2vUVp0{TE?8FN=^+C{jW2!Qsr@IWza%Sv>1z;rMGJx-pZ= zfT*YwWm5}Dx1Hcq0Vi+-DBM~|O)~;~wiuzw3@Bt0bC#L&ip>g}tO6S6m=%i^Km|0# zWL?3TnrBV5SXWIpRODKobrJV@Xv(qXx^$LEI(6VHu(#UNXRZf(ajpJJ zw(2Y0yjpxCj|wYdCBo8@q_jU*_%tia9r8K4Ub5kTw_)GB%+xwn;J7A+!mp4e8WO#WMM*4t~Sj znVL+dmQmWM4-zv)(NaQ)p-@U*)b>GY34ze3AVMBQ(H9Y)3W6ZZHGT6Z2wqs6bM{($ z?{)UM<0BKTOCoZ7Fm-~9Jg`MhrqV;f+JT>!s3RUFCQheQ-zhizUL!ORE@~iJRDYa^ zl+_~s_rMB9HHjuBcsMgP`+4r96zIoM0Scfo8u1X7Q5DtBqz2w8}wU?S$Nv$~Z zqg?6Bj&dI_sZF1n;2L3{FnuK0hkmUX&(X4)NP$os*wLua4px0k=Dn6(}FGW0;4AZ za?wm4mEXAi3CMl{^gOwO1N+axGI@v@#sJHltx3NDj-3VCo?6EPsT7k*@M*5)9ARc z9|8-qC6E;lq|yR;u@TZ^w+t5?E8b@0S*Fp&jUY?0^jmNe@p_O9|7L&#yc-v#O3Ec!q-pS!8Q3E z)hdW>qDoAm+C7bXhnIo3Z{yMt#_OxdXREj}Lw;xhxm*skh1xU7UqG1tuuYt*1uV3; zx8s*rfO@?OnY)O?S9`HmA-9#~z-LgYR50-V2HyN^0|N^SI5s_wR4RpJGKoYYfw8d+ z`uc{@)pZb^oq5C)d>3y9J3Bkr+}yDa_y+&uzcK^)2dLNz5dZ)H literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/weapon/bow/metal-4.vox b/assets/voxygen/voxel/weapon/bow/metal-4.vox new file mode 100644 index 0000000000000000000000000000000000000000..72375c934626ca4a185f4b015201c1b1b5299ab3 GIT binary patch literal 1584 zcmeH_-)mG?5XWck&y5>3ZnC@CjcG&3Mni={RuhcTL@}mIut}?ixHhp=Hb2xw+A8c_ zHEytSE1K2^Nwd}(Sw=SDYD%WIhM)xR0ak=lZ41iWawlz^GvzmS0t+SDHURDPpJ~K zuBb*G*L5YelAfBxNETI-CAAZtVI@2z5~xWuQBtSYGwfPVi3Dm9tu3kA%wf}KGiGxS z)gkK8?-a#$ib{+?9ilG%Zc1!7rNju-AsV`-b|@uIh;}Gt1nLs4U`-YDSI}QUKh-6= z>6$v5sA0y#o;YFN8}^JqU80qYSAM9vnY!6m-9p_$dnR9FRF`Os?~L)CF}^d#cTydqar)!z zOPqa)voBPKh%gqQoD)%_q=vy+8SI(KwOLftWZ#KeB{eP1$D(afU)>U0sik? z{tVAM)(C77H{;M_n2w}xvmHr$5H%ziXq*#UtCSry2< z0rBf0Z&yRwY`m2hcx$6L{+RjK1t+-EUlv?hY(e`^eZbde@bF+YJ0BSo>1& z;DO-wBJX`Fc#b{5zFVTo>>`E3UqC9k*V)gKu8_4)^65%4Lu>QYND) zw~pb-fmz_vBi!hszp9Kvu8iB`jQ30-pU;D3AsB=F1w>gN*2sy#VWFw13BR5Ps`MUY z@;VOOYsaF`*lLaqABXSz=)Sp(_di=k_tX@Qj13}_$snChBbiL1xAzTnbo8LBtALi4 z0uo8i#T>!<`Z`utR z6swfgHWCa)|VECpr%i7-xb2w4h6DhNLK_`Z4H%$s@d@KST>6K??E z=5##C1UF=W#rTruZU?+XhKmtmq;D_9k0T3SGYpn7M93ndjRGzee6=t=GvZ|w^vUXXhxU#6aIKR(EwU77uEmZp-Ar3TA9bk6zzMFZF zxyNuGaiodTNFHSd`fQYZ%zmEHZ=l4$fQ4d!Imq(| z4HOx8B!>b6M{@|HIpA7Q{01moD|_<-*9mfv5#T*R2U*fV5p{v@D#!u@^@Z7M(;#)8 z2@;6}{VPl~J~(={emUc@M%n5A+@=};>6IE)Ue@SXZG&0`pjL(Pjj^}Z%}>twy1HC> zP1}{#PF%{orN`-2O2qqoipX8HPdCYPI8kdYY!M=3V;n@gZHje}`r_UeLnM zJ4&4Q(%!2{#~JM&pLcg@XKRbfo0}c)$yK0RJXhp>go?%DzWnwq$w{E29-whQ(76!M z^>Lv2v(EW?=kL|0fq57AV3g0w3a_TA;MXa0|MrfE{CR66ht>h=18 L{@>oa{R8|4U*9XM literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/weapon/bow/rawwood-1.vox b/assets/voxygen/voxel/weapon/bow/rawwood-1.vox new file mode 100644 index 0000000000000000000000000000000000000000..e2f3fe1ae2e0427776349b72d05546032164ef06 GIT binary patch literal 1408 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 diff --git a/assets/voxygen/voxel/weapon/bow/shortbow_starter.vox b/assets/voxygen/voxel/weapon/bow/starter.vox similarity index 100% rename from assets/voxygen/voxel/weapon/bow/shortbow_starter.vox rename to assets/voxygen/voxel/weapon/bow/starter.vox diff --git a/assets/voxygen/voxel/weapon/bow/longbow_ore_nature-0.vox b/assets/voxygen/voxel/weapon/bow/velorite.vox similarity index 100% rename from assets/voxygen/voxel/weapon/bow/longbow_ore_nature-0.vox rename to assets/voxygen/voxel/weapon/bow/velorite.vox diff --git a/assets/voxygen/voxel/weapon/bow/wood-0.vox b/assets/voxygen/voxel/weapon/bow/wood-0.vox new file mode 100644 index 0000000000000000000000000000000000000000..9b3fd6f8d47fe08804c6da4795df34687720753c GIT binary patch literal 1336 zcmeH`O>0^~6o!xYdexgR%~v6Y#9WA4l7J;*TP^{$jj0-}n#3l#mKxF|5GyEXp>a{O z2nnQtENTN4%7tJ`>qZJTE#0)MZn{V}`32o|-Tm7m{SDpaz%yrtne)DL2IfJ0W$c8A zV!_CLPBbnNEk?9ZS9`%>U^cadNlBEib^Fx^ZS(>Y3(9)*NH zp7#!s#p)un%}rvTLPkdFbCKNnnB*>n%vOcu9yiI|E;9D>8P=3~6*AeFUN;E_#>hGn zV`9vVg^@=|=-@0cB6~>eVRVrwum>Xv>>;y$SIP=pMF^W1!tEN0&8R)_{-3-|5>$=Gh3$Zog8;c&p|bYfy+0v?YCKA#V& zs>1L0BNPfD8jT_zk0X^zLDMv3G8t@aY#^J>BA?HrR4SodE~8SZU~g{^hlhtaK0ZdZ zT1Bl^gRbkS*Xw9B8fZ3~Xti1hj1i(vLijpi?FJ$1BRo|Jy8*&>h)`J|=m|n2Mfj)@ z0@IV2yXiqp^QZ}%kP%4 z+1y0&QxT54^Kd3LOl7t){p1;L?;OB?aDq_v4D+WgXz#yZ`@=Wr+{-23AGywd90icJ yTJd>g1i#X0*gZ*jAD$v#{fXhkFnqcXg^L38C9W%Q-3zX}imMm+PcP8^|9=4tl1}~r literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/weapon/bow/wood-1.vox b/assets/voxygen/voxel/weapon/bow/wood-1.vox new file mode 100644 index 0000000000000000000000000000000000000000..d97ebdf1832fa60ba50fa8f0379f5e71d847cd1c GIT binary patch literal 1392 zcmdT^OKTHR82#p*v}u~>BvB~3C{k@vBS9$!jLu{x25V_C#3BVjT}a$WD3mT#s<{ z@ss=t=Zr8n*yQHd9OnxL7oN}ava`sEG2-R53O{^--e-sxFA+QUPxFtpX>P1u?A7dl zqfX9}K?AXPJkH5vl1(=(%PT}Y0gBjO^GC|RhGMTjnhrb%`pxHXV7h~PR`kX*n! zxb*P277vfp-!|boZ8u#8sM5o@ z0PQ@K46p?=<)Kx8DX5x#%{*sqJglJ~EMYCRPdfA&N$7hk*zOXlqEADIV&rA$%k5!``OLa s2)g|t&@@e4uXoqtO_akVUY^zQX?77`$LDc=l7IZjq5RtJ{^Ugd1LV6n>;M1& delta 317 zcmXAkJx&8b427R(W+%xKHrZrh`krms^ZZes%KG7cclj>q_GWtrboEyE`!!kz`788YFv`S(dXT zZ-dNbd6yI%+GhoyRCsjADne2W=pri??1(VJ5gbt;!!i3Na01IcqC}hxiiAyBFeN`H zC#<4hkp81}GdJd|33M&Q) Yw;GO(z1rc^UmQ+u?Y>@)-)`f60g59v@Bjb+ diff --git a/assets/voxygen/voxel/weapon/bow/shortbow_wood-1.vox b/assets/voxygen/voxel/weapon/bow/wood-3.vox similarity index 67% rename from assets/voxygen/voxel/weapon/bow/shortbow_wood-1.vox rename to assets/voxygen/voxel/weapon/bow/wood-3.vox index 9dff83e1714497efbcfc62dcc3e7e5dde8d2c36f..318952e697c9fc69a756b7a39d0ce84a953d959e 100644 GIT binary patch delta 310 zcmWlTJ#xY@6oglnC4(`)#@Ojnq|FUzC@5S21v3oL***w4MedOj_%Sq?@X zd5@kkbcSypWNNSoN*eM@;s)P}dYoGZ*&1G>*BtR(&{Q$J;<`EUhC<#+4NxavVyal; JVEgx+rf_;0Zu?kA0&iQ01`+D=%O4XoPvwcP;j6W9DGI`7r8bHOLrfCIx1Ywb1r*79C7- zK`$Sm-6ZdNg%0f}g`S>pM1+V4Mik;fKE@|BCHNGd;xpeLiHapEmaDl}<7;$-Zie%I+lr4$?~SqU4>QIl=l}o! diff --git a/assets/voxygen/voxel/weapon/bow/wood-4.vox b/assets/voxygen/voxel/weapon/bow/wood-4.vox new file mode 100644 index 0000000000000000000000000000000000000000..72a2473350c78f926688fe7ec6ae9443f8b5ae17 GIT binary patch literal 1344 zcmdT@O=}ZT6g~5uv}wK@i3?G%NHIl?1VxM(otF=Sv9uUsg@Pb1ByJ=`N*7wHxDh`n zscj?}l)|iRw%G^)5p>hF+k!Gb!f?HlMaWPnQbF*+nRnhj=iYbUg(+XJ99;)+EmJ7* zhJ*&p7Z!xiIq;GgUdACt<>o@+7w^uxOtYbDc^H}rBgFnt4pN9~1qJjVdxADR0RbbxJiy$~+|M3AdnOW) zCb-5p^D*vWjCU``yzKL^&%-$$<_2?vxxu>5b#>0yZKzQJg&{Mfs0l41phmd22_Pxhol{&H#X7u}J?4(>w27clCd|&!LC6-1?7A>H_q@ z>XP-MOL1$3`gKs>Vtixlt`7aBY-GsW)@$0dmIvon^$k6$EK}K>q#g;{`CO(-)uif^ zd0J{LQtAk3>3N&(J#AC*BxvzGs9n#}*YyhZR?iJ "common.items.weapons.sword.starter", 3 => "common.items.weapons.hammer.starter_hammer", 4 => "common.items.weapons.staff.starter_staff", - _ => "common.items.weapons.bow.starter_bow", + _ => "common.items.weapons.bow.starter", }, )), 1 => entity @@ -634,7 +634,7 @@ impl Floor { 1..=2 => "common.items.weapons.sword.steel-8", 3 => "common.items.weapons.hammer.worn_iron_hammer-0", 4 => "common.items.weapons.staff.bone_staff", - _ => "common.items.weapons.bow.wood_shortbow-1", + _ => "common.items.weapons.bow.hardwood-3", }, )), 2 => entity @@ -651,7 +651,7 @@ impl Floor { 2 => "common.items.weapons.sword.cultist", 3 => "common.items.weapons.hammer.bronze_hammer-0", 4 => "common.items.weapons.staff.bone_staff", - _ => "common.items.weapons.bow.wood_longbow-0", + _ => "common.items.weapons.bow.wood-3", }, )), 3 => entity @@ -667,7 +667,7 @@ impl Floor { 1..=2 => "common.items.weapons.sword.steel-2", 3 => "common.items.weapons.hammer.cobalt_hammer-0", 4 => "common.items.weapons.staff.amethyst_staff", - _ => "common.items.weapons.bow.horn_longbow-0", + _ => "common.items.weapons.bow.bone-1", }, )), 4 => entity @@ -683,7 +683,7 @@ impl Floor { 1..=2 => "common.items.weapons.sword.cultist", 3 => "common.items.weapons.hammer.cultist_purp_2h-0", 4 => "common.items.weapons.staff.cultist_staff", - _ => "common.items.weapons.bow.horn_longbow-0", + _ => "common.items.weapons.bow.bone-1", }, )), 5 => match dynamic_rng.gen_range(0..6) { @@ -715,13 +715,13 @@ impl Floor { 0 => "common.items.weapons.axe.malachite_axe-0", 1..=2 => "common.items.weapons.sword.cultist", 3 => "common.items.weapons.hammer.cultist_purp_2h-0", - _ => "common.items.weapons.bow.horn_longbow-0", + _ => "common.items.weapons.bow.bone-1", }, )), }, _ => entity.with_name("Humanoid").with_main_tool( comp::Item::new_from_asset_expect( - "common.items.weapons.bow.horn_longbow-0", + "common.items.weapons.bow.bone-1", ), ), }; @@ -789,7 +789,7 @@ impl Floor { "common.items.weapons.hammer.worn_iron_hammer-0" }, 4 => "common.items.weapons.staff.bone_staff", - _ => "common.items.weapons.bow.wood_shortbow-1", + _ => "common.items.weapons.bow.hardwood-3", }, )), EntityInfo::at(tile_wcenter.map(|e| e as f32)) @@ -831,7 +831,7 @@ impl Floor { 1..=2 => "common.items.weapons.sword.steel-2", 3 => "common.items.weapons.hammer.cobalt_hammer-0", 4 => "common.items.weapons.staff.amethyst_staff", - _ => "common.items.weapons.bow.horn_longbow-0", + _ => "common.items.weapons.bow.bone-1", }, ),); 2 @@ -855,7 +855,7 @@ impl Floor { 3 => "common.items.weapons.hammer.cultist_purp_2h-0", 4 => "common.items.weapons.staff.cultist_staff", - _ => "common.items.weapons.bow.horn_longbow-0", + _ => "common.items.weapons.bow.bone-1", }, ),); 2 @@ -1010,7 +1010,7 @@ impl Floor { "common.items.weapons.hammer.cultist_purp_2h-0" }, 4 => "common.items.weapons.staff.cultist_staff", - _ => "common.items.weapons.bow.horn_longbow-0", + _ => "common.items.weapons.bow.bone-1", }, )), EntityInfo::at(tile_wcenter.map(|e| e as f32)) diff --git a/world/src/site/settlement/mod.rs b/world/src/site/settlement/mod.rs index ee2c443324..42c314028b 100644 --- a/world/src/site/settlement/mod.rs +++ b/world/src/site/settlement/mod.rs @@ -948,7 +948,7 @@ impl Settlement { 4 => "common.items.weapons.tool.rake", 5 => "common.items.weapons.tool.shovel-0", _ => "common.items.weapons.tool.shovel-1", - //_ => "common.items.weapons.bow.starter_bow", TODO: Re-Add this when we have a better way of distributing npc_weapons here + //_ => "common.items.weapons.bow.starter", TODO: Re-Add this when we have a better way of distributing npc_weapons here }, )) .with_loadout_config(loadout_builder::LoadoutConfig::Villager) From 2a5edb41ab6b17371d9fc3217fdf7168ce10341a Mon Sep 17 00:00:00 2001 From: Sam Date: Wed, 24 Feb 2021 21:52:32 -0500 Subject: [PATCH 4/5] Weapon offsets in humanoid manifest --- .../common/items/weapons/axe/bronze_axe-2.ron | 2 +- .../loot_tables/loot_table_weapon_common.ron | 3 +- assets/voxygen/item_image_manifest.ron | 148 ++++++++-------- .../voxel/humanoid_main_weapon_manifest.ron | 160 +++++++++--------- 4 files changed, 157 insertions(+), 156 deletions(-) diff --git a/assets/common/items/weapons/axe/bronze_axe-2.ron b/assets/common/items/weapons/axe/bronze_axe-2.ron index bb2c6ef8c1..673ab08b7f 100644 --- a/assets/common/items/weapons/axe/bronze_axe-2.ron +++ b/assets/common/items/weapons/axe/bronze_axe-2.ron @@ -11,6 +11,6 @@ ItemDef( speed: 1.0, )), )), - quality: High, + quality: Moderate, tags: [], ) \ No newline at end of file diff --git a/assets/common/loot_tables/loot_table_weapon_common.ron b/assets/common/loot_tables/loot_table_weapon_common.ron index 3362614c5b..19fbcd8160 100644 --- a/assets/common/loot_tables/loot_table_weapon_common.ron +++ b/assets/common/loot_tables/loot_table_weapon_common.ron @@ -40,4 +40,5 @@ (0.05, "common.items.weapons.bow.wood-1"), (0.05, "common.items.weapons.bow.wood-2"), (0.05, "common.items.weapons.bow.wood-3"), - (0.05, "common.items.weapons.bow.wood-4"), \ No newline at end of file + (0.05, "common.items.weapons.bow.wood-4"), +] \ No newline at end of file diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron index f780a72a2c..b87ba8e7cf 100644 --- a/assets/voxygen/item_image_manifest.ron +++ b/assets/voxygen/item_image_manifest.ron @@ -17,7 +17,7 @@ (-1.0, 0.0, 0.0), (-70.0, 55.0, 0.0), 1.0, ), Tool("example_bow"): VoxTrans( - "voxel.weapon.bow.longbow_ore_nature-0", + "voxel.weapon.bow.velorite", (-1.0, 0.0, 0.0), (90.0, 60.0, 0.0), 1.0, ), Tool("example_staff_fire"): VoxTrans( @@ -46,127 +46,127 @@ ), // Bows Tool("common.items.weapons.bow.bone-0"): VoxTrans( - "voxel.weapons.bow.bone-0", + "voxel.weapon.bow.bone-0", (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, ), Tool("common.items.weapons.bow.bone-1"): VoxTrans( - "voxel.weapons.bow.bone-1", + "voxel.weapon.bow.bone-1", (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, ), Tool("common.items.weapons.bow.bone-2"): VoxTrans( - "voxel.weapons.bow.bone-2", + "voxel.weapon.bow.bone-2", (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, ), Tool("common.items.weapons.bow.bone-3"): VoxTrans( - "voxel.weapons.bow.bone-3", + "voxel.weapon.bow.bone-3", (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, ), Tool("common.items.weapons.bow.eldwood-0"): VoxTrans( - "voxel.weapons.bow.eldwood-0", + "voxel.weapon.bow.eldwood-0", (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, ), Tool("common.items.weapons.bow.eldwood-1"): VoxTrans( - "voxel.weapons.bow.eldwood-1", + "voxel.weapon.bow.eldwood-1", (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, ), Tool("common.items.weapons.bow.eldwood-2"): VoxTrans( - "voxel.weapons.bow.eldwood-2", + "voxel.weapon.bow.eldwood-2", (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, ), Tool("common.items.weapons.bow.frostwood-0"): VoxTrans( - "voxel.weapons.bow.frostwood-0", + "voxel.weapon.bow.frostwood-0", (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, ), Tool("common.items.weapons.bow.frostwood-1"): VoxTrans( - "voxel.weapons.bow.frostwood-1", + "voxel.weapon.bow.frostwood-1", (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, ), Tool("common.items.weapons.bow.frostwood-2"): VoxTrans( - "voxel.weapons.bow.frostwood-2", + "voxel.weapon.bow.frostwood-2", (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, ), Tool("common.items.weapons.bow.hardwood-0"): VoxTrans( - "voxel.weapons.bow.hardwood-0", + "voxel.weapon.bow.hardwood-0", (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, ), Tool("common.items.weapons.bow.hardwood-1"): VoxTrans( - "voxel.weapons.bow.hardwood-1", + "voxel.weapon.bow.hardwood-1", (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, ), Tool("common.items.weapons.bow.hardwood-2"): VoxTrans( - "voxel.weapons.bow.hardwood-2", + "voxel.weapon.bow.hardwood-2", (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, ), Tool("common.items.weapons.bow.hardwood-3"): VoxTrans( - "voxel.weapons.bow.hardwood-3", + "voxel.weapon.bow.hardwood-3", (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, ), Tool("common.items.weapons.bow.hardwood-4"): VoxTrans( - "voxel.weapons.bow.hardwood-4", + "voxel.weapon.bow.hardwood-4", (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, ), Tool("common.items.weapons.bow.hardwood-5"): VoxTrans( - "voxel.weapons.bow.hardwood-5", + "voxel.weapon.bow.hardwood-5", (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, ), Tool("common.items.weapons.bow.metal-0"): VoxTrans( - "voxel.weapons.bow.metal-0", + "voxel.weapon.bow.metal-0", (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, ), Tool("common.items.weapons.bow.metal-1"): VoxTrans( - "voxel.weapons.bow.metal-1", + "voxel.weapon.bow.metal-1", (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, ), Tool("common.items.weapons.bow.metal-2"): VoxTrans( - "voxel.weapons.bow.metal-2", + "voxel.weapon.bow.metal-2", (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, ), Tool("common.items.weapons.bow.metal-3"): VoxTrans( - "voxel.weapons.bow.metal-3", + "voxel.weapon.bow.metal-3", (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, ), Tool("common.items.weapons.bow.metal-4"): VoxTrans( - "voxel.weapons.bow.metal-4", + "voxel.weapon.bow.metal-4", (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, ), Tool("common.items.weapons.bow.rawwood-0"): VoxTrans( - "voxel.weapons.bow.rawwood-0", + "voxel.weapon.bow.rawwood-0", (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, ), Tool("common.items.weapons.bow.rawwood-1"): VoxTrans( - "voxel.weapons.bow.rawwood-1", + "voxel.weapon.bow.rawwood-1", (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, ), Tool("common.items.weapons.bow.sagitta"): VoxTrans( - "voxel.weapons.bow.sagitta", + "voxel.weapon.bow.sagitta", (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, ), Tool("common.items.weapons.bow.starter"): VoxTrans( - "voxel.weapons.bow.starter", + "voxel.weapon.bow.starter", (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, ), Tool("common.items.weapons.bow.velorite"): VoxTrans( - "voxel.weapons.bow.velorite", + "voxel.weapon.bow.velorite", (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, ), Tool("common.items.weapons.bow.wood-0"): VoxTrans( - "voxel.weapons.bow.wood-0", + "voxel.weapon.bow.wood-0", (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, ), Tool("common.items.weapons.bow.wood-1"): VoxTrans( - "voxel.weapons.bow.wood-1", + "voxel.weapon.bow.wood-1", (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, ), Tool("common.items.weapons.bow.wood-2"): VoxTrans( - "voxel.weapons.bow.wood-2", + "voxel.weapon.bow.wood-2", (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, ), Tool("common.items.weapons.bow.wood-3"): VoxTrans( - "voxel.weapons.bow.wood-3", + "voxel.weapon.bow.wood-3", (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, ), Tool("common.items.weapons.bow.wood-4"): VoxTrans( - "voxel.weapons.bow.wood-4", + "voxel.weapon.bow.wood-4", (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, ), // Daggers @@ -184,171 +184,171 @@ ), // Swords Tool("common.items.weapons.sword.bloodsteel-0"): VoxTrans( - "voxel.weapons.sword.bloodsteel-0", + "voxel.weapon.sword.bloodsteel-0", (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), Tool("common.items.weapons.sword.bloodsteel-1"): VoxTrans( - "voxel.weapons.sword.bloodsteel-1", + "voxel.weapon.sword.bloodsteel-1", (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), Tool("common.items.weapons.sword.bloodsteel-2"): VoxTrans( - "voxel.weapons.sword.bloodsteel-2", + "voxel.weapon.sword.bloodsteel-2", (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), Tool("common.items.weapons.sword.bronze-0"): VoxTrans( - "voxel.weapons.sword.bronze-0", + "voxel.weapon.sword.bronze-0", (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), Tool("common.items.weapons.sword.bronze-1"): VoxTrans( - "voxel.weapons.sword.bronze-1", + "voxel.weapon.sword.bronze-1", (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), Tool("common.items.weapons.sword.bronze-2"): VoxTrans( - "voxel.weapons.sword.bronze-2", + "voxel.weapon.sword.bronze-2", (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), Tool("common.items.weapons.sword.caladbolg"): VoxTrans( - "voxel.weapons.sword.caladbolg", + "voxel.weapon.sword.caladbolg", (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), Tool("common.items.weapons.sword.cobalt-0"): VoxTrans( - "voxel.weapons.sword.cobalt-0", + "voxel.weapon.sword.cobalt-0", (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), Tool("common.items.weapons.sword.cobalt-1"): VoxTrans( - "voxel.weapons.sword.cobalt-1", + "voxel.weapon.sword.cobalt-1", (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), Tool("common.items.weapons.sword.cobalt-2"): VoxTrans( - "voxel.weapons.sword.cobalt-2", + "voxel.weapon.sword.cobalt-2", (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), Tool("common.items.weapons.sword.cobalt-3"): VoxTrans( - "voxel.weapons.sword.cobalt-3", + "voxel.weapon.sword.cobalt-3", (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), Tool("common.items.weapons.sword.cultist"): VoxTrans( - "voxel.weapons.sword.cultist", + "voxel.weapon.sword.cultist", (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), Tool("common.items.weapons.sword.frost-0"): VoxTrans( - "voxel.weapons.sword.frost-0", + "voxel.weapon.sword.frost-0", (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), Tool("common.items.weapons.sword.frost-1"): VoxTrans( - "voxel.weapons.sword.frost-1", + "voxel.weapon.sword.frost-1", (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), Tool("common.items.weapons.sword.iron-0"): VoxTrans( - "voxel.weapons.sword.iron-0", + "voxel.weapon.sword.iron-0", (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), Tool("common.items.weapons.sword.iron-1"): VoxTrans( - "voxel.weapons.sword.iron-1", + "voxel.weapon.sword.iron-1", (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), Tool("common.items.weapons.sword.iron-10"): VoxTrans( - "voxel.weapons.sword.iron-10", + "voxel.weapon.sword.iron-10", (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), Tool("common.items.weapons.sword.iron-2"): VoxTrans( - "voxel.weapons.sword.iron-2", + "voxel.weapon.sword.iron-2", (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), Tool("common.items.weapons.sword.iron-3"): VoxTrans( - "voxel.weapons.sword.iron-3", + "voxel.weapon.sword.iron-3", (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), Tool("common.items.weapons.sword.iron-4"): VoxTrans( - "voxel.weapons.sword.iron-4", + "voxel.weapon.sword.iron-4", (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), Tool("common.items.weapons.sword.iron-5"): VoxTrans( - "voxel.weapons.sword.iron-5", + "voxel.weapon.sword.iron-5", (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), Tool("common.items.weapons.sword.iron-6"): VoxTrans( - "voxel.weapons.sword.iron-6", + "voxel.weapon.sword.iron-6", (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), Tool("common.items.weapons.sword.iron-7"): VoxTrans( - "voxel.weapons.sword.iron-7", + "voxel.weapon.sword.iron-7", (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), Tool("common.items.weapons.sword.iron-8"): VoxTrans( - "voxel.weapons.sword.iron-8", + "voxel.weapon.sword.iron-8", (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), Tool("common.items.weapons.sword.iron-9"): VoxTrans( - "voxel.weapons.sword.iron-9", + "voxel.weapon.sword.iron-9", (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), Tool("common.items.weapons.sword.starter"): VoxTrans( - "voxel.weapons.sword.starter", + "voxel.weapon.sword.starter", (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), Tool("common.items.weapons.sword.steel-0"): VoxTrans( - "voxel.weapons.sword.steel-0", + "voxel.weapon.sword.steel-0", (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), Tool("common.items.weapons.sword.steel-1"): VoxTrans( - "voxel.weapons.sword.steel-1", + "voxel.weapon.sword.steel-1", (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), Tool("common.items.weapons.sword.steel-2"): VoxTrans( - "voxel.weapons.sword.steel-2", + "voxel.weapon.sword.steel-2", (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), Tool("common.items.weapons.sword.steel-3"): VoxTrans( - "voxel.weapons.sword.steel-3", + "voxel.weapon.sword.steel-3", (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), Tool("common.items.weapons.sword.steel-4"): VoxTrans( - "voxel.weapons.sword.steel-4", + "voxel.weapon.sword.steel-4", (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), Tool("common.items.weapons.sword.steel-5"): VoxTrans( - "voxel.weapons.sword.steel-5", + "voxel.weapon.sword.steel-5", (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), Tool("common.items.weapons.sword.steel-6"): VoxTrans( - "voxel.weapons.sword.steel-6", + "voxel.weapon.sword.steel-6", (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), Tool("common.items.weapons.sword.steel-7"): VoxTrans( - "voxel.weapons.sword.steel-7", + "voxel.weapon.sword.steel-7", (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), Tool("common.items.weapons.sword.steel-8"): VoxTrans( - "voxel.weapons.sword.steel-8", + "voxel.weapon.sword.steel-8", (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), Tool("common.items.weapons.sword.stone-0"): VoxTrans( - "voxel.weapons.sword.stone-0", + "voxel.weapon.sword.stone-0", (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), Tool("common.items.weapons.sword.stone-1"): VoxTrans( - "voxel.weapons.sword.stone-1", + "voxel.weapon.sword.stone-1", (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), Tool("common.items.weapons.sword.stone-2"): VoxTrans( - "voxel.weapons.sword.stone-2", + "voxel.weapon.sword.stone-2", (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), Tool("common.items.weapons.sword.wood-0"): VoxTrans( - "voxel.weapons.sword.wood-0", + "voxel.weapon.sword.wood-0", (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), Tool("common.items.weapons.sword.wood-1"): VoxTrans( - "voxel.weapons.sword.wood-1", + "voxel.weapon.sword.wood-1", (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), Tool("common.items.weapons.sword.wood-2"): VoxTrans( - "voxel.weapons.sword.wood-2", + "voxel.weapon.sword.wood-2", (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1, ), Tool("common.items.debug.admin_sword"): VoxTrans( - "voxel.weapon.sword.frost_cleaver-1", + "voxel.weapon.sword.frost-1", (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, ), // 1h Swords diff --git a/assets/voxygen/voxel/humanoid_main_weapon_manifest.ron b/assets/voxygen/voxel/humanoid_main_weapon_manifest.ron index 7acbd56fd9..c9f7d728a7 100644 --- a/assets/voxygen/voxel/humanoid_main_weapon_manifest.ron +++ b/assets/voxygen/voxel/humanoid_main_weapon_manifest.ron @@ -1,166 +1,166 @@ ({ //Swords "common.items.weapons.sword.bloodsteel-0": ( - vox_spec: ("weapons.sword.bloodsteel-0", (-2.0, -4.5, -7.5)), + vox_spec: ("weapon.sword.bloodsteel-0", (-2.0, -4.5, -4.5)), color: None ), "common.items.weapons.sword.bloodsteel-1": ( - vox_spec: ("weapons.sword.bloodsteel-1", (-2.0, -4.5, -7.5)), + vox_spec: ("weapon.sword.bloodsteel-1", (-2.0, -4.5, -5.5)), color: None ), "common.items.weapons.sword.bloodsteel-2": ( - vox_spec: ("weapons.sword.bloodsteel-2", (-2.0, -4.5, -7.5)), + vox_spec: ("weapon.sword.bloodsteel-2", (-1.5, -3.5, -5.5)), color: None ), "common.items.weapons.sword.bronze-0": ( - vox_spec: ("weapons.sword.bronze-0", (-2.0, -4.5, -7.5)), + vox_spec: ("weapon.sword.bronze-0", (-2.0, -3.5, -4.5)), color: None ), "common.items.weapons.sword.bronze-1": ( - vox_spec: ("weapons.sword.bronze-1", (-2.0, -4.5, -7.5)), + vox_spec: ("weapon.sword.bronze-1", (-2.0, -3.5, -5.5)), color: None ), "common.items.weapons.sword.bronze-2": ( - vox_spec: ("weapons.sword.bronze-2", (-2.0, -4.5, -7.5)), + vox_spec: ("weapon.sword.bronze-2", (-1.5, -4.5, -4.5)), color: None ), "common.items.weapons.sword.caladbolg": ( - vox_spec: ("weapons.sword.caladbolg", (-2.0, -4.5, -7.5)), + vox_spec: ("weapon.sword.caladbolg", (-1.5, -6.5, -5.5)), color: None ), "common.items.weapons.sword.cobalt-0": ( - vox_spec: ("weapons.sword.cobalt-0", (-2.0, -4.5, -7.5)), + vox_spec: ("weapon.sword.cobalt-0", (-1.5, -5.5, -5.0)), color: None ), "common.items.weapons.sword.cobalt-1": ( - vox_spec: ("weapons.sword.cobalt-1", (-2.0, -4.5, -7.5)), + vox_spec: ("weapon.sword.cobalt-1", (-1.5, -6.5, -6.0)), color: None ), "common.items.weapons.sword.cobalt-2": ( - vox_spec: ("weapons.sword.cobalt-2", (-2.0, -4.5, -7.5)), + vox_spec: ("weapon.sword.cobalt-2", (-1.5, -5.5, -4.5)), color: None ), "common.items.weapons.sword.cobalt-3": ( - vox_spec: ("weapons.sword.cobalt-3", (-2.0, -4.5, -7.5)), + vox_spec: ("weapon.sword.cobalt-3", (-1.5, -4.5, -4.5)), color: None ), "common.items.weapons.sword.cultist": ( - vox_spec: ("weapons.sword.cultist", (-2.0, -4.5, -7.5)), + vox_spec: ("weapon.sword.cultist", (-2.0, -4.5, -7.0)), color: None ), "common.items.weapons.sword.frost-0": ( - vox_spec: ("weapons.sword.frost-0", (-2.0, -4.5, -7.5)), + vox_spec: ("weapon.sword.frost-0", (-1.5, -6.5, -6.5)), color: None ), "common.items.weapons.sword.frost-1": ( - vox_spec: ("weapons.sword.frost-1", (-2.0, -4.5, -7.5)), + vox_spec: ("weapon.sword.frost-1", (-1.5, -6.0, -6.0)), color: None ), "common.items.weapons.sword.iron-0": ( - vox_spec: ("weapons.sword.iron-0", (-2.0, -4.5, -7.5)), + vox_spec: ("weapon.sword.iron-0", (-2.0, -4.5, -5.0)), color: None ), "common.items.weapons.sword.iron-1": ( - vox_spec: ("weapons.sword.iron-1", (-2.0, -4.5, -7.5)), - color: None - ), - "common.items.weapons.sword.iron-10": ( - vox_spec: ("weapons.sword.iron-10", (-2.0, -4.5, -7.5)), + vox_spec: ("weapon.sword.iron-1", (-1.5, -5.5, -6.5)), color: None ), "common.items.weapons.sword.iron-2": ( - vox_spec: ("weapons.sword.iron-2", (-2.0, -4.5, -7.5)), + vox_spec: ("weapon.sword.iron-2", (-1.5, -5.5, -5.5)), color: None ), "common.items.weapons.sword.iron-3": ( - vox_spec: ("weapons.sword.iron-3", (-2.0, -4.5, -7.5)), + vox_spec: ("weapon.sword.iron-3", (-1.5, -5.5, -5.5)), color: None ), "common.items.weapons.sword.iron-4": ( - vox_spec: ("weapons.sword.iron-4", (-2.0, -4.5, -7.5)), + vox_spec: ("weapon.sword.iron-4", (-1.5, -4.5, -5.5)), color: None ), "common.items.weapons.sword.iron-5": ( - vox_spec: ("weapons.sword.iron-5", (-2.0, -4.5, -7.5)), + vox_spec: ("weapon.sword.iron-5", (-1.5, -5.5, -4.5)), color: None ), "common.items.weapons.sword.iron-6": ( - vox_spec: ("weapons.sword.iron-6", (-2.0, -4.5, -7.5)), + vox_spec: ("weapon.sword.iron-6", (-1.5, -5.5, -6.0)), color: None ), "common.items.weapons.sword.iron-7": ( - vox_spec: ("weapons.sword.iron-7", (-2.0, -4.5, -7.5)), + vox_spec: ("weapon.sword.iron-7", (-2.5, -6.5, -6.5)), color: None ), "common.items.weapons.sword.iron-8": ( - vox_spec: ("weapons.sword.iron-8", (-2.0, -4.5, -7.5)), + vox_spec: ("weapon.sword.iron-8", (-2.5, -5.5, -4.5)), color: None ), "common.items.weapons.sword.iron-9": ( - vox_spec: ("weapons.sword.iron-9", (-2.0, -4.5, -7.5)), + vox_spec: ("weapon.sword.iron-9", (-1.5, -3.5, -4.5)), + color: None + ), + "common.items.weapons.sword.iron-10": ( + vox_spec: ("weapon.sword.iron-10", (-1.5, -4.5, -5.5)), color: None ), "common.items.weapons.sword.starter": ( - vox_spec: ("weapons.sword.starter", (-2.0, -4.5, -7.5)), + vox_spec: ("weapon.sword.starter", (-1.5, -4.5, -6.5)), color: None ), "common.items.weapons.sword.steel-0": ( - vox_spec: ("weapons.sword.steel-0", (-2.0, -4.5, -7.5)), + vox_spec: ("weapon.sword.steel-0", (-1.5, -5.5, -5.5)), color: None ), "common.items.weapons.sword.steel-1": ( - vox_spec: ("weapons.sword.steel-1", (-2.0, -4.5, -7.5)), + vox_spec: ("weapon.sword.steel-1", (-1.5, -5.5, -5.5)), color: None ), "common.items.weapons.sword.steel-2": ( - vox_spec: ("weapons.sword.steel-2", (-2.0, -4.5, -7.5)), + vox_spec: ("weapon.sword.steel-2", (-1.5, -6.5, -4.5)), color: None ), "common.items.weapons.sword.steel-3": ( - vox_spec: ("weapons.sword.steel-3", (-2.0, -4.5, -7.5)), + vox_spec: ("weapon.sword.steel-3", (-1.5, -5.5, -5.5)), color: None ), "common.items.weapons.sword.steel-4": ( - vox_spec: ("weapons.sword.steel-4", (-2.0, -4.5, -7.5)), + vox_spec: ("weapon.sword.steel-4", (-1.5, -5.5, -5.5)), color: None ), "common.items.weapons.sword.steel-5": ( - vox_spec: ("weapons.sword.steel-5", (-2.0, -4.5, -7.5)), + vox_spec: ("weapon.sword.steel-5", (-1.5, -3.5, -5.5)), color: None ), "common.items.weapons.sword.steel-6": ( - vox_spec: ("weapons.sword.steel-6", (-2.0, -4.5, -7.5)), + vox_spec: ("weapon.sword.steel-6", (-1.5, -5.5, -4.5)), color: None ), "common.items.weapons.sword.steel-7": ( - vox_spec: ("weapons.sword.steel-7", (-2.0, -4.5, -7.5)), + vox_spec: ("weapon.sword.steel-7", (-1.5, -5.5, -5.5)), color: None ), "common.items.weapons.sword.steel-8": ( - vox_spec: ("weapons.sword.steel-8", (-2.0, -4.5, -7.5)), + vox_spec: ("weapon.sword.steel-8", (-1.5, -6.0, -6.0)), color: None ), "common.items.weapons.sword.stone-0": ( - vox_spec: ("weapons.sword.stone-0", (-2.0, -4.5, -7.5)), + vox_spec: ("weapon.sword.stone-0", (-2.0, -5.5, -5.0)), color: None ), "common.items.weapons.sword.stone-1": ( - vox_spec: ("weapons.sword.stone-1", (-2.0, -4.5, -7.5)), + vox_spec: ("weapon.sword.stone-1", (-1.5, -4.5, -5.5)), color: None ), "common.items.weapons.sword.stone-2": ( - vox_spec: ("weapons.sword.stone-2", (-2.0, -4.5, -7.5)), + vox_spec: ("weapon.sword.stone-2", (-1.0, -5.5, -4.5)), color: None ), "common.items.weapons.sword.wood-0": ( - vox_spec: ("weapons.sword.wood-0", (-2.0, -4.5, -7.5)), + vox_spec: ("weapon.sword.wood-0", (-1.0, -4.5, -4.5)), color: None ), "common.items.weapons.sword.wood-1": ( - vox_spec: ("weapons.sword.wood-1", (-2.0, -4.5, -7.5)), + vox_spec: ("weapon.sword.wood-1", (-1.5, -6.0, -5.5)), color: None ), "common.items.weapons.sword.wood-2": ( - vox_spec: ("weapons.sword.wood-2", (-2.0, -4.5, -7.5)), + vox_spec: ("weapon.sword.wood-2", (-1.5, -7.5, -3.5)), color: None ), // 1h Swords @@ -290,7 +290,7 @@ color: None ), "common.items.weapons.axe.bronze_axe-2": ( - vox_spec: ("weapon.axe.2haxe_bronze-2", (-1.5, -3.0, -5.5)), + vox_spec: ("weapon.axe.2haxe_bronze-2", (-1.5, -7.0, -4.0)), color: None ), "common.items.weapons.axe.iron_axe-0": ( @@ -370,7 +370,7 @@ color: None ), "common.items.weapons.axe.bloodsteel_axe-2": ( - vox_spec: ("weapon.axe.2haxe_bloodsteel-2", (-1.5, -5.0, -4.0)), + vox_spec: ("weapon.axe.2haxe_bloodsteel-2", (-1.5, -8.0, -4.0)), color: None ), "common.items.weapons.axe.cobalt_axe-0": ( @@ -382,11 +382,11 @@ color: None ), "common.items.weapons.axe.malachite_axe-0": ( - vox_spec: ("weapon.axe.2haxe_malachite-0", (-1.5, -5.0, -6.0)), + vox_spec: ("weapon.axe.2haxe_malachite-0", (-1.5, -8.0, -5.0)), color: None ), "common.items.weapons.axe.parashu": ( - vox_spec: ("weapon.axe.parashu", (-1.5, -5.0, -6.0)), + vox_spec: ("weapon.axe.parashu", (-1.5, -12.0, -6.0)), color: None ), // 1h Axes @@ -696,127 +696,127 @@ ), // Bows "common.items.weapons.bow.bone-0": ( - vox_spec: ("weapons.bow.bone-0", (-0.5, -3.0, -8.5)), + vox_spec: ("weapon.bow.bone-0", (0.0, -6.0, -12.5)), color: None ), "common.items.weapons.bow.bone-1": ( - vox_spec: ("weapons.bow.bone-1", (-0.5, -3.0, -8.5)), + vox_spec: ("weapon.bow.bone-1", (-0.5, -6.0, -14.5)), color: None ), "common.items.weapons.bow.bone-2": ( - vox_spec: ("weapons.bow.bone-2", (-0.5, -3.0, -8.5)), + vox_spec: ("weapon.bow.bone-2", (0.0, -6.0, -12.5)), color: None ), "common.items.weapons.bow.bone-3": ( - vox_spec: ("weapons.bow.bone-3", (-0.5, -3.0, -8.5)), + vox_spec: ("weapon.bow.bone-3", (0.0, -6.0, -12.5)), color: None ), "common.items.weapons.bow.eldwood-0": ( - vox_spec: ("weapons.bow.eldwood-0", (-0.5, -3.0, -8.5)), + vox_spec: ("weapon.bow.eldwood-0", (0.0, -4.0, -12.5)), color: None ), "common.items.weapons.bow.eldwood-1": ( - vox_spec: ("weapons.bow.eldwood-1", (-0.5, -3.0, -8.5)), + vox_spec: ("weapon.bow.eldwood-1", (0.0, -4.0, -12.5)), color: None ), "common.items.weapons.bow.eldwood-2": ( - vox_spec: ("weapons.bow.eldwood-2", (-0.5, -3.0, -8.5)), + vox_spec: ("weapon.bow.eldwood-2", (-0.5, -6.0, -12.5)), color: None ), "common.items.weapons.bow.frostwood-0": ( - vox_spec: ("weapons.bow.frostwood-0", (-0.5, -3.0, -8.5)), + vox_spec: ("weapon.bow.frostwood-0", (0.0, -6.0, -13.5)), color: None ), "common.items.weapons.bow.frostwood-1": ( - vox_spec: ("weapons.bow.frostwood-1", (-0.5, -3.0, -8.5)), + vox_spec: ("weapon.bow.frostwood-1", (0.0, -6.0, -12.5)), color: None ), "common.items.weapons.bow.frostwood-2": ( - vox_spec: ("weapons.bow.frostwood-2", (-0.5, -3.0, -8.5)), + vox_spec: ("weapon.bow.frostwood-2", (-0.5, -6.0, -12.5)), color: None ), "common.items.weapons.bow.hardwood-0": ( - vox_spec: ("weapons.bow.hardwood-0", (-0.5, -3.0, -8.5)), + vox_spec: ("weapon.bow.hardwood-0", (-0.5, -3.0, -12.5)), color: None ), "common.items.weapons.bow.hardwood-1": ( - vox_spec: ("weapons.bow.hardwood-1", (-0.5, -3.0, -8.5)), + vox_spec: ("weapon.bow.hardwood-1", (-0.5, -5.0, -12.5)), color: None ), "common.items.weapons.bow.hardwood-2": ( - vox_spec: ("weapons.bow.hardwood-2", (-0.5, -3.0, -8.5)), + vox_spec: ("weapon.bow.hardwood-2", (-0.5, -6.0, -12.5)), color: None ), "common.items.weapons.bow.hardwood-3": ( - vox_spec: ("weapons.bow.hardwood-3", (-0.5, -3.0, -8.5)), + vox_spec: ("weapon.bow.hardwood-3", (-0.5, -4.0, -11.5)), color: None ), "common.items.weapons.bow.hardwood-4": ( - vox_spec: ("weapons.bow.hardwood-4", (-0.5, -3.0, -8.5)), + vox_spec: ("weapon.bow.hardwood-4", (-0.5, -3.5, -12.5)), color: None ), "common.items.weapons.bow.hardwood-5": ( - vox_spec: ("weapons.bow.hardwood-5", (-0.5, -3.0, -8.5)), + vox_spec: ("weapon.bow.hardwood-5", (-0.5, -3.5, -13.0)), color: None ), "common.items.weapons.bow.metal-0": ( - vox_spec: ("weapons.bow.metal-0", (-0.5, -3.0, -8.5)), + vox_spec: ("weapon.bow.metal-0", (-0.5, -5.0, -12.5)), color: None ), "common.items.weapons.bow.metal-1": ( - vox_spec: ("weapons.bow.metal-1", (-0.5, -3.0, -8.5)), + vox_spec: ("weapon.bow.metal-1", (-0.5, -4.5, -12.5)), color: None ), "common.items.weapons.bow.metal-2": ( - vox_spec: ("weapons.bow.metal-2", (-0.5, -3.0, -8.5)), + vox_spec: ("weapon.bow.metal-2", (-0.5, -4.5, -11.5)), color: None ), "common.items.weapons.bow.metal-3": ( - vox_spec: ("weapons.bow.metal-3", (-0.5, -3.0, -8.5)), + vox_spec: ("weapon.bow.metal-3", (-0.5, -4.5, -14.5)), color: None ), "common.items.weapons.bow.metal-4": ( - vox_spec: ("weapons.bow.metal-4", (-0.5, -3.0, -8.5)), + vox_spec: ("weapon.bow.metal-4", (-0.5, -4.5, -14.5)), color: None ), "common.items.weapons.bow.rawwood-0": ( - vox_spec: ("weapons.bow.rawwood-0", (-0.5, -3.0, -8.5)), + vox_spec: ("weapon.bow.rawwood-0", (-0.5, -5.0, -12.5)), color: None ), "common.items.weapons.bow.rawwood-1": ( - vox_spec: ("weapons.bow.rawwood-1", (-0.5, -3.0, -8.5)), + vox_spec: ("weapon.bow.rawwood-1", (-0.5, -5.5, -12.5)), color: None ), "common.items.weapons.bow.sagitta": ( - vox_spec: ("weapons.bow.sagitta", (-0.5, -3.0, -8.5)), + vox_spec: ("weapon.bow.sagitta", (-0.5, -7.5, -12.5)), color: None ), "common.items.weapons.bow.starter": ( - vox_spec: ("weapons.bow.starter", (-0.5, -3.0, -8.5)), + vox_spec: ("weapon.bow.starter", (0.5, -3.0, -8.5)), color: None ), "common.items.weapons.bow.velorite": ( - vox_spec: ("weapons.bow.velorite", (-0.5, -3.0, -8.5)), + vox_spec: ("weapon.bow.velorite", (-0.5, -5.0, -15.5)), color: None ), "common.items.weapons.bow.wood-0": ( - vox_spec: ("weapons.bow.wood-0", (-0.5, -3.0, -8.5)), + vox_spec: ("weapon.bow.wood-0", (0.0, -6.0, -10.0)), color: None ), "common.items.weapons.bow.wood-1": ( - vox_spec: ("weapons.bow.wood-1", (-0.5, -3.0, -8.5)), + vox_spec: ("weapon.bow.wood-1", (0.0, -5.0, -12.5)), color: None ), "common.items.weapons.bow.wood-2": ( - vox_spec: ("weapons.bow.wood-2", (-0.5, -3.0, -8.5)), + vox_spec: ("weapon.bow.wood-2", (0.0, -4.0, -11.0)), color: None ), "common.items.weapons.bow.wood-3": ( - vox_spec: ("weapons.bow.wood-3", (-0.5, -3.0, -8.5)), + vox_spec: ("weapon.bow.wood-3", (-0.5, -4.0, -12.5)), color: None ), "common.items.weapons.bow.wood-4": ( - vox_spec: ("weapons.bow.wood-4", (-0.5, -3.0, -8.5)), + vox_spec: ("weapon.bow.wood-4", (0.0, -5.5, -11.5)), color: None ), // Farming Equipment @@ -916,7 +916,7 @@ color: None ), "common.items.debug.admin_sword": ( - vox_spec: ("weapon.sword.frost_cleaver-1", (-2.0, -4.5, -7.5)), + vox_spec: ("weapon.sword.frost-1", (-2.0, -4.5, -7.5)), color: None ), // Misc From c77721e8c7063f59c407d559fc0a79ad5f734c3c Mon Sep 17 00:00:00 2001 From: Snowram Date: Fri, 26 Feb 2021 02:37:59 +0100 Subject: [PATCH 5/5] Fixes weapons model and icon offsets --- assets/voxygen/item_image_manifest.ron | 52 ++--- .../voxel/humanoid_main_weapon_manifest.ron | 194 +++++++++--------- 2 files changed, 123 insertions(+), 123 deletions(-) diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron index b87ba8e7cf..cc393bd835 100644 --- a/assets/voxygen/item_image_manifest.ron +++ b/assets/voxygen/item_image_manifest.ron @@ -443,47 +443,47 @@ // Axes Tool("common.items.weapons.axe.starter_axe"): VoxTrans( "voxel.weapon.axe.2haxe_rusty", - (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1, ), Tool("common.items.weapons.axe.orc_axe-0"): VoxTrans( "voxel.weapon.axe.2haxe_orc-0", - (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + (1.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.13, ), Tool("common.items.weapons.axe.worn_iron_axe-0"): VoxTrans( "voxel.weapon.axe.2haxe_worn_iron-0", - (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + (1.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.1, ), Tool("common.items.weapons.axe.worn_iron_axe-1"): VoxTrans( "voxel.weapon.axe.2haxe_worn_iron-1", - (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + (1.0, 0.5, 0.0), (-135.0, 90.0, 0.0), 1.1, ), Tool("common.items.weapons.axe.worn_iron_axe-2"): VoxTrans( "voxel.weapon.axe.2haxe_worn_iron-2", - (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + (1.0, 0.8, 0.0), (-135.0, 90.0, 0.0), 1.15, ), Tool("common.items.weapons.axe.worn_iron_axe-3"): VoxTrans( "voxel.weapon.axe.2haxe_worn_iron-3", - (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + (1.0, 0.5, 0.0), (-135.0, 90.0, 0.0), 1.1, ), Tool("common.items.weapons.axe.worn_iron_axe-4"): VoxTrans( "voxel.weapon.axe.2haxe_worn_iron-4", - (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + (1.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.2, ), Tool("common.items.weapons.axe.bronze_axe-0"): VoxTrans( "voxel.weapon.axe.2haxe_bronze-0", - (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + (1.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.1, ), Tool("common.items.weapons.axe.bronze_axe-1"): VoxTrans( "voxel.weapon.axe.2haxe_bronze-1", - (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + (1.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.2, ), Tool("common.items.weapons.axe.bronze_axe-2"): VoxTrans( "voxel.weapon.axe.2haxe_bronze-2", - (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + (1.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1., ), Tool("common.items.weapons.axe.iron_axe-0"): VoxTrans( "voxel.weapon.axe.2haxe_iron-0", - (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.05, ), Tool("common.items.weapons.axe.iron_axe-1"): VoxTrans( "voxel.weapon.axe.2haxe_iron-1", @@ -491,19 +491,19 @@ ), Tool("common.items.weapons.axe.iron_axe-2"): VoxTrans( "voxel.weapon.axe.2haxe_iron-2", - (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1, ), Tool("common.items.weapons.axe.iron_axe-3"): VoxTrans( "voxel.weapon.axe.2haxe_iron-3", - (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1, ), Tool("common.items.weapons.axe.iron_axe-4"): VoxTrans( "voxel.weapon.axe.2haxe_iron-4", - (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.05, ), Tool("common.items.weapons.axe.iron_axe-5"): VoxTrans( "voxel.weapon.axe.2haxe_iron-5", - (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + (1.0, -0.5, 0.0), (-135.0, 90.0, 0.0), 1.1, ), Tool("common.items.weapons.axe.iron_axe-6"): VoxTrans( "voxel.weapon.axe.2haxe_iron-6", @@ -511,11 +511,11 @@ ), Tool("common.items.weapons.axe.iron_axe-7"): VoxTrans( "voxel.weapon.axe.2haxe_iron-7", - (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1, ), Tool("common.items.weapons.axe.iron_axe-8"): VoxTrans( "voxel.weapon.axe.2haxe_iron-8", - (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.13, ), Tool("common.items.weapons.axe.iron_axe-9"): VoxTrans( "voxel.weapon.axe.2haxe_iron-9", @@ -523,7 +523,7 @@ ), Tool("common.items.weapons.axe.steel_axe-0"): VoxTrans( "voxel.weapon.axe.2haxe_steel-0", - (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1, ), Tool("common.items.weapons.axe.steel_axe-1"): VoxTrans( "voxel.weapon.axe.2haxe_steel-1", @@ -543,31 +543,31 @@ ), Tool("common.items.weapons.axe.steel_axe-5"): VoxTrans( "voxel.weapon.axe.2haxe_steel-5", - (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1, ), Tool("common.items.weapons.axe.steel_axe-6"): VoxTrans( "voxel.weapon.axe.2haxe_steel-6", - (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.2, ), Tool("common.items.weapons.axe.bloodsteel_axe-0"): VoxTrans( "voxel.weapon.axe.2haxe_bloodsteel-0", - (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.15, ), Tool("common.items.weapons.axe.bloodsteel_axe-1"): VoxTrans( "voxel.weapon.axe.2haxe_bloodsteel-1", - (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + (1.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.1, ), Tool("common.items.weapons.axe.bloodsteel_axe-2"): VoxTrans( "voxel.weapon.axe.2haxe_bloodsteel-2", - (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1, ), Tool("common.items.weapons.axe.cobalt_axe-0"): VoxTrans( "voxel.weapon.axe.2haxe_cobalt-0", - (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1, ), Tool("common.items.weapons.axe.cobalt_axe-1"): VoxTrans( "voxel.weapon.axe.2haxe_cobalt-1", - (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1, ), Tool("common.items.weapons.axe.malachite_axe-0"): VoxTrans( "voxel.weapon.axe.2haxe_malachite-0", @@ -575,7 +575,7 @@ ), Tool("common.items.weapons.axe.parashu"): VoxTrans( "voxel.weapon.axe.parashu", - (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1, ), // 1h Axes Tool("common.items.weapons.axe_1h.bloodsteel-0"): VoxTrans( diff --git a/assets/voxygen/voxel/humanoid_main_weapon_manifest.ron b/assets/voxygen/voxel/humanoid_main_weapon_manifest.ron index c9f7d728a7..45f11c6aac 100644 --- a/assets/voxygen/voxel/humanoid_main_weapon_manifest.ron +++ b/assets/voxygen/voxel/humanoid_main_weapon_manifest.ron @@ -1,166 +1,166 @@ ({ //Swords "common.items.weapons.sword.bloodsteel-0": ( - vox_spec: ("weapon.sword.bloodsteel-0", (-2.0, -4.5, -4.5)), + vox_spec: ("weapon.sword.bloodsteel-0", (-1.5, -4.5, -4.0)), color: None ), "common.items.weapons.sword.bloodsteel-1": ( - vox_spec: ("weapon.sword.bloodsteel-1", (-2.0, -4.5, -5.5)), + vox_spec: ("weapon.sword.bloodsteel-1", (-2.5, -3.0, -5.5)), color: None ), "common.items.weapons.sword.bloodsteel-2": ( - vox_spec: ("weapon.sword.bloodsteel-2", (-1.5, -3.5, -5.5)), + vox_spec: ("weapon.sword.bloodsteel-2", (-1.5, -3.5, -4.0)), color: None ), "common.items.weapons.sword.bronze-0": ( - vox_spec: ("weapon.sword.bronze-0", (-2.0, -3.5, -4.5)), + vox_spec: ("weapon.sword.bronze-0", (-1.5, -3.0, -4.0)), color: None ), "common.items.weapons.sword.bronze-1": ( - vox_spec: ("weapon.sword.bronze-1", (-2.0, -3.5, -5.5)), + vox_spec: ("weapon.sword.bronze-1", (-1.5, -3.0, -4.0)), color: None ), "common.items.weapons.sword.bronze-2": ( - vox_spec: ("weapon.sword.bronze-2", (-1.5, -4.5, -4.5)), + vox_spec: ("weapon.sword.bronze-2", (-1.5, -3.0, -4.0)), color: None ), "common.items.weapons.sword.caladbolg": ( - vox_spec: ("weapon.sword.caladbolg", (-1.5, -6.5, -5.5)), + vox_spec: ("weapon.sword.caladbolg", (-1.5, -5.5, -4.0)), color: None ), "common.items.weapons.sword.cobalt-0": ( - vox_spec: ("weapon.sword.cobalt-0", (-1.5, -5.5, -5.0)), + vox_spec: ("weapon.sword.cobalt-0", (-1.5, -5.0, -4.0)), color: None ), "common.items.weapons.sword.cobalt-1": ( - vox_spec: ("weapon.sword.cobalt-1", (-1.5, -6.5, -6.0)), + vox_spec: ("weapon.sword.cobalt-1", (-1.5, -6.0, -5.0)), color: None ), "common.items.weapons.sword.cobalt-2": ( - vox_spec: ("weapon.sword.cobalt-2", (-1.5, -5.5, -4.5)), + vox_spec: ("weapon.sword.cobalt-2", (-1.5, -5.0, -4.0)), color: None ), "common.items.weapons.sword.cobalt-3": ( - vox_spec: ("weapon.sword.cobalt-3", (-1.5, -4.5, -4.5)), + vox_spec: ("weapon.sword.cobalt-3", (-1.5, -4.0, -4.0)), color: None ), "common.items.weapons.sword.cultist": ( - vox_spec: ("weapon.sword.cultist", (-2.0, -4.5, -7.0)), + vox_spec: ("weapon.sword.cultist", (-1.5, -4.0, -6.0)), color: None ), "common.items.weapons.sword.frost-0": ( - vox_spec: ("weapon.sword.frost-0", (-1.5, -6.5, -6.5)), + vox_spec: ("weapon.sword.frost-0", (-1.5, -5.5, -5.0)), color: None ), "common.items.weapons.sword.frost-1": ( - vox_spec: ("weapon.sword.frost-1", (-1.5, -6.0, -6.0)), + vox_spec: ("weapon.sword.frost-1", (-1.5, -5.5, -5.0)), color: None ), "common.items.weapons.sword.iron-0": ( - vox_spec: ("weapon.sword.iron-0", (-2.0, -4.5, -5.0)), + vox_spec: ("weapon.sword.iron-0", (-1.5, -3.5, -4.0)), color: None ), "common.items.weapons.sword.iron-1": ( - vox_spec: ("weapon.sword.iron-1", (-1.5, -5.5, -6.5)), + vox_spec: ("weapon.sword.iron-1", (-1.5, -5.0, -5.0)), color: None ), "common.items.weapons.sword.iron-2": ( - vox_spec: ("weapon.sword.iron-2", (-1.5, -5.5, -5.5)), + vox_spec: ("weapon.sword.iron-2", (-1.5, -5.0, -4.0)), color: None ), "common.items.weapons.sword.iron-3": ( - vox_spec: ("weapon.sword.iron-3", (-1.5, -5.5, -5.5)), + vox_spec: ("weapon.sword.iron-3", (-1.5, -4.0, -4.0)), color: None ), "common.items.weapons.sword.iron-4": ( - vox_spec: ("weapon.sword.iron-4", (-1.5, -4.5, -5.5)), + vox_spec: ("weapon.sword.iron-4", (-1.5, -4.0, -4.0)), color: None ), "common.items.weapons.sword.iron-5": ( - vox_spec: ("weapon.sword.iron-5", (-1.5, -5.5, -4.5)), + vox_spec: ("weapon.sword.iron-5", (-1.5, -4.0, -4.0)), color: None ), "common.items.weapons.sword.iron-6": ( - vox_spec: ("weapon.sword.iron-6", (-1.5, -5.5, -6.0)), + vox_spec: ("weapon.sword.iron-6", (-1.5, -5.0, -5.0)), color: None ), "common.items.weapons.sword.iron-7": ( - vox_spec: ("weapon.sword.iron-7", (-2.5, -6.5, -6.5)), + vox_spec: ("weapon.sword.iron-7", (-2.0, -6.0, -5.0)), color: None ), "common.items.weapons.sword.iron-8": ( - vox_spec: ("weapon.sword.iron-8", (-2.5, -5.5, -4.5)), + vox_spec: ("weapon.sword.iron-8", (-2.0, -5.0, -4.0)), color: None ), "common.items.weapons.sword.iron-9": ( - vox_spec: ("weapon.sword.iron-9", (-1.5, -3.5, -4.5)), + vox_spec: ("weapon.sword.iron-9", (-1.5, -2.5, -4.0)), color: None ), "common.items.weapons.sword.iron-10": ( - vox_spec: ("weapon.sword.iron-10", (-1.5, -4.5, -5.5)), + vox_spec: ("weapon.sword.iron-10", (-1.5, -4.0, -4.0)), color: None ), "common.items.weapons.sword.starter": ( - vox_spec: ("weapon.sword.starter", (-1.5, -4.5, -6.5)), + vox_spec: ("weapon.sword.starter", (-1.5, -4.0, -4.0)), color: None ), "common.items.weapons.sword.steel-0": ( - vox_spec: ("weapon.sword.steel-0", (-1.5, -5.5, -5.5)), + vox_spec: ("weapon.sword.steel-0", (-1.5, -5.0, -5.0)), color: None ), "common.items.weapons.sword.steel-1": ( - vox_spec: ("weapon.sword.steel-1", (-1.5, -5.5, -5.5)), + vox_spec: ("weapon.sword.steel-1", (-1.5, -4.0, -5.0)), color: None ), "common.items.weapons.sword.steel-2": ( - vox_spec: ("weapon.sword.steel-2", (-1.5, -6.5, -4.5)), + vox_spec: ("weapon.sword.steel-2", (-1.5, -6.0, -4.0)), color: None ), "common.items.weapons.sword.steel-3": ( - vox_spec: ("weapon.sword.steel-3", (-1.5, -5.5, -5.5)), + vox_spec: ("weapon.sword.steel-3", (-1.5, -4.0, -4.0)), color: None ), "common.items.weapons.sword.steel-4": ( - vox_spec: ("weapon.sword.steel-4", (-1.5, -5.5, -5.5)), + vox_spec: ("weapon.sword.steel-4", (-1.5, -5.0, -4.0)), color: None ), "common.items.weapons.sword.steel-5": ( - vox_spec: ("weapon.sword.steel-5", (-1.5, -3.5, -5.5)), + vox_spec: ("weapon.sword.steel-5", (-1.5, -2.5, -5.0)), color: None ), "common.items.weapons.sword.steel-6": ( - vox_spec: ("weapon.sword.steel-6", (-1.5, -5.5, -4.5)), + vox_spec: ("weapon.sword.steel-6", (-1.5, -5.0, -4.0)), color: None ), "common.items.weapons.sword.steel-7": ( - vox_spec: ("weapon.sword.steel-7", (-1.5, -5.5, -5.5)), + vox_spec: ("weapon.sword.steel-7", (-1.5, -5.0, -4.0)), color: None ), "common.items.weapons.sword.steel-8": ( - vox_spec: ("weapon.sword.steel-8", (-1.5, -6.0, -6.0)), + vox_spec: ("weapon.sword.steel-8", (-1.5, -5.0, -5.0)), color: None ), "common.items.weapons.sword.stone-0": ( - vox_spec: ("weapon.sword.stone-0", (-2.0, -5.5, -5.0)), + vox_spec: ("weapon.sword.stone-0", (-2.5, -4.0, -5.0)), color: None ), "common.items.weapons.sword.stone-1": ( - vox_spec: ("weapon.sword.stone-1", (-1.5, -4.5, -5.5)), + vox_spec: ("weapon.sword.stone-1", (-1.5, -4.0, -5.0)), color: None ), "common.items.weapons.sword.stone-2": ( - vox_spec: ("weapon.sword.stone-2", (-1.0, -5.5, -4.5)), + vox_spec: ("weapon.sword.stone-2", (-1.5, -4.0, -4.0)), color: None ), "common.items.weapons.sword.wood-0": ( - vox_spec: ("weapon.sword.wood-0", (-1.0, -4.5, -4.5)), + vox_spec: ("weapon.sword.wood-0", (-1.5, -3.5, -4.0)), color: None ), "common.items.weapons.sword.wood-1": ( - vox_spec: ("weapon.sword.wood-1", (-1.5, -6.0, -5.5)), + vox_spec: ("weapon.sword.wood-1", (-1.5, -5.0, -5.0)), color: None ), "common.items.weapons.sword.wood-2": ( - vox_spec: ("weapon.sword.wood-2", (-1.5, -7.5, -3.5)), + vox_spec: ("weapon.sword.wood-2", (-1.5, -6.5, -3.0)), color: None ), // 1h Swords @@ -254,7 +254,7 @@ ), // Axes "common.items.weapons.axe.starter_axe": ( - vox_spec: ("weapon.axe.2haxe_rusty", (-1.5, -5.0, -4.0)), + vox_spec: ("weapon.axe.2haxe_rusty", (-1.5, -7.0, -4.0)), color: None ), "common.items.weapons.axe.orc_axe-0": ( @@ -262,7 +262,7 @@ color: None ), "common.items.weapons.axe.worn_iron_axe-0": ( - vox_spec: ("weapon.axe.2haxe_worn_iron-0", (-1.5, -3.0, -4.0)), + vox_spec: ("weapon.axe.2haxe_worn_iron-0", (-1.5, -5.0, -4.0)), color: None ), "common.items.weapons.axe.worn_iron_axe-1": ( @@ -278,59 +278,59 @@ color: None ), "common.items.weapons.axe.worn_iron_axe-4": ( - vox_spec: ("weapon.axe.2haxe_worn_iron-4", (-1.5, -4.0, -5.5)), + vox_spec: ("weapon.axe.2haxe_worn_iron-4", (-1.5, -6.0, -5.5)), color: None ), "common.items.weapons.axe.bronze_axe-0": ( - vox_spec: ("weapon.axe.2haxe_bronze-0", (-1.5, -4.0, -4.5)), + vox_spec: ("weapon.axe.2haxe_bronze-0", (-1.5, -7.0, -4.5)), color: None ), "common.items.weapons.axe.bronze_axe-1": ( - vox_spec: ("weapon.axe.2haxe_bronze-1", (-1.5, -3.0, -5.5)), + vox_spec: ("weapon.axe.2haxe_bronze-1", (-1.5, -5.0, -4.0)), color: None ), "common.items.weapons.axe.bronze_axe-2": ( - vox_spec: ("weapon.axe.2haxe_bronze-2", (-1.5, -7.0, -4.0)), + vox_spec: ("weapon.axe.2haxe_bronze-2", (-1.5, -8.0, -4.0)), color: None ), "common.items.weapons.axe.iron_axe-0": ( - vox_spec: ("weapon.axe.2haxe_iron-0", (-1.5, -5.0, -5.5)), + vox_spec: ("weapon.axe.2haxe_iron-0", (-1.5, -7.0, -5.5)), color: None ), "common.items.weapons.axe.iron_axe-1": ( - vox_spec: ("weapon.axe.2haxe_iron-1", (-1.5, -5.0, -5.5)), + vox_spec: ("weapon.axe.2haxe_iron-1", (-1.5, -7.0, -5.5)), color: None ), "common.items.weapons.axe.iron_axe-2": ( - vox_spec: ("weapon.axe.2haxe_iron-2", (-1.5, -5.0, -5.5)), + vox_spec: ("weapon.axe.2haxe_iron-2", (-1.5, -7.0, -5.5)), color: None ), "common.items.weapons.axe.iron_axe-3": ( - vox_spec: ("weapon.axe.2haxe_iron-3", (-1.5, -6.0, -6.5)), + vox_spec: ("weapon.axe.2haxe_iron-3", (-1.5, -8.0, -6.5)), color: None ), "common.items.weapons.axe.iron_axe-4": ( - vox_spec: ("weapon.axe.2haxe_iron-4", (-1.5, -6.0, -5.5)), + vox_spec: ("weapon.axe.2haxe_iron-4", (-1.5, -7.0, -5.5)), color: None ), "common.items.weapons.axe.iron_axe-5": ( - vox_spec: ("weapon.axe.2haxe_iron-5", (-1.5, -6.0, -5.0)), + vox_spec: ("weapon.axe.2haxe_iron-5", (-1.5, -7.0, -5.0)), color: None ), "common.items.weapons.axe.iron_axe-6": ( - vox_spec: ("weapon.axe.2haxe_iron-6", (-1.5, -5.0, -6.0)), + vox_spec: ("weapon.axe.2haxe_iron-6", (-1.5, -7.0, -6.0)), color: None ), "common.items.weapons.axe.iron_axe-7": ( - vox_spec: ("weapon.axe.2haxe_iron-7", (-1.5, -5.0, -5.0)), + vox_spec: ("weapon.axe.2haxe_iron-7", (-1.5, -7.0, -5.0)), color: None ), "common.items.weapons.axe.iron_axe-8": ( - vox_spec: ("weapon.axe.2haxe_iron-8", (-1.5, -5.0, -5.0)), + vox_spec: ("weapon.axe.2haxe_iron-8", (-1.5, -7.0, -5.0)), color: None ), "common.items.weapons.axe.iron_axe-9": ( - vox_spec: ("weapon.axe.2haxe_iron-9", (-1.5, -4.0, -5.0)), + vox_spec: ("weapon.axe.2haxe_iron-9", (-1.5, -6.0, -5.0)), color: None ), "common.items.weapons.axe.steel_axe-0": ( @@ -338,27 +338,27 @@ color: None ), "common.items.weapons.axe.steel_axe-1": ( - vox_spec: ("weapon.axe.2haxe_steel-1", (-1.5, -7.0, -5.5)), + vox_spec: ("weapon.axe.2haxe_steel-1", (-1.5, -8.0, -5.5)), color: None ), "common.items.weapons.axe.steel_axe-2": ( - vox_spec: ("weapon.axe.2haxe_steel-2", (-1.5, -3.5, -3.5)), + vox_spec: ("weapon.axe.2haxe_steel-2", (-1.5, -9.0, -3.5)), color: None ), "common.items.weapons.axe.steel_axe-3": ( - vox_spec: ("weapon.axe.2haxe_steel-3", (-1.5, -4.0, -6.0)), + vox_spec: ("weapon.axe.2haxe_steel-3", (-1.5, -5.5, -6.0)), color: None ), "common.items.weapons.axe.steel_axe-4": ( - vox_spec: ("weapon.axe.2haxe_steel-4", (-1.5, -4.0, -5.5)), + vox_spec: ("weapon.axe.2haxe_steel-4", (-1.5, -6.0, -5.5)), color: None ), "common.items.weapons.axe.steel_axe-5": ( - vox_spec: ("weapon.axe.2haxe_steel-5", (-1.5, -5.5, -5.5)), + vox_spec: ("weapon.axe.2haxe_steel-5", (-1.5, -8.0, -5.5)), color: None ), "common.items.weapons.axe.steel_axe-6": ( - vox_spec: ("weapon.axe.2haxe_steel-6", (-1.5, -4.0, -4.0)), + vox_spec: ("weapon.axe.2haxe_steel-6", (-1.5, -6.0, -4.0)), color: None ), "common.items.weapons.axe.bloodsteel_axe-0": ( @@ -366,7 +366,7 @@ color: None ), "common.items.weapons.axe.bloodsteel_axe-1": ( - vox_spec: ("weapon.axe.2haxe_bloodsteel-1", (-1.5, -5.5, -5.0)), + vox_spec: ("weapon.axe.2haxe_bloodsteel-1", (-1.5, -7.0, -5.0)), color: None ), "common.items.weapons.axe.bloodsteel_axe-2": ( @@ -374,15 +374,15 @@ color: None ), "common.items.weapons.axe.cobalt_axe-0": ( - vox_spec: ("weapon.axe.2haxe_cobalt-0", (-1.5, -5.0, -5.5)), + vox_spec: ("weapon.axe.2haxe_cobalt-0", (-1.5, -7.0, -5.5)), color: None ), "common.items.weapons.axe.cobalt_axe-1": ( - vox_spec: ("weapon.axe.2haxe_cobalt-1", (-1.5, -5.0, -5.5)), + vox_spec: ("weapon.axe.2haxe_cobalt-1", (-1.5, -8.0, -5.5)), color: None ), "common.items.weapons.axe.malachite_axe-0": ( - vox_spec: ("weapon.axe.2haxe_malachite-0", (-1.5, -8.0, -5.0)), + vox_spec: ("weapon.axe.2haxe_malachite-0", (-1.5, -7.0, -5.0)), color: None ), "common.items.weapons.axe.parashu": ( @@ -696,59 +696,59 @@ ), // Bows "common.items.weapons.bow.bone-0": ( - vox_spec: ("weapon.bow.bone-0", (0.0, -6.0, -12.5)), + vox_spec: ("weapon.bow.bone-0", (-0.5, -5.5, -12.5)), color: None ), "common.items.weapons.bow.bone-1": ( - vox_spec: ("weapon.bow.bone-1", (-0.5, -6.0, -14.5)), + vox_spec: ("weapon.bow.bone-1", (-1.5, -4.5, -15.5)), color: None ), "common.items.weapons.bow.bone-2": ( - vox_spec: ("weapon.bow.bone-2", (0.0, -6.0, -12.5)), + vox_spec: ("weapon.bow.bone-2", (-1.5, -5.5, -13.0)), color: None ), "common.items.weapons.bow.bone-3": ( - vox_spec: ("weapon.bow.bone-3", (0.0, -6.0, -12.5)), + vox_spec: ("weapon.bow.bone-3", (-1.5, -5.0, -12.5)), color: None ), "common.items.weapons.bow.eldwood-0": ( - vox_spec: ("weapon.bow.eldwood-0", (0.0, -4.0, -12.5)), + vox_spec: ("weapon.bow.eldwood-0", (-1.5, -4.0, -12.5)), color: None ), "common.items.weapons.bow.eldwood-1": ( - vox_spec: ("weapon.bow.eldwood-1", (0.0, -4.0, -12.5)), + vox_spec: ("weapon.bow.eldwood-1", (-1.5, -5.5, -12.5)), color: None ), "common.items.weapons.bow.eldwood-2": ( - vox_spec: ("weapon.bow.eldwood-2", (-0.5, -6.0, -12.5)), + vox_spec: ("weapon.bow.eldwood-2", (-1.5, -4.5, -12.5)), color: None ), "common.items.weapons.bow.frostwood-0": ( - vox_spec: ("weapon.bow.frostwood-0", (0.0, -6.0, -13.5)), + vox_spec: ("weapon.bow.frostwood-0", (-1.5, -6.0, -13.5)), color: None ), "common.items.weapons.bow.frostwood-1": ( - vox_spec: ("weapon.bow.frostwood-1", (0.0, -6.0, -12.5)), + vox_spec: ("weapon.bow.frostwood-1", (-1.5, -5.0, -12.5)), color: None ), "common.items.weapons.bow.frostwood-2": ( - vox_spec: ("weapon.bow.frostwood-2", (-0.5, -6.0, -12.5)), + vox_spec: ("weapon.bow.frostwood-2", (-1.5, -4.5, -12.5)), color: None ), "common.items.weapons.bow.hardwood-0": ( - vox_spec: ("weapon.bow.hardwood-0", (-0.5, -3.0, -12.5)), + vox_spec: ("weapon.bow.hardwood-0", (-1.5, -4.0, -12.0)), color: None ), "common.items.weapons.bow.hardwood-1": ( - vox_spec: ("weapon.bow.hardwood-1", (-0.5, -5.0, -12.5)), + vox_spec: ("weapon.bow.hardwood-1", (-1.5, -4.5, -12.5)), color: None ), "common.items.weapons.bow.hardwood-2": ( - vox_spec: ("weapon.bow.hardwood-2", (-0.5, -6.0, -12.5)), + vox_spec: ("weapon.bow.hardwood-2", (-1.5, -6.0, -12.5)), color: None ), "common.items.weapons.bow.hardwood-3": ( - vox_spec: ("weapon.bow.hardwood-3", (-0.5, -4.0, -11.5)), + vox_spec: ("weapon.bow.hardwood-3", (-0.5, -4.0, -11.0)), color: None ), "common.items.weapons.bow.hardwood-4": ( @@ -756,67 +756,67 @@ color: None ), "common.items.weapons.bow.hardwood-5": ( - vox_spec: ("weapon.bow.hardwood-5", (-0.5, -3.5, -13.0)), + vox_spec: ("weapon.bow.hardwood-5", (-1.5, -5.0, -13.5)), color: None ), "common.items.weapons.bow.metal-0": ( - vox_spec: ("weapon.bow.metal-0", (-0.5, -5.0, -12.5)), + vox_spec: ("weapon.bow.metal-0", (-0.5, -6.0, -13.5)), color: None ), "common.items.weapons.bow.metal-1": ( - vox_spec: ("weapon.bow.metal-1", (-0.5, -4.5, -12.5)), + vox_spec: ("weapon.bow.metal-1", (-1.5, -5.0, -13.5)), color: None ), "common.items.weapons.bow.metal-2": ( - vox_spec: ("weapon.bow.metal-2", (-0.5, -4.5, -11.5)), + vox_spec: ("weapon.bow.metal-2", (-1.5, -4.0, -11.5)), color: None ), "common.items.weapons.bow.metal-3": ( - vox_spec: ("weapon.bow.metal-3", (-0.5, -4.5, -14.5)), + vox_spec: ("weapon.bow.metal-3", (-1.5, -5.5, -15.0)), color: None ), "common.items.weapons.bow.metal-4": ( - vox_spec: ("weapon.bow.metal-4", (-0.5, -4.5, -14.5)), + vox_spec: ("weapon.bow.metal-4", (-1.5, -4.0, -15.0)), color: None ), "common.items.weapons.bow.rawwood-0": ( - vox_spec: ("weapon.bow.rawwood-0", (-0.5, -5.0, -12.5)), + vox_spec: ("weapon.bow.rawwood-0", (-1.5, -4.0, -12.5)), color: None ), "common.items.weapons.bow.rawwood-1": ( - vox_spec: ("weapon.bow.rawwood-1", (-0.5, -5.5, -12.5)), + vox_spec: ("weapon.bow.rawwood-1", (-1.5, -4.0, -12.5)), color: None ), "common.items.weapons.bow.sagitta": ( - vox_spec: ("weapon.bow.sagitta", (-0.5, -7.5, -12.5)), + vox_spec: ("weapon.bow.sagitta", (-1.5, -7.0, -12.5)), color: None ), "common.items.weapons.bow.starter": ( - vox_spec: ("weapon.bow.starter", (0.5, -3.0, -8.5)), + vox_spec: ("weapon.bow.starter", (-0.5, -3.0, -8.5)), color: None ), "common.items.weapons.bow.velorite": ( - vox_spec: ("weapon.bow.velorite", (-0.5, -5.0, -15.5)), + vox_spec: ("weapon.bow.velorite", (-1.5, -4.0, -15.0)), color: None ), "common.items.weapons.bow.wood-0": ( - vox_spec: ("weapon.bow.wood-0", (0.0, -6.0, -10.0)), + vox_spec: ("weapon.bow.wood-0", (-0.5, -5.0, -11.0)), color: None ), "common.items.weapons.bow.wood-1": ( - vox_spec: ("weapon.bow.wood-1", (0.0, -5.0, -12.5)), + vox_spec: ("weapon.bow.wood-1", (-0.5, -4.5, -12.5)), color: None ), "common.items.weapons.bow.wood-2": ( - vox_spec: ("weapon.bow.wood-2", (0.0, -4.0, -11.0)), + vox_spec: ("weapon.bow.wood-2", (-0.5, -3.5, -11.0)), color: None ), "common.items.weapons.bow.wood-3": ( - vox_spec: ("weapon.bow.wood-3", (-0.5, -4.0, -12.5)), + vox_spec: ("weapon.bow.wood-3", (-0.5, -3.5, -12.5)), color: None ), "common.items.weapons.bow.wood-4": ( - vox_spec: ("weapon.bow.wood-4", (0.0, -5.5, -11.5)), + vox_spec: ("weapon.bow.wood-4", (-0.5, -4.5, -11.5)), color: None ), // Farming Equipment