From 6f73713c79614603db1b925abcb522a4b8722517 Mon Sep 17 00:00:00 2001 From: Samuel Keiffer Date: Sat, 1 Aug 2020 20:08:30 +0000 Subject: [PATCH] Allows for weapons to have different stats. Seperates healing staff out from staffs into its own weapon type: sceptre. Splits bow weapon type into shortbow and longbow. --- .cargo/config | 2 + .gitignore | 2 + CHANGELOG.md | 2 + Cargo.lock | 90 ++++- Cargo.toml | 3 +- assets/common/items/boss_drops/potions.ron | 2 +- assets/common/items/consumable/potion_big.ron | 2 +- assets/common/items/consumable/potion_med.ron | 2 +- .../common/items/consumable/potion_minor.ron | 2 +- assets/common/items/debug/boost.ron | 5 +- assets/common/items/debug/possess.ron | 5 +- assets/common/items/food/apple.ron | 2 +- .../items/food/apple_mushroom_curry.ron | 2 +- assets/common/items/food/apple_stick.ron | 2 +- assets/common/items/food/cheese.ron | 2 +- assets/common/items/food/coconut.ron | 2 +- assets/common/items/food/mushroom.ron | 2 +- assets/common/items/food/mushroom_stick.ron | 2 +- .../items/weapons/axe/bloodsteel_axe-0.ron | 13 + .../items/weapons/axe/bloodsteel_axe-1.ron | 13 + .../items/weapons/axe/bloodsteel_axe-2.ron | 13 + .../common/items/weapons/axe/bronze_axe-0.ron | 13 + .../common/items/weapons/axe/bronze_axe-1.ron | 13 + .../common/items/weapons/axe/cobalt_axe-0.ron | 13 + .../common/items/weapons/axe/iron_axe-0.ron | 13 + .../common/items/weapons/axe/iron_axe-1.ron | 13 + .../common/items/weapons/axe/iron_axe-2.ron | 13 + .../common/items/weapons/axe/iron_axe-3.ron | 13 + .../common/items/weapons/axe/iron_axe-4.ron | 13 + .../common/items/weapons/axe/iron_axe-5.ron | 13 + .../common/items/weapons/axe/iron_axe-6.ron | 13 + .../common/items/weapons/axe/iron_axe-7.ron | 13 + .../common/items/weapons/axe/iron_axe-8.ron | 13 + .../common/items/weapons/axe/iron_axe-9.ron | 13 + .../items/weapons/axe/malachite_axe-0.ron | 13 + assets/common/items/weapons/axe/orc_axe-0.ron | 13 + .../common/items/weapons/axe/starter_axe.ron | 7 +- .../common/items/weapons/axe/steel_axe-0.ron | 13 + .../common/items/weapons/axe/steel_axe-1.ron | 13 + .../common/items/weapons/axe/steel_axe-2.ron | 13 + .../common/items/weapons/axe/steel_axe-3.ron | 13 + .../common/items/weapons/axe/steel_axe-4.ron | 13 + .../common/items/weapons/axe/steel_axe-5.ron | 13 + .../common/items/weapons/axe/steel_axe-6.ron | 13 + .../items/weapons/axe/worn_iron_axe-0.ron | 13 + .../items/weapons/axe/worn_iron_axe-1.ron | 13 + .../items/weapons/axe/worn_iron_axe-2.ron | 13 + .../items/weapons/axe/worn_iron_axe-3.ron | 13 + .../items/weapons/axe/worn_iron_axe-4.ron | 13 + .../items/weapons/bow/horn_longbow-0.ron | 13 + .../items/weapons/bow/iron_longbow-0.ron | 13 + .../items/weapons/bow/leafy_longbow-0.ron | 13 + .../items/weapons/bow/leafy_shortbow-0.ron | 13 + .../common/items/weapons/bow/rare_longbow.ron | 13 + .../common/items/weapons/bow/starter_bow.ron | 7 +- .../items/weapons/bow/wood_longbow-0.ron | 13 + .../items/weapons/bow/wood_longbow-1.ron | 13 + .../items/weapons/bow/wood_shortbow-0.ron | 13 + .../items/weapons/bow/wood_shortbow-1.ron | 13 + .../items/weapons/dagger/starter_dagger.ron | 7 +- assets/common/items/weapons/empty.ron | 10 - assets/common/items/weapons/empty/empty.ron | 13 + .../items/weapons/hammer/bronze_hammer-0.ron | 13 + .../items/weapons/hammer/bronze_hammer-1.ron | 13 + .../items/weapons/hammer/cobalt_hammer-0.ron | 13 + .../items/weapons/hammer/cobalt_hammer-1.ron | 13 + .../items/weapons/hammer/flimsy_hammer.ron | 13 + .../common/items/weapons/hammer/hammer_1.ron | 7 +- .../items/weapons/hammer/iron_hammer-0.ron | 13 + .../items/weapons/hammer/iron_hammer-1.ron | 13 + .../items/weapons/hammer/iron_hammer-2.ron | 13 + .../items/weapons/hammer/iron_hammer-3.ron | 13 + .../items/weapons/hammer/iron_hammer-4.ron | 13 + .../items/weapons/hammer/iron_hammer-5.ron | 13 + .../items/weapons/hammer/iron_hammer-6.ron | 13 + .../items/weapons/hammer/iron_hammer-7.ron | 13 + .../items/weapons/hammer/iron_hammer-8.ron | 13 + .../common/items/weapons/hammer/mjolnir.ron | 13 + .../items/weapons/hammer/ramshead_hammer.ron | 13 + .../items/weapons/hammer/runic_hammer.ron | 13 + .../items/weapons/hammer/starter_hammer.ron | 7 +- .../items/weapons/hammer/steel_hammer-0.ron | 13 + .../items/weapons/hammer/steel_hammer-1.ron | 13 + .../items/weapons/hammer/steel_hammer-2.ron | 13 + .../items/weapons/hammer/steel_hammer-3.ron | 13 + .../items/weapons/hammer/steel_hammer-4.ron | 13 + .../items/weapons/hammer/steel_hammer-5.ron | 13 + .../items/weapons/hammer/stone_hammer-0.ron | 13 + .../items/weapons/hammer/stone_hammer-1.ron | 13 + .../items/weapons/hammer/stone_hammer-2.ron | 13 + .../items/weapons/hammer/stone_hammer-3.ron | 13 + .../items/weapons/hammer/wood_hammer-0.ron | 13 + .../weapons/hammer/worn_iron_hammer-0.ron | 13 + .../weapons/hammer/worn_iron_hammer-1.ron | 13 + .../weapons/hammer/worn_iron_hammer-2.ron | 13 + .../weapons/hammer/worn_iron_hammer-3.ron | 13 + .../common/items/weapons/shield/shield_1.ron | 7 +- .../items/weapons/staff/amethyst_staff.ron | 13 + .../common/items/weapons/staff/bone_staff.ron | 13 + .../items/weapons/staff/cultist_staff.ron | 13 + assets/common/items/weapons/staff/staff_1.ron | 7 +- .../items/weapons/staff/staff_nature.ron | 7 +- .../items/weapons/staff/starter_staff.ron | 7 +- .../items/weapons/sword/cultist_purp_2h-0.ron | 7 +- .../weapons/sword/greatsword_2h_dam-0.ron | 7 +- .../weapons/sword/greatsword_2h_dam-1.ron | 7 +- .../weapons/sword/greatsword_2h_dam-2.ron | 7 +- .../weapons/sword/greatsword_2h_fine-0.ron | 7 +- .../weapons/sword/greatsword_2h_fine-1.ron | 7 +- .../weapons/sword/greatsword_2h_fine-2.ron | 7 +- .../weapons/sword/greatsword_2h_orn-0.ron | 9 +- .../weapons/sword/greatsword_2h_orn-1.ron | 9 +- .../weapons/sword/greatsword_2h_orn-2.ron | 9 +- .../weapons/sword/greatsword_2h_simple-0.ron | 7 +- .../weapons/sword/greatsword_2h_simple-1.ron | 7 +- .../weapons/sword/greatsword_2h_simple-2.ron | 7 +- .../items/weapons/sword/long_2h_dam-0.ron | 7 +- .../items/weapons/sword/long_2h_dam-1.ron | 7 +- .../items/weapons/sword/long_2h_dam-2.ron | 7 +- .../items/weapons/sword/long_2h_dam-3.ron | 7 +- .../items/weapons/sword/long_2h_dam-4.ron | 7 +- .../items/weapons/sword/long_2h_dam-5.ron | 7 +- .../items/weapons/sword/long_2h_fine-0.ron | 7 +- .../items/weapons/sword/long_2h_fine-1.ron | 7 +- .../items/weapons/sword/long_2h_fine-2.ron | 7 +- .../items/weapons/sword/long_2h_fine-3.ron | 7 +- .../items/weapons/sword/long_2h_fine-4.ron | 7 +- .../items/weapons/sword/long_2h_fine-5.ron | 7 +- .../items/weapons/sword/long_2h_orn-0.ron | 9 +- .../items/weapons/sword/long_2h_orn-1.ron | 9 +- .../items/weapons/sword/long_2h_orn-2.ron | 9 +- .../items/weapons/sword/long_2h_orn-3.ron | 9 +- .../items/weapons/sword/long_2h_orn-4.ron | 9 +- .../items/weapons/sword/long_2h_orn-5.ron | 9 +- .../items/weapons/sword/long_2h_simple-0.ron | 7 +- .../items/weapons/sword/long_2h_simple-1.ron | 7 +- .../items/weapons/sword/long_2h_simple-2.ron | 7 +- .../items/weapons/sword/long_2h_simple-3.ron | 7 +- .../items/weapons/sword/long_2h_simple-4.ron | 7 +- .../items/weapons/sword/long_2h_simple-5.ron | 7 +- .../items/weapons/sword/short_sword_0.ron | 7 +- .../items/weapons/sword/starter_sword.ron | 7 +- .../common/items/weapons/sword/wood_sword.ron | 7 +- .../weapons/sword/zweihander_sword_0.ron | 9 +- assets/common/items/weapons/tool/broom.ron | 7 +- .../common/items/weapons/tool/fishing_rod.ron | 7 +- assets/common/items/weapons/tool/hoe.ron | 7 +- assets/common/items/weapons/tool/pickaxe.ron | 7 +- .../common/items/weapons/tool/pitchfork.ron | 7 +- assets/common/items/weapons/tool/rake.ron | 7 +- assets/common/items/weapons/tool/shovel-0.ron | 7 +- assets/common/items/weapons/tool/shovel-1.ron | 7 +- assets/common/loot_table.ron | 86 ++++- assets/voxygen/i18n/de_DE.ron | 9 +- assets/voxygen/item_image_manifest.ron | 311 +++++++++++++++++- .../voxel/humanoid_main_weapon_manifest.ron | 311 +++++++++++++++++- .../voxel/weapon/axe/2haxe_bloodsteel-0.vox | Bin 0 -> 56404 bytes .../voxel/weapon/axe/2haxe_bloodsteel-1.vox | Bin 0 -> 56192 bytes .../voxel/weapon/axe/2haxe_bloodsteel-2.vox | Bin 0 -> 1492 bytes .../voxel/weapon/axe/2haxe_bronze-0.vox | Bin 0 -> 55944 bytes .../voxel/weapon/axe/2haxe_bronze-1.vox | Bin 0 -> 56028 bytes .../voxel/weapon/axe/2haxe_cobalt-0.vox | Bin 0 -> 56116 bytes .../voxygen/voxel/weapon/axe/2haxe_iron-0.vox | Bin 0 -> 56316 bytes .../voxygen/voxel/weapon/axe/2haxe_iron-1.vox | Bin 0 -> 56212 bytes .../voxygen/voxel/weapon/axe/2haxe_iron-2.vox | Bin 0 -> 27855 bytes .../voxygen/voxel/weapon/axe/2haxe_iron-3.vox | Bin 0 -> 56324 bytes .../voxygen/voxel/weapon/axe/2haxe_iron-4.vox | Bin 0 -> 27980 bytes .../voxygen/voxel/weapon/axe/2haxe_iron-5.vox | Bin 0 -> 27852 bytes .../voxygen/voxel/weapon/axe/2haxe_iron-6.vox | Bin 0 -> 56220 bytes .../voxygen/voxel/weapon/axe/2haxe_iron-7.vox | Bin 0 -> 56284 bytes .../voxygen/voxel/weapon/axe/2haxe_iron-8.vox | Bin 0 -> 56276 bytes .../voxygen/voxel/weapon/axe/2haxe_iron-9.vox | Bin 0 -> 56092 bytes .../voxel/weapon/axe/2haxe_malachite-0.vox | Bin 0 -> 56276 bytes .../voxygen/voxel/weapon/axe/2haxe_orc-0.vox | Bin 0 -> 27712 bytes .../axe/{rusty_2h.vox => 2haxe_rusty.vox} | Bin .../voxel/weapon/axe/2haxe_steel-0.vox | Bin 0 -> 27951 bytes .../voxel/weapon/axe/2haxe_steel-1.vox | Bin 0 -> 56380 bytes .../voxel/weapon/axe/2haxe_steel-2.vox | Bin 0 -> 56144 bytes .../voxel/weapon/axe/2haxe_steel-3.vox | Bin 0 -> 27779 bytes .../voxel/weapon/axe/2haxe_steel-4.vox | Bin 0 -> 56172 bytes .../voxel/weapon/axe/2haxe_steel-5.vox | Bin 0 -> 56532 bytes .../voxel/weapon/axe/2haxe_steel-6.vox | Bin 0 -> 56116 bytes .../voxel/weapon/axe/2haxe_worn_iron-0.vox | Bin 0 -> 27643 bytes .../voxel/weapon/axe/2haxe_worn_iron-1.vox | Bin 0 -> 27599 bytes .../voxel/weapon/axe/2haxe_worn_iron-2.vox | Bin 0 -> 27603 bytes .../voxel/weapon/axe/2haxe_worn_iron-3.vox | Bin 0 -> 27663 bytes .../voxel/weapon/axe/2haxe_worn_iron-4.vox | Bin 0 -> 56116 bytes assets/voxygen/voxel/weapon/axe/orc-0.vox | Bin 1556 -> 0 bytes .../voxel/weapon/bow/longbow_horn-0.vox | Bin 0 -> 28027 bytes .../voxel/weapon/bow/longbow_iron-0.vox | Bin 0 -> 27787 bytes .../voxel/weapon/bow/longbow_leafy-0.vox | Bin 0 -> 23910 bytes .../bow/{rare_bow-0.vox => longbow_rare.vox} | Bin .../bow/{longbow-0.vox => longbow_wood-0.vox} | Bin .../bow/{longbow-1.vox => longbow_wood-1.vox} | Bin .../voxel/weapon/bow/shortbow_leafy-0.vox | Bin 0 -> 27426 bytes .../voxel/weapon/bow/shortbow_starter.vox | Bin 0 -> 27414 bytes .../{shortbow-0.vox => shortbow_wood-0.vox} | Bin .../{shortbow-1.vox => shortbow_wood-1.vox} | Bin .../voxel/weapon/hammer/2hhammer_bronze-0.vox | Bin 0 -> 57052 bytes .../voxel/weapon/hammer/2hhammer_bronze-1.vox | Bin 0 -> 56596 bytes .../voxel/weapon/hammer/2hhammer_cobalt-0.vox | Bin 0 -> 57432 bytes .../voxel/weapon/hammer/2hhammer_cobalt-1.vox | Bin 0 -> 56824 bytes .../voxel/weapon/hammer/2hhammer_flimsy.vox | Bin 0 -> 1668 bytes .../voxel/weapon/hammer/2hhammer_iron-0.vox | Bin 0 -> 2952 bytes .../voxel/weapon/hammer/2hhammer_iron-1.vox | Bin 0 -> 3436 bytes .../voxel/weapon/hammer/2hhammer_iron-2.vox | Bin 0 -> 56552 bytes .../voxel/weapon/hammer/2hhammer_iron-3.vox | Bin 0 -> 56672 bytes .../voxel/weapon/hammer/2hhammer_iron-4.vox | Bin 0 -> 57352 bytes .../voxel/weapon/hammer/2hhammer_iron-5.vox | Bin 0 -> 28111 bytes .../voxel/weapon/hammer/2hhammer_iron-6.vox | Bin 0 -> 56816 bytes .../voxel/weapon/hammer/2hhammer_iron-7.vox | Bin 0 -> 3332 bytes .../voxel/weapon/hammer/2hhammer_iron-8.vox | Bin 0 -> 27827 bytes .../voxel/weapon/hammer/2hhammer_mjolnir.vox | Bin 0 -> 57740 bytes .../voxel/weapon/hammer/2hhammer_ramshead.vox | Bin 0 -> 57744 bytes .../voxel/weapon/hammer/2hhammer_runic.vox | Bin 0 -> 57436 bytes .../{rusty_2h.vox => 2hhammer_rusty.vox} | Bin .../voxel/weapon/hammer/2hhammer_steel-0.vox | Bin 0 -> 56696 bytes .../voxel/weapon/hammer/2hhammer_steel-1.vox | Bin 0 -> 58228 bytes .../voxel/weapon/hammer/2hhammer_steel-2.vox | Bin 0 -> 56604 bytes .../voxel/weapon/hammer/2hhammer_steel-3.vox | Bin 0 -> 57188 bytes .../voxel/weapon/hammer/2hhammer_steel-4.vox | Bin 0 -> 57300 bytes .../voxel/weapon/hammer/2hhammer_steel-5.vox | Bin 0 -> 56968 bytes .../voxel/weapon/hammer/2hhammer_stone-0.vox | Bin 0 -> 57784 bytes .../voxel/weapon/hammer/2hhammer_stone-1.vox | Bin 0 -> 57800 bytes .../voxel/weapon/hammer/2hhammer_stone-2.vox | Bin 0 -> 57544 bytes .../voxel/weapon/hammer/2hhammer_stone-3.vox | Bin 0 -> 57560 bytes .../voxel/weapon/hammer/2hhammer_wood-0.vox | Bin 0 -> 57352 bytes .../weapon/hammer/2hhammer_worn_iron-0.vox | Bin 0 -> 27867 bytes .../weapon/hammer/2hhammer_worn_iron-1.vox | Bin 0 -> 28023 bytes .../weapon/hammer/2hhammer_worn_iron-2.vox | Bin 0 -> 27731 bytes .../weapon/hammer/2hhammer_worn_iron-3.vox | Bin 0 -> 28155 bytes .../voxel/weapon/staff/firestaff_amethyst.vox | Bin 0 -> 27535 bytes .../voxel/weapon/staff/firestaff_bone.vox | Bin 0 -> 27451 bytes .../voxel/weapon/staff/firestaff_cultist.vox | Bin 0 -> 27910 bytes .../{wood-fire.vox => firestaff_starter.vox} | Bin common/src/comp/body.rs | 74 ++--- common/src/comp/damage.rs | 12 +- common/src/comp/inventory/item/tool.rs | 195 +++++++---- common/src/loadout_builder.rs | 2 +- common/src/states/leap_melee.rs | 5 +- server/src/cmd.rs | 2 +- server/src/events/entity_manipulation.rs | 4 +- .../down.sql | 1 + .../up.sql | 154 +++++++++ server/src/sys/terrain.rs | 6 +- tools/Cargo.toml | 10 + tools/src/main.rs | 165 ++++++++++ .../audio/sfx/event_mapper/combat/tests.rs | 2 +- voxygen/src/hud/hotbar.rs | 4 +- voxygen/src/hud/mod.rs | 23 +- voxygen/src/hud/skillbar.rs | 4 +- voxygen/src/hud/util.rs | 33 +- 252 files changed, 2646 insertions(+), 309 deletions(-) create mode 100644 assets/common/items/weapons/axe/bloodsteel_axe-0.ron create mode 100644 assets/common/items/weapons/axe/bloodsteel_axe-1.ron create mode 100644 assets/common/items/weapons/axe/bloodsteel_axe-2.ron create mode 100644 assets/common/items/weapons/axe/bronze_axe-0.ron create mode 100644 assets/common/items/weapons/axe/bronze_axe-1.ron create mode 100644 assets/common/items/weapons/axe/cobalt_axe-0.ron create mode 100644 assets/common/items/weapons/axe/iron_axe-0.ron create mode 100644 assets/common/items/weapons/axe/iron_axe-1.ron create mode 100644 assets/common/items/weapons/axe/iron_axe-2.ron create mode 100644 assets/common/items/weapons/axe/iron_axe-3.ron create mode 100644 assets/common/items/weapons/axe/iron_axe-4.ron create mode 100644 assets/common/items/weapons/axe/iron_axe-5.ron create mode 100644 assets/common/items/weapons/axe/iron_axe-6.ron create mode 100644 assets/common/items/weapons/axe/iron_axe-7.ron create mode 100644 assets/common/items/weapons/axe/iron_axe-8.ron create mode 100644 assets/common/items/weapons/axe/iron_axe-9.ron create mode 100644 assets/common/items/weapons/axe/malachite_axe-0.ron create mode 100644 assets/common/items/weapons/axe/orc_axe-0.ron create mode 100644 assets/common/items/weapons/axe/steel_axe-0.ron create mode 100644 assets/common/items/weapons/axe/steel_axe-1.ron create mode 100644 assets/common/items/weapons/axe/steel_axe-2.ron create mode 100644 assets/common/items/weapons/axe/steel_axe-3.ron create mode 100644 assets/common/items/weapons/axe/steel_axe-4.ron create mode 100644 assets/common/items/weapons/axe/steel_axe-5.ron create mode 100644 assets/common/items/weapons/axe/steel_axe-6.ron create mode 100644 assets/common/items/weapons/axe/worn_iron_axe-0.ron create mode 100644 assets/common/items/weapons/axe/worn_iron_axe-1.ron create mode 100644 assets/common/items/weapons/axe/worn_iron_axe-2.ron create mode 100644 assets/common/items/weapons/axe/worn_iron_axe-3.ron create mode 100644 assets/common/items/weapons/axe/worn_iron_axe-4.ron create mode 100644 assets/common/items/weapons/bow/horn_longbow-0.ron create mode 100644 assets/common/items/weapons/bow/iron_longbow-0.ron create mode 100644 assets/common/items/weapons/bow/leafy_longbow-0.ron create mode 100644 assets/common/items/weapons/bow/leafy_shortbow-0.ron create mode 100644 assets/common/items/weapons/bow/rare_longbow.ron create mode 100644 assets/common/items/weapons/bow/wood_longbow-0.ron create mode 100644 assets/common/items/weapons/bow/wood_longbow-1.ron create mode 100644 assets/common/items/weapons/bow/wood_shortbow-0.ron create mode 100644 assets/common/items/weapons/bow/wood_shortbow-1.ron delete mode 100644 assets/common/items/weapons/empty.ron create mode 100644 assets/common/items/weapons/empty/empty.ron create mode 100644 assets/common/items/weapons/hammer/bronze_hammer-0.ron create mode 100644 assets/common/items/weapons/hammer/bronze_hammer-1.ron create mode 100644 assets/common/items/weapons/hammer/cobalt_hammer-0.ron create mode 100644 assets/common/items/weapons/hammer/cobalt_hammer-1.ron create mode 100644 assets/common/items/weapons/hammer/flimsy_hammer.ron create mode 100644 assets/common/items/weapons/hammer/iron_hammer-0.ron create mode 100644 assets/common/items/weapons/hammer/iron_hammer-1.ron create mode 100644 assets/common/items/weapons/hammer/iron_hammer-2.ron create mode 100644 assets/common/items/weapons/hammer/iron_hammer-3.ron create mode 100644 assets/common/items/weapons/hammer/iron_hammer-4.ron create mode 100644 assets/common/items/weapons/hammer/iron_hammer-5.ron create mode 100644 assets/common/items/weapons/hammer/iron_hammer-6.ron create mode 100644 assets/common/items/weapons/hammer/iron_hammer-7.ron create mode 100644 assets/common/items/weapons/hammer/iron_hammer-8.ron create mode 100644 assets/common/items/weapons/hammer/mjolnir.ron create mode 100644 assets/common/items/weapons/hammer/ramshead_hammer.ron create mode 100644 assets/common/items/weapons/hammer/runic_hammer.ron create mode 100644 assets/common/items/weapons/hammer/steel_hammer-0.ron create mode 100644 assets/common/items/weapons/hammer/steel_hammer-1.ron create mode 100644 assets/common/items/weapons/hammer/steel_hammer-2.ron create mode 100644 assets/common/items/weapons/hammer/steel_hammer-3.ron create mode 100644 assets/common/items/weapons/hammer/steel_hammer-4.ron create mode 100644 assets/common/items/weapons/hammer/steel_hammer-5.ron create mode 100644 assets/common/items/weapons/hammer/stone_hammer-0.ron create mode 100644 assets/common/items/weapons/hammer/stone_hammer-1.ron create mode 100644 assets/common/items/weapons/hammer/stone_hammer-2.ron create mode 100644 assets/common/items/weapons/hammer/stone_hammer-3.ron create mode 100644 assets/common/items/weapons/hammer/wood_hammer-0.ron create mode 100644 assets/common/items/weapons/hammer/worn_iron_hammer-0.ron create mode 100644 assets/common/items/weapons/hammer/worn_iron_hammer-1.ron create mode 100644 assets/common/items/weapons/hammer/worn_iron_hammer-2.ron create mode 100644 assets/common/items/weapons/hammer/worn_iron_hammer-3.ron create mode 100644 assets/common/items/weapons/staff/amethyst_staff.ron create mode 100644 assets/common/items/weapons/staff/bone_staff.ron create mode 100644 assets/common/items/weapons/staff/cultist_staff.ron create mode 100644 assets/voxygen/voxel/weapon/axe/2haxe_bloodsteel-0.vox create mode 100644 assets/voxygen/voxel/weapon/axe/2haxe_bloodsteel-1.vox create mode 100644 assets/voxygen/voxel/weapon/axe/2haxe_bloodsteel-2.vox create mode 100644 assets/voxygen/voxel/weapon/axe/2haxe_bronze-0.vox create mode 100644 assets/voxygen/voxel/weapon/axe/2haxe_bronze-1.vox create mode 100644 assets/voxygen/voxel/weapon/axe/2haxe_cobalt-0.vox create mode 100644 assets/voxygen/voxel/weapon/axe/2haxe_iron-0.vox create mode 100644 assets/voxygen/voxel/weapon/axe/2haxe_iron-1.vox create mode 100644 assets/voxygen/voxel/weapon/axe/2haxe_iron-2.vox create mode 100644 assets/voxygen/voxel/weapon/axe/2haxe_iron-3.vox create mode 100644 assets/voxygen/voxel/weapon/axe/2haxe_iron-4.vox create mode 100644 assets/voxygen/voxel/weapon/axe/2haxe_iron-5.vox create mode 100644 assets/voxygen/voxel/weapon/axe/2haxe_iron-6.vox create mode 100644 assets/voxygen/voxel/weapon/axe/2haxe_iron-7.vox create mode 100644 assets/voxygen/voxel/weapon/axe/2haxe_iron-8.vox create mode 100644 assets/voxygen/voxel/weapon/axe/2haxe_iron-9.vox create mode 100644 assets/voxygen/voxel/weapon/axe/2haxe_malachite-0.vox create mode 100644 assets/voxygen/voxel/weapon/axe/2haxe_orc-0.vox rename assets/voxygen/voxel/weapon/axe/{rusty_2h.vox => 2haxe_rusty.vox} (100%) create mode 100644 assets/voxygen/voxel/weapon/axe/2haxe_steel-0.vox create mode 100644 assets/voxygen/voxel/weapon/axe/2haxe_steel-1.vox create mode 100644 assets/voxygen/voxel/weapon/axe/2haxe_steel-2.vox create mode 100644 assets/voxygen/voxel/weapon/axe/2haxe_steel-3.vox create mode 100644 assets/voxygen/voxel/weapon/axe/2haxe_steel-4.vox create mode 100644 assets/voxygen/voxel/weapon/axe/2haxe_steel-5.vox create mode 100644 assets/voxygen/voxel/weapon/axe/2haxe_steel-6.vox create mode 100644 assets/voxygen/voxel/weapon/axe/2haxe_worn_iron-0.vox create mode 100644 assets/voxygen/voxel/weapon/axe/2haxe_worn_iron-1.vox create mode 100644 assets/voxygen/voxel/weapon/axe/2haxe_worn_iron-2.vox create mode 100644 assets/voxygen/voxel/weapon/axe/2haxe_worn_iron-3.vox create mode 100644 assets/voxygen/voxel/weapon/axe/2haxe_worn_iron-4.vox delete mode 100644 assets/voxygen/voxel/weapon/axe/orc-0.vox create mode 100644 assets/voxygen/voxel/weapon/bow/longbow_horn-0.vox create mode 100644 assets/voxygen/voxel/weapon/bow/longbow_iron-0.vox create mode 100644 assets/voxygen/voxel/weapon/bow/longbow_leafy-0.vox rename assets/voxygen/voxel/weapon/bow/{rare_bow-0.vox => longbow_rare.vox} (100%) rename assets/voxygen/voxel/weapon/bow/{longbow-0.vox => longbow_wood-0.vox} (100%) rename assets/voxygen/voxel/weapon/bow/{longbow-1.vox => longbow_wood-1.vox} (100%) create mode 100644 assets/voxygen/voxel/weapon/bow/shortbow_leafy-0.vox create mode 100644 assets/voxygen/voxel/weapon/bow/shortbow_starter.vox rename assets/voxygen/voxel/weapon/bow/{shortbow-0.vox => shortbow_wood-0.vox} (100%) rename assets/voxygen/voxel/weapon/bow/{shortbow-1.vox => shortbow_wood-1.vox} (100%) create mode 100644 assets/voxygen/voxel/weapon/hammer/2hhammer_bronze-0.vox create mode 100644 assets/voxygen/voxel/weapon/hammer/2hhammer_bronze-1.vox create mode 100644 assets/voxygen/voxel/weapon/hammer/2hhammer_cobalt-0.vox create mode 100644 assets/voxygen/voxel/weapon/hammer/2hhammer_cobalt-1.vox create mode 100644 assets/voxygen/voxel/weapon/hammer/2hhammer_flimsy.vox create mode 100644 assets/voxygen/voxel/weapon/hammer/2hhammer_iron-0.vox create mode 100644 assets/voxygen/voxel/weapon/hammer/2hhammer_iron-1.vox create mode 100644 assets/voxygen/voxel/weapon/hammer/2hhammer_iron-2.vox create mode 100644 assets/voxygen/voxel/weapon/hammer/2hhammer_iron-3.vox create mode 100644 assets/voxygen/voxel/weapon/hammer/2hhammer_iron-4.vox create mode 100644 assets/voxygen/voxel/weapon/hammer/2hhammer_iron-5.vox create mode 100644 assets/voxygen/voxel/weapon/hammer/2hhammer_iron-6.vox create mode 100644 assets/voxygen/voxel/weapon/hammer/2hhammer_iron-7.vox create mode 100644 assets/voxygen/voxel/weapon/hammer/2hhammer_iron-8.vox create mode 100644 assets/voxygen/voxel/weapon/hammer/2hhammer_mjolnir.vox create mode 100644 assets/voxygen/voxel/weapon/hammer/2hhammer_ramshead.vox create mode 100644 assets/voxygen/voxel/weapon/hammer/2hhammer_runic.vox rename assets/voxygen/voxel/weapon/hammer/{rusty_2h.vox => 2hhammer_rusty.vox} (100%) create mode 100644 assets/voxygen/voxel/weapon/hammer/2hhammer_steel-0.vox create mode 100644 assets/voxygen/voxel/weapon/hammer/2hhammer_steel-1.vox create mode 100644 assets/voxygen/voxel/weapon/hammer/2hhammer_steel-2.vox create mode 100644 assets/voxygen/voxel/weapon/hammer/2hhammer_steel-3.vox create mode 100644 assets/voxygen/voxel/weapon/hammer/2hhammer_steel-4.vox create mode 100644 assets/voxygen/voxel/weapon/hammer/2hhammer_steel-5.vox create mode 100644 assets/voxygen/voxel/weapon/hammer/2hhammer_stone-0.vox create mode 100644 assets/voxygen/voxel/weapon/hammer/2hhammer_stone-1.vox create mode 100644 assets/voxygen/voxel/weapon/hammer/2hhammer_stone-2.vox create mode 100644 assets/voxygen/voxel/weapon/hammer/2hhammer_stone-3.vox create mode 100644 assets/voxygen/voxel/weapon/hammer/2hhammer_wood-0.vox create mode 100644 assets/voxygen/voxel/weapon/hammer/2hhammer_worn_iron-0.vox create mode 100644 assets/voxygen/voxel/weapon/hammer/2hhammer_worn_iron-1.vox create mode 100644 assets/voxygen/voxel/weapon/hammer/2hhammer_worn_iron-2.vox create mode 100644 assets/voxygen/voxel/weapon/hammer/2hhammer_worn_iron-3.vox create mode 100644 assets/voxygen/voxel/weapon/staff/firestaff_amethyst.vox create mode 100644 assets/voxygen/voxel/weapon/staff/firestaff_bone.vox create mode 100644 assets/voxygen/voxel/weapon/staff/firestaff_cultist.vox rename assets/voxygen/voxel/weapon/staff/{wood-fire.vox => firestaff_starter.vox} (100%) create mode 100644 server/src/migrations/2020-07-29-204534_power_stat_for_weapons/down.sql create mode 100644 server/src/migrations/2020-07-29-204534_power_stat_for_weapons/up.sql create mode 100644 tools/Cargo.toml create mode 100644 tools/src/main.rs diff --git a/.cargo/config b/.cargo/config index ae79b60dee..6a9b75f52a 100644 --- a/.cargo/config +++ b/.cargo/config @@ -3,3 +3,5 @@ rustflags = [ "-C", "link-arg=-fuse-ld=gold", ] +[alias] +generate = "run --package tools --" \ No newline at end of file diff --git a/.gitignore b/.gitignore index 57bb68842f..8ca8fe2e6b 100644 --- a/.gitignore +++ b/.gitignore @@ -30,6 +30,8 @@ run.sh maps screenshots todo.txt +armorstats.csv +weaponstats.csv # Game data *.sqlite diff --git a/CHANGELOG.md b/CHANGELOG.md index 3a7a76af54..e7ae3855bf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -47,6 +47,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Protection stat to armor that reduces incoming damage - Loading-Screen tips - Feeding animation for some animals +- Power stat to weapons which affects weapon damage + ### Changed - Improved camera aiming diff --git a/Cargo.lock b/Cargo.lock index 44664909e2..8f02d4147c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -120,7 +120,7 @@ version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cc755b23c19211c270ef000fa7ce871377825e6cc7d1bfd0311076f22c5e6ba1" dependencies = [ - "proc-macro-error", + "proc-macro-error 0.4.12", "proc-macro2 1.0.18", "quote 1.0.7", "syn 1.0.33", @@ -521,9 +521,13 @@ version = "2.33.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bdfa80d47f954d53a35a64987ca1422f495b8d6483c0fe9f7117b36c2a792129" dependencies = [ + "ansi_term", + "atty", "bitflags", + "strsim 0.8.0", "textwrap", "unicode-width", + "vec_map", ] [[package]] @@ -1007,7 +1011,7 @@ dependencies = [ "ident_case", "proc-macro2 1.0.18", "quote 1.0.7", - "strsim", + "strsim 0.9.3", "syn 1.0.33", ] @@ -1891,6 +1895,15 @@ dependencies = [ "serde", ] +[[package]] +name = "heck" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205" +dependencies = [ + "unicode-segmentation", +] + [[package]] name = "hermit-abi" version = "0.1.13" @@ -3097,7 +3110,20 @@ version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "18f33027081eba0a6d8aba6d1b1c3a3be58cbb12106341c2d5759fcd9b5277e7" dependencies = [ - "proc-macro-error-attr", + "proc-macro-error-attr 0.4.12", + "proc-macro2 1.0.18", + "quote 1.0.7", + "syn 1.0.33", + "version_check 0.9.2", +] + +[[package]] +name = "proc-macro-error" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc175e9777c3116627248584e8f8b3e2987405cabe1c0adf7d1dd28f09dc7880" +dependencies = [ + "proc-macro-error-attr 1.0.3", "proc-macro2 1.0.18", "quote 1.0.7", "syn 1.0.33", @@ -3117,6 +3143,19 @@ dependencies = [ "version_check 0.9.2", ] +[[package]] +name = "proc-macro-error-attr" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3cc9795ca17eb581285ec44936da7fc2335a3f34f2ddd13118b6f4d515435c50" +dependencies = [ + "proc-macro2 1.0.18", + "quote 1.0.7", + "syn 1.0.33", + "syn-mid", + "version_check 0.9.2", +] + [[package]] name = "proc-macro-hack" version = "0.5.16" @@ -3942,12 +3981,42 @@ dependencies = [ "bytes", ] +[[package]] +name = "strsim" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" + [[package]] name = "strsim" version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c" +[[package]] +name = "structopt" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de2f5e239ee807089b62adce73e48c625e0ed80df02c7ab3f068f5db5281065c" +dependencies = [ + "clap", + "lazy_static", + "structopt-derive", +] + +[[package]] +name = "structopt-derive" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "510413f9de616762a4fbeab62509bf15c729603b72d7cd71280fbca431b1c118" +dependencies = [ + "heck", + "proc-macro-error 1.0.3", + "proc-macro2 1.0.18", + "quote 1.0.7", + "syn 1.0.33", +] + [[package]] name = "sum_type" version = "0.2.0" @@ -4244,6 +4313,15 @@ dependencies = [ "serde", ] +[[package]] +name = "tools" +version = "0.1.0" +dependencies = [ + "csv", + "structopt", + "veloren-common", +] + [[package]] name = "tracing" version = "0.1.15" @@ -4385,6 +4463,12 @@ dependencies = [ "smallvec 1.4.0", ] +[[package]] +name = "unicode-segmentation" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e83e153d1053cbb5a118eeff7fd5be06ed99153f00dbcd8ae310c5fb2b22edc0" + [[package]] name = "unicode-width" version = "0.1.7" diff --git a/Cargo.toml b/Cargo.toml index b87d9807fd..e73d2cd0a8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,7 +10,8 @@ members = [ "voxygen", "world", "network", - "voxygen/src/anim" + "voxygen/src/anim", + "tools" ] # default profile for devs, fast to compile, okay enough to run, no debug information diff --git a/assets/common/items/boss_drops/potions.ron b/assets/common/items/boss_drops/potions.ron index 011a0c8d42..01650058e7 100644 --- a/assets/common/items/boss_drops/potions.ron +++ b/assets/common/items/boss_drops/potions.ron @@ -4,7 +4,7 @@ Item( kind: Consumable( kind: Potion, effect: Health(( - amount: 100, + amount: 1000, cause: Item, )), ), diff --git a/assets/common/items/consumable/potion_big.ron b/assets/common/items/consumable/potion_big.ron index 60ddf64298..7e903bb48a 100644 --- a/assets/common/items/consumable/potion_big.ron +++ b/assets/common/items/consumable/potion_big.ron @@ -4,7 +4,7 @@ Item( kind: Consumable( kind: PotionLarge, effect: Health(( - amount: 100, + amount: 1000, cause: Item, )), ), diff --git a/assets/common/items/consumable/potion_med.ron b/assets/common/items/consumable/potion_med.ron index ece9348e1b..3ec58e046d 100644 --- a/assets/common/items/consumable/potion_med.ron +++ b/assets/common/items/consumable/potion_med.ron @@ -4,7 +4,7 @@ Item( kind: Consumable( kind: PotionMed, effect: Health(( - amount: 70, + amount: 700, cause: Item, )), ), diff --git a/assets/common/items/consumable/potion_minor.ron b/assets/common/items/consumable/potion_minor.ron index 431af1fbe7..5dca958483 100644 --- a/assets/common/items/consumable/potion_minor.ron +++ b/assets/common/items/consumable/potion_minor.ron @@ -4,7 +4,7 @@ Item( kind: Consumable( kind: PotionMinor, effect: Health(( - amount: 50, + amount: 500, cause: Item, )), ), diff --git a/assets/common/items/debug/boost.ron b/assets/common/items/debug/boost.ron index b9ae0408fb..4fc86afae3 100644 --- a/assets/common/items/debug/boost.ron +++ b/assets/common/items/debug/boost.ron @@ -4,7 +4,10 @@ Item( kind: Tool( ( kind: Debug(Boost), - equip_time_millis: 0, + stats: ( + equip_time_millis: 0, + power: 1.00, + ), ) ), ) diff --git a/assets/common/items/debug/possess.ron b/assets/common/items/debug/possess.ron index b9ae0408fb..4fc86afae3 100644 --- a/assets/common/items/debug/possess.ron +++ b/assets/common/items/debug/possess.ron @@ -4,7 +4,10 @@ Item( kind: Tool( ( kind: Debug(Boost), - equip_time_millis: 0, + stats: ( + equip_time_millis: 0, + power: 1.00, + ), ) ), ) diff --git a/assets/common/items/food/apple.ron b/assets/common/items/food/apple.ron index abec0c62e3..48b7d56a5a 100644 --- a/assets/common/items/food/apple.ron +++ b/assets/common/items/food/apple.ron @@ -4,7 +4,7 @@ Item( kind: Consumable( kind: Apple, effect: Health(( - amount: 20, + amount: 200, cause: Item, )), ), diff --git a/assets/common/items/food/apple_mushroom_curry.ron b/assets/common/items/food/apple_mushroom_curry.ron index d8146e4c82..03aed62d4b 100644 --- a/assets/common/items/food/apple_mushroom_curry.ron +++ b/assets/common/items/food/apple_mushroom_curry.ron @@ -4,7 +4,7 @@ Item( kind: Consumable( kind: AppleShroomCurry, effect: Health(( - amount: 120, + amount: 1200, cause: Item, )), ), diff --git a/assets/common/items/food/apple_stick.ron b/assets/common/items/food/apple_stick.ron index 78bd97ce66..5d7b183e07 100644 --- a/assets/common/items/food/apple_stick.ron +++ b/assets/common/items/food/apple_stick.ron @@ -4,7 +4,7 @@ Item( kind: Consumable( kind: AppleStick, effect: Health(( - amount: 60, + amount: 600, cause: Item, )), ), diff --git a/assets/common/items/food/cheese.ron b/assets/common/items/food/cheese.ron index 8c4f618b96..037519d22b 100644 --- a/assets/common/items/food/cheese.ron +++ b/assets/common/items/food/cheese.ron @@ -4,7 +4,7 @@ Item( kind: Consumable( kind: Cheese, effect: Health(( - amount: 15, + amount: 150, cause: Item, )), ), diff --git a/assets/common/items/food/coconut.ron b/assets/common/items/food/coconut.ron index b38608652d..103d4c9b38 100644 --- a/assets/common/items/food/coconut.ron +++ b/assets/common/items/food/coconut.ron @@ -4,7 +4,7 @@ Item( kind: Consumable( kind: Coconut, effect: Health(( - amount: 30, + amount: 300, cause: Item, )), ), diff --git a/assets/common/items/food/mushroom.ron b/assets/common/items/food/mushroom.ron index d341a5f773..e612b1d2c7 100644 --- a/assets/common/items/food/mushroom.ron +++ b/assets/common/items/food/mushroom.ron @@ -4,7 +4,7 @@ Item( kind: Consumable( kind: Mushroom, effect: Health(( - amount: 10, + amount: 100, cause: Item, )), ), diff --git a/assets/common/items/food/mushroom_stick.ron b/assets/common/items/food/mushroom_stick.ron index d44bbbec48..5f0577d855 100644 --- a/assets/common/items/food/mushroom_stick.ron +++ b/assets/common/items/food/mushroom_stick.ron @@ -4,7 +4,7 @@ Item( kind: Consumable( kind: MushroomStick, effect: Health(( - amount: 50, + amount: 500, cause: Item, )), ), diff --git a/assets/common/items/weapons/axe/bloodsteel_axe-0.ron b/assets/common/items/weapons/axe/bloodsteel_axe-0.ron new file mode 100644 index 0000000000..b0636b63fa --- /dev/null +++ b/assets/common/items/weapons/axe/bloodsteel_axe-0.ron @@ -0,0 +1,13 @@ +Item( + name: "Bloodsteel Axe", + description: "An axe forged from steel that thirsts for blood.", + kind: Tool( + ( + kind: Axe(BloodsteelAxe0), + stats: ( + equip_time_millis: 400, + power: 1.60, + ), + ) + ), +) diff --git a/assets/common/items/weapons/axe/bloodsteel_axe-1.ron b/assets/common/items/weapons/axe/bloodsteel_axe-1.ron new file mode 100644 index 0000000000..895c7a0a35 --- /dev/null +++ b/assets/common/items/weapons/axe/bloodsteel_axe-1.ron @@ -0,0 +1,13 @@ +Item( + name: "Executioner's Axe", + description: "An axe forged from steel that thirsts for blood.", + kind: Tool( + ( + kind: Axe(BloodsteelAxe1), + stats: ( + equip_time_millis: 400, + power: 1.60, + ), + ) + ), +) diff --git a/assets/common/items/weapons/axe/bloodsteel_axe-2.ron b/assets/common/items/weapons/axe/bloodsteel_axe-2.ron new file mode 100644 index 0000000000..16c8602286 --- /dev/null +++ b/assets/common/items/weapons/axe/bloodsteel_axe-2.ron @@ -0,0 +1,13 @@ +Item( + name: "Tribal Axe", + description: "An axe forged from steel that thirsts for blood.", + kind: Tool( + ( + kind: Axe(BloodsteelAxe2), + stats: ( + equip_time_millis: 400, + power: 1.60, + ), + ) + ), +) diff --git a/assets/common/items/weapons/axe/bronze_axe-0.ron b/assets/common/items/weapons/axe/bronze_axe-0.ron new file mode 100644 index 0000000000..eae58eeed0 --- /dev/null +++ b/assets/common/items/weapons/axe/bronze_axe-0.ron @@ -0,0 +1,13 @@ +Item( + name: "Bronze Axe", + description: "Forged from bronze.", + kind: Tool( + ( + kind: Axe(BronzeAxe0), + stats: ( + equip_time_millis: 400, + power: 1.00, + ), + ) + ), +) diff --git a/assets/common/items/weapons/axe/bronze_axe-1.ron b/assets/common/items/weapons/axe/bronze_axe-1.ron new file mode 100644 index 0000000000..2c0c719a84 --- /dev/null +++ b/assets/common/items/weapons/axe/bronze_axe-1.ron @@ -0,0 +1,13 @@ +Item( + name: "Discus Axe", + description: "Forged from bronze.", + kind: Tool( + ( + kind: Axe(BronzeAxe1), + stats: ( + equip_time_millis: 400, + power: 1.00, + ), + ) + ), +) diff --git a/assets/common/items/weapons/axe/cobalt_axe-0.ron b/assets/common/items/weapons/axe/cobalt_axe-0.ron new file mode 100644 index 0000000000..8ad2d73f34 --- /dev/null +++ b/assets/common/items/weapons/axe/cobalt_axe-0.ron @@ -0,0 +1,13 @@ +Item( + name: "Cobalt Axe", + description: "Forged from cobalt.", + kind: Tool( + ( + kind: Axe(CobaltAxe0), + stats: ( + equip_time_millis: 400, + power: 1.80, + ), + ) + ), +) diff --git a/assets/common/items/weapons/axe/iron_axe-0.ron b/assets/common/items/weapons/axe/iron_axe-0.ron new file mode 100644 index 0000000000..4999939753 --- /dev/null +++ b/assets/common/items/weapons/axe/iron_axe-0.ron @@ -0,0 +1,13 @@ +Item( + name: "Iron Greataxe", + description: "Forged from iron.", + kind: Tool( + ( + kind: Axe(IronAxe0), + stats: ( + equip_time_millis: 400, + power: 1.20, + ), + ) + ), +) diff --git a/assets/common/items/weapons/axe/iron_axe-1.ron b/assets/common/items/weapons/axe/iron_axe-1.ron new file mode 100644 index 0000000000..961c5fe151 --- /dev/null +++ b/assets/common/items/weapons/axe/iron_axe-1.ron @@ -0,0 +1,13 @@ +Item( + name: "Ceremonial Axe", + description: "Forged from iron.", + kind: Tool( + ( + kind: Axe(IronAxe1), + stats: ( + equip_time_millis: 400, + power: 1.20, + ), + ) + ), +) diff --git a/assets/common/items/weapons/axe/iron_axe-2.ron b/assets/common/items/weapons/axe/iron_axe-2.ron new file mode 100644 index 0000000000..91f675da40 --- /dev/null +++ b/assets/common/items/weapons/axe/iron_axe-2.ron @@ -0,0 +1,13 @@ +Item( + name: "Cyclone Axe", + description: "Forged from iron.", + kind: Tool( + ( + kind: Axe(IronAxe2), + stats: ( + equip_time_millis: 400, + power: 1.20, + ), + ) + ), +) diff --git a/assets/common/items/weapons/axe/iron_axe-3.ron b/assets/common/items/weapons/axe/iron_axe-3.ron new file mode 100644 index 0000000000..980da5d65d --- /dev/null +++ b/assets/common/items/weapons/axe/iron_axe-3.ron @@ -0,0 +1,13 @@ +Item( + name: "Iron Battleaxe", + description: "Forged from iron.", + kind: Tool( + ( + kind: Axe(IronAxe3), + stats: ( + equip_time_millis: 400, + power: 1.20, + ), + ) + ), +) diff --git a/assets/common/items/weapons/axe/iron_axe-4.ron b/assets/common/items/weapons/axe/iron_axe-4.ron new file mode 100644 index 0000000000..362a41ee12 --- /dev/null +++ b/assets/common/items/weapons/axe/iron_axe-4.ron @@ -0,0 +1,13 @@ +Item( + name: "Butcher's Axe", + description: "Forged from iron.", + kind: Tool( + ( + kind: Axe(IronAxe4), + stats: ( + equip_time_millis: 400, + power: 1.20, + ), + ) + ), +) diff --git a/assets/common/items/weapons/axe/iron_axe-5.ron b/assets/common/items/weapons/axe/iron_axe-5.ron new file mode 100644 index 0000000000..c5fc2adb92 --- /dev/null +++ b/assets/common/items/weapons/axe/iron_axe-5.ron @@ -0,0 +1,13 @@ +Item( + name: "Barbarian's Axe", + description: "Forged from iron.", + kind: Tool( + ( + kind: Axe(IronAxe5), + stats: ( + equip_time_millis: 400, + power: 1.20, + ), + ) + ), +) diff --git a/assets/common/items/weapons/axe/iron_axe-6.ron b/assets/common/items/weapons/axe/iron_axe-6.ron new file mode 100644 index 0000000000..e1590ba742 --- /dev/null +++ b/assets/common/items/weapons/axe/iron_axe-6.ron @@ -0,0 +1,13 @@ +Item( + name: "Iron Axe", + description: "Forged from iron.", + kind: Tool( + ( + kind: Axe(IronAxe6), + stats: ( + equip_time_millis: 400, + power: 1.20, + ), + ) + ), +) diff --git a/assets/common/items/weapons/axe/iron_axe-7.ron b/assets/common/items/weapons/axe/iron_axe-7.ron new file mode 100644 index 0000000000..37cdb8c415 --- /dev/null +++ b/assets/common/items/weapons/axe/iron_axe-7.ron @@ -0,0 +1,13 @@ +Item( + name: "Iron Labrys", + description: "Forged from iron.", + kind: Tool( + ( + kind: Axe(IronAxe7), + stats: ( + equip_time_millis: 400, + power: 1.20, + ), + ) + ), +) diff --git a/assets/common/items/weapons/axe/iron_axe-8.ron b/assets/common/items/weapons/axe/iron_axe-8.ron new file mode 100644 index 0000000000..0d5f508586 --- /dev/null +++ b/assets/common/items/weapons/axe/iron_axe-8.ron @@ -0,0 +1,13 @@ +Item( + name: "Fanged Axe", + description: "Forged from iron.", + kind: Tool( + ( + kind: Axe(IronAxe8), + stats: ( + equip_time_millis: 400, + power: 1.20, + ), + ) + ), +) diff --git a/assets/common/items/weapons/axe/iron_axe-9.ron b/assets/common/items/weapons/axe/iron_axe-9.ron new file mode 100644 index 0000000000..167d70402c --- /dev/null +++ b/assets/common/items/weapons/axe/iron_axe-9.ron @@ -0,0 +1,13 @@ +Item( + name: "Wolfen Axe", + description: "Forged from iron.", + kind: Tool( + ( + kind: Axe(IronAxe9), + stats: ( + equip_time_millis: 400, + power: 1.20, + ), + ) + ), +) diff --git a/assets/common/items/weapons/axe/malachite_axe-0.ron b/assets/common/items/weapons/axe/malachite_axe-0.ron new file mode 100644 index 0000000000..06c6e376c3 --- /dev/null +++ b/assets/common/items/weapons/axe/malachite_axe-0.ron @@ -0,0 +1,13 @@ +Item( + name: "Malachite Axe", + description: "An axe infused with malachite.", + kind: Tool( + ( + kind: Axe(MalachiteAxe0), + stats: ( + equip_time_millis: 400, + power: 2.00, + ), + ) + ), +) diff --git a/assets/common/items/weapons/axe/orc_axe-0.ron b/assets/common/items/weapons/axe/orc_axe-0.ron new file mode 100644 index 0000000000..64876beee8 --- /dev/null +++ b/assets/common/items/weapons/axe/orc_axe-0.ron @@ -0,0 +1,13 @@ +Item( + name: "Beast Cleaver", + description: "Created by orcs to cleave beasts in 2.", + kind: Tool( + ( + kind: Axe(OrcAxe0), + stats: ( + equip_time_millis: 400, + power: 0.60, + ), + ) + ), +) diff --git a/assets/common/items/weapons/axe/starter_axe.ron b/assets/common/items/weapons/axe/starter_axe.ron index 7f8fc50946..a5d89a6111 100644 --- a/assets/common/items/weapons/axe/starter_axe.ron +++ b/assets/common/items/weapons/axe/starter_axe.ron @@ -1,10 +1,13 @@ Item( name: "Notched Axe", - description: "Two-Hand Axe\n\nPower 3-14\n\nEvery dent tells the story of a chopped tree.\n\n", + description: "Every dent tells the story of a chopped tree.", kind: Tool( ( kind: Axe(BasicAxe), - equip_time_millis: 400, + stats: ( + equip_time_millis: 400, + power: 0.50, + ), ) ), ) diff --git a/assets/common/items/weapons/axe/steel_axe-0.ron b/assets/common/items/weapons/axe/steel_axe-0.ron new file mode 100644 index 0000000000..fe2a449e60 --- /dev/null +++ b/assets/common/items/weapons/axe/steel_axe-0.ron @@ -0,0 +1,13 @@ +Item( + name: "Steel Battleaxe", + description: "Forged from steel.", + kind: Tool( + ( + kind: Axe(SteelAxe0), + stats: ( + equip_time_millis: 400, + power: 1.40, + ), + ) + ), +) diff --git a/assets/common/items/weapons/axe/steel_axe-1.ron b/assets/common/items/weapons/axe/steel_axe-1.ron new file mode 100644 index 0000000000..697febfdf2 --- /dev/null +++ b/assets/common/items/weapons/axe/steel_axe-1.ron @@ -0,0 +1,13 @@ +Item( + name: "Steel Labrys", + description: "Forged from steel.", + kind: Tool( + ( + kind: Axe(SteelAxe1), + stats: ( + equip_time_millis: 400, + power: 1.40, + ), + ) + ), +) diff --git a/assets/common/items/weapons/axe/steel_axe-2.ron b/assets/common/items/weapons/axe/steel_axe-2.ron new file mode 100644 index 0000000000..bde51d949a --- /dev/null +++ b/assets/common/items/weapons/axe/steel_axe-2.ron @@ -0,0 +1,13 @@ +Item( + name: "Steel Axe", + description: "Forged from steel.", + kind: Tool( + ( + kind: Axe(SteelAxe2), + stats: ( + equip_time_millis: 400, + power: 1.40, + ), + ) + ), +) diff --git a/assets/common/items/weapons/axe/steel_axe-3.ron b/assets/common/items/weapons/axe/steel_axe-3.ron new file mode 100644 index 0000000000..167d659b43 --- /dev/null +++ b/assets/common/items/weapons/axe/steel_axe-3.ron @@ -0,0 +1,13 @@ +Item( + name: "Crescent Axe", + description: "Forged from steel.", + kind: Tool( + ( + kind: Axe(SteelAxe3), + stats: ( + equip_time_millis: 400, + power: 1.40, + ), + ) + ), +) diff --git a/assets/common/items/weapons/axe/steel_axe-4.ron b/assets/common/items/weapons/axe/steel_axe-4.ron new file mode 100644 index 0000000000..7e0db521a2 --- /dev/null +++ b/assets/common/items/weapons/axe/steel_axe-4.ron @@ -0,0 +1,13 @@ +Item( + name: "Moon Axe", + description: "Forged from steel.", + kind: Tool( + ( + kind: Axe(SteelAxe4), + stats: ( + equip_time_millis: 400, + power: 1.40, + ), + ) + ), +) diff --git a/assets/common/items/weapons/axe/steel_axe-5.ron b/assets/common/items/weapons/axe/steel_axe-5.ron new file mode 100644 index 0000000000..ef3f0a786e --- /dev/null +++ b/assets/common/items/weapons/axe/steel_axe-5.ron @@ -0,0 +1,13 @@ +Item( + name: "Owl Axe", + description: "Forged from steel.", + kind: Tool( + ( + kind: Axe(SteelAxe5), + stats: ( + equip_time_millis: 400, + power: 1.40, + ), + ) + ), +) diff --git a/assets/common/items/weapons/axe/steel_axe-6.ron b/assets/common/items/weapons/axe/steel_axe-6.ron new file mode 100644 index 0000000000..d82880f57e --- /dev/null +++ b/assets/common/items/weapons/axe/steel_axe-6.ron @@ -0,0 +1,13 @@ +Item( + name: "Spade Axe", + description: "Forged from steel.", + kind: Tool( + ( + kind: Axe(SteelAxe6), + stats: ( + equip_time_millis: 400, + power: 1.40, + ), + ) + ), +) diff --git a/assets/common/items/weapons/axe/worn_iron_axe-0.ron b/assets/common/items/weapons/axe/worn_iron_axe-0.ron new file mode 100644 index 0000000000..d545f69f93 --- /dev/null +++ b/assets/common/items/weapons/axe/worn_iron_axe-0.ron @@ -0,0 +1,13 @@ +Item( + name: "Worn Dwarven Axe", + description: "Hopefully it's previous owner won't miss it.", + kind: Tool( + ( + kind: Axe(WornIronAxe0), + stats: ( + equip_time_millis: 400, + power: 0.80, + ), + ) + ), +) diff --git a/assets/common/items/weapons/axe/worn_iron_axe-1.ron b/assets/common/items/weapons/axe/worn_iron_axe-1.ron new file mode 100644 index 0000000000..8c0420149d --- /dev/null +++ b/assets/common/items/weapons/axe/worn_iron_axe-1.ron @@ -0,0 +1,13 @@ +Item( + name: "Worn Elven Axe", + description: "Hopefully it's previous owner won't miss it.", + kind: Tool( + ( + kind: Axe(WornIronAxe1), + stats: ( + equip_time_millis: 400, + power: 0.80, + ), + ) + ), +) diff --git a/assets/common/items/weapons/axe/worn_iron_axe-2.ron b/assets/common/items/weapons/axe/worn_iron_axe-2.ron new file mode 100644 index 0000000000..de275d3510 --- /dev/null +++ b/assets/common/items/weapons/axe/worn_iron_axe-2.ron @@ -0,0 +1,13 @@ +Item( + name: "Worn Human Axe", + description: "Hopefully it's previous owner won't miss it.", + kind: Tool( + ( + kind: Axe(WornIronAxe2), + stats: ( + equip_time_millis: 400, + power: 0.80, + ), + ) + ), +) diff --git a/assets/common/items/weapons/axe/worn_iron_axe-3.ron b/assets/common/items/weapons/axe/worn_iron_axe-3.ron new file mode 100644 index 0000000000..79e7932c31 --- /dev/null +++ b/assets/common/items/weapons/axe/worn_iron_axe-3.ron @@ -0,0 +1,13 @@ +Item( + name: "Worn Orcish Axe", + description: "Hopefully it's previous owner won't miss it.", + kind: Tool( + ( + kind: Axe(WornIronAxe3), + stats: ( + equip_time_millis: 400, + power: 0.80, + ), + ) + ), +) diff --git a/assets/common/items/weapons/axe/worn_iron_axe-4.ron b/assets/common/items/weapons/axe/worn_iron_axe-4.ron new file mode 100644 index 0000000000..153e3cd50b --- /dev/null +++ b/assets/common/items/weapons/axe/worn_iron_axe-4.ron @@ -0,0 +1,13 @@ +Item( + name: "Beetle Axe", + description: "The blade is in the shape of a beetle.", + kind: Tool( + ( + kind: Axe(WornIronAxe4), + stats: ( + equip_time_millis: 400, + power: 0.80, + ), + ) + ), +) diff --git a/assets/common/items/weapons/bow/horn_longbow-0.ron b/assets/common/items/weapons/bow/horn_longbow-0.ron new file mode 100644 index 0000000000..73d270dc71 --- /dev/null +++ b/assets/common/items/weapons/bow/horn_longbow-0.ron @@ -0,0 +1,13 @@ +Item( + name: "Horn Bow", + description: "You don't recognize the creature these horns belong to.", + kind: Tool( + ( + kind: Bow(HornLongbow0), + stats: ( + equip_time_millis: 400, + power: 1.50, + ), + ) + ), +) diff --git a/assets/common/items/weapons/bow/iron_longbow-0.ron b/assets/common/items/weapons/bow/iron_longbow-0.ron new file mode 100644 index 0000000000..7d02b3f3b8 --- /dev/null +++ b/assets/common/items/weapons/bow/iron_longbow-0.ron @@ -0,0 +1,13 @@ +Item( + name: "Soldier's Bow", + description: "Has an insignia on it.", + kind: Tool( + ( + kind: Bow(IronLongbow0), + stats: ( + equip_time_millis: 400, + power: 1.75, + ), + ) + ), +) diff --git a/assets/common/items/weapons/bow/leafy_longbow-0.ron b/assets/common/items/weapons/bow/leafy_longbow-0.ron new file mode 100644 index 0000000000..dbfd1f7f25 --- /dev/null +++ b/assets/common/items/weapons/bow/leafy_longbow-0.ron @@ -0,0 +1,13 @@ +Item( + name: "Elven Longbow", + description: "There's a new leaf starting to grow.", + kind: Tool( + ( + kind: Bow(LeafyLongbow0), + stats: ( + equip_time_millis: 400, + power: 1.25, + ), + ) + ), +) diff --git a/assets/common/items/weapons/bow/leafy_shortbow-0.ron b/assets/common/items/weapons/bow/leafy_shortbow-0.ron new file mode 100644 index 0000000000..5ffef32b22 --- /dev/null +++ b/assets/common/items/weapons/bow/leafy_shortbow-0.ron @@ -0,0 +1,13 @@ +Item( + name: "Elven Shortbow", + description: "The wood still seems alive.", + kind: Tool( + ( + kind: Bow(LeafyShortbow0), + stats: ( + equip_time_millis: 400, + power: 1.00, + ), + ) + ), +) diff --git a/assets/common/items/weapons/bow/rare_longbow.ron b/assets/common/items/weapons/bow/rare_longbow.ron new file mode 100644 index 0000000000..c8e9a003ac --- /dev/null +++ b/assets/common/items/weapons/bow/rare_longbow.ron @@ -0,0 +1,13 @@ +Item( + name: "Enchanted Longbow", + description: "You can sense power resting in the bow.", + kind: Tool( + ( + kind: Bow(RareLongbow), + stats: ( + equip_time_millis: 400, + power: 2.00, + ), + ) + ), +) diff --git a/assets/common/items/weapons/bow/starter_bow.ron b/assets/common/items/weapons/bow/starter_bow.ron index 9be6b10661..89f7145cb9 100644 --- a/assets/common/items/weapons/bow/starter_bow.ron +++ b/assets/common/items/weapons/bow/starter_bow.ron @@ -1,10 +1,13 @@ Item( name: "Uneven Bow", - description: "Bow\n\nPower: 5\n\nSomeone carved his initials into it...\n\n", + description: "Someone carved his initials into it.", kind: Tool( ( kind: Bow(ShortBow0), - equip_time_millis: 400, + stats: ( + equip_time_millis: 400, + power: 0.50, + ), ) ), ) diff --git a/assets/common/items/weapons/bow/wood_longbow-0.ron b/assets/common/items/weapons/bow/wood_longbow-0.ron new file mode 100644 index 0000000000..574233a316 --- /dev/null +++ b/assets/common/items/weapons/bow/wood_longbow-0.ron @@ -0,0 +1,13 @@ +Item( + name: "Longbow", + description: "It's been well used.", + kind: Tool( + ( + kind: Bow(WoodLongbow0), + stats: ( + equip_time_millis: 400, + power: 1.00, + ), + ) + ), +) diff --git a/assets/common/items/weapons/bow/wood_longbow-1.ron b/assets/common/items/weapons/bow/wood_longbow-1.ron new file mode 100644 index 0000000000..a437445d70 --- /dev/null +++ b/assets/common/items/weapons/bow/wood_longbow-1.ron @@ -0,0 +1,13 @@ +Item( + name: "Recurve Bow", + description: "It's hard to pull all the way back.", + kind: Tool( + ( + kind: Bow(WoodLongbow1), + stats: ( + equip_time_millis: 400, + power: 1.00, + ), + ) + ), +) diff --git a/assets/common/items/weapons/bow/wood_shortbow-0.ron b/assets/common/items/weapons/bow/wood_shortbow-0.ron new file mode 100644 index 0000000000..790f99f618 --- /dev/null +++ b/assets/common/items/weapons/bow/wood_shortbow-0.ron @@ -0,0 +1,13 @@ +Item( + name: "Hunting Bow", + description: "Strips of leather are wrapped around the handle.", + kind: Tool( + ( + kind: Bow(WoodShortbow0), + stats: ( + equip_time_millis: 400, + power: 0.75, + ), + ) + ), +) diff --git a/assets/common/items/weapons/bow/wood_shortbow-1.ron b/assets/common/items/weapons/bow/wood_shortbow-1.ron new file mode 100644 index 0000000000..9d1ca7719a --- /dev/null +++ b/assets/common/items/weapons/bow/wood_shortbow-1.ron @@ -0,0 +1,13 @@ +Item( + name: "Horse Bow", + description: "Works on the ground too.", + kind: Tool( + ( + kind: Bow(WoodShortbow1), + stats: ( + equip_time_millis: 400, + power: 0.75, + ), + ) + ), +) diff --git a/assets/common/items/weapons/dagger/starter_dagger.ron b/assets/common/items/weapons/dagger/starter_dagger.ron index 98924729be..da2ab390de 100644 --- a/assets/common/items/weapons/dagger/starter_dagger.ron +++ b/assets/common/items/weapons/dagger/starter_dagger.ron @@ -1,10 +1,13 @@ Item( name: "Rusty Dagger", - description: "One-Hand Dagger\n\nPower 5-6\n\n#writing.\n\n", + description: "Easily concealed.", kind: Tool( ( kind: Dagger(BasicDagger), - equip_time_millis: 300, + stats: ( + equip_time_millis: 300, + power: 1.00, + ), ) ), ) diff --git a/assets/common/items/weapons/empty.ron b/assets/common/items/weapons/empty.ron deleted file mode 100644 index 62a2bf4785..0000000000 --- a/assets/common/items/weapons/empty.ron +++ /dev/null @@ -1,10 +0,0 @@ -Item( - name: "Empty", - description: "", - kind: Tool ( - ( - kind: Empty, - equip_time_millis: 200, - ) - ), -) diff --git a/assets/common/items/weapons/empty/empty.ron b/assets/common/items/weapons/empty/empty.ron new file mode 100644 index 0000000000..489101c9f0 --- /dev/null +++ b/assets/common/items/weapons/empty/empty.ron @@ -0,0 +1,13 @@ +Item( + name: "Empty", + description: "You expected a description?", + kind: Tool ( + ( + kind: Empty, + stats: ( + equip_time_millis: 200, + power: 1.00, + ), + ) + ), +) diff --git a/assets/common/items/weapons/hammer/bronze_hammer-0.ron b/assets/common/items/weapons/hammer/bronze_hammer-0.ron new file mode 100644 index 0000000000..60b255dd56 --- /dev/null +++ b/assets/common/items/weapons/hammer/bronze_hammer-0.ron @@ -0,0 +1,13 @@ +Item( + name: "Bronze Hammer", + description: "Forged with bronze.", + kind: Tool( + ( + kind: Hammer(BronzeHammer0), + stats: ( + equip_time_millis: 500, + power: 1.00, + ), + ) + ), +) diff --git a/assets/common/items/weapons/hammer/bronze_hammer-1.ron b/assets/common/items/weapons/hammer/bronze_hammer-1.ron new file mode 100644 index 0000000000..a5ac72d80b --- /dev/null +++ b/assets/common/items/weapons/hammer/bronze_hammer-1.ron @@ -0,0 +1,13 @@ +Item( + name: "Bronze Club", + description: "Forged with bronze.", + kind: Tool( + ( + kind: Hammer(BronzeHammer1), + stats: ( + equip_time_millis: 500, + power: 1.00, + ), + ) + ), +) diff --git a/assets/common/items/weapons/hammer/cobalt_hammer-0.ron b/assets/common/items/weapons/hammer/cobalt_hammer-0.ron new file mode 100644 index 0000000000..8956eeb25b --- /dev/null +++ b/assets/common/items/weapons/hammer/cobalt_hammer-0.ron @@ -0,0 +1,13 @@ +Item( + name: "Cobalt Hammer", + description: "Forged with cobalt.", + kind: Tool( + ( + kind: Hammer(CobaltHammer0), + stats: ( + equip_time_millis: 500, + power: 1.60, + ), + ) + ), +) diff --git a/assets/common/items/weapons/hammer/cobalt_hammer-1.ron b/assets/common/items/weapons/hammer/cobalt_hammer-1.ron new file mode 100644 index 0000000000..2e1c4f24b1 --- /dev/null +++ b/assets/common/items/weapons/hammer/cobalt_hammer-1.ron @@ -0,0 +1,13 @@ +Item( + name: "Cobalt Mace", + description: "Forged with cobalt.", + kind: Tool( + ( + kind: Hammer(CobaltHammer1), + stats: ( + equip_time_millis: 500, + power: 1.60, + ), + ) + ), +) diff --git a/assets/common/items/weapons/hammer/flimsy_hammer.ron b/assets/common/items/weapons/hammer/flimsy_hammer.ron new file mode 100644 index 0000000000..f8f927bcde --- /dev/null +++ b/assets/common/items/weapons/hammer/flimsy_hammer.ron @@ -0,0 +1,13 @@ +Item( + name: "Flimsy Hammer", + description: "The head is barely secured.", + kind: Tool( + ( + kind: Hammer(FlimsyHammer), + stats: ( + equip_time_millis: 500, + power: 0.50, + ), + ) + ), +) diff --git a/assets/common/items/weapons/hammer/hammer_1.ron b/assets/common/items/weapons/hammer/hammer_1.ron index 02ba5d1069..681503ce27 100644 --- a/assets/common/items/weapons/hammer/hammer_1.ron +++ b/assets/common/items/weapons/hammer/hammer_1.ron @@ -1,10 +1,13 @@ Item( name: "Crude Mallet", - description: "Two-Hand Hammer\n\nPower: 10-12\n\nBreaks bones like sticks and stones.\n\n", + description: "Breaks bones like sticks and stones.", kind: Tool( ( kind: Hammer(BasicHammer), - equip_time_millis: 500, + stats: ( + equip_time_millis: 500, + power: 0.50, + ), ) ) ) diff --git a/assets/common/items/weapons/hammer/iron_hammer-0.ron b/assets/common/items/weapons/hammer/iron_hammer-0.ron new file mode 100644 index 0000000000..7737d7b2b7 --- /dev/null +++ b/assets/common/items/weapons/hammer/iron_hammer-0.ron @@ -0,0 +1,13 @@ +Item( + name: "Iron Hammer", + description: "Forged with iron.", + kind: Tool( + ( + kind: Hammer(IronHammer0), + stats: ( + equip_time_millis: 500, + power: 1.20, + ), + ) + ), +) diff --git a/assets/common/items/weapons/hammer/iron_hammer-1.ron b/assets/common/items/weapons/hammer/iron_hammer-1.ron new file mode 100644 index 0000000000..7659c348de --- /dev/null +++ b/assets/common/items/weapons/hammer/iron_hammer-1.ron @@ -0,0 +1,13 @@ +Item( + name: "Iron Battlehammer", + description: "Forged with iron.", + kind: Tool( + ( + kind: Hammer(IronHammer1), + stats: ( + equip_time_millis: 500, + power: 1.20, + ), + ) + ), +) diff --git a/assets/common/items/weapons/hammer/iron_hammer-2.ron b/assets/common/items/weapons/hammer/iron_hammer-2.ron new file mode 100644 index 0000000000..1afd2d6883 --- /dev/null +++ b/assets/common/items/weapons/hammer/iron_hammer-2.ron @@ -0,0 +1,13 @@ +Item( + name: "Iron Mace", + description: "Forged with iron.", + kind: Tool( + ( + kind: Hammer(IronHammer2), + stats: ( + equip_time_millis: 500, + power: 1.20, + ), + ) + ), +) diff --git a/assets/common/items/weapons/hammer/iron_hammer-3.ron b/assets/common/items/weapons/hammer/iron_hammer-3.ron new file mode 100644 index 0000000000..a863bb9fd9 --- /dev/null +++ b/assets/common/items/weapons/hammer/iron_hammer-3.ron @@ -0,0 +1,13 @@ +Item( + name: "Crowned Mace", + description: "Forged with iron.", + kind: Tool( + ( + kind: Hammer(IronHammer3), + stats: ( + equip_time_millis: 500, + power: 1.20, + ), + ) + ), +) diff --git a/assets/common/items/weapons/hammer/iron_hammer-4.ron b/assets/common/items/weapons/hammer/iron_hammer-4.ron new file mode 100644 index 0000000000..351fb9ab87 --- /dev/null +++ b/assets/common/items/weapons/hammer/iron_hammer-4.ron @@ -0,0 +1,13 @@ +Item( + name: "Forge Hammer", + description: "Forged with iron.", + kind: Tool( + ( + kind: Hammer(IronHammer4), + stats: ( + equip_time_millis: 500, + power: 1.20, + ), + ) + ), +) diff --git a/assets/common/items/weapons/hammer/iron_hammer-5.ron b/assets/common/items/weapons/hammer/iron_hammer-5.ron new file mode 100644 index 0000000000..4c55c417be --- /dev/null +++ b/assets/common/items/weapons/hammer/iron_hammer-5.ron @@ -0,0 +1,13 @@ +Item( + name: "Pike Hammer", + description: "Forged with iron.", + kind: Tool( + ( + kind: Hammer(IronHammer5), + stats: ( + equip_time_millis: 500, + power: 1.20, + ), + ) + ), +) diff --git a/assets/common/items/weapons/hammer/iron_hammer-6.ron b/assets/common/items/weapons/hammer/iron_hammer-6.ron new file mode 100644 index 0000000000..943e0bb084 --- /dev/null +++ b/assets/common/items/weapons/hammer/iron_hammer-6.ron @@ -0,0 +1,13 @@ +Item( + name: "Spiked Maul", + description: "Forged with iron.", + kind: Tool( + ( + kind: Hammer(IronHammer6), + stats: ( + equip_time_millis: 500, + power: 1.20, + ), + ) + ), +) diff --git a/assets/common/items/weapons/hammer/iron_hammer-7.ron b/assets/common/items/weapons/hammer/iron_hammer-7.ron new file mode 100644 index 0000000000..56236db81c --- /dev/null +++ b/assets/common/items/weapons/hammer/iron_hammer-7.ron @@ -0,0 +1,13 @@ +Item( + name: "Giant's Fist", + description: "Forged with iron.", + kind: Tool( + ( + kind: Hammer(IronHammer7), + stats: ( + equip_time_millis: 500, + power: 1.20, + ), + ) + ), +) diff --git a/assets/common/items/weapons/hammer/iron_hammer-8.ron b/assets/common/items/weapons/hammer/iron_hammer-8.ron new file mode 100644 index 0000000000..0a9d25ae8e --- /dev/null +++ b/assets/common/items/weapons/hammer/iron_hammer-8.ron @@ -0,0 +1,13 @@ +Item( + name: "Lucerne Hammer", + description: "Forged with iron.", + kind: Tool( + ( + kind: Hammer(IronHammer8), + stats: ( + equip_time_millis: 500, + power: 1.20, + ), + ) + ), +) diff --git a/assets/common/items/weapons/hammer/mjolnir.ron b/assets/common/items/weapons/hammer/mjolnir.ron new file mode 100644 index 0000000000..9fe513de64 --- /dev/null +++ b/assets/common/items/weapons/hammer/mjolnir.ron @@ -0,0 +1,13 @@ +Item( + name: "Mjolnir", + description: "It's crackling with lightning.", + kind: Tool( + ( + kind: Hammer(Mjolnir), + stats: ( + equip_time_millis: 500, + power: 2.00, + ), + ) + ), +) diff --git a/assets/common/items/weapons/hammer/ramshead_hammer.ron b/assets/common/items/weapons/hammer/ramshead_hammer.ron new file mode 100644 index 0000000000..fadeb831e4 --- /dev/null +++ b/assets/common/items/weapons/hammer/ramshead_hammer.ron @@ -0,0 +1,13 @@ +Item( + name: "Ram's Head Mace", + description: "You feel an evil presence in the hammer.", + kind: Tool( + ( + kind: Hammer(RamsheadHammer), + stats: ( + equip_time_millis: 500, + power: 1.80, + ), + ) + ), +) diff --git a/assets/common/items/weapons/hammer/runic_hammer.ron b/assets/common/items/weapons/hammer/runic_hammer.ron new file mode 100644 index 0000000000..fee6415ef5 --- /dev/null +++ b/assets/common/items/weapons/hammer/runic_hammer.ron @@ -0,0 +1,13 @@ +Item( + name: "Runic Hammer", + description: "There are strange runes inscribed into it.", + kind: Tool( + ( + kind: Hammer(RunicHammer), + stats: ( + equip_time_millis: 500, + power: 1.80, + ), + ) + ), +) diff --git a/assets/common/items/weapons/hammer/starter_hammer.ron b/assets/common/items/weapons/hammer/starter_hammer.ron index 5e707614af..5e96f3b028 100644 --- a/assets/common/items/weapons/hammer/starter_hammer.ron +++ b/assets/common/items/weapons/hammer/starter_hammer.ron @@ -1,10 +1,13 @@ Item( name: "Sturdy Old Hammer", - description: "Two-Hand Hammer\n\nPower: 10-12\n\n'Property of...' The rest is missing.\n\n", + description: "'Property of...' The rest is missing.", kind: Tool( ( kind: Hammer(BasicHammer), - equip_time_millis: 500, + stats: ( + equip_time_millis: 500, + power: 0.50, + ), ) ), ) diff --git a/assets/common/items/weapons/hammer/steel_hammer-0.ron b/assets/common/items/weapons/hammer/steel_hammer-0.ron new file mode 100644 index 0000000000..e7beaa8acf --- /dev/null +++ b/assets/common/items/weapons/hammer/steel_hammer-0.ron @@ -0,0 +1,13 @@ +Item( + name: "Steel Hammer", + description: "Forged with steel.", + kind: Tool( + ( + kind: Hammer(SteelHammer0), + stats: ( + equip_time_millis: 500, + power: 1.40, + ), + ) + ), +) diff --git a/assets/common/items/weapons/hammer/steel_hammer-1.ron b/assets/common/items/weapons/hammer/steel_hammer-1.ron new file mode 100644 index 0000000000..af48dc1b20 --- /dev/null +++ b/assets/common/items/weapons/hammer/steel_hammer-1.ron @@ -0,0 +1,13 @@ +Item( + name: "Steel Greathammer", + description: "Forged with steel.", + kind: Tool( + ( + kind: Hammer(SteelHammer1), + stats: ( + equip_time_millis: 500, + power: 1.40, + ), + ) + ), +) diff --git a/assets/common/items/weapons/hammer/steel_hammer-2.ron b/assets/common/items/weapons/hammer/steel_hammer-2.ron new file mode 100644 index 0000000000..0facbc44d9 --- /dev/null +++ b/assets/common/items/weapons/hammer/steel_hammer-2.ron @@ -0,0 +1,13 @@ +Item( + name: "Steel Club", + description: "Forged with steel.", + kind: Tool( + ( + kind: Hammer(SteelHammer2), + stats: ( + equip_time_millis: 500, + power: 1.40, + ), + ) + ), +) diff --git a/assets/common/items/weapons/hammer/steel_hammer-3.ron b/assets/common/items/weapons/hammer/steel_hammer-3.ron new file mode 100644 index 0000000000..0e896b86aa --- /dev/null +++ b/assets/common/items/weapons/hammer/steel_hammer-3.ron @@ -0,0 +1,13 @@ +Item( + name: "Battle Mace", + description: "Forged with steel.", + kind: Tool( + ( + kind: Hammer(SteelHammer3), + stats: ( + equip_time_millis: 500, + power: 1.40, + ), + ) + ), +) diff --git a/assets/common/items/weapons/hammer/steel_hammer-4.ron b/assets/common/items/weapons/hammer/steel_hammer-4.ron new file mode 100644 index 0000000000..263c2ebb25 --- /dev/null +++ b/assets/common/items/weapons/hammer/steel_hammer-4.ron @@ -0,0 +1,13 @@ +Item( + name: "Brute's Hammer", + description: "Forged with steel.", + kind: Tool( + ( + kind: Hammer(SteelHammer4), + stats: ( + equip_time_millis: 500, + power: 1.40, + ), + ) + ), +) diff --git a/assets/common/items/weapons/hammer/steel_hammer-5.ron b/assets/common/items/weapons/hammer/steel_hammer-5.ron new file mode 100644 index 0000000000..c3990bfc78 --- /dev/null +++ b/assets/common/items/weapons/hammer/steel_hammer-5.ron @@ -0,0 +1,13 @@ +Item( + name: "Morning Star", + description: "Forged with steel.", + kind: Tool( + ( + kind: Hammer(SteelHammer5), + stats: ( + equip_time_millis: 500, + power: 1.40, + ), + ) + ), +) diff --git a/assets/common/items/weapons/hammer/stone_hammer-0.ron b/assets/common/items/weapons/hammer/stone_hammer-0.ron new file mode 100644 index 0000000000..215c38e55f --- /dev/null +++ b/assets/common/items/weapons/hammer/stone_hammer-0.ron @@ -0,0 +1,13 @@ +Item( + name: "Basalt Sledgehammer", + description: "It seems brittle.", + kind: Tool( + ( + kind: Hammer(StoneHammer0), + stats: ( + equip_time_millis: 500, + power: 0.70, + ), + ) + ), +) diff --git a/assets/common/items/weapons/hammer/stone_hammer-1.ron b/assets/common/items/weapons/hammer/stone_hammer-1.ron new file mode 100644 index 0000000000..045b13127e --- /dev/null +++ b/assets/common/items/weapons/hammer/stone_hammer-1.ron @@ -0,0 +1,13 @@ +Item( + name: "Granite Sledgehammer", + description: "It seems brittle.", + kind: Tool( + ( + kind: Hammer(StoneHammer1), + stats: ( + equip_time_millis: 500, + power: 0.70, + ), + ) + ), +) diff --git a/assets/common/items/weapons/hammer/stone_hammer-2.ron b/assets/common/items/weapons/hammer/stone_hammer-2.ron new file mode 100644 index 0000000000..8f86fca117 --- /dev/null +++ b/assets/common/items/weapons/hammer/stone_hammer-2.ron @@ -0,0 +1,13 @@ +Item( + name: "Rocky Maul", + description: "It seems brittle.", + kind: Tool( + ( + kind: Hammer(StoneHammer2), + stats: ( + equip_time_millis: 500, + power: 0.70, + ), + ) + ), +) diff --git a/assets/common/items/weapons/hammer/stone_hammer-3.ron b/assets/common/items/weapons/hammer/stone_hammer-3.ron new file mode 100644 index 0000000000..c14e05e638 --- /dev/null +++ b/assets/common/items/weapons/hammer/stone_hammer-3.ron @@ -0,0 +1,13 @@ +Item( + name: "Stone Sledgehammer", + description: "It seems brittle.", + kind: Tool( + ( + kind: Hammer(StoneHammer3), + stats: ( + equip_time_millis: 500, + power: 0.70, + ), + ) + ), +) diff --git a/assets/common/items/weapons/hammer/wood_hammer-0.ron b/assets/common/items/weapons/hammer/wood_hammer-0.ron new file mode 100644 index 0000000000..ed954d40dc --- /dev/null +++ b/assets/common/items/weapons/hammer/wood_hammer-0.ron @@ -0,0 +1,13 @@ +Item( + name: "Hardwood Mallet", + description: "Seems sturdy enough.", + kind: Tool( + ( + kind: Hammer(WoodHammer0), + stats: ( + equip_time_millis: 500, + power: 0.60, + ), + ) + ), +) diff --git a/assets/common/items/weapons/hammer/worn_iron_hammer-0.ron b/assets/common/items/weapons/hammer/worn_iron_hammer-0.ron new file mode 100644 index 0000000000..627cd3cd7a --- /dev/null +++ b/assets/common/items/weapons/hammer/worn_iron_hammer-0.ron @@ -0,0 +1,13 @@ +Item( + name: "Worn Dwarven Hammer", + description: "The previous owner won't miss it much.", + kind: Tool( + ( + kind: Hammer(WornIronHammer0), + stats: ( + equip_time_millis: 500, + power: 0.85, + ), + ) + ), +) diff --git a/assets/common/items/weapons/hammer/worn_iron_hammer-1.ron b/assets/common/items/weapons/hammer/worn_iron_hammer-1.ron new file mode 100644 index 0000000000..425394261e --- /dev/null +++ b/assets/common/items/weapons/hammer/worn_iron_hammer-1.ron @@ -0,0 +1,13 @@ +Item( + name: "Worn Elven Hammer", + description: "The previous owner won't miss it much.", + kind: Tool( + ( + kind: Hammer(WornIronHammer1), + stats: ( + equip_time_millis: 500, + power: 0.85, + ), + ) + ), +) diff --git a/assets/common/items/weapons/hammer/worn_iron_hammer-2.ron b/assets/common/items/weapons/hammer/worn_iron_hammer-2.ron new file mode 100644 index 0000000000..c97a09f9e8 --- /dev/null +++ b/assets/common/items/weapons/hammer/worn_iron_hammer-2.ron @@ -0,0 +1,13 @@ +Item( + name: "Worn Human Mace", + description: "The previous owner won't miss it much.", + kind: Tool( + ( + kind: Hammer(WornIronHammer2), + stats: ( + equip_time_millis: 500, + power: 0.85, + ), + ) + ), +) diff --git a/assets/common/items/weapons/hammer/worn_iron_hammer-3.ron b/assets/common/items/weapons/hammer/worn_iron_hammer-3.ron new file mode 100644 index 0000000000..276385d7c4 --- /dev/null +++ b/assets/common/items/weapons/hammer/worn_iron_hammer-3.ron @@ -0,0 +1,13 @@ +Item( + name: "Worn Orcish Hammer", + description: "The previous owner won't miss it much.", + kind: Tool( + ( + kind: Hammer(WornIronHammer3), + stats: ( + equip_time_millis: 500, + power: 0.85, + ), + ) + ), +) diff --git a/assets/common/items/weapons/shield/shield_1.ron b/assets/common/items/weapons/shield/shield_1.ron index a9d2119ba8..ce1a0d5a2a 100644 --- a/assets/common/items/weapons/shield/shield_1.ron +++ b/assets/common/items/weapons/shield/shield_1.ron @@ -1,10 +1,13 @@ Item( name: "A Tattered Targe", - description: "One-Hand Shield\n\nPower 5-6\n\n#writing.\n\n", + description: "Should withstand a few more hits, hopefully...", kind: Tool ( ( kind: Shield(BasicShield), - equip_time_millis: 400, + stats: ( + equip_time_millis: 400, + power: 1.00, + ), ) ), ) diff --git a/assets/common/items/weapons/staff/amethyst_staff.ron b/assets/common/items/weapons/staff/amethyst_staff.ron new file mode 100644 index 0000000000..4d23b5f259 --- /dev/null +++ b/assets/common/items/weapons/staff/amethyst_staff.ron @@ -0,0 +1,13 @@ +Item( + name: "Amethyst Staff", + description: "The amethyst faintly glows.", + kind: Tool( + ( + kind: Staff(AmethystStaff), + stats: ( + equip_time_millis: 300, + power: 1.50, + ), + ) + ), +) diff --git a/assets/common/items/weapons/staff/bone_staff.ron b/assets/common/items/weapons/staff/bone_staff.ron new file mode 100644 index 0000000000..7159d7273c --- /dev/null +++ b/assets/common/items/weapons/staff/bone_staff.ron @@ -0,0 +1,13 @@ +Item( + name: "Bone Staff", + description: "There's a red gem suspended in the bones.", + kind: Tool( + ( + kind: Staff(BoneStaff), + stats: ( + equip_time_millis: 300, + power: 1.00, + ), + ) + ), +) diff --git a/assets/common/items/weapons/staff/cultist_staff.ron b/assets/common/items/weapons/staff/cultist_staff.ron new file mode 100644 index 0000000000..3c4fb7f1e0 --- /dev/null +++ b/assets/common/items/weapons/staff/cultist_staff.ron @@ -0,0 +1,13 @@ +Item( + name: "Cultist Staff", + description: "The fire gives off no heat.", + kind: Tool( + ( + kind: Staff(CultistStaff), + stats: ( + equip_time_millis: 300, + power: 2.00, + ), + ) + ), +) diff --git a/assets/common/items/weapons/staff/staff_1.ron b/assets/common/items/weapons/staff/staff_1.ron index 0654dc2b8b..cda1730332 100644 --- a/assets/common/items/weapons/staff/staff_1.ron +++ b/assets/common/items/weapons/staff/staff_1.ron @@ -1,10 +1,13 @@ Item( name: "Humble Stick", - description: "Two-Hand Staff\n\nPower: 2-10\n\nWalking stick with a sharpened end\n\n", + description: "Walking stick with a sharpened end.", kind: Tool( ( kind: Staff(BasicStaff), - equip_time_millis: 200, + stats: ( + equip_time_millis: 200, + power: 0.50, + ), ) ), ) diff --git a/assets/common/items/weapons/staff/staff_nature.ron b/assets/common/items/weapons/staff/staff_nature.ron index 11764ac526..4e4a5875d3 100644 --- a/assets/common/items/weapons/staff/staff_nature.ron +++ b/assets/common/items/weapons/staff/staff_nature.ron @@ -1,10 +1,13 @@ Item( name: "Sceptre of Regeneration", - description: "Healing-Sceptre\n\nPower 15-18\n\nHeals your allies with the power of nature.\n\n", + description: "Heals your allies with the power of nature.", kind: Tool( ( kind: Staff(Sceptre), - equip_time_millis: 400, + stats: ( + equip_time_millis: 400, + power: 1.00, + ), ) ), ) diff --git a/assets/common/items/weapons/staff/starter_staff.ron b/assets/common/items/weapons/staff/starter_staff.ron index 8b8e8d6f88..568158ea80 100644 --- a/assets/common/items/weapons/staff/starter_staff.ron +++ b/assets/common/items/weapons/staff/starter_staff.ron @@ -1,10 +1,13 @@ Item( name: "Gnarled Rod", - description: "Firestaff\n\nPower: 1-13\n\nSmells like resin and magic.\n\n", + description: "Smells like resin and magic.", kind: Tool( ( kind: Staff(BasicStaff), - equip_time_millis: 300, + stats: ( + equip_time_millis: 300, + power: 0.50, + ), ) ), ) diff --git a/assets/common/items/weapons/sword/cultist_purp_2h-0.ron b/assets/common/items/weapons/sword/cultist_purp_2h-0.ron index 869200b553..d1bfa7bb36 100644 --- a/assets/common/items/weapons/sword/cultist_purp_2h-0.ron +++ b/assets/common/items/weapons/sword/cultist_purp_2h-0.ron @@ -1,10 +1,13 @@ Item( name: "Magical Cultist Greatsword", - description: "Two-Hand Sword\n\nPower: 6-20\n\nThis belonged to an evil Cult Leader\n\n", + description: "This belonged to an evil Cult Leader.", kind: Tool( ( kind: Sword(CultPurp0), - equip_time_millis: 500, + stats: ( + equip_time_millis: 500, + power: 2.00, + ), ) ), ) diff --git a/assets/common/items/weapons/sword/greatsword_2h_dam-0.ron b/assets/common/items/weapons/sword/greatsword_2h_dam-0.ron index 62e4a0826c..6a1c7b7b7e 100644 --- a/assets/common/items/weapons/sword/greatsword_2h_dam-0.ron +++ b/assets/common/items/weapons/sword/greatsword_2h_dam-0.ron @@ -1,10 +1,13 @@ Item( name: "Damaged Greatsword", - description: "A Damaged Two-Handed Greatsword\n\nPower: 2-10\n\n", + description: "The blade has been chipped quite a few times.", kind: Tool( ( kind: Sword(GreatswordDam0), - equip_time_millis: 500, + stats: ( + equip_time_millis: 500, + power: 0.80, + ), ) ), ) diff --git a/assets/common/items/weapons/sword/greatsword_2h_dam-1.ron b/assets/common/items/weapons/sword/greatsword_2h_dam-1.ron index 6eda562d23..83d15ea7b7 100644 --- a/assets/common/items/weapons/sword/greatsword_2h_dam-1.ron +++ b/assets/common/items/weapons/sword/greatsword_2h_dam-1.ron @@ -1,10 +1,13 @@ Item( name: "Damaged Greatsword", - description: "A Damaged Two-Handed Greatsword\n\nPower: 2-10\n\n", + description: "The blade has been chipped quite a few times.", kind: Tool( ( kind: Sword(GreatswordDam1), - equip_time_millis: 500, + stats: ( + equip_time_millis: 500, + power: 0.80, + ), ) ), ) diff --git a/assets/common/items/weapons/sword/greatsword_2h_dam-2.ron b/assets/common/items/weapons/sword/greatsword_2h_dam-2.ron index a18b0ca92c..111b3ff878 100644 --- a/assets/common/items/weapons/sword/greatsword_2h_dam-2.ron +++ b/assets/common/items/weapons/sword/greatsword_2h_dam-2.ron @@ -1,10 +1,13 @@ Item( name: "Damaged Greatsword", - description: "A Damaged Two-Handed Greatsword\n\nPower: 2-10\n\n", + description: "The blade has been chipped quite a few times.", kind: Tool( ( kind: Sword(GreatswordDam2), - equip_time_millis: 500, + stats: ( + equip_time_millis: 500, + power: 0.80, + ), ) ), ) diff --git a/assets/common/items/weapons/sword/greatsword_2h_fine-0.ron b/assets/common/items/weapons/sword/greatsword_2h_fine-0.ron index ffc620be41..95abc564d9 100644 --- a/assets/common/items/weapons/sword/greatsword_2h_fine-0.ron +++ b/assets/common/items/weapons/sword/greatsword_2h_fine-0.ron @@ -1,10 +1,13 @@ Item( name: "Fine Greatsword", - description: "A Fine Two-Handed Greatsword\n\nPower: 2-10\n\n", + description: "It's been polished and sharpened recently.", kind: Tool( ( kind: Sword(GreatswordFine0), - equip_time_millis: 500, + stats: ( + equip_time_millis: 500, + power: 1.40, + ), ) ), ) diff --git a/assets/common/items/weapons/sword/greatsword_2h_fine-1.ron b/assets/common/items/weapons/sword/greatsword_2h_fine-1.ron index 6cc55512cc..3badfbcd5c 100644 --- a/assets/common/items/weapons/sword/greatsword_2h_fine-1.ron +++ b/assets/common/items/weapons/sword/greatsword_2h_fine-1.ron @@ -1,10 +1,13 @@ Item( name: "Fine Greatsword", - description: "A Fine Two-Handed Greatsword\n\nPower: 2-10\n\n", + description: "It's been polished and sharpened recently.", kind: Tool( ( kind: Sword(GreatswordFine1), - equip_time_millis: 500, + stats: ( + equip_time_millis: 500, + power: 1.40, + ), ) ), ) diff --git a/assets/common/items/weapons/sword/greatsword_2h_fine-2.ron b/assets/common/items/weapons/sword/greatsword_2h_fine-2.ron index 660a61580c..4244eab379 100644 --- a/assets/common/items/weapons/sword/greatsword_2h_fine-2.ron +++ b/assets/common/items/weapons/sword/greatsword_2h_fine-2.ron @@ -1,10 +1,13 @@ Item( name: "Fine Greatsword", - description: "A Fine Two-Handed Greatsword\n\nPower: 2-10\n\n", + description: "It's been polished and sharpened recently.", kind: Tool( ( kind: Sword(GreatswordFine2), - equip_time_millis: 500, + stats: ( + equip_time_millis: 500, + power: 1.40, + ), ) ), ) diff --git a/assets/common/items/weapons/sword/greatsword_2h_orn-0.ron b/assets/common/items/weapons/sword/greatsword_2h_orn-0.ron index 8cb721b52e..6abb86b3d2 100644 --- a/assets/common/items/weapons/sword/greatsword_2h_orn-0.ron +++ b/assets/common/items/weapons/sword/greatsword_2h_orn-0.ron @@ -1,10 +1,13 @@ Item( - name: "Ornimented Greatsword", - description: "A Ornimented Two-Handed Greatsword\n\nPower: 2-10\n\n", + name: "Ornamented Greatsword", + description: "The sword's almost a work of art.", kind: Tool( ( kind: Sword(GreatswordOrn0), - equip_time_millis: 500, + stats: ( + equip_time_millis: 500, + power: 1.70, + ), ) ), ) diff --git a/assets/common/items/weapons/sword/greatsword_2h_orn-1.ron b/assets/common/items/weapons/sword/greatsword_2h_orn-1.ron index 3f8818f308..e576e764ab 100644 --- a/assets/common/items/weapons/sword/greatsword_2h_orn-1.ron +++ b/assets/common/items/weapons/sword/greatsword_2h_orn-1.ron @@ -1,10 +1,13 @@ Item( - name: "Ornimented Greatsword", - description: "A Ornimented Two-Handed Greatsword\n\nPower: 2-10\n\n", + name: "Ornamented Greatsword", + description: "The sword's almost a work of art.", kind: Tool( ( kind: Sword(GreatswordOrn1), - equip_time_millis: 500, + stats: ( + equip_time_millis: 500, + power: 1.70, + ), ) ), ) diff --git a/assets/common/items/weapons/sword/greatsword_2h_orn-2.ron b/assets/common/items/weapons/sword/greatsword_2h_orn-2.ron index bab5a60f9a..99d0398eab 100644 --- a/assets/common/items/weapons/sword/greatsword_2h_orn-2.ron +++ b/assets/common/items/weapons/sword/greatsword_2h_orn-2.ron @@ -1,10 +1,13 @@ Item( - name: "Ornimented Greatsword", - description: "A Ornimented Two-Handed Greatsword\n\nPower: 2-10\n\n", + name: "Ornamented Greatsword", + description: "The sword's almost a work of art.", kind: Tool( ( kind: Sword(GreatswordOrn2), - equip_time_millis: 500, + stats: ( + equip_time_millis: 500, + power: 1.70, + ), ) ), ) diff --git a/assets/common/items/weapons/sword/greatsword_2h_simple-0.ron b/assets/common/items/weapons/sword/greatsword_2h_simple-0.ron index c757d1d3d4..67d7d6873e 100644 --- a/assets/common/items/weapons/sword/greatsword_2h_simple-0.ron +++ b/assets/common/items/weapons/sword/greatsword_2h_simple-0.ron @@ -1,10 +1,13 @@ Item( name: "Simple Greatsword", - description: "A Simple Two-Handed Greatsword\n\nPower: 2-10\n\n", + description: "It's been well used.", kind: Tool( ( kind: Sword(GreatswordSimple0), - equip_time_millis: 500, + stats: ( + equip_time_millis: 500, + power: 1.10, + ), ) ), ) diff --git a/assets/common/items/weapons/sword/greatsword_2h_simple-1.ron b/assets/common/items/weapons/sword/greatsword_2h_simple-1.ron index 4dedbb496e..dcfa308a5d 100644 --- a/assets/common/items/weapons/sword/greatsword_2h_simple-1.ron +++ b/assets/common/items/weapons/sword/greatsword_2h_simple-1.ron @@ -1,10 +1,13 @@ Item( name: "Simple Greatsword", - description: "A Simple Two-Handed Greatsword\n\nPower: 2-10\n\n", + description: "It's been well used.", kind: Tool( ( kind: Sword(GreatswordSimple1), - equip_time_millis: 500, + stats: ( + equip_time_millis: 500, + power: 1.10, + ), ) ), ) diff --git a/assets/common/items/weapons/sword/greatsword_2h_simple-2.ron b/assets/common/items/weapons/sword/greatsword_2h_simple-2.ron index 4c72bc3cbf..d93dd879fa 100644 --- a/assets/common/items/weapons/sword/greatsword_2h_simple-2.ron +++ b/assets/common/items/weapons/sword/greatsword_2h_simple-2.ron @@ -1,10 +1,13 @@ Item( name: "Simple Greatsword", - description: "A Simple Two-Handed Greatsword\n\nPower: 2-10\n\n", + description: "It's been well used.", kind: Tool( ( kind: Sword(GreatswordSimple2), - equip_time_millis: 500, + stats: ( + equip_time_millis: 500, + power: 1.10, + ), ) ), ) diff --git a/assets/common/items/weapons/sword/long_2h_dam-0.ron b/assets/common/items/weapons/sword/long_2h_dam-0.ron index 20174e74c7..bce959a920 100644 --- a/assets/common/items/weapons/sword/long_2h_dam-0.ron +++ b/assets/common/items/weapons/sword/long_2h_dam-0.ron @@ -1,10 +1,13 @@ Item( name: "Damaged Longsword", - description: "A Damaged Double-Edged, Two-Handed Longsword\n\nPower: 2-10\n\n", + description: "It's slightly cracked.", kind: Tool( ( kind: Sword(LongDam0), - equip_time_millis: 500, + stats: ( + equip_time_millis: 500, + power: 0.60, + ), ) ), ) diff --git a/assets/common/items/weapons/sword/long_2h_dam-1.ron b/assets/common/items/weapons/sword/long_2h_dam-1.ron index 01a01ca543..ce3e909608 100644 --- a/assets/common/items/weapons/sword/long_2h_dam-1.ron +++ b/assets/common/items/weapons/sword/long_2h_dam-1.ron @@ -1,10 +1,13 @@ Item( name: "Damaged Longsword", - description: "A Damaged Double-Edged, Two-Handed Longsword\n\nPower: 2-10\n\n", + description: "It's slightly cracked.", kind: Tool( ( kind: Sword(LongDam1), - equip_time_millis: 500, + stats: ( + equip_time_millis: 500, + power: 0.60, + ), ) ), ) diff --git a/assets/common/items/weapons/sword/long_2h_dam-2.ron b/assets/common/items/weapons/sword/long_2h_dam-2.ron index afd1dedebb..ea66f096e1 100644 --- a/assets/common/items/weapons/sword/long_2h_dam-2.ron +++ b/assets/common/items/weapons/sword/long_2h_dam-2.ron @@ -1,10 +1,13 @@ Item( name: "Damaged Longsword", - description: "A Damaged Double-Edged, Two-Handed Longsword\n\nPower: 2-10\n\n", + description: "It's slightly cracked.", kind: Tool( ( kind: Sword(LongDam2), - equip_time_millis: 500, + stats: ( + equip_time_millis: 500, + power: 0.60, + ), ) ), ) diff --git a/assets/common/items/weapons/sword/long_2h_dam-3.ron b/assets/common/items/weapons/sword/long_2h_dam-3.ron index ba0857975b..b4d337f218 100644 --- a/assets/common/items/weapons/sword/long_2h_dam-3.ron +++ b/assets/common/items/weapons/sword/long_2h_dam-3.ron @@ -1,10 +1,13 @@ Item( name: "Damaged Longsword", - description: "A Damaged Single-Edged, Two-Handed Longsword\n\nPower: 2-10\n\n", + description: "It's slightly cracked.", kind: Tool( ( kind: Sword(LongDam3), - equip_time_millis: 500, + stats: ( + equip_time_millis: 500, + power: 0.60, + ), ) ), ) diff --git a/assets/common/items/weapons/sword/long_2h_dam-4.ron b/assets/common/items/weapons/sword/long_2h_dam-4.ron index 118a4a2a4f..2f6b02784c 100644 --- a/assets/common/items/weapons/sword/long_2h_dam-4.ron +++ b/assets/common/items/weapons/sword/long_2h_dam-4.ron @@ -1,10 +1,13 @@ Item( name: "Damaged Longsword", - description: "A Damaged Single-Edged, Two-Handed Longsword\n\nPower: 2-10\n\n", + description: "It's slightly cracked.", kind: Tool( ( kind: Sword(LongDam4), - equip_time_millis: 500, + stats: ( + equip_time_millis: 500, + power: 0.60, + ), ) ), ) diff --git a/assets/common/items/weapons/sword/long_2h_dam-5.ron b/assets/common/items/weapons/sword/long_2h_dam-5.ron index a5b1eb35eb..34d3e5b9c9 100644 --- a/assets/common/items/weapons/sword/long_2h_dam-5.ron +++ b/assets/common/items/weapons/sword/long_2h_dam-5.ron @@ -1,10 +1,13 @@ Item( name: "Damaged Longsword", - description: "A Damaged Single-Edged, Two-Handed Longsword\n\nPower: 2-10\n\n", + description: "It's slightly cracked.", kind: Tool( ( kind: Sword(LongDam5), - equip_time_millis: 500, + stats: ( + equip_time_millis: 500, + power: 0.60, + ), ) ), ) diff --git a/assets/common/items/weapons/sword/long_2h_fine-0.ron b/assets/common/items/weapons/sword/long_2h_fine-0.ron index 62a08d3ca1..b490ba79cc 100644 --- a/assets/common/items/weapons/sword/long_2h_fine-0.ron +++ b/assets/common/items/weapons/sword/long_2h_fine-0.ron @@ -1,10 +1,13 @@ Item( name: "Fine Longsword", - description: "A Very Fine Double-Edged, Two-Hand LongSword\n\nPower: 2-10\n\n", + description: "It shines when you hold it up to the light.", kind: Tool( ( kind: Sword(LongFine0), - equip_time_millis: 500, + stats: ( + equip_time_millis: 500, + power: 1.20, + ), ) ), ) diff --git a/assets/common/items/weapons/sword/long_2h_fine-1.ron b/assets/common/items/weapons/sword/long_2h_fine-1.ron index 37e45ab9f4..28f6dfcaa9 100644 --- a/assets/common/items/weapons/sword/long_2h_fine-1.ron +++ b/assets/common/items/weapons/sword/long_2h_fine-1.ron @@ -1,10 +1,13 @@ Item( name: "Fine Longsword", - description: "A Very Fine Double-Edged, Two-Hand LongSword\n\nPower: 2-10\n\n", + description: "It shines when you hold it up to the light.", kind: Tool( ( kind: Sword(LongFine1), - equip_time_millis: 500, + stats: ( + equip_time_millis: 500, + power: 1.20, + ), ) ), ) diff --git a/assets/common/items/weapons/sword/long_2h_fine-2.ron b/assets/common/items/weapons/sword/long_2h_fine-2.ron index 463712a64f..2c140aabab 100644 --- a/assets/common/items/weapons/sword/long_2h_fine-2.ron +++ b/assets/common/items/weapons/sword/long_2h_fine-2.ron @@ -1,10 +1,13 @@ Item( name: "Fine Longsword", - description: "A Very Fine Double-Edged, Two-Hand LongSword\n\nPower: 2-10\n\n", + description: "It shines when you hold it up to the light.", kind: Tool( ( kind: Sword(LongFine2), - equip_time_millis: 500, + stats: ( + equip_time_millis: 500, + power: 1.20, + ), ) ), ) diff --git a/assets/common/items/weapons/sword/long_2h_fine-3.ron b/assets/common/items/weapons/sword/long_2h_fine-3.ron index 457993ae29..7daa493b1a 100644 --- a/assets/common/items/weapons/sword/long_2h_fine-3.ron +++ b/assets/common/items/weapons/sword/long_2h_fine-3.ron @@ -1,10 +1,13 @@ Item( name: "Fine Longsword", - description: "A Very Fine Single-Edged, Two-Hand LongSword\n\nPower: 2-10\n\n", + description: "It shines when you hold it up to the light.", kind: Tool( ( kind: Sword(LongFine3), - equip_time_millis: 500, + stats: ( + equip_time_millis: 500, + power: 1.20, + ), ) ), ) diff --git a/assets/common/items/weapons/sword/long_2h_fine-4.ron b/assets/common/items/weapons/sword/long_2h_fine-4.ron index d1ea6cd56d..0f293eecc0 100644 --- a/assets/common/items/weapons/sword/long_2h_fine-4.ron +++ b/assets/common/items/weapons/sword/long_2h_fine-4.ron @@ -1,10 +1,13 @@ Item( name: "Fine Longsword", - description: "A Very Fine Single-Edged, Two-Hand LongSword\n\nPower: 2-10\n\n", + description: "It shines when you hold it up to the light.", kind: Tool( ( kind: Sword(LongFine4), - equip_time_millis: 500, + stats: ( + equip_time_millis: 500, + power: 1.20, + ), ) ), ) diff --git a/assets/common/items/weapons/sword/long_2h_fine-5.ron b/assets/common/items/weapons/sword/long_2h_fine-5.ron index f2e1a4a8b2..ec1270f9df 100644 --- a/assets/common/items/weapons/sword/long_2h_fine-5.ron +++ b/assets/common/items/weapons/sword/long_2h_fine-5.ron @@ -1,10 +1,13 @@ Item( name: "Fine Longsword", - description: "A Very Fine Single-Edged, Two-Hand LongSword\n\nPower: 2-10\n\n", + description: "It shines when you hold it up to the light.", kind: Tool( ( kind: Sword(LongFine5), - equip_time_millis: 500, + stats: ( + equip_time_millis: 500, + power: 1.20, + ), ) ), ) diff --git a/assets/common/items/weapons/sword/long_2h_orn-0.ron b/assets/common/items/weapons/sword/long_2h_orn-0.ron index ee2d8007b0..f3666b68eb 100644 --- a/assets/common/items/weapons/sword/long_2h_orn-0.ron +++ b/assets/common/items/weapons/sword/long_2h_orn-0.ron @@ -1,10 +1,13 @@ Item( - name: "Ornimented Longsword", - description: "An Ornimanted Double-Edged, Two-Hand LongSword\n\nPower: 2-10\n\n", + name: "Ornamented Longsword", + description: "It's probably the weapon of some noble.", kind: Tool( ( kind: Sword(LongOrn0), - equip_time_millis: 500, + stats: ( + equip_time_millis: 500, + power: 1.50, + ), ) ), ) diff --git a/assets/common/items/weapons/sword/long_2h_orn-1.ron b/assets/common/items/weapons/sword/long_2h_orn-1.ron index 49bb90e103..b5b5942e64 100644 --- a/assets/common/items/weapons/sword/long_2h_orn-1.ron +++ b/assets/common/items/weapons/sword/long_2h_orn-1.ron @@ -1,10 +1,13 @@ Item( - name: "Ornimented Longsword", - description: "An Ornimanted Double-Edged, Two-Hand LongSword\n\nPower: 2-10\n\n", + name: "Ornamented Longsword", + description: "It's probably the weapon of some noble.", kind: Tool( ( kind: Sword(LongOrn1), - equip_time_millis: 500, + stats: ( + equip_time_millis: 500, + power: 1.50, + ), ) ), ) diff --git a/assets/common/items/weapons/sword/long_2h_orn-2.ron b/assets/common/items/weapons/sword/long_2h_orn-2.ron index 3814a1f31c..8214bf5695 100644 --- a/assets/common/items/weapons/sword/long_2h_orn-2.ron +++ b/assets/common/items/weapons/sword/long_2h_orn-2.ron @@ -1,10 +1,13 @@ Item( - name: "Ornimented Longsword", - description: "An Ornimanted Double-Edged, Two-Hand LongSword\n\nPower: 2-10\n\n", + name: "Ornamented Longsword", + description: "It's probably the weapon of some noble.", kind: Tool( ( kind: Sword(LongOrn2), - equip_time_millis: 500, + stats: ( + equip_time_millis: 500, + power: 1.50, + ), ) ), ) diff --git a/assets/common/items/weapons/sword/long_2h_orn-3.ron b/assets/common/items/weapons/sword/long_2h_orn-3.ron index b43ecddb7b..a6c60d0f1f 100644 --- a/assets/common/items/weapons/sword/long_2h_orn-3.ron +++ b/assets/common/items/weapons/sword/long_2h_orn-3.ron @@ -1,10 +1,13 @@ Item( - name: "Ornimented Longsword", - description: "An Ornimanted Single-Edged, Two-Hand LongSword\n\nPower: 2-10\n\n", + name: "Ornamented Longsword", + description: "It's probably the weapon of some noble.", kind: Tool( ( kind: Sword(LongOrn3), - equip_time_millis: 500, + stats: ( + equip_time_millis: 500, + power: 1.50, + ), ) ), ) diff --git a/assets/common/items/weapons/sword/long_2h_orn-4.ron b/assets/common/items/weapons/sword/long_2h_orn-4.ron index 357d9433bd..cee5dd1f81 100644 --- a/assets/common/items/weapons/sword/long_2h_orn-4.ron +++ b/assets/common/items/weapons/sword/long_2h_orn-4.ron @@ -1,10 +1,13 @@ Item( - name: "Ornimented Longsword", - description: "An Ornimanted Single-Edged, Two-Hand LongSword\n\nPower: 2-10\n\n", + name: "Ornamented Longsword", + description: "It's probably the weapon of some noble.", kind: Tool( ( kind: Sword(LongOrn4), - equip_time_millis: 500, + stats: ( + equip_time_millis: 500, + power: 1.50, + ), ) ), ) diff --git a/assets/common/items/weapons/sword/long_2h_orn-5.ron b/assets/common/items/weapons/sword/long_2h_orn-5.ron index 4edfb6f01c..c9e481c421 100644 --- a/assets/common/items/weapons/sword/long_2h_orn-5.ron +++ b/assets/common/items/weapons/sword/long_2h_orn-5.ron @@ -1,10 +1,13 @@ Item( - name: "Ornimented Longsword", - description: "An Ornimanted Single-Edged, Two-Hand LongSword\n\nPower: 2-10\n\n", + name: "Ornamented Longsword", + description: "It's probably the weapon of some noble.", kind: Tool( ( kind: Sword(LongOrn5), - equip_time_millis: 500, + stats: ( + equip_time_millis: 500, + power: 1.50, + ), ) ), ) diff --git a/assets/common/items/weapons/sword/long_2h_simple-0.ron b/assets/common/items/weapons/sword/long_2h_simple-0.ron index b2ad9a59d0..39b884b7cd 100644 --- a/assets/common/items/weapons/sword/long_2h_simple-0.ron +++ b/assets/common/items/weapons/sword/long_2h_simple-0.ron @@ -1,10 +1,13 @@ Item( name: "Simple Longsword", - description: "A Simple Double-Edged, Two-Handed Longsword\n\nPower: 2-10\n\n", + description: "It was well maintained by it's previous owner.", kind: Tool( ( kind: Sword(LongSimple0), - equip_time_millis: 500, + stats: ( + equip_time_millis: 500, + power: 0.90, + ), ) ), ) diff --git a/assets/common/items/weapons/sword/long_2h_simple-1.ron b/assets/common/items/weapons/sword/long_2h_simple-1.ron index e4eb4b123c..4f73bec92a 100644 --- a/assets/common/items/weapons/sword/long_2h_simple-1.ron +++ b/assets/common/items/weapons/sword/long_2h_simple-1.ron @@ -1,10 +1,13 @@ Item( name: "Simple Longsword", - description: "A Simple Double-Edged, Two-Handed Longsword\n\nPower: 2-10\n\n", + description: "It was well maintained by it's previous owner.", kind: Tool( ( kind: Sword(LongSimple1), - equip_time_millis: 500, + stats: ( + equip_time_millis: 500, + power: 0.90, + ), ) ), ) diff --git a/assets/common/items/weapons/sword/long_2h_simple-2.ron b/assets/common/items/weapons/sword/long_2h_simple-2.ron index 9aa2ab80a7..865a177a2e 100644 --- a/assets/common/items/weapons/sword/long_2h_simple-2.ron +++ b/assets/common/items/weapons/sword/long_2h_simple-2.ron @@ -1,10 +1,13 @@ Item( name: "Simple Longsword", - description: "A Simple Double-Edged, Two-Handed Longsword\n\nPower: 2-10\n\n", + description: "It was well maintained by it's previous owner.", kind: Tool( ( kind: Sword(LongSimple2), - equip_time_millis: 500, + stats: ( + equip_time_millis: 500, + power: 0.90, + ), ) ), ) diff --git a/assets/common/items/weapons/sword/long_2h_simple-3.ron b/assets/common/items/weapons/sword/long_2h_simple-3.ron index 9ee608f6f0..6aa7bf2b29 100644 --- a/assets/common/items/weapons/sword/long_2h_simple-3.ron +++ b/assets/common/items/weapons/sword/long_2h_simple-3.ron @@ -1,10 +1,13 @@ Item( name: "Simple Longsword", - description: "A Simple Single-Edged, Two-Handed Longsword\n\nPower: 2-10\n\n", + description: "It was well maintained by it's previous owner.", kind: Tool( ( kind: Sword(LongSimple3), - equip_time_millis: 500, + stats: ( + equip_time_millis: 500, + power: 0.90, + ), ) ), ) diff --git a/assets/common/items/weapons/sword/long_2h_simple-4.ron b/assets/common/items/weapons/sword/long_2h_simple-4.ron index e92bed29e9..3ce5b159b7 100644 --- a/assets/common/items/weapons/sword/long_2h_simple-4.ron +++ b/assets/common/items/weapons/sword/long_2h_simple-4.ron @@ -1,10 +1,13 @@ Item( name: "Simple Longsword", - description: "A Simple Single-Edged, Two-Handed Longsword\n\nPower: 2-10\n\n", + description: "It was well maintained by it's previous owner.", kind: Tool( ( kind: Sword(LongSimple4), - equip_time_millis: 500, + stats: ( + equip_time_millis: 500, + power: 0.90, + ), ) ), ) diff --git a/assets/common/items/weapons/sword/long_2h_simple-5.ron b/assets/common/items/weapons/sword/long_2h_simple-5.ron index 59f6a199b4..e105db14bd 100644 --- a/assets/common/items/weapons/sword/long_2h_simple-5.ron +++ b/assets/common/items/weapons/sword/long_2h_simple-5.ron @@ -1,10 +1,13 @@ Item( name: "Simple Longsword", - description: "A Simple Single-Edged, Two-Handed Longsword\n\nPower: 2-10\n\n", + description: "It was well maintained by it's previous owner.", kind: Tool( ( kind: Sword(LongSimple5), - equip_time_millis: 500, + stats: ( + equip_time_millis: 500, + power: 0.90, + ), ) ), ) diff --git a/assets/common/items/weapons/sword/short_sword_0.ron b/assets/common/items/weapons/sword/short_sword_0.ron index cdec6c999e..474eab303b 100644 --- a/assets/common/items/weapons/sword/short_sword_0.ron +++ b/assets/common/items/weapons/sword/short_sword_0.ron @@ -1,10 +1,13 @@ Item( name: "Vicious Gladius", - description: "Two-Hand Sword\n\nPower: 2-10\n\n", + description: "There's blood encrusted on the blade.", kind: Tool( ( kind: Sword(Short0), - equip_time_millis: 400, + stats: ( + equip_time_millis: 400, + power: 0.75, + ), ) ), ) diff --git a/assets/common/items/weapons/sword/starter_sword.ron b/assets/common/items/weapons/sword/starter_sword.ron index 0348998a8e..223c633b95 100644 --- a/assets/common/items/weapons/sword/starter_sword.ron +++ b/assets/common/items/weapons/sword/starter_sword.ron @@ -1,10 +1,13 @@ Item( name: "Battered Sword", - description: "Two-Hand Sword\n\nPower: 2-10\n\nHeld together by Rust and hope.\n\n", + description: "Held together by Rust and hope.", kind: Tool( ( kind: Sword(BasicSword), - equip_time_millis: 300, + stats: ( + equip_time_millis: 300, + power: 0.50, + ), ) ), ) diff --git a/assets/common/items/weapons/sword/wood_sword.ron b/assets/common/items/weapons/sword/wood_sword.ron index 038468636c..f8df8df720 100644 --- a/assets/common/items/weapons/sword/wood_sword.ron +++ b/assets/common/items/weapons/sword/wood_sword.ron @@ -1,10 +1,13 @@ Item( name: "Wooden Training Sword", - description: "Two-Hand Sword\n\nPower: 2-10\n\n", + description: "It's not sharp.", kind: Tool( ( kind: Sword(WoodTraining), - equip_time_millis: 400, + stats: ( + equip_time_millis: 400, + power: 0.50, + ), ) ), ) diff --git a/assets/common/items/weapons/sword/zweihander_sword_0.ron b/assets/common/items/weapons/sword/zweihander_sword_0.ron index a3bc54faa4..e960188c19 100644 --- a/assets/common/items/weapons/sword/zweihander_sword_0.ron +++ b/assets/common/items/weapons/sword/zweihander_sword_0.ron @@ -1,10 +1,13 @@ Item( - name: "Sturdy Bihander", - description: "Two-Hand Sword\n\nPower: 2-10\n\n", + name: "Sturdy Zweihander", + description: "It's a big sword, and sharp too.", kind: Tool( ( kind: Sword(Zweihander0), - equip_time_millis: 500, + stats: ( + equip_time_millis: 500, + power: 1.50, + ), ) ), ) diff --git a/assets/common/items/weapons/tool/broom.ron b/assets/common/items/weapons/tool/broom.ron index 8edc349d37..0e68b82413 100644 --- a/assets/common/items/weapons/tool/broom.ron +++ b/assets/common/items/weapons/tool/broom.ron @@ -1,10 +1,13 @@ Item( name: "Broom", - description: "", + description: "It's beginning to fall apart.", kind: Tool ( ( kind: Farming(Broom), - equip_time_millis: 400, + stats: ( + equip_time_millis: 400, + power: 1.00, + ), ) ), ) diff --git a/assets/common/items/weapons/tool/fishing_rod.ron b/assets/common/items/weapons/tool/fishing_rod.ron index 4c28cd5598..4da51b2db0 100644 --- a/assets/common/items/weapons/tool/fishing_rod.ron +++ b/assets/common/items/weapons/tool/fishing_rod.ron @@ -1,10 +1,13 @@ Item( name: "Fishing Rod", - description: "", + description: "Smells of fish.", kind: Tool ( ( kind: Farming(FishingRod0), - equip_time_millis: 400, + stats: ( + equip_time_millis: 400, + power: 1.00, + ), ) ), ) diff --git a/assets/common/items/weapons/tool/hoe.ron b/assets/common/items/weapons/tool/hoe.ron index 528eb22309..70527eff36 100644 --- a/assets/common/items/weapons/tool/hoe.ron +++ b/assets/common/items/weapons/tool/hoe.ron @@ -1,10 +1,13 @@ Item( name: "Hoe", - description: "", + description: "It's stained with dirt.", kind: Tool ( ( kind: Farming(Hoe0), - equip_time_millis: 400, + stats: ( + equip_time_millis: 400, + power: 1.00, + ), ) ), ) diff --git a/assets/common/items/weapons/tool/pickaxe.ron b/assets/common/items/weapons/tool/pickaxe.ron index 197724284b..4c4c527be4 100644 --- a/assets/common/items/weapons/tool/pickaxe.ron +++ b/assets/common/items/weapons/tool/pickaxe.ron @@ -1,10 +1,13 @@ Item( name: "Pickaxe", - description: "", + description: "It has a chipped edge.", kind: Tool ( ( kind: Farming(Pickaxe0), - equip_time_millis: 400, + stats: ( + equip_time_millis: 400, + power: 1.00, + ), ) ), ) diff --git a/assets/common/items/weapons/tool/pitchfork.ron b/assets/common/items/weapons/tool/pitchfork.ron index ca2474db74..f425c9e7c7 100644 --- a/assets/common/items/weapons/tool/pitchfork.ron +++ b/assets/common/items/weapons/tool/pitchfork.ron @@ -1,10 +1,13 @@ Item( name: "Pitchfork", - description: "", + description: "One of the prongs is broken.", kind: Tool ( ( kind: Farming(Pitchfork), - equip_time_millis: 400, + stats: ( + equip_time_millis: 400, + power: 1.00, + ), ) ), ) diff --git a/assets/common/items/weapons/tool/rake.ron b/assets/common/items/weapons/tool/rake.ron index 43aa815603..b9ec11f738 100644 --- a/assets/common/items/weapons/tool/rake.ron +++ b/assets/common/items/weapons/tool/rake.ron @@ -1,10 +1,13 @@ Item( name: "Rake", - description: "", + description: "Held together with twine.", kind: Tool ( ( kind: Farming(Rake), - equip_time_millis: 400, + stats: ( + equip_time_millis: 400, + power: 1.00, + ), ) ), ) diff --git a/assets/common/items/weapons/tool/shovel-0.ron b/assets/common/items/weapons/tool/shovel-0.ron index 2cd8adb761..46edc4ee5d 100644 --- a/assets/common/items/weapons/tool/shovel-0.ron +++ b/assets/common/items/weapons/tool/shovel-0.ron @@ -1,10 +1,13 @@ Item( name: "Shovel", - description: "", + description: "It's covered in manure.", kind: Tool ( ( kind: Farming(Shovel0), - equip_time_millis: 400, + stats: ( + equip_time_millis: 400, + power: 1.00, + ), ) ), ) diff --git a/assets/common/items/weapons/tool/shovel-1.ron b/assets/common/items/weapons/tool/shovel-1.ron index 033d72b89a..f191d77645 100644 --- a/assets/common/items/weapons/tool/shovel-1.ron +++ b/assets/common/items/weapons/tool/shovel-1.ron @@ -1,10 +1,13 @@ Item( name: "Shovel", - description: "", + description: "It's been recently cleaned.", kind: Tool ( ( kind: Farming(Shovel1), - equip_time_millis: 400, + stats: ( + equip_time_millis: 400, + power: 1.00, + ), ) ), ) diff --git a/assets/common/loot_table.ron b/assets/common/loot_table.ron index fa609e55c6..0b00677652 100644 --- a/assets/common/loot_table.ron +++ b/assets/common/loot_table.ron @@ -49,15 +49,91 @@ (0.007, "common.items.weapons.sword.long_2h_orn-3"), (0.007, "common.items.weapons.sword.long_2h_orn-4"), (0.007, "common.items.weapons.sword.long_2h_orn-5"), + (0.01, "common.items.weapons.sword.zweihander_sword_0"), // axes - (1, "common.items.weapons.axe.starter_axe"), + (0.10, "common.items.weapons.axe.starter_axe"), + (0.10, "common.items.weapons.axe.orc_axe-0"), + (0.04, "common.items.weapons.axe.worn_iron_axe-0"), + (0.04, "common.items.weapons.axe.worn_iron_axe-1"), + (0.04, "common.items.weapons.axe.worn_iron_axe-2"), + (0.04, "common.items.weapons.axe.worn_iron_axe-3"), + (0.04, "common.items.weapons.axe.worn_iron_axe-4"), + (0.10, "common.items.weapons.axe.bronze_axe-0"), + (0.10, "common.items.weapons.axe.bronze_axe-1"), + (0.03, "common.items.weapons.axe.iron_axe-0"), + (0.03, "common.items.weapons.axe.iron_axe-1"), + (0.03, "common.items.weapons.axe.iron_axe-2"), + (0.03, "common.items.weapons.axe.iron_axe-3"), + (0.03, "common.items.weapons.axe.iron_axe-4"), + (0.03, "common.items.weapons.axe.iron_axe-5"), + (0.03, "common.items.weapons.axe.iron_axe-6"), + (0.03, "common.items.weapons.axe.iron_axe-7"), + (0.03, "common.items.weapons.axe.iron_axe-8"), + (0.03, "common.items.weapons.axe.iron_axe-9"), + (0.02, "common.items.weapons.axe.steel_axe-0"), + (0.02, "common.items.weapons.axe.steel_axe-1"), + (0.02, "common.items.weapons.axe.steel_axe-2"), + (0.02, "common.items.weapons.axe.steel_axe-3"), + (0.02, "common.items.weapons.axe.steel_axe-4"), + (0.02, "common.items.weapons.axe.steel_axe-5"), + (0.02, "common.items.weapons.axe.steel_axe-6"), + (0.01, "common.items.weapons.axe.bloodsteel_axe-0"), + (0.01, "common.items.weapons.axe.bloodsteel_axe-1"), + (0.01, "common.items.weapons.axe.bloodsteel_axe-2"), + (0.01, "common.items.weapons.axe.cobalt_axe-0"), + (0.01, "common.items.weapons.axe.malachite_axe-0"), + // healing staff + (0.8, "common.items.weapons.staff.staff_nature"), // staves - (1, "common.items.weapons.staff.staff_nature"), - (1, "common.items.weapons.staff.starter_staff"), + (0.50, "common.items.weapons.staff.starter_staff"), + (0.35, "common.items.weapons.staff.bone_staff"), + (0.15, "common.items.weapons.staff.amethyst_staff"), + (0.01, "common.items.weapons.staff.cultist_staff"), // hammers - (1, "common.items.weapons.hammer.starter_hammer"), + (0.05, "common.items.weapons.hammer.starter_hammer"), + (0.05, "common.items.weapons.hammer.wood_hammer-0"), + (0.05, "common.items.weapons.hammer.flimsy_hammer"), + (0.05, "common.items.weapons.hammer.stone_hammer-0"), + (0.05, "common.items.weapons.hammer.stone_hammer-1"), + (0.05, "common.items.weapons.hammer.stone_hammer-2"), + (0.05, "common.items.weapons.hammer.stone_hammer-3"), + (0.05, "common.items.weapons.hammer.worn_iron_hammer-0"), + (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"), + (0.05, "common.items.weapons.hammer.bronze_hammer-0"), + (0.05, "common.items.weapons.hammer.bronze_hammer-1"), + (0.03, "common.items.weapons.hammer.iron_hammer-0"), + (0.03, "common.items.weapons.hammer.iron_hammer-1"), + (0.03, "common.items.weapons.hammer.iron_hammer-2"), + (0.03, "common.items.weapons.hammer.iron_hammer-3"), + (0.03, "common.items.weapons.hammer.iron_hammer-4"), + (0.03, "common.items.weapons.hammer.iron_hammer-5"), + (0.03, "common.items.weapons.hammer.iron_hammer-6"), + (0.03, "common.items.weapons.hammer.iron_hammer-7"), + (0.03, "common.items.weapons.hammer.iron_hammer-8"), + (0.02, "common.items.weapons.hammer.steel_hammer-0"), + (0.02, "common.items.weapons.hammer.steel_hammer-1"), + (0.02, "common.items.weapons.hammer.steel_hammer-2"), + (0.02, "common.items.weapons.hammer.steel_hammer-3"), + (0.02, "common.items.weapons.hammer.steel_hammer-4"), + (0.02, "common.items.weapons.hammer.steel_hammer-5"), + (0.01, "common.items.weapons.hammer.cobalt_hammer-0"), + (0.01, "common.items.weapons.hammer.cobalt_hammer-1"), + (0.01, "common.items.weapons.hammer.runic_hammer"), + (0.01, "common.items.weapons.hammer.ramshead_hammer"), + (0.01, "common.items.weapons.hammer.mjolnir"), // bows - (1, "common.items.weapons.bow.starter_bow"), + (0.20, "common.items.weapons.bow.starter_bow"), + (0.15, "common.items.weapons.bow.wood_shortbow-0"), + (0.15, "common.items.weapons.bow.wood_shortbow-1"), + (0.10, "common.items.weapons.bow.leafy_shortbow-0"), + (0.10, "common.items.weapons.bow.wood_longbow-0"), + (0.10, "common.items.weapons.bow.wood_longbow-1"), + (0.08, "common.items.weapons.bow.leafy_longbow-0"), + (0.05, "common.items.weapons.bow.horn_longbow-0"), + (0.03, "common.items.weapons.bow.iron_longbow-0"), + (0.01, "common.items.weapons.bow.rare_longbow"), // belts (0.17, "common.items.armor.belt.cloth_blue_0"), (0.17, "common.items.armor.belt.cloth_green_0"), diff --git a/assets/voxygen/i18n/de_DE.ron b/assets/voxygen/i18n/de_DE.ron index 4258f0bcc2..de6f9305bb 100644 --- a/assets/voxygen/i18n/de_DE.ron +++ b/assets/voxygen/i18n/de_DE.ron @@ -92,6 +92,8 @@ VoxygenLocalization( /// Start Main screen section "main.connecting": "Verbinde ", "main.creating_world": "Erschaffe Welt ", + "main.tip": "Tip:", + "hud.settings.loading_tips": "Ladebildschirm Tips", /// Start Main screen section @@ -118,14 +120,11 @@ Danke, dass Ihr Euch die Zeit genommen habt diese Zeilen zu lesen und wir hoffen /// Login process description "main.login_process": r#"Information zum Login: -Zum Spielen wird ein Account benötigt. - -Diesen könnt Ihr Euch hier erstellen: +Erstellt euch hier einen Account zum Spielen: https://account.veloren.net. -Aktuell wird nur das Aussehen -eurer erstellen Charaktere gespeichert."#, +"#, "main.login.server_not_found": "Server nicht gefunden.", "main.login.authentication_error": "Authentifizierung fehlgeschlagen", "main.login.server_full": "Server ist voll", diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron index 5f6e0daa18..20ddabafcc 100644 --- a/assets/voxygen/item_image_manifest.ron +++ b/assets/voxygen/item_image_manifest.ron @@ -5,7 +5,43 @@ // Weapons // Bows Tool(Bow(ShortBow0)): VoxTrans( - "voxel.weapon.bow.shortbow-0", + "voxel.weapon.bow.shortbow_starter", + (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, + ), + Tool(Bow(WoodShortbow0)): VoxTrans( + "voxel.weapon.bow.shortbow_wood-0", + (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, + ), + Tool(Bow(WoodShortbow1)): VoxTrans( + "voxel.weapon.bow.shortbow_wood-1", + (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, + ), + Tool(Bow(LeafyShortbow0)): VoxTrans( + "voxel.weapon.bow.shortbow_leafy-0", + (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, + ), + Tool(Bow(WoodLongbow0)): VoxTrans( + "voxel.weapon.bow.longbow_wood-0", + (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, + ), + Tool(Bow(WoodLongbow1)): VoxTrans( + "voxel.weapon.bow.longbow_wood-1", + (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, + ), + Tool(Bow(LeafyLongbow0)): VoxTrans( + "voxel.weapon.bow.longbow_leafy-0", + (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, + ), + Tool(Bow(HornLongbow0)): VoxTrans( + "voxel.weapon.bow.longbow_horn-0", + (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, + ), + Tool(Bow(IronLongbow0)): VoxTrans( + "voxel.weapon.bow.longbow_iron-0", + (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, + ), + Tool(Bow(RareLongbow)): VoxTrans( + "voxel.weapon.bow.longbow_rare", (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, ), // Daggers @@ -184,19 +220,284 @@ ), // Axes Tool(Axe(BasicAxe)): VoxTrans( - "voxel.weapon.axe.rusty_2h", + "voxel.weapon.axe.2haxe_rusty", + (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + ), + Tool(Axe(OrcAxe0)): VoxTrans( + "voxel.weapon.axe.2haxe_orc-0", + (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + ), + Tool(Axe(WornIronAxe0)): VoxTrans( + "voxel.weapon.axe.2haxe_worn_iron-0", + (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + ), + Tool(Axe(WornIronAxe1)): VoxTrans( + "voxel.weapon.axe.2haxe_worn_iron-1", + (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + ), + Tool(Axe(WornIronAxe2)): VoxTrans( + "voxel.weapon.axe.2haxe_worn_iron-2", + (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + ), + Tool(Axe(WornIronAxe3)): VoxTrans( + "voxel.weapon.axe.2haxe_worn_iron-3", + (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + ), + Tool(Axe(WornIronAxe4)): VoxTrans( + "voxel.weapon.axe.2haxe_worn_iron-4", + (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + ), + Tool(Axe(BronzeAxe0)): VoxTrans( + "voxel.weapon.axe.2haxe_bronze-0", + (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + ), + Tool(Axe(BronzeAxe1)): VoxTrans( + "voxel.weapon.axe.2haxe_bronze-1", + (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + ), + Tool(Axe(IronAxe0)): VoxTrans( + "voxel.weapon.axe.2haxe_iron-0", + (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + ), + Tool(Axe(IronAxe1)): VoxTrans( + "voxel.weapon.axe.2haxe_iron-1", + (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + ), + Tool(Axe(IronAxe2)): VoxTrans( + "voxel.weapon.axe.2haxe_iron-2", + (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + ), + Tool(Axe(IronAxe3)): VoxTrans( + "voxel.weapon.axe.2haxe_iron-3", + (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + ), + Tool(Axe(IronAxe4)): VoxTrans( + "voxel.weapon.axe.2haxe_iron-4", + (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + ), + Tool(Axe(IronAxe5)): VoxTrans( + "voxel.weapon.axe.2haxe_iron-5", + (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + ), + Tool(Axe(IronAxe6)): VoxTrans( + "voxel.weapon.axe.2haxe_iron-6", + (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + ), + Tool(Axe(IronAxe7)): VoxTrans( + "voxel.weapon.axe.2haxe_iron-7", + (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + ), + Tool(Axe(IronAxe8)): VoxTrans( + "voxel.weapon.axe.2haxe_iron-8", + (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + ), + Tool(Axe(IronAxe8)): VoxTrans( + "voxel.weapon.axe.2haxe_iron-8", + (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + ), + Tool(Axe(IronAxe9)): VoxTrans( + "voxel.weapon.axe.2haxe_iron-9", + (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + ), + Tool(Axe(SteelAxe0)): VoxTrans( + "voxel.weapon.axe.2haxe_steel-0", + (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + ), + Tool(Axe(SteelAxe1)): VoxTrans( + "voxel.weapon.axe.2haxe_steel-1", + (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + ), + Tool(Axe(SteelAxe2)): VoxTrans( + "voxel.weapon.axe.2haxe_steel-2", + (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + ), + Tool(Axe(SteelAxe3)): VoxTrans( + "voxel.weapon.axe.2haxe_steel-3", + (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + ), + Tool(Axe(SteelAxe4)): VoxTrans( + "voxel.weapon.axe.2haxe_steel-4", + (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + ), + Tool(Axe(SteelAxe5)): VoxTrans( + "voxel.weapon.axe.2haxe_steel-5", + (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + ), + Tool(Axe(SteelAxe6)): VoxTrans( + "voxel.weapon.axe.2haxe_steel-6", + (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + ), + Tool(Axe(BloodsteelAxe0)): VoxTrans( + "voxel.weapon.axe.2haxe_bloodsteel-0", + (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + ), + Tool(Axe(BloodsteelAxe1)): VoxTrans( + "voxel.weapon.axe.2haxe_bloodsteel-1", + (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + ), + Tool(Axe(BloodsteelAxe2)): VoxTrans( + "voxel.weapon.axe.2haxe_bloodsteel-2", + (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + ), + Tool(Axe(CobaltAxe0)): VoxTrans( + "voxel.weapon.axe.2haxe_cobalt-0", + (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + ), + Tool(Axe(MalachiteAxe0)): VoxTrans( + "voxel.weapon.axe.2haxe_malachite-0", (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, ), // Hammers Tool(Hammer(BasicHammer)): VoxTrans( - "voxel.weapon.hammer.rusty_2h", + "voxel.weapon.hammer.2hhammer_rusty", (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1, - ), + ), + Tool(Hammer(WoodHammer0)): VoxTrans( + "voxel.weapon.hammer.2hhammer_wood-0", + (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1, + ), + Tool(Hammer(FlimsyHammer)): VoxTrans( + "voxel.weapon.hammer.2hhammer_flimsy", + (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1, + ), + Tool(Hammer(StoneHammer0)): VoxTrans( + "voxel.weapon.hammer.2hhammer_stone-0", + (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1, + ), + Tool(Hammer(StoneHammer1)): VoxTrans( + "voxel.weapon.hammer.2hhammer_stone-1", + (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1, + ), + Tool(Hammer(StoneHammer2)): VoxTrans( + "voxel.weapon.hammer.2hhammer_stone-2", + (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1, + ), + Tool(Hammer(StoneHammer3)): VoxTrans( + "voxel.weapon.hammer.2hhammer_stone-3", + (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1, + ), + Tool(Hammer(WornIronHammer0)): VoxTrans( + "voxel.weapon.hammer.2hhammer_worn_iron-0", + (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1, + ), + Tool(Hammer(WornIronHammer1)): VoxTrans( + "voxel.weapon.hammer.2hhammer_worn_iron-1", + (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1, + ), + Tool(Hammer(WornIronHammer2)): VoxTrans( + "voxel.weapon.hammer.2hhammer_worn_iron-2", + (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1, + ), + Tool(Hammer(WornIronHammer3)): VoxTrans( + "voxel.weapon.hammer.2hhammer_worn_iron-3", + (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1, + ), + Tool(Hammer(BronzeHammer0)): VoxTrans( + "voxel.weapon.hammer.2hhammer_bronze-0", + (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1, + ), + Tool(Hammer(BronzeHammer1)): VoxTrans( + "voxel.weapon.hammer.2hhammer_bronze-1", + (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1, + ), + Tool(Hammer(IronHammer0)): VoxTrans( + "voxel.weapon.hammer.2hhammer_iron-0", + (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1, + ), + Tool(Hammer(IronHammer1)): VoxTrans( + "voxel.weapon.hammer.2hhammer_iron-1", + (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1, + ), + Tool(Hammer(IronHammer2)): VoxTrans( + "voxel.weapon.hammer.2hhammer_iron-2", + (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1, + ), + Tool(Hammer(IronHammer3)): VoxTrans( + "voxel.weapon.hammer.2hhammer_iron-3", + (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1, + ), + Tool(Hammer(IronHammer4)): VoxTrans( + "voxel.weapon.hammer.2hhammer_iron-4", + (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1, + ), + Tool(Hammer(IronHammer5)): VoxTrans( + "voxel.weapon.hammer.2hhammer_iron-5", + (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1, + ), + Tool(Hammer(IronHammer6)): VoxTrans( + "voxel.weapon.hammer.2hhammer_iron-6", + (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1, + ), + Tool(Hammer(IronHammer7)): VoxTrans( + "voxel.weapon.hammer.2hhammer_iron-7", + (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1, + ), + Tool(Hammer(IronHammer8)): VoxTrans( + "voxel.weapon.hammer.2hhammer_iron-8", + (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1, + ), + Tool(Hammer(SteelHammer0)): VoxTrans( + "voxel.weapon.hammer.2hhammer_steel-0", + (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1, + ), + Tool(Hammer(SteelHammer1)): VoxTrans( + "voxel.weapon.hammer.2hhammer_steel-1", + (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1, + ), + Tool(Hammer(SteelHammer2)): VoxTrans( + "voxel.weapon.hammer.2hhammer_steel-2", + (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1, + ), + Tool(Hammer(SteelHammer3)): VoxTrans( + "voxel.weapon.hammer.2hhammer_steel-3", + (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1, + ), + Tool(Hammer(SteelHammer4)): VoxTrans( + "voxel.weapon.hammer.2hhammer_steel-4", + (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1, + ), + Tool(Hammer(SteelHammer5)): VoxTrans( + "voxel.weapon.hammer.2hhammer_steel-5", + (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1, + ), + Tool(Hammer(CobaltHammer0)): VoxTrans( + "voxel.weapon.hammer.2hhammer_Cobalt-0", + (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1, + ), + Tool(Hammer(CobaltHammer1)): VoxTrans( + "voxel.weapon.hammer.2hhammer_Cobalt-1", + (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1, + ), + Tool(Hammer(RunicHammer)): VoxTrans( + "voxel.weapon.hammer.2hhammer_runic", + (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1, + ), + Tool(Hammer(RamsheadHammer)): VoxTrans( + "voxel.weapon.hammer.2hhammer_ramshead", + (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1, + ), + Tool(Hammer(Mjolnir)): VoxTrans( + "voxel.weapon.hammer.2hhammer_mjolnir", + (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1, + ), // Staffs Tool(Staff(BasicStaff)): VoxTrans( - "voxel.weapon.staff.wood-fire", + "voxel.weapon.staff.firestaff_starter", (1.0, 0.0, 0.0), (-310., 90.0, 0.0), 1.2, ), + Tool(Staff(BoneStaff)): VoxTrans( + "voxel.weapon.staff.firestaff_bone", + (1.0, 0.0, 0.0), (-310., 90.0, 0.0), 1.2, + ), + Tool(Staff(AmethystStaff)): VoxTrans( + "voxel.weapon.staff.firestaff_amethyst", + (1.0, 0.0, 0.0), (-310., 90.0, 0.0), 1.2, + ), + Tool(Staff(CultistStaff)): VoxTrans( + "voxel.weapon.staff.firestaff_cultist", + (1.0, 0.0, 0.0), (-310., 90.0, 0.0), 1.2, + ), + // Healing staff Tool(Staff(Sceptre)): VoxTrans( "voxel.weapon.staff.wood-nature", (1.0, -1.0, 0.0), (-310., 90.0, 0.0), 1.2, diff --git a/assets/voxygen/voxel/humanoid_main_weapon_manifest.ron b/assets/voxygen/voxel/humanoid_main_weapon_manifest.ron index 3efea95da9..a9405ea3dd 100644 --- a/assets/voxygen/voxel/humanoid_main_weapon_manifest.ron +++ b/assets/voxygen/voxel/humanoid_main_weapon_manifest.ron @@ -167,13 +167,262 @@ vox_spec: ("weapon.sword.cultist_purp_2h-0", (-2.0, -4.5, -7.5)), color: None ), + // Axes Axe(BasicAxe): ( - vox_spec: ("weapon.axe.rusty_2h", (-1.5, -5.0, -4.0)), + vox_spec: ("weapon.axe.2haxe_rusty", (-1.5, -5.0, -4.0)), + color: None + ), + Axe(OrcAxe0): ( + vox_spec: ("weapon.axe.2haxe_orc-0", (-1.5, -3.0, -4.5)), + color: None + ), + Axe(WornIronAxe0): ( + vox_spec: ("weapon.axe.2haxe_worn_iron-0", (-1.5, -3.0, -4.0)), + color: None + ), + Axe(WornIronAxe1): ( + vox_spec: ("weapon.axe.2haxe_worn_iron-1", (-1.5, -4.0, -4.0)), + color: None + ), + Axe(WornIronAxe2): ( + vox_spec: ("weapon.axe.2haxe_worn_iron-2", (-1.5, -4.0, -4.0)), + color: None + ), + Axe(WornIronAxe3): ( + vox_spec: ("weapon.axe.2haxe_worn_iron-3", (-1.5, -4.5, -4.0)), + color: None + ), + Axe(WornIronAxe4): ( + vox_spec: ("weapon.axe.2haxe_worn_iron-4", (-1.5, -4.0, -5.5)), + color: None + ), + Axe(BronzeAxe0): ( + vox_spec: ("weapon.axe.2haxe_bronze-0", (-1.5, -4.0, -4.5)), + color: None + ), + Axe(BronzeAxe1): ( + vox_spec: ("weapon.axe.2haxe_bronze-1", (-1.5, -3.0, -5.5)), + color: None + ), + Axe(IronAxe0): ( + vox_spec: ("weapon.axe.2haxe_iron-0", (-1.5, -5.0, -5.5)), + color: None + ), + Axe(IronAxe1): ( + vox_spec: ("weapon.axe.2haxe_iron-1", (-1.5, -5.0, -5.5)), + color: None + ), + Axe(IronAxe2): ( + vox_spec: ("weapon.axe.2haxe_iron-2", (-1.5, -5.0, -5.5)), + color: None + ), + Axe(IronAxe3): ( + vox_spec: ("weapon.axe.2haxe_iron-3", (-1.5, -6.0, -6.5)), + color: None + ), + Axe(IronAxe4): ( + vox_spec: ("weapon.axe.2haxe_iron-4", (-1.5, -6.0, -5.5)), + color: None + ), + Axe(IronAxe5): ( + vox_spec: ("weapon.axe.2haxe_iron-5", (-1.5, -6.0, -5.0)), + color: None + ), + Axe(IronAxe6): ( + vox_spec: ("weapon.axe.2haxe_iron-6", (-1.5, -5.0, -6.0)), + color: None + ), + Axe(IronAxe7): ( + vox_spec: ("weapon.axe.2haxe_iron-7", (-1.5, -5.0, -5.0)), + color: None + ), + Axe(IronAxe8): ( + vox_spec: ("weapon.axe.2haxe_iron-8", (-1.5, -5.0, -5.0)), + color: None + ), + Axe(IronAxe9): ( + vox_spec: ("weapon.axe.2haxe_iron-9", (-1.5, -4.0, -5.0)), + color: None + ), + Axe(SteelAxe0): ( + vox_spec: ("weapon.axe.2haxe_steel-0", (-1.5, -6.0, -4.5)), + color: None + ), + Axe(SteelAxe1): ( + vox_spec: ("weapon.axe.2haxe_steel-1", (-1.5, -7.0, -5.5)), + color: None + ), + Axe(SteelAxe2): ( + vox_spec: ("weapon.axe.2haxe_steel-2", (-1.5, -3.5, -3.5)), + color: None + ), + Axe(SteelAxe3): ( + vox_spec: ("weapon.axe.2haxe_steel-3", (-1.5, -4.0, -6.0)), + color: None + ), + Axe(SteelAxe4): ( + vox_spec: ("weapon.axe.2haxe_steel-4", (-1.5, -4.0, -5.5)), + color: None + ), + Axe(SteelAxe5): ( + vox_spec: ("weapon.axe.2haxe_steel-5", (-1.5, -5.5, -5.5)), + color: None + ), + Axe(SteelAxe6): ( + vox_spec: ("weapon.axe.2haxe_steel-6", (-1.5, -4.0, -4.0)), + color: None + ), + Axe(BloodsteelAxe0): ( + vox_spec: ("weapon.axe.2haxe_bloodsteel-0", (-1.5, -5.0, -6.0)), + color: None + ), + Axe(BloodsteelAxe1): ( + vox_spec: ("weapon.axe.2haxe_bloodsteel-1", (-1.5, -5.5, -5.0)), + color: None + ), + Axe(BloodsteelAxe2): ( + vox_spec: ("weapon.axe.2haxe_bloodsteel-2", (-1.5, -5.0, -4.0)), + color: None + ), + Axe(CobaltAxe0): ( + vox_spec: ("weapon.axe.2haxe_cobalt-0", (-1.5, -5.0, -5.5)), + color: None + ), + Axe(MalachiteAxe0): ( + vox_spec: ("weapon.axe.2haxe_malachite-0", (-1.5, -5.0, -6.0)), color: None ), // Hammers Hammer(BasicHammer): ( - vox_spec: ("weapon.hammer.rusty_2h", (-2.5, -5.5, -4.0)), + vox_spec: ("weapon.hammer.2hhammer_rusty", (-2.5, -5.5, -4.5)), + color: None + ), + Hammer(WoodHammer0): ( + vox_spec: ("weapon.hammer.2hhammer_wood-0", (-3.5, -5.5, -4.5)), + color: None + ), + Hammer(FlimsyHammer): ( + vox_spec: ("weapon.hammer.2hhammer_flimsy", (-2.5, -5.5, -4.0)), + color: None + ), + Hammer(StoneHammer0): ( + vox_spec: ("weapon.hammer.2hhammer_stone-0", (-3.5, -6.5, -5.0)), + color: None + ), + Hammer(StoneHammer1): ( + vox_spec: ("weapon.hammer.2hhammer_stone-1", (-3.5, -6.5, -5.0)), + color: None + ), + Hammer(StoneHammer2): ( + vox_spec: ("weapon.hammer.2hhammer_stone-2", (-3.5, -6.5, -5.0)), + color: None + ), + Hammer(StoneHammer3): ( + vox_spec: ("weapon.hammer.2hhammer_stone-3", (-2.5, -6.5, -5.0)), + color: None + ), + Hammer(WornIronHammer0): ( + vox_spec: ("weapon.hammer.2hhammer_worn_iron-0", (-2.5, -4.5, -4.0)), + color: None + ), + Hammer(WornIronHammer1): ( + vox_spec: ("weapon.hammer.2hhammer_worn_iron-1", (-2.5, -4.5, -3.0)), + color: None + ), + Hammer(WornIronHammer2): ( + vox_spec: ("weapon.hammer.2hhammer_worn_iron-2", (-2.5, -3.5, -3.0)), + color: None + ), + Hammer(WornIronHammer3): ( + vox_spec: ("weapon.hammer.2hhammer_worn_iron-3", (-2.5, -4.5, -3.0)), + color: None + ), + Hammer(BronzeHammer0): ( + vox_spec: ("weapon.hammer.2hhammer_bronze-0", (-2.5, -6.5, -5.0)), + color: None + ), + Hammer(BronzeHammer1): ( + vox_spec: ("weapon.hammer.2hhammer_bronze-1", (-3.5, -3.5, -4.0)), + color: None + ), + Hammer(IronHammer0): ( + vox_spec: ("weapon.hammer.2hhammer_iron-0", (-2.5, -6.5, -4.0)), + color: None + ), + Hammer(IronHammer1): ( + vox_spec: ("weapon.hammer.2hhammer_iron-1", (-3.5, -7.5, -5.0)), + color: None + ), + Hammer(IronHammer2): ( + vox_spec: ("weapon.hammer.2hhammer_iron-2", (-3.5, -3.5, -5.0)), + color: None + ), + Hammer(IronHammer3): ( + vox_spec: ("weapon.hammer.2hhammer_iron-3", (-3.5, -3.5, -5.0)), + color: None + ), + Hammer(IronHammer4): ( + vox_spec: ("weapon.hammer.2hhammer_iron-4", (-3.5, -7.5, -4.0)), + color: None + ), + Hammer(IronHammer5): ( + vox_spec: ("weapon.hammer.2hhammer_iron-5", (-1.5, -7.0, -5.0)), + color: None + ), + Hammer(IronHammer6): ( + vox_spec: ("weapon.hammer.2hhammer_iron-6", (-2.5, -7.0, -5.0)), + color: None + ), + Hammer(IronHammer7): ( + vox_spec: ("weapon.hammer.2hhammer_iron-7", (-3.5, -7.5, -5.0)), + color: None + ), + Hammer(IronHammer8): ( + vox_spec: ("weapon.hammer.2hhammer_iron-8", (-1.5, -5.5, -7.0)), + color: None + ), + Hammer(SteelHammer0): ( + vox_spec: ("weapon.hammer.2hhammer_steel-0", (-2.5, -5.5, -5.0)), + color: None + ), + Hammer(SteelHammer1): ( + vox_spec: ("weapon.hammer.2hhammer_steel-1", (-3.5, -7.5, -5.0)), + color: None + ), + Hammer(SteelHammer2): ( + vox_spec: ("weapon.hammer.2hhammer_steel-2", (-3.5, -3.5, -3.0)), + color: None + ), + Hammer(SteelHammer3): ( + vox_spec: ("weapon.hammer.2hhammer_steel-3", (-5.5, -5.5, -4.5)), + color: None + ), + Hammer(SteelHammer4): ( + vox_spec: ("weapon.hammer.2hhammer_steel-4", (-3.5, -7.5, -4.0)), + color: None + ), + Hammer(SteelHammer5): ( + vox_spec: ("weapon.hammer.2hhammer_steel-5", (-5.5, -5.5, -5.0)), + color: None + ), + Hammer(CobaltHammer0): ( + vox_spec: ("weapon.hammer.2hhammer_cobalt-0", (-2.5, -7.5, -6.0)), + color: None + ), + Hammer(CobaltHammer1): ( + vox_spec: ("weapon.hammer.2hhammer_cobalt-1", (-4.5, -4.5, -4.0)), + color: None + ), + Hammer(RunicHammer): ( + vox_spec: ("weapon.hammer.2hhammer_runic", (-2.5, -7.5, -5.0)), + color: None + ), + Hammer(RamsheadHammer): ( + vox_spec: ("weapon.hammer.2hhammer_ramshead", (-4.5, -5.5, -5.0)), + color: None + ), + Hammer(Mjolnir): ( + vox_spec: ("weapon.hammer.2hhammer_mjolnir", (-2.5, -8.5, -4.0)), color: None ), /*Dagger(Craftsman): ( //TODO This should be a 1h hammer! @@ -192,23 +441,43 @@ ), // Bows Bow(ShortBow0): ( - vox_spec: ("weapon.bow.shortbow-0", (-1.0, -6.0, 2.5)), + vox_spec: ("weapon.bow.shortbow_starter", (-1.0, -6.0, 3.0)), color: None ), - Bow(ShortBow1): ( - vox_spec: ("weapon.bow.shortbow-1", (-1.0, -6.0, 2.5)), - color: None - ), - Bow(LongBow0): ( - vox_spec: ("weapon.bow.longbow-0", (-1.0, -6.0, 2.5)), + Bow(WoodShortbow0): ( + vox_spec: ("weapon.bow.shortbow_wood-0", (-1.0, -6.0, 2.5)), color: None ), - Bow(LongBow1): ( - vox_spec: ("weapon.bow.longbow-1", (-1.0, -6.0, 2.5)), + Bow(WoodShortbow1): ( + vox_spec: ("weapon.bow.shortbow_wood-1", (-1.0, -6.5, 2.5)), color: None ), - Bow(RareBow0): ( - vox_spec: ("weapon.bow.rare_bow-0", (-1.0, -6.0, 2.5)), + Bow(LeafyShortbow0): ( + vox_spec: ("weapon.bow.shortbow_leafy-0", (-1.0, -8.0, 3.5)), + color: None + ), + Bow(WoodLongbow0): ( + vox_spec: ("weapon.bow.longbow_wood-0", (-1.0, -6.0, -0.5)), + color: None + ), + Bow(WoodLongbow1): ( + vox_spec: ("weapon.bow.longbow_wood-1", (-1.0, -6.0, 0.0)), + color: None + ), + Bow(LeafyLongbow0): ( + vox_spec: ("weapon.bow.longbow_leafy-0", (-1.0, -8.0, -0.5)), + color: None + ), + Bow(HornLongbow0): ( + vox_spec: ("weapon.bow.longbow_horn-0", (-2.0, -6.0, -6.5)), + color: None + ), + Bow(IronLongbow0): ( + vox_spec: ("weapon.bow.longbow_iron-0", (-2.0, -6.0, -5.5)), + color: None + ), + Bow(RareLongbow): ( + vox_spec: ("weapon.bow.longbow_rare", (-2.0, -6.0, -2.5)), color: None ), // Farming Equipment @@ -254,10 +523,22 @@ ), // Staves Staff(BasicStaff): ( - vox_spec: ("weapon.staff.wood-fire", (-1.0, -6.0, -3.0)), + vox_spec: ("weapon.staff.firestaff_starter", (-1.0, -6.0, -3.0)), color: None ), - // Sceptres + Staff(BoneStaff): ( + vox_spec: ("weapon.staff.firestaff_bone", (-1.0, -6.0, -3.0)), + color: None + ), + Staff(AmethystStaff): ( + vox_spec: ("weapon.staff.firestaff_amethyst", (-1.0, -8.0, -4.0)), + color: None + ), + Staff(CultistStaff): ( + vox_spec: ("weapon.staff.firestaff_cultist", (-2.0, -6.0, -4.0)), + color: None + ), + // Healing staff Staff(Sceptre): ( vox_spec: ("weapon.staff.wood-nature", (-1.0, -6.0, -5.0)), color: None diff --git a/assets/voxygen/voxel/weapon/axe/2haxe_bloodsteel-0.vox b/assets/voxygen/voxel/weapon/axe/2haxe_bloodsteel-0.vox new file mode 100644 index 0000000000000000000000000000000000000000..cd7fd5701ef3d8407cce9996c75f3c483a1b398b GIT binary patch literal 56404 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 Bb-@4t literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/weapon/axe/2haxe_bloodsteel-1.vox b/assets/voxygen/voxel/weapon/axe/2haxe_bloodsteel-1.vox new file mode 100644 index 0000000000000000000000000000000000000000..18af90ab1b925890e4e01e3208d3a9543808a054 GIT binary patch literal 56192 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 NqdT{lwk-kv{{ki=Q2_t| literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/weapon/axe/2haxe_bloodsteel-2.vox b/assets/voxygen/voxel/weapon/axe/2haxe_bloodsteel-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_bronze-0.vox b/assets/voxygen/voxel/weapon/axe/2haxe_bronze-0.vox new file mode 100644 index 0000000000000000000000000000000000000000..853ff34fe13c4701010ed470561fb4e95e530cf0 GIT binary patch literal 55944 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 R^zpj+m+stR#$poS{Q%B_Kl=ax literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/weapon/axe/2haxe_cobalt-0.vox b/assets/voxygen/voxel/weapon/axe/2haxe_cobalt-0.vox new file mode 100644 index 0000000000000000000000000000000000000000..0a729d864a0b2f32513ddc85825dbcb9b72fb19f GIT binary patch literal 56116 zcmdtqdvp}l9S86`n`Adn4S6gQP*#FM0)*WpO9G+>0SPaWhX_$wH`&Q%vYXxQW)l(` zZ6QiUMG+}#t0G#8){07z3baME)Y@8W(OO$et+m#^Yg=pW^XKn(X9)zNp3~F6zJr&U z-<^AZ_kQl3nZpSjmoHl3*{YOUIAiW5d{Um*lv+BsX?DH@d}MGrjmsHaR;+BAJIcWq ze5~hUxSR(Jmt&vd%HXqWzr*FW3|HoU!r5_LTynTLin%`*qp01;8`f?Z#cU{w8o9+h2A?zd>?-7S8OEiM z*JIcLBa`bKg%Kl%&skhlQN-aY=KOq}$MyNccrCbO7xUO$q~5`~^LY$c5wAUu;Vk0y z;d;JrsN#rGAcgZd4W1(xr-RQ9?rU%kE*vY4jVyx;pR@U#?XY6YmRvGQKPAV1Gx(Cy zhg{1Mo3rH7Lig(&Nudk2Z*sQ4Wp2JjL z@;<#=QbLCgEtID8$lNDBvJ^JBX~fkY@?1NCDz;4}H9Lz`B$w3oB2tIlRJc&l@D4?z zHYu9;n4;{6qJn-!#T>gIR#dw%kLGn0Qq$UEx^eHBG^SP}eYc{S6^d5XE9#!5=uWO*Tw6xg>@l=v@p#&5R#V?)b+ol@CLOxra(a7*MH9;1 zG`)H>&A)Iwnak@aGEY(eRf@Ky6dk-((Uh~wXl~_Lx^hYtC1*{g<&|!-YDdz>Ip@%x zRg-CA{WMy*DoBZI*3s0)`Lrh9M4PUU(4L*^>BuwpP+ndhoiW@^^XJbeU&R=jQgtp( ztFEBg(|xq);;FRhx>2<2zA^ObbCq=Tg$Z;wkGW@uqUR4Ndh;bkYpn5fXMYVHeq<)S z^V(8M-c(2%A1a~8UmQV4Y4rc>fAik(|HWTZQ$x4aZKKJ)?R4ITbu^-X1U-AdqL;5w z^ziucR8dhuZROpxyRnf}{~9VymeSrk>^;1;tc=RXm6NyHOO=x=DRk3%I%Cyvdg0M? zXm8U9+U)TRtbe^{q+b6E&f8228h6vmrO#8cji~pIoz(xp9=c`sGj!KeM`&L62DQ>}RM}kUJ<2$u==FW}{9fnh>*Mb8E2!VI4?D}v54$JzA9YVB z{^}XL1~JiH1g9*ocE>_O5=vo42ROl-$>!S zHzS}l@;59vdovPBBY!i8vo~i#Y0iSujE2&9pfqPgX~sZl%Aqu4p)}_}Y0ibxjDymQ zhtgC)X)2*K6QDE`p)`}AG*wWV$xs?El*R|8sfNJ7ei_0KxrDGG;^Ue^Pn{I zp)?DiGz+0L^1q0|`L~0Mpfs04X%<6imOyEiLTQ#kX)c4(EQiuu4y9QErCAB3X@b&R z0j0STN^=#IW)+ks0HwJaN)v?AG(%}xpfn*UjR~b`h0=tfG;L5C3rf=trHMdkqEMO+ zC`}AX6Nl0ypfsO=(j=iYolu$-l%@+x(+#Cr4W;RU()2=U)<9`K38m?S(p&?jxfV+E zDJadSp)_luH0z)={ZN|gpfuM*Y1Tt&J_Dt>0ZOw0N^>KW<|Zi3%}|<+P?}qyG`B)& zHbH4_gVJn<(%cTE*#f2cER<#|l;#d7&7Dx1yP!0mgVKB+N^>`q<{l``y-=EMP@4Oo zG~1yx_d{tOfYN*cO0xq>^F=7lPAJWTP@0FJG+%gcpfulv(j11;d<#nRER^QkP@3nUG~a>Jd>2adJe1~pP?{H@G~b8Pya=WF0hHzl zl;$NU&C5`lA3|wffztd4O7kj|=EqQ)pFn9|gVOvIN^=xS^D`*T>rk4XLuuZC()nrTIOS<_}PsKSF8#1f_WgO7mwZ&0nB2 ze}&S#3#IuRl;%As&EKIk??Y++0j2pTl;&ShntwxS{sX1?FO-I$G|EsapG8?*0;%4F znJpI~tF^VO({#!8YSRk0rMQ{$IVDcUyTWZ5eC4h3>0X@)v&D}6x`V`lM7kzZx>)g~ z9oFbDn9}LIQWpq&rEZe9%5R50yJfu{t+t~&Jy2`3t4HRcdjz7Pqz;mcE}B=)wQ@MP z3`q1?W~^IRbi_mEKyynsR!TgBn_IC~$q}&9-YG)wPM%x9hNz`p;QdHLUJQ)uSdOKj~cHD zg!FnGi*!Gq*Irql&nt7Cm7c5g9GI(qDqG{>z_GQm^9;E?x-vYl?n7?2P8>C3o%$k? zjJNCddf{5*-IAi#pToZgf(bL3>Pnh6q}s1%(i{zj%s@={IiceC19?drA?XJY`l8i} zcIXSUClQwf_HK1s_KfwdV2jy#d_Lh|hipuBRkbY7ilH*=ooSB7;~iSiVfENsX>VC) zOE79b{QCV2$_r{g8?wKFR9n*QY>P+rlKNzf^V4GtdQ^4aFu(n=kRGlj9*rjjU+?wk z|Mbvp$6j@vXk0pxtmnWoNY+4e_;?bzCC1q+4EAv)=*)mA8#{wV2H zx+tl-#VSv-g$4eZo;p0A{y+~yCc(GmmWxN z4h&=`GgB!}cEYmh-5!{PPN5@{VaKE9aG+&S6x5Ms>YbE6J`exWombG>yfXMI+$PCw@u)F$Yx@*v)+Uy=f*j)X><{7eZyRf^5EV}MCWTuB>^ZP}* zdqCQp0~WhyNMyJNES$$;^B5Mp+put5*z)@=9A{Byn|nxR<;SEWCnhs<8l`o7lS~^Q zlh&M=MdeB3Hc`+dZLUGd@zR#vFYR1x;|63_A-7K$lyX9ov=+uBk0EV&JT}ioc$%a= zt6!!~Xq0x2&EUQwuSsTctjOnnSp(AU9FWozli8f#!u>OOTnC?>`Hj-S^RRdtrJ4iJ zSz7ZAna0IAAtuv!T`YXI7BtEz*)F!^ zvW3r**Uy^UC@ro=DY?z!=Dy>24g~{JxcRL5x;Zb;FPqoE!gIEAek-qylQypT zygskLtYz)eOI<2}5A_bJV>q|EUa_Ehjd~}C4|Ok{ORy!>98ndY8sWq!)p$yj|Kun& z$5Wz8PmWSEIwh*?QnNlKSK#C*wKAtf%{@8FK2}tPidwVe!UaN2h>yz3 zO6uw9q1U$wT6)hBn(F$1-gCL=@ZpszlpbF8_(ztUDi0N2?IrIuv#5CIJQ9o3Ni;b~ z?8+r^#6vkN1?4vjI&G_7QTqM5rVlmD6Nlz*k5Y1eY@9fIZ`5+v5~ z_?t3FY#&Erzl%0cpFn$kZhGmwiA2lKpzZv~9^~>em$$fV?-I1{c0q^t3VQZ2u2%`# zwOG&-YXlvO3aa6H*Lp!)!`$8>XkoFSjg^8r774nO+gFztk+FCRZCX8pc0@|4=dudg z(XfyX-*`E_z1yH!Q#~}lbTVCh!3>J5ub`&og8Hr!v@+hB5hf6CLP!~hpMZqDHIA(Z*MPkc6QRHcnxj6zKIU(y@8HCeGfUEPAbUv zkk{)afAJKWTXGhiQ(8=m=lf~ZMe}Iub*It3`=-z<&(5S{&(ET}dCUX51wA(?=#3Wz zZ8B!ioqc6=q-X9I^wJfA9-1+Oii?Y>VQL4hSh}A?-zIV=+;s2`a}Td6Dx&G$LYl*SFlYKC z3g3JK6>Q9>=N~zf4%QUXHeR#g^{@0!)a!r#x!ZKE>b1{NqJgOUj=j|PzyZ2t|I>8W zlSe7gx|z=J-ANbUdx+LPdX%cFs_1q83W^La^gdaS3VN;IoZoBwe0|(~eg*Y=_F-pr z^TY0`_K&)!6MuAn{Jyb|$-9BN6A_O^)noCG@~MzkTR z;{56(6ime1qYdf<=qvH-UTv+BIoS+d;nAI{}4JCCtpK1$6eX4D? zuOwhr{bppPS?e@w6?&lhSbLY6hwc%Kg%i4RqDFnaaWu+~qfy(8qfrkejz+!MI2!d8 z!qKP?GL9w_O5=diIH5G^oxyo;vY|BUCu%r*GagE#ev*T;Hxr;Vxlo!sD2@7QCC+=} zhSGSTH2F}P0w_%(lt%px3(hxfB9un`%^c3&oDQX#1f`h_rSU>(&VbTPfznKc(oBQW zoC&2l3raH`N;3mWQw*h<38k3@r8yf)GaE`%0;QP)rSU;&{7{-wC`}oZrW{HWfYQu` z(o{fcDxoyzq-Nsw}Y#oG?zkYRzqplKxx)OY1Tn$E`!pnhtgaQ zrP%k(nO&&4Nw{b zO4A6XX@b(kpft@;nieQc97@v)rTGMuCIO{sgVH3SH0@BD4k%40l%@+x(+#EB1f}^T zl%@wt^C>9JHBg#QLuoz(rMVVL(+j2PgVJ0FrMVtTa|4v-vrw8Fp){MJG&ezMZido) z4ob5HN^=X8=2j@pRw&JFP?~K}n%ki?+o3d{htlkT(%b>1xf4or7nJ4;P?|47Y3_#7 z+ykY#7fQ1eN^>8SW*3y^ekjcYP?|46X?8)UTv+BI}VQHzO;}TBlj7&;!-S+Pl;|bdO*x zoY0lTstcD-Q#=Qks4Q5nw;EJ8VGn( zMK43BB^ryU&HMQY?6Al|~O(TO=@Evui%%cZwZ!tc8P{o|B6O5I@ zsEwH^)Np<+PsGhtRvqt4byS->dhAfL+1%AocQ9ru+GQ=F0m0J~h`xsky42BXiYHWqmvv99}Ck&zRez z8>1uZKIUfY#IZ1vIu1mDv?^xk!4U>gSFA)Nz@&mmw&0T&q;L| zHMY56;b>%xPP(bn2q#k?CA~^lrLw4wBLnM;Xu>#Q{;Ek2t#`4lHB@J`=#4PHbvmuN z^S)9Y!mo5|EYz)cM@_dkHITYFGLV@pl1y^46P8Wy_Q)i33SEmZ?0Bs<8mt>t3+b9> U>YY@5{9gX0JJ&^GF%{tdFJ&)!Q2+n{ literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/weapon/axe/2haxe_iron-1.vox b/assets/voxygen/voxel/weapon/axe/2haxe_iron-1.vox new file mode 100644 index 0000000000000000000000000000000000000000..8b85d4fc2c9bc4e17be60909f5e832d5848f1965 GIT binary patch literal 56212 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 literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/weapon/axe/2haxe_iron-6.vox b/assets/voxygen/voxel/weapon/axe/2haxe_iron-6.vox new file mode 100644 index 0000000000000000000000000000000000000000..5dca9ed3104c29718bf5a5aacdb1c73afec97b6c GIT binary patch literal 56220 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 HNPzFZ)DB1c?cp8kwj(PWN$XtY_jR@=0#Im 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 literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/weapon/axe/2haxe_iron-8.vox b/assets/voxygen/voxel/weapon/axe/2haxe_iron-8.vox new file mode 100644 index 0000000000000000000000000000000000000000..7e902418c41241b810ba1feec728fe5cb0d27104 GIT binary patch literal 56276 zcmds+dvsLQ6^GBABr{1SKmvKAFgz3j5@wPN35ps7`}A?tShg5Qw@~SO5B5*qpuh z*^l#`bI)B_Vcp90p6yDh<#QLW;6Xk4s#0qf*DuHsgP$~(kt}DhtgowI{DgxQe)h5$ zE@!{tauJnGxnbz-cvhK_}Xt-FM9Oum7(baEch<_yea}F6!H~Z6B zAHn(vo|m~ywppB9*O|?A-8`4Wy6QJF9hTwB=6=$L>$%wH8riSdR-CJx4okTlmV-wJ zk4C1%jpACPxUcw1Ie#qYjp4eZSuf_gV|cCNFX~s$63#DSJTG&&fJ3zv2zL{4rc-9 zvN#L5R{_TqaxWfTg$IqC{D?84grzv5T!oh67{#$l=M-{ZsX3ZixTiCp`>|y48gojb zMixsZ>zO>}$hvuS^O((Jw%B7LhC82Q3Rt+eTZHv29#o#rhv2AeQG>%JW-61;nNaMa4+%sK9mNd~>(s&K&JgOPK%m#YLsiZsA`E?z3`&B zN*2UVO-&8;^z_i{TNN$3`zTGye~;eD&!;0tmP;r-wD_?PmE77wD!Ix-o@=I4+0NOd z7G#i$WRu!8n$*!k%3ZFgs728kTNIu1h@#Ahq7i+H#;{%ZprWefZd%fkOZC@|p_>kz zN%MOYt=gujVXva@7dUrSDUGux(&V0LG;4n?jZNg!#LcBNZTEQcJu`)hu23}jTCTla z(VWAI)LQPpF_YA`k)-zJ)21nTw8vXOFP%S@XvqZH#;@!FmX}%HWZBlGXz%Tcj_gtN z?4xYgD%!O`(c`NX9SFPd zD`u5bV*YGeH?5GYsUd-`s2 zyWLb=R7f6=hkRudX;%5!bZ$i%Etun@l^4&ZE!Ukvd+(h{uRJ@Ajz2%0?&6;NcPo1C zkfJwURJ75WN;~>0>F7iA=Dxu;ZR(|xz7l%oK1DBGuIRz3Q>m=1jG8BP(6UAQNcC-`fz3Vx8^xYG!u2-v4{HZ-%q#f zdz$Wi@)-GBH_-*XJ89`XhiT0t$EdcpmR{$tpvq*ScPZ_dqSyNE^}WXL*GJ9s71a0a zgGQPBpgHk>*qko>;raYC%-Us7aS?gsn<78M=x=ATyVcBOBM`Ehn%dh;`J4ngO)K1- zlsKP!gaV0pd$?IXfZlSS&T4Bl8*SUK6T}X*rabb=30U!jZB}YCnAGLG;tPbm;+x?u z_uHn=j;yh*PTQ*1jhdqEU9t|H5r~Eo+Blg;zTP-A!j3~D$BaWGFC-3)Tx=W~`3m9C z$OjpRCJTxt8;ZsaMI(0x=iZEfqLJT};hfDVC>r@q4$j%+LD7tcq8S54BfqW0xip=c&S(M*P- zISY#BY$%#3P&8AaXv&~yra{q6hoU(Lie?5BO*s_JOeh*J6pasxrUHtl5{jk@ipCE` zGYg8Q8j7X{ie@$x&ACuC=RwiTfucDdisk|+nhT+5YN2T6LeX3VMKceIWa}^X#5Q?S&ilz~YCIm%eLeVrq(S)IB znxSYcD4MIGXd+NFQ7D=gD4G})O&p4*6^iC#P&5fBnl>n!Bos|M6io*dO(zsh7Zgo5 z6wO8`nvX-#^gz*k0*dAuD4I_~(R>Pu=2|G4UMQMAD4Oe_Xs(B%xdDpi(@-=wLeXr3 zqPYo*=4L3G&p^>^hN8Izisn`*nk`T?w?WZtg`&9~ie?)W&1a!#wnNd}0Y$R|isnuz zn$JPed>)GCE-0G2p=j=bqS*;Wb1xLlE-0G&plI%gqWJ<8&2A`~FGA7mfui{m6wL!r zG+&0Ic@T=`D^N5KLDB4mqInpK<`F2GN14&Ro`j+~0!8x_6wT96G~a}xISNJdEhw62plH4gMe{5a z&3B+^z6(Y392Cv>plF_lqWL})%?nU8KY*e+21WBC6wOOeG(Uu*c^Qi4M^H4cK+*gd zismO!G_OL@{1l4jI26s#plDu$qWL)#&FfG!zks571B&LCP&98s(fkUE<}E0iUqjLS z28!mlP&B`TqWL`(%^#p>{s=|$Cn%b?p=kaLMe`RZn!iHPyaPq^Hz=BSp=kaNMe`mM z%|D=M{s~3%FDROSL(%*PisrviGz3MX45f0ID1#-C>~1wPMG09=P3>)_OY~0D3O6S? zO!=H*C*tkl<}}v4=oY(Z@J$# zeRgDxZFSmKwQkfDZSRtG=!`%#l+Z?E{AVP2SPS<)u1Di z&GA)!kI!2r?AqUAnL`7`G3*Y>MA+Vs8o%xuuMC9rehgST&*!yw*5~ueTIZ+MDw%_8 z)o*1}JRBI70`sCtk=EDF`V)2%(iGE83zJv#T{O1?yv4S#^WuTpvCI4kJ3J}w#H!8e);wN49W$y-wiq6K(aYuwl&A2 zdP{xMQA+M^=4fE}fg><{dcr>06_!_TA|JALV2d=sq-vlce4>cV zcs=|_dY_w08PeO{uu#|>CP}+Gtxz)cQPR6~WvYrK4mQ?GIANW%esSs6`V`w*gN;^9 zAB6p_(`D_G_g3f-zS6DHV7ERUS#EEtkxULYvWuC?Bo{kr+w^GYp6$kJ)o9wbl5b|S_Ku}rvAtXrHO|m2?Y7h_zAd(n{GBC zp{Z4(R#X&`qP8lcrD(0F6sbU4L`$u$phatKEw$EK`@6Qa*8aTS`(_CQqMp;!zrKTy zdGF1A_s!?MnbAWyE?uLa-%! zuHj<1Tzd_d<3+=jaoBJTIb;}~Rfa3`km1aD(Qp)4hBIrA;mX=;I9=T5+-Eq4>@%`C z#yO1phwd?)Ib1S%>}hYtc%CE^DX5pu#<)jXg#-&t()v<4fu`M|@8G zrMY%h9qW^`JW7(|ob@5cPuuTa&gP&^?Ci3@rJpVdL)1kc}C?pmRsrz zW-PBSkxKfIYfdh~c&N>khEHZVF-kg5iSnNuCHHtrRK>|ra!02`Rh}G`IapNH$x(9G zr{oHp93?ArO4QVoqlOF?RV`8Vb1s^p#O=@dCse?t7yHHVao1)VaJQE zmGsb<^(9ocZ8Z6xn?S`^DjIh!=iaPn`hG=f3D3XAO={CHQae4gZbBYy_Z8AB=Z_+) zJBv2)BfFc+t6bjZvZ-6qjyn_`*skdLC%9d!XzOf6Pt_|r8d229?e3+DHiWsqOVP|y zMJs9)bdc|m(f8j(j zmsV4>PEp@gingQ_?Y~XY)H6$HUfDRha%wpxXHBD}WkqCFjiU8)#?!79Q)ppBJvFWj zQO`ANX=dGgT9as`4cA9$*Y+Fe$g}rSPEHPuC@!M;^XHSlbPP=`Kby|2D5crc{j})f zX|&3W9YT#%joFgNpug-xoexE7xpQ7>t#i2tci42UnL!UbSAy~dIKeI&ZYGa zd+3RmM$%Cl{XhHPx-as7@mE$>((Tn-Xo`O;owsf+jqDpq&pn{%l`9lIGI1i6mX=cM z*e=>RcP^>EHB^`^q}_Mgdw6w82~8L~o+^BPno>52!Z+VQBUTjC;m5|)?#7X{(d+GB z{~GToz5W-Rw~-di-AT(EUZ7+vQO}**sqevEbnDJ%>F%eGP+iwLT6xPBNi6uU&T{diu1WvLUDJs_emwuTz>)>e za1uG>nnMlfu(v~+fu@;M2vHmyi&O5*(T5eg;~osm}g0Q$=PdQ?Zd z*=)B1dVsWp?dcx*Ut&U=#wrOAiV6hLX@Pb+cWn?fi}5tODFN;3jVBR@yO`3lHSSa39> zpfvK6Ih?&Y14?rylx8%P#tWr63raHvN;4KpGY(2K9!hgIlx6~yW+IfP6iQPDrI`e! zIR{EJ8A?+QrI`Yy@j+?)P?`!TO(m433Q7}z(oBWYR6}WMpfuB_GAPY*C`}`j<_ajyl~9_ipfoF> zG(jlMN+?YTO49_TX@=5-p)@9xrUgn9fzq@>X)GwsDkx19N)v<9v_Wa&P?`jkrX5Q2 zDJV@6O49+QNkM5kp)_4kn$=L6ZYWI;lx7W-=F?D`UMS6Hpfp!QX+8_3xduveEtF<0 zl%@|#a~+iCdMM2eP@2y{X>Nqltb@|r1f{tdN^=X8W<8YVRw&JFP?`-;n%ki?8=*9J zKxsBXX+967*$kz*6H0Rzl;&8SW($<&ekjdWD9r;s14{E4l;&|L%@a_Xolu&uL1}hD zX`Y1A?1s{O9ZK^Qlx7c5Msi7=#atWq-+D*4q!d6R5XNNgN z>Z?sF(wgEh<#$OtndpqPW^m0{?$@I_+RbLW9nb@$9c)kcWXcdLk+hqYx*1C8bUx_| zMtssY*;gL0n|?d8#%`^)Th)4^mRM)E+=m_!jD?fBkz909-B|9G!@;FrqUSQ>UAm(! z5jOk7Egh_scm{@B@fOJuw9@nHMl^@JDgps-y69yH#Un9O1_ylJfKO)$CC!jb>MQrz zHypM)qWzOr^A$NH^T0_v47@)*P&Rkq+@VyP zy{n;~VAw`i^>;+GIle03_4}&CuKU|8b6}u!47x&cA!4sbO+e3@s0@bndK_!%aekk@ zvVOl$?sZoBUS(wez3Qj3B@qc8TPr)ypxdK6BmL_>=w|E0F*DwwEA7d|DjlyEt|ieW zDXIcl{ChCeZYEQmNz;Z@1oWLW#X?~-7}sM?=s5mBUXn&g`hJA2v{dg|6=uewe& zA)QFpvws;RYp^MDJc(TKdHI*jeQtWlfVu4j3rEaB2I;QVRydXZDCt$YDxF0J_D`%U zk)(CP{Y#ggTJK^y5C#bvmuR^S%ll!mo6DEYzcSM{aj*dLp^lKarixOr<#4 s3CpH;yZ*|Z^-jtdzn6dM!OdnYCIS8r0WvjCRsaA1 literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/weapon/axe/2haxe_malachite-0.vox b/assets/voxygen/voxel/weapon/axe/2haxe_malachite-0.vox new file mode 100644 index 0000000000000000000000000000000000000000..492dbf22d145fb829c4414b8df0e471a886b4e4f GIT binary patch literal 56276 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 literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/weapon/axe/2haxe_orc-0.vox b/assets/voxygen/voxel/weapon/axe/2haxe_orc-0.vox new file mode 100644 index 0000000000000000000000000000000000000000..356acd78c165a9c3db3217f57fc90fd5bf3527ea GIT binary patch literal 27712 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 QOYv~Xn?>4q^M5P<1{5KO>Hq)$ literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/weapon/axe/2haxe_steel-1.vox b/assets/voxygen/voxel/weapon/axe/2haxe_steel-1.vox new file mode 100644 index 0000000000000000000000000000000000000000..f0a3adb9ee253e5f9efdce5518c9b61615655c7d GIT binary patch literal 56380 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 literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/weapon/axe/2haxe_steel-2.vox b/assets/voxygen/voxel/weapon/axe/2haxe_steel-2.vox new file mode 100644 index 0000000000000000000000000000000000000000..9aa8f269cc114716a67a985aa249f6386da50628 GIT binary patch literal 56144 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 Q$HhN%=SDLUkp`as0<{279smFU literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/weapon/axe/2haxe_worn_iron-0.vox b/assets/voxygen/voxel/weapon/axe/2haxe_worn_iron-0.vox new file mode 100644 index 0000000000000000000000000000000000000000..daf033b6887c1fff52e92f03bc41bb8296a4c238 GIT binary patch literal 27643 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 literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/weapon/axe/2haxe_worn_iron-3.vox b/assets/voxygen/voxel/weapon/axe/2haxe_worn_iron-3.vox new file mode 100644 index 0000000000000000000000000000000000000000..5dc0d3c77d919cd6c3037d51c5b47f1ae0d8a30f GIT binary patch literal 27663 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 literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/weapon/axe/orc-0.vox b/assets/voxygen/voxel/weapon/axe/orc-0.vox deleted file mode 100644 index 351ab2569eea3fa3f1cbb4983813854506460931..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1556 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 literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/weapon/bow/longbow_iron-0.vox b/assets/voxygen/voxel/weapon/bow/longbow_iron-0.vox new file mode 100644 index 0000000000000000000000000000000000000000..c1b8797950ee39710f289806ac7ced273af09a3d GIT binary patch literal 27787 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 literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/weapon/bow/rare_bow-0.vox b/assets/voxygen/voxel/weapon/bow/longbow_rare.vox similarity index 100% rename from assets/voxygen/voxel/weapon/bow/rare_bow-0.vox rename to assets/voxygen/voxel/weapon/bow/longbow_rare.vox diff --git a/assets/voxygen/voxel/weapon/bow/longbow-0.vox b/assets/voxygen/voxel/weapon/bow/longbow_wood-0.vox similarity index 100% rename from assets/voxygen/voxel/weapon/bow/longbow-0.vox rename to assets/voxygen/voxel/weapon/bow/longbow_wood-0.vox diff --git a/assets/voxygen/voxel/weapon/bow/longbow-1.vox b/assets/voxygen/voxel/weapon/bow/longbow_wood-1.vox similarity index 100% rename from assets/voxygen/voxel/weapon/bow/longbow-1.vox rename to assets/voxygen/voxel/weapon/bow/longbow_wood-1.vox diff --git a/assets/voxygen/voxel/weapon/bow/shortbow_leafy-0.vox b/assets/voxygen/voxel/weapon/bow/shortbow_leafy-0.vox new file mode 100644 index 0000000000000000000000000000000000000000..2186f178e06c3297e641730c8d9a3366407a348b GIT binary patch literal 27426 zcmeI*d3Y3O9S86?*<27HMO!sN%*GO00h8U$E}^kC2_z5#At5A%B(%fq?(Alg-JNxh zlte995h_Jd8_-5;Dnf1J5v%E8JzB4NRHYtx-}S8bef#VCduOxcdi0Mz-=|NWr!P!q z=AHNbyubIIcV0GuXSlX~pYya3qOEcJF1Zsc28GzOy|;N8pU9LWwF0bab+#0M-4u4aRW0;apt^I?zyEn#CfGWb4zhV^GemsEtR)WDev4;9Q8cQ zH@8&5LZvp&EmgQssah`8xovZ!oO&vim6cI>c{x>9R?@n4>!`ZAntVPV)z#HeeSJMO zH#bvjYb&+4w^Mg_H}&@RlBQ`C3DZngY$TPj4ik3{Iq;UwL8beJAGCFsIAK~LN#XWb)md-O7*^XrK&G|-x@YiL8) z2CDJbP+h!^8gFc*mJ==1G1ftQ@7hboq(RC1lT^NC2UYIwr45=%p235(Y4{k`A3IIW zqvvSHnJMbM`$01Ad6>p!UoOb_DN<~2CmN`)q=X(=y_z2H>!Y&j-Bh#x3|XU((W;JB zC9HI~pBFq=m77ayrj@WyYk0BLf}H89a`|Smd27Vz%IqG#Tb@9a{>loIfh+oIHthHb>Kn=$Mb4BLcZn=$NG47&}(wqV%p7`7F| z^52#KK8Wtbux%KY|G5KT5ZWoDx=G3-eU`vwgAMhyEV40|hv9mTMx zFzjgz`(_OL77TkEh8@GOZ^f{0!?3qw*tcWYaSVG0hJ6QyJ%eH2iDA!T*mD^6P7M1l z40{)by&J<$VAywK*!N)A_hQ)hVc1Cw`+f|24~G2!hW#Lhox-s9V%YmI?EM(_0Sx;g z4ErF4{V<082!{PAhW!|ZeF(!ojA1{HVLyRkKZ#*Kg<(I9VIRS;pTV%7#ju~lu%E}U zk7C#_VAwBW*e_w&^BDFq4Etpa`xOlPRSf$z40{2?ejUSp1H*n3!+s0HejCGn2g80B z!+sCLejmgB0K@(e!~O`v{uskPj$wa-VSkEYe}-Xyj$wa+VSkBXpTMxc!mz)_u)o2u zzs0b>!?3@{uz$d?f5fnV!mxkFuz$g@f5otW!?1tHu>ZiY|HQEW!m$6wu>ZlZ|HZI` zVfjt9d6LeToA%URRGVnu+`3;foS4g!h4Mu6Tj^L})@yKO%fhpSuO;I~ARW;YoZ~A} zIRQPDGVBah-G~{9@Guvs;dU;U2b^-{mTiaop&79ul@Yaq_6y6oxXEQ@Dv;ak;$|$w zhGshCS65Z7IvFgMCmx^Anc29SrpLk&gDd-7PM=FDdcx4TQTdwQT9pwrlY<9^hcB#*HitM%2F*&otn$*);i?5)*KtE>JKLDHaH&p z4Z{g5l@0EWjLf4wJ2*WRRsBuq!&=ZD6>m0UaH%Zs^*P-xFAt8&kDA8pf}FA75b}kv zJz$%Bs#U8-3#yo=&s06P%N}~STMcAWCRVPQja5yPkQLUZ2h(;IyniY)obCI9vq8ZT zBbHPL@q{&?%B#T+Swl>CeQLJqaU+pRCk(qI9(%(2BYM!#Vycb`&CXCWSao9hRx+RM zggOYBk*GQ_4#q78?7KB&+7YWudca6tycE`>d}BOS9-buooN+LQk8j>)Im65&WJy&sJobq>j5*SZiM?HYu|a7M-`FJd_1D7 zrAdW*Q>G!lm~F_$j8sZuGlosw(rgfF@~AWJ*u^t{SPRTL)76=ZN8L%T<95nls&c@H zM7V%Ev8Az%|53_heB9&MU^E44j{{MHx8Hr9~My wKa`6ya1MG=2F|P0q70nZ&P5qGFYt>d@Lla)%{R+{IXUIVD+}kz-P4wy1XQd%b^rhX literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/weapon/bow/shortbow_starter.vox b/assets/voxygen/voxel/weapon/bow/shortbow_starter.vox new file mode 100644 index 0000000000000000000000000000000000000000..6cf7761fa88419a74a86698a2e7cae4a7f968f9e GIT binary patch literal 27414 zcmeI*d301)9S882jV(Z0ZPf%Zqa{`WlbOj3iLo^a5D0-Rgrty!_VF_FW-`glyz$LU zN}?952sK4f8_-5;Dng}kiPdzmF0ET#s!|u+_qx`7-~ILXyKgdNJNie@_w?kPUU+%$ z-S@kn`@8ooBm?JhP3u0_DNWOw>vy#9O3NM4v^_hz8&=8=mmFS}@Ny|H`?|V!oa42W z7dk5s2Y5NESj)-rYPmTc7K*jpT(6eLih&`{5-DDFV^z&xvqfM1zxS7fa{hN zYXwWVZYi&qmTTHFUN3u*rY-07a^7FT>lJ*wklPe;n?i20lFgNDuH@}i+}A4ZYZY&= z<{VaY4!meZUM;7H>n`!cJK9^G?c|#MDr2Hdk!>mQ?d@%sIGbwBvMI-Mc@blSRB(}f zDS5mIA=?r+9jm7bc+c%}yQ<@R8rv?D<6Ify+k%LMUF{hJ#NHI*>Ot; zGoz$(UX*8Ul%zN>$~!koGMX1vIX5bQp(x+nD9L)B<)0fRm(jeaO>?7`E)-QIQSI9| z*K3jxmy(haDlILgva&K-zkWScR8)}P@28rY8mg_WrG|zEYHDht*49?)?ChlO?rzd` zor1w2_4oIaWm%L;rD%9~m<}B}L`RMsp^=dhI&tCzjgF4e*w`42kB`%tGiPXGVuB_o zCuwSGit1b%HI-@9xj~}?ZjJi=8l`JAI$WpGNP|Wvn=~44(`ceoqr1B`s`GB3ZJR2n zxu%l#)K*c~)~o11V;zN>w^Fpdk&=6xX{cv69X`-WN6jue-hUn4V)fFksSw>Z9HrBT zlXSRo)jh<^!40{EJU58=IFzoX&?3Eby1sGO7A_P2Y)?--tfDe%E zMhwfJks`9?k6aOK1%`EFSpM7?F$w&!G=i{blhfMK^`*zFj$5yS4luuT|N{E`A-GgB}Fl;A=y#~YX#jyJ@Y!`;@#;`pYc0Y!_7Q zwim+&Fl-RRniw{OVZ#`<55q<_H4Wgkgs`@GR48z`p zVPA`3M=|`H?AI~uH!$osG3>W6?6)!OcQEXCG3@s+?DsM34>0TxG3<{p z?2j?*qZsxl81| zCk*>%4Eq-h`&SJ6Hw^oC4EqlZ`%et}FAV!{4ErAp`(F%87*^g?o6mFsFZvUEQLWv& zxoJN$QiRKrOL<4{wbJpxtk>Xj&zg6+97`t5KssvJQsZByY63d9d11MPML(%A2I`Q1t}Y}1fV`8B;&sv;Ok4oHq}>9mSBq=-Db({w!Y|2q|;MFDfp zkQ!#BH>%8pk?OmQqZ+ri>u#S%Z{vNvAwF2%7qp!|Bp>Gu!?u;mCU<*Amf4=2oRNyD z@!H0a9&~2Km#r9B!SO!7%j5RREOO8}mCh+k28^h4cc`1o zkQ>msHst*3sXp6G_E}Lir5@?yYUzN>tZP}d4fBhv<3ZJ3z=~S748EHGrvdq`y6&5P zueE}%RLqd=Zgh$p2TMX09gFWLDp5pk^@a3{>@;ZKRy*Bf(VW{n~1luFWVC zr5ejDsg1B5nUQ~1QD-rkFanXdIuV|WtaIkwUKPUkd?IS7N0UnT#!N?YFx!!XnW+?G zGp0?Q(rgmy;!%4tu#0=WVLdQw&ro|RA9W_BjmO2mRO5gdjY@#W-csKz|0ra-NCOoi z&qf&oU&u+Ngseb1S;95^BvZvTZ$rhYXW;*iQ=_wuU?iQCK~Fns0z!5=nM%i;dY{MV z_4w2!!uOZlSw4TJ_nC>yNET({^2At_iOYSqC=-`!X;CIFH|3&CT#{atiOW-JQ6?_W g&PAEHJm42i;w`Nm4L5PZQe3>qlSS%y^`w=@0dT=PF8}}l literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/weapon/bow/shortbow-0.vox b/assets/voxygen/voxel/weapon/bow/shortbow_wood-0.vox similarity index 100% rename from assets/voxygen/voxel/weapon/bow/shortbow-0.vox rename to assets/voxygen/voxel/weapon/bow/shortbow_wood-0.vox diff --git a/assets/voxygen/voxel/weapon/bow/shortbow-1.vox b/assets/voxygen/voxel/weapon/bow/shortbow_wood-1.vox similarity index 100% rename from assets/voxygen/voxel/weapon/bow/shortbow-1.vox rename to assets/voxygen/voxel/weapon/bow/shortbow_wood-1.vox diff --git a/assets/voxygen/voxel/weapon/hammer/2hhammer_bronze-0.vox b/assets/voxygen/voxel/weapon/hammer/2hhammer_bronze-0.vox new file mode 100644 index 0000000000000000000000000000000000000000..2b30dbd5a64ace7aa17dfe7db5ccddd0693b4cdb GIT binary patch literal 57052 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 SB>My_@Jlus5Fr-NU literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/weapon/hammer/2hhammer_bronze-1.vox b/assets/voxygen/voxel/weapon/hammer/2hhammer_bronze-1.vox new file mode 100644 index 0000000000000000000000000000000000000000..7c22b65a7c1ff4c984782ad7a44a78f0565c72b1 GIT binary patch literal 56596 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 literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/weapon/hammer/2hhammer_cobalt-1.vox b/assets/voxygen/voxel/weapon/hammer/2hhammer_cobalt-1.vox new file mode 100644 index 0000000000000000000000000000000000000000..6364729f9c805a355faaa6dcc3196b1bfd4a8889 GIT binary patch literal 56824 zcmdsCFq5STWh=B5S}4#K3KZxtO(v5elT4f>Gt*i@ zC?HS^1!@5W$|6=oR!ap@p&%lPhy@YF3J8e1sED{8f9Jkw=m!4fKfjmWynD_)+xOi2 zUh+xu>9Uj0sNZCaS#->TlW;R{>@;TSg5~o^s(@=)VH}A28D}nE@T#j?V_J)h@f;`X zV0fOBb=^_fkXw{@yrR78jmo*sDCkVqbw=krw+Qo*IoBHj*~6Nfb-m)eqk3m#&T-)5 zj>cT=im^64?>fUE!`>T~bFIIRwc%M$ZM`Do#NC0NI}H9I%!?5pu{|I5E^eZ7%cN0~eq>!b5NxLnsmekT`#t*?IWIMhE5 zKI4!ZwvNi`qdJv+=qpf51!^6Od3nzF>T+&TY2I-vk!Nh)_p7pQQCZ%&m3cQ*2bhF%h8sd2s@GVCjmB>|^3x!}0f7ct6b3EumRq#_E z48Jz(p^i|fI_E*}Bev_7g1-#?ejVzo#=H*o)WEM6J%-M! zM$MJz5$3+uQ3)T&+6Nc?v9kJO?v}&09OtPVeL#Jv-StXgQ-*$)g9qHc_7RLB&4HMx z)5F~fVQ4M5`%V??YhYWAxHZ_5+PtszyLH&xy1WNpx2Oi^O7o&VQ=Jc?7EkLbLN9FW za>yDJI`BJ~yQtB_K8IXzxQMO8ug!VjbzSsGdxyJc`v;x&&O!c=_5l7G3pKik<-yKH z-7aFd+BZ88AN%Zi$ZdVFhS(l@=%EG|YYz6-LtF}wvOgkJ>od<4{0x8>wv}g zz-rl$-&A4WYtRSu5V?KS?8CR%t;!WcE{0s}*5*sxDvWB3n!HqGBD?^ooD-7<`Fj8fE4hJojyxD+|dFfexxK>sj23?I+1kLNa|1M`qUTmzj!PJ{D` zXTd8&Z!j?LJ$1=R(zVQl2gV6Q?pB__mHk3#*D(6%6d5%8bar4 zx63v<;6n=6hwCFvy-SZjr9usGsl8siV(a|GW6oSstCPZ|YaT|lH`WtZA*>m8w^HRk zR*}7}w8nj`8uzx+iuSQ;+S^LMOzdOTytkEBy^mGP-d5U~eXM5fZB@KKt5&sIa@?`U zn8Meswzf7|vu2IFc8!taZ+cQDRlFzfR8+|J?Tge@?q2ZVhmJ9GDy8P!dZ|DE5Sh05 zFfsEzG2O$(+*&5)$x0cs$VgR>k#QT0%(%};Nw<+vYmJmcuDr`g^P&;5uxE@czpz}c z*mj`ITVrJLMk6clF|z78_%5!M@yUsD@S5o|YwH}T%T&n3^|dnnjtLTZYKl~yZRFq! z5qp!7BOWzkPDTFJC1N&?7V|)bTt1~#wuHyZ3rE(8EIddy;<#L$<8x!J@kv4Yb7~%j4d!doF=NQ>MVC2!OjLe=f zUFObelG)+uazbmPESp{_$>us)f81o*y5dlo-7rJC&pk=j^qnQ^&QHkd^m5s7Nw;j> za;fZi;wBj}VuVzemr8woy+o!>log#(nLKlf%xnqEffFalhKt9^J-1Ahm!6(3JD)v7 zZbZ(lcNlr*5hJfZZ)A0Hs$9ReNuIoWuDt#7Qpv0vBkS+1ko%vjk)1N(|IR;ae61{) zez2T9t3fjJ4%>&nsi{e>Zrv=0MsAhEFTY4?*4D^Vw;6fiEF*VKohs9&O_Q!kSvm3e z2gIyhEn_odW!rVZ9-d!|von6YTrhc~9Ci3L(y{JRsa{bf&)z#(wk@xbYtXa3^Q)c4 zI&K4%|v*ToN7Q~ign*}xy}kMDC&J@Ih_(M#Vc`hBi_cMh!T ziJ-s zvh&dBHuKQvf#jjl2b+gR-$Fbz`a52o+5u6-^TrO*0iu3l+^QDwt$!>DLxQ_&nwMRNod&5=|zM^Vun zO+_<@isl$9nq#SG=2FqjqoSElMe|WAn&YTwj;EqoKt;2Visl3=niHvL7E#gYe{;n1 z*LEjU(VRj>vzUrz2^Gy!Dw_sAyJD z(L||e&ZVM>QPHfVqG_k1>7b&CQ_*x%(Ilv7x~OQ9R5a&N(R5SMq^M|msAzhrXwp

CrlR>870n}5G+(Ep`34ouH>qeIrJ{L^ zie@_%&Er%wPf*c(i;Ct+Dw=Oo(L6;(^BpRhr>SVZOGWcNDw=1gXueNH^DGt352$FK zqoVmC70nJRn&+u#UZA4+5f#mgR5U-PqIrpm<|kA%Kc%91nTqCTR5UxOXnsyb^9mKs zt5h_vQPKQ@isp4Hnm4Fu-lU@WB^AwER5ZV$qWLuy&2Ok^eoIC3J1UyrQ_=i^isp}0 zG;dSU{E3R@&r~#jp`v+*isr9WH1AT;{Edp{Jt~^NQ_=i`isqkGH2`M;AY=1d!4e<6}9 zQ$Yw#7qR4-bkJpWyrtl%o4aT3*g#LPtFcwljsUuONYOnU_RTHzk#MuJTYXP5zNeuo z_S+#{NCf?8Yq43=P08yrmZW)Hp(O6$RGccHm2Oy0twvv^pSVuhCYkhW8 zyni51DnMxXAqYF^Os0D5B%bd}Yk*+4vdN%gyA*4W_rG6HBG#iD)7a3c?KxwAk?qc` zOr_I3mY^q@54JMcvi|m1DmeW1`HblU8k`N?-{?SBCf?tbPT7`5G{=#J9D5v9>zlyS z-`io+wWm|*jKa5t>+L_Ax@*^?ZUapz1k!#EwLzmsS0>&MqATHgd}!|31(!W?2My~; z#P{Q5Rk>uxK;fliyL3(=iaHJ@wv$9Axm*3JvZ?JZ_V>lwlf8B$f_I$_8|-|z(VF0q z?n}j1+1=4{FDfL`#i2w&u=v0Lg6-BeyW2xW*br8V1MGciWg^BUS{$4D&;?E5lxiEOf*rNnP{SH zX4~JRX=VH|%lP{=tvu{|{Jol1US^_+@-Y+bI)RA8IS%JIoa1l~Gtoq8W}=C*otR}i zeVP{I#1yd%Yua{e4{Hx=T6wvSXrg?~L=%<3Otfni=v7vLvjUtI;4EgMiL#mPK!>K4 z32;t;a{`>fzK4BUd6|hO%EwH!>jYv2xfij6Tp#3f3G(^V9^z%+q;(wF{YstK>#vej zS63q*kK^IEV9(_hiHTH`kxk{k{q<7h5&he{Bds)0ldq&pEZoeEhA zBDqhG$)~{CmGQ*etfw2G#cW9mI*<}oZ$35u5HOg zb}SDC@nTdigpt+nAn$x8if3|AdTSffjtC0QaPLV$?UF#=;QT=!WMT_s-oePW6wE#! z!2Or9fTm|KA%aEn6Zw@)oD$4^B3Pak+`hp&ESQc6zC9pV>l8#;pK23~9cO<)P#+Ss zR|^Ij1ee%vsmMeul83>TB21nrL;TGuOm@{{`GdFc+e{24`9ai{T|AaS*YJES%q6h=ukYh`wHj?xXtmgqp-v3; zMltq&Hx_2kVfE%^Bqb#w-JgQo++37~@=&?`S-e;lLZr47`(LfW*n3+s_jw+EzFmy9 zyCwLHGZ$tAcfJ=q`cW_#E5fDWa;#jd$M3(iqJK0Q=f84r<6Z{Vkn^AK|IwAs|K`8V{KIxp> N-{{=>#v8AfzX9rJXG#D7 literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/weapon/hammer/2hhammer_iron-0.vox b/assets/voxygen/voxel/weapon/hammer/2hhammer_iron-0.vox new file mode 100644 index 0000000000000000000000000000000000000000..9b3977b83e847d0997fcc476ca6df5dfadcc17d5 GIT binary patch literal 2952 zcmcJQZD^I}8ON{ZzVGMdyqM?ZA)! zb^XqDKhJ&coaf}wBaii-HM9M@#}5!TUoe{-pBgQ;8eTE1g4OWY;i>VxDFv?^k(rBa zE=p|PB{t_5(5XDi`fsdm`l;9I;GD`8_Q|gR5iyEGcf@`|q8Xlt9HC*gi z>zYwQolrxRQm52plu>8YWEA^32R`=mQR3N?f66C*E=uv>TNwxT8|EDNR;FRz#WAxn zH5n(o2PwoUKBXq(j5?zx;~X`lIcD4Is0(;9E;0jYk$M$=6*a_d)R4AO-^0v3 z)MVVwp4;i$*%z6%&qZ+uXV<~!@8Ik@`1~CW4^fH--^$R*8Fw<*$sBb;opdrsopy3g z)UC`~b6uQgSHs6$%u$1fDDC2U)MONw*h`5sEU}*wdo3OHWR&7lJZV;LMpkY(@YDe; zDmNl<;3FKEW6t5gL!dX0^EmJjzyfPSna_eF16YiU%j~7hUdnTU-V)X(xTMUU%JU(? zrMR@r88VmRQe4K`jO&4i0G7k$aNr@(Tb{Mxz(W8l;J|^009M2m*)wV}G|-#FxhiK+TLAB{2fLV=ap~e~1ID;BzP~!}0oI!2WMYX0U18END zaIW^0CxgRz)_R=B`5I?{3(SSum#|)E007M|ucgF)pt2TUzH?sPin~5?oT} z_W%ch-cnr3Tw0&^WT3YU2QFiO5U4GO%W)6VLjcRO=R9-ZsRL;RTmc83I)D{%;EFg1 ztv>GNIqha|-TZD+C)8w=QiE@0+{6E#9-iGE-XqhVxktzL?6z>{|LM@skQNsg_30VY z!*5>Ky3)V(&r(U(uI*Rr_4fF0?@Ie{MfE3p)q8xS2F^Vo8;xZ%dD;0++4YLr_nWHE znpU4SZFHBb!+g#THW{ly{bN8TK^K)K5KgLs>!~={TDLXa+~aONhj{@(8Vv6 z_3>AFq)vYD>HpWtt>{DSGy&rH`Ynm%~fbYx4LzPo3&4h*#E)-$H5VbcqTOsAWs z^T$jh1I!GWj_ozQhCjHiThpU`S~%FRvrpfz#c%G=*`p)6_QP-K?-!=Eaa~0Z-oI88 zU+ve^hjwUYpK0margQVAt3NUA+__UDBO|wSVq!vv1}mB#-=$O2hxOc}d$e=&Ce1u~ zK#R{mu9L@~(ZX|6I{kwgtz3LXH{W|xg+f8Kt_}@;ag+Kstk?FJ9F>a>4ZB?@fRGqiJEfU#~4~)%CYW^pC$xYW8HiPW`&1 zcW=~nOKbn{pMU$BZjBGF*Av?}Yj*DgcRv5N9-SK7pp_$Av~}xN{dC7UZMpBfcAa=x z^`*Mr|E1~U$4zhb_iJEaKu6ad)7KupEL&PodA6)8ukyDVH68EfyR&AEzPDjn5A8am z=E+x7J5tq0zuBNGQ+1u`?bUzZzctso*5SzyHG5Qg@zsl3`qheleEB`S{)e0T^7AM3 z(97pE@$;*ieCMWyhllm4NtS{BC4bZO$?xv$?-RaX|Lc98!rRZ;XJzZn&w8)r@Als9 J3*UXc{Re>l0@eTk literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/weapon/hammer/2hhammer_iron-1.vox b/assets/voxygen/voxel/weapon/hammer/2hhammer_iron-1.vox new file mode 100644 index 0000000000000000000000000000000000000000..583ed1f39905beb01c1ea474d366f999f6e94129 GIT binary patch literal 3436 zcmcK6U5HiJ6~OVe_g;ISb3e{FI(P2Z7@hjj%#31U#*D_K=@^w{OieMi)=W}~PC^_c zGz?|#WEd>Tw4qjPtre3(Q)`Pz39*S-Y3YNNAR!P!u%Q%+giuOf`%p^XR{uA?mBv1G z;K%yf=iGCa_k#PrynpbFi0s}r@fbn&7b1HnCU;i51%DZq;12A6Vsc`rM8e;M7YR}3 ze3DK`GN(kJ$y~^!qeP#RL%Xqr=s4>*>pGgqGxE$GRHDzxbH`c7+3p#C&}V)sWd4w5 z{$R+F!Xcl9Lm>-X6Q)9rq@2-1AxDbjk(`*)!H^}+B>EZGWaLOWIdY^D=S$?oRHk2^ z4mmMZxVFOi%5+H8>5x@9Q{_xSzu-(k-ov%XdpNU%GfOzLglFvKKE0gj<;+sfAYaOv zWn8!*dcjVn^L0BYwVCdob=Cm1Sle$qle)7J4%dj zzQ5x=J)#mLeCY24Xdq9_5;=TEKkMf?$a8Wie1$VmxGFUQ6cMhVhX6%{>*3xAP(+B- z=Nvo&6cGvH>K*6mvz{0nGxCT;EuNX@Is_;py+m}O-th>5K4Q04YNaOnNFK@I6L}(s z%cwKztj_z^JF#2m)KK^md5N>|Wj+^L<~b_V2v9^wl|FoxJ`@oNQt(*?Gh!fW!FwT* zOAj-61SldBL>la>!LAzYs==-r?5e@88tjUhYjivU6cGvHnfb=7_spP(Nc1H%Iu0HI ziiiZK^bwTLBF1hVsUtPfCvqrU#&aQL)QH_WXAXrgk(aoR=*r9x%FGZU75bINlqUu# zA`+y^48F=WL`6h`6wKfe3hqygMPn)vrHA*1M}Q(CL8Qqpo9wd5E}QJK$u67hvdJ!+ zeD9j^r48H&t-ZCRbB#37Q z@3{_29+4n{dj@6*tk;CvqrU#&aP+GtPGFoOw=7^d)jAT$vgH ziU_IDueA8yat|mXy+o8MGx#bqC?a)&6g+>ydl%e~ToI9|rH2_j0u&JmB5iirW|wVt z*=Cn*cG+f^ZFb4bwb^BRHb7mQUAEa}n_V*V%n-=cGehe3Lz_Le*&}^o?AA)H)I=Z2 zq40@3(I>i$=RklWcI%uu6uv}WVn+03&OysuSD~&@L&+ngO25kUAyny8M)kEZcwTJzNwM{BiRDMcibb(L>iQdEn|4=h*YmwL`BI;K@5&vvV?k`sX|Y2W#a{f7 zYxlHm#q=s$voK;~m&a{jre>>7v~A@4O56DEoz{3tY|TsD`;6EFSHbZSlC!e7|E4F=D?7$YW*&Sl9(ciPFZPPnf+5Da%JM-*4w(!->cINPQyY}6$+277j z+q%_td*Ggx_UIRf?Ad*r?Z_^%#jlH<{ifK}ABb&TKVsX*Ms4feBQ~?+KHE1^x9Lp- zcH-f+cKN_vwspgLJM#2nw(!D}cKqmbHvf%DJNca>cKO09cH^Dbtx~C2vu~*l4i4JJ z;Z-)a;q&&;mJPOb^S!ox+qj+l_Hw)UvsLz|_eSjI2kY!7eCFlzV(>@R;1o1Y%C z*A_?Z`kUMB?|SiYtFCm)8E-= U#qRL4X5IenW}n{p_Seh50eS*+R{#J2 literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/weapon/hammer/2hhammer_iron-2.vox b/assets/voxygen/voxel/weapon/hammer/2hhammer_iron-2.vox new file mode 100644 index 0000000000000000000000000000000000000000..ca87f819e7bb197550d38fad67721b69ed96da9b GIT binary patch literal 56552 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 INQi^)zq|u?UH||9 literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/weapon/hammer/2hhammer_iron-3.vox b/assets/voxygen/voxel/weapon/hammer/2hhammer_iron-3.vox new file mode 100644 index 0000000000000000000000000000000000000000..bd6f60c5147b806bdad7a73d2c2c1901cab537c0 GIT binary patch literal 56672 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 literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/weapon/hammer/2hhammer_iron-4.vox b/assets/voxygen/voxel/weapon/hammer/2hhammer_iron-4.vox new file mode 100644 index 0000000000000000000000000000000000000000..382bffaf85e004acbe732c719ba1b2aed4bbdc8c GIT binary patch literal 57352 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 Ume0BY1#9y{^kh*V)c>vh7qlXY_5c6? literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/weapon/hammer/2hhammer_iron-6.vox b/assets/voxygen/voxel/weapon/hammer/2hhammer_iron-6.vox new file mode 100644 index 0000000000000000000000000000000000000000..b589f5995152c34e254ed1617c1eb46927e3f1f8 GIT binary patch literal 56816 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 R_ynr?Lpw*~nT!|&{tLn|oEZQB literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/weapon/hammer/2hhammer_iron-7.vox b/assets/voxygen/voxel/weapon/hammer/2hhammer_iron-7.vox new file mode 100644 index 0000000000000000000000000000000000000000..a954ac99e3b66fecc0bbf093cf12277512185ebb GIT binary patch literal 3332 zcmcK6eQ1^E8OQPax$o<`pXWJwF`D!CoV1$xLX-H~#+TH-EH+9TJ3FkKYtv4;(o#bx zE6LHO5*%%|GAC}%1>3i{}^NcUHd-z-&oyW z3w*q<>$^`Cam?b$K@2#5Q;)46@)6T3KWe5L%k1h?a{$0x?$&2Eg{ zM({8UmkDL&`IUChR8cChStD)M@f9;q)0bq&#z|XVXe$( zXVe*WdFJI#X!|s9AGqhtLOVn`6jEu2j58`VGQ`*pDY8hNQm4!jGj@<6=FD?y&RAhy zVV^U0Fh|xw-AUca4q_KO$hz3?X5LNB8JAEmp+@Xs2N~j0YGjDZsF(5FoEfzDkdM90 zd->edDRoNC=`-q#x;%4wt+HP|BvANBAFE_rol$C^R(XGVXiA^aXY|mFKBv$5eki=F z%?1dPq&DLbAW$Tp83F`a_EI|(An;19+-a??)IQQjdT6Y*W30XCQ)X%HX-S!-%u;4q zjpt$yN*yz1IkTMCg~C^A?WB|ULx4b$bTLDKK+C?H&jCT=>a!jJ0)l4p}Vo8;Lf&n9^`$+JnGP4aA#CwK4&5GW#i zU?1&+ zIrE&?udrWX4uO_^2R#I?ljns;fIt!9y10W!fItzEbdwzd1d7BJ$g)M2E&fetkztDrTV&WG!xq^wLx4cbURvz{fx;{I5ctR)1PY&W2Z7JH zgFxYP?jZ0L?jTSkoy-s*P$XT<5FpU9@8by5u2Nv zv(HXBd+3d;wyOFs`$x5ESFY@_^6Rbf-`-NsXx)mZ`mO)yS{pobx4B(vZmMGL>@ss# z>(;Z!S>t(Ux1Dsh?rmq;l(VjRXT9|GH=S+X(_y=x@3D!Od+i68ZnvFt&h{=id-{U2 zmp(4oxpr76E?Bp}d4?7zhbar6G+2NheUT3~{bIT@ot+XS12ki8-ciG(6x7q1~V|L~H z->|=*o3yp7>UQs4E9~Jf57@K&x7pNgXY=25cBbv@@{gQtUpHi9TZe7?rXic&dAIE! zs@vq|K0EQ?8e2TD(Y9|`XH!o-VskG%VaJa?XGgw0VJE*gWsB!uwQKLaVI3VE*6dws z>({Th`$jg~mQCyJfsqZiecKir+c9b5^9MtA{iC(^Gv0IYoU;%A;Owt| zbarHNz+RspwySTA+2?=RXVb@f?8L9D_RhzJUAGng_s_p|dCSI!R@;+XH~iPnKRi5a zKi+o6Hr{#G?m6~~74wC?|4V0|JmKukfdLyF9JGV04%=5Ax@d0xh}EWRcIma7e}_j~ z{Ol}WZr@q6VE5m1%APs?sx=QZ?4#eTu}c$$o$Bwm|9t;)uY9e?_kC#72hCo3?YzzZ zYSDgp@jd(LyVq>X3&-sKSI*eOKfi4I-o9p|qoekjGjkd2pBAn;`}FrWpYKzCzW&!e bzlAq`&%Wp^FTd!noZss1#tYy2``y0*{vTmI literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/weapon/hammer/2hhammer_iron-8.vox b/assets/voxygen/voxel/weapon/hammer/2hhammer_iron-8.vox new file mode 100644 index 0000000000000000000000000000000000000000..9f3cd414a119d407411192d140a9d94c85df107a GIT binary patch literal 27827 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 D)eYCp literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/weapon/hammer/2hhammer_mjolnir.vox b/assets/voxygen/voxel/weapon/hammer/2hhammer_mjolnir.vox new file mode 100644 index 0000000000000000000000000000000000000000..f2c047f19a3886d44094f846b26836f3503d2a8a GIT binary patch literal 57740 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 a9ac))lAVv;N$!(u#xL8sD^n=2LGs_TS31%F literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/weapon/hammer/2hhammer_ramshead.vox b/assets/voxygen/voxel/weapon/hammer/2hhammer_ramshead.vox new file mode 100644 index 0000000000000000000000000000000000000000..2f4d541c12aee9535e97fd10203625ec15b8aae4 GIT binary patch literal 57744 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 E0gK8vYybcN literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/weapon/hammer/2hhammer_runic.vox b/assets/voxygen/voxel/weapon/hammer/2hhammer_runic.vox new file mode 100644 index 0000000000000000000000000000000000000000..e6dfabe7247bb223713e34e73dcfb42db0bb7441 GIT binary patch literal 57436 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 Yv>Um2Tqb!>vJoF{b9<(zhZU0l1seqkP5=M^ literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/weapon/hammer/rusty_2h.vox b/assets/voxygen/voxel/weapon/hammer/2hhammer_rusty.vox similarity index 100% rename from assets/voxygen/voxel/weapon/hammer/rusty_2h.vox rename to assets/voxygen/voxel/weapon/hammer/2hhammer_rusty.vox diff --git a/assets/voxygen/voxel/weapon/hammer/2hhammer_steel-0.vox b/assets/voxygen/voxel/weapon/hammer/2hhammer_steel-0.vox new file mode 100644 index 0000000000000000000000000000000000000000..555cd39406dd65fcefd449bba2bd66f68bd09156 GIT binary patch literal 56696 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 a88V9Mk*-JYr1*q`{Gpv&V#%Z!g#QaTe2;1X literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/weapon/hammer/2hhammer_steel-1.vox b/assets/voxygen/voxel/weapon/hammer/2hhammer_steel-1.vox new file mode 100644 index 0000000000000000000000000000000000000000..d0ef43b407883e1e7a8a5e01bea2b0c8637a8a51 GIT binary patch literal 58228 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 literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/weapon/hammer/2hhammer_steel-2.vox b/assets/voxygen/voxel/weapon/hammer/2hhammer_steel-2.vox new file mode 100644 index 0000000000000000000000000000000000000000..6877868162bd9cd5f35cb44e76b3696b4d4eb97b GIT binary patch literal 56604 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 literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/weapon/hammer/2hhammer_steel-3.vox b/assets/voxygen/voxel/weapon/hammer/2hhammer_steel-3.vox new file mode 100644 index 0000000000000000000000000000000000000000..2dd66ad4b51555db8667b9cb31e1a6566df2b7a3 GIT binary patch literal 57188 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 literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/weapon/hammer/2hhammer_steel-4.vox b/assets/voxygen/voxel/weapon/hammer/2hhammer_steel-4.vox new file mode 100644 index 0000000000000000000000000000000000000000..4760e88d226258259c671b0b8dad6d172c501323 GIT binary patch literal 57300 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 Dcpu_> literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/weapon/hammer/2hhammer_steel-5.vox b/assets/voxygen/voxel/weapon/hammer/2hhammer_steel-5.vox new file mode 100644 index 0000000000000000000000000000000000000000..efef7a9a106fe08647792b0bcc8e0ac976d8158e GIT binary patch literal 56968 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 O@XJnajU|&D5dJUzQOGL* literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/weapon/hammer/2hhammer_stone-0.vox b/assets/voxygen/voxel/weapon/hammer/2hhammer_stone-0.vox new file mode 100644 index 0000000000000000000000000000000000000000..89aaf5ae4fceff762480851b643716d45d36ba95 GIT binary patch literal 57784 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 EW7K#|TmS$7 literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/weapon/hammer/2hhammer_stone-1.vox b/assets/voxygen/voxel/weapon/hammer/2hhammer_stone-1.vox new file mode 100644 index 0000000000000000000000000000000000000000..da48f36011363a1aa74a8c858410d11a72704dcf GIT binary patch literal 57800 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 RlkdbIJGoRD8DWF`{{hcNBS-)M literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/weapon/hammer/2hhammer_stone-2.vox b/assets/voxygen/voxel/weapon/hammer/2hhammer_stone-2.vox new file mode 100644 index 0000000000000000000000000000000000000000..e4c991f1185db4c89d37ad23812215bb80ed945d GIT binary patch literal 57544 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 literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/weapon/hammer/2hhammer_wood-0.vox b/assets/voxygen/voxel/weapon/hammer/2hhammer_wood-0.vox new file mode 100644 index 0000000000000000000000000000000000000000..76a60673a6cdb2194e2ecdaa3ef7e91c9baab8b8 GIT binary patch literal 57352 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 literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/weapon/hammer/2hhammer_worn_iron-0.vox b/assets/voxygen/voxel/weapon/hammer/2hhammer_worn_iron-0.vox new file mode 100644 index 0000000000000000000000000000000000000000..d23934c7874031db0573f20d560d0188ac8d35ea GIT binary patch literal 27867 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 literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/weapon/hammer/2hhammer_worn_iron-1.vox b/assets/voxygen/voxel/weapon/hammer/2hhammer_worn_iron-1.vox new file mode 100644 index 0000000000000000000000000000000000000000..1db6785b668e44f80553f01ac7d5296de0fc13a9 GIT binary patch literal 28023 zcmeI5d301)9mn6i`;ri7%Z>^n(H5(KFq32eV=D%RCE_JEey5PRoweI`w&+qR}5=h|aAD-{=d#XHr35O6o(65+(y?}eK?CJs z$aS6aka5ag$Uq?vZOCX{qW)0C^+HkCxTqmxqONC9d#E8(0)GkWQq+(sgTD;*1k{iz z2M;n6QA1`DYRH_28ZzgjhRg-1Au|~@WTv2=QXX=qPIVyzgjMim{ai(MZ=@@@H#-EPyVTWKt269~3kP8{egB$}Nt zGm+m+XKQ1qC_|rTKOO4})ClVcXGRT=G%6}GHcE3mi&Z%`N;5hus%mVM zcdn@Fu~C}OS*+;TC|#MeqLz-0Dmz!yGL33ov$D?7givPBo-Om{&6D}_=gWcx3uMWX zB@&HBrKYAvR;*Yd_4W1A*w`q|&CSx@-Yy*-9pd}G#N%=4?d_FJCL@JHL3ZuhCA)X; zmc4uT%7Ft1L9cjTrJcZS4xiV$;%!42IRq;965EnBTwFo z+wKwQ(U~HTEfhIbD;KT4NEWp%lB&)ssmazz-L-YnaIisIjf>*UFD z|J=Fq#MZ4cd&vf=y7H)G4nHn)TINV}Fe=%{vNG6)ep&Rp0sWpTPptrH1@!rEs%u+! zxi(PrOwnV(o{EKmY%l?aA5V67_vZsWbo^YVKhdKHUU+dtBmHD1S2U~iu=L~V3@;8x z&&28#0#?T*U=>Ng>Y5U;x+?^%{@Fpm>itB(>gRR>b|MEmiG$T|WC)9JJ_maN2RoUA z)ep3UwZ%6T4D2)xb~*>EAM6QhJClQ*#lh;|IuI7&=^X4cI9UA_j<5)GI9UB=n2_yU z4)$3b>^u&(f`ffF2m2fj_CgN!A`W&w2m4$O_F@k9c^vHXIoJgp>_QG!|KgBv-oAi? zUChBQ;b6lYY=ncYV3%>Q%Q@H=ag1qZu{gWb%*ZsA}%IM}Tm?3EnsRUGWq9IVg5ZsTBM9Bd~C z+r`1gIoN=M?dD(;9BdBI=$k8v|Th^9H%3`o4LfP>w|!M>D(eHjP)at`)d4t6&OyN82)1qXW_2m4A6b}t9}Dh_rZ z2fLqxy`F=8H3xfugS~-+J;=enhJ$@A2YZNveH{n;dJgst9PEu8>|qY}CJy#y4)%>4 z?3*~)TR7Mw9PFDp*tc-7w{oy= zcX6=CIoNk{uM+y_4)!Dmdk+VDF9&-c2YWvU`vDI2 z0S@+q9PEcU*bj5CAK_phz zALU>_%fWt*gZ(@Q`xpoNI0yR$4)%*2?3Xy$FLSV`IM}anuwUh1zsA9SorC=b2m4J9 z_FEk6w>jAFaIoLyV86$~exHN=0SEg82m3<~_D3A-k2%<%aIin+V1LHJKFPuUoP+%Z z2m4D7_E#M2uQ}M?aInASV1LKK{+@&V0|)y@4)#wR?4LQy| zba*n|tqebD@HM=6nKiagf>9ZbRt!nI`LT2&6=>&ZxFQ<1lvpl^>7aN`?=tI%C-d7i z$FL5%3=J(x9zAG(I{DuRRm6G=7_&omn#sx>t0R63Y`;FeV{uPB zR~$q0DZXJimnn=SciRwIS9^4Fu|l7nZ!R|A$BU~{J>u9t5%Ja0ib%Lx7svYhlELUe zb)0hv^+KY!V9TR+)J&Bhw>b@4wqGP%T>41FF664AT(##&uJ$(R&LsTd#Vm5pxqsG~ z7@7My?*%U zuy?SX#PC)seq<81(Va~7*+#H4n^8bl*CevqU(3jj<+{)sX<-203;?rRtu9!Z6#d|~d*Dv(sf_zUVWtTLfV_d2O zpp3egZQlf5WSx%N;kq)ZOim}iJX~Ra+o5}g-)n6_7hBAj2Un?nXW}$Or=kC0fnB+p zp)RAwwi6BFiQ+`<$RnLB=bB`^F!X+HyGmCLQ8dbS)>X2NL@s$o{v#B-i}`G~2#8K?*g3I)Kh5o*xzdBM~8L76n2%ax}vZ|v)qo0|$&SYFB zt|!L0OkAI{ahbT@OXD(eeJICe;+pihOk7W?ahbTDo#QfbJ>bVp;_I8+>aRz_S}Gtt LS=5K>|5pADhig(* literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/weapon/hammer/2hhammer_worn_iron-2.vox b/assets/voxygen/voxel/weapon/hammer/2hhammer_worn_iron-2.vox new file mode 100644 index 0000000000000000000000000000000000000000..7d204e414603da67a728c0ca6a12f8df89fa07dd GIT binary patch literal 27731 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 XTiZIDZsG+?@^HwLMcO!f%F=%Tq%uZ- literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/weapon/hammer/2hhammer_worn_iron-3.vox b/assets/voxygen/voxel/weapon/hammer/2hhammer_worn_iron-3.vox new file mode 100644 index 0000000000000000000000000000000000000000..46178d55793ad56b95425927b0ee0cb02fbdfda3 GIT binary patch literal 28155 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 EQ#cY>#Q*>R literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/weapon/staff/firestaff_amethyst.vox b/assets/voxygen/voxel/weapon/staff/firestaff_amethyst.vox new file mode 100644 index 0000000000000000000000000000000000000000..d818a2fb6a76d4550b01beb4ad907298928d8764 GIT binary patch literal 27535 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 literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/weapon/staff/firestaff_bone.vox b/assets/voxygen/voxel/weapon/staff/firestaff_bone.vox new file mode 100644 index 0000000000000000000000000000000000000000..edf5deece856f868a9b64fde72d9368d3abe7ea2 GIT binary patch literal 27451 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 R0)iz)VKTFb51ap6`WNoH-#q{T literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/weapon/staff/wood-fire.vox b/assets/voxygen/voxel/weapon/staff/firestaff_starter.vox similarity index 100% rename from assets/voxygen/voxel/weapon/staff/wood-fire.vox rename to assets/voxygen/voxel/weapon/staff/firestaff_starter.vox diff --git a/common/src/comp/body.rs b/common/src/comp/body.rs index 80eaef09f8..88c7de2893 100644 --- a/common/src/comp/body.rs +++ b/common/src/comp/body.rs @@ -133,37 +133,37 @@ impl Body { pub fn base_health(&self) -> u32 { match self { - Body::Humanoid(_) => 52, - Body::QuadrupedSmall(_) => 44, - Body::QuadrupedMedium(_) => 72, - Body::BirdMedium(_) => 36, - Body::FishMedium(_) => 32, - Body::Dragon(_) => 256, - Body::BirdSmall(_) => 24, - Body::FishSmall(_) => 20, - Body::BipedLarge(_) => 144, - Body::Object(_) => 100, - Body::Golem(_) => 168, - Body::Critter(_) => 32, - Body::QuadrupedLow(_) => 64, + Body::Humanoid(_) => 520, + Body::QuadrupedSmall(_) => 440, + Body::QuadrupedMedium(_) => 720, + Body::BirdMedium(_) => 360, + Body::FishMedium(_) => 320, + Body::Dragon(_) => 2560, + Body::BirdSmall(_) => 240, + Body::FishSmall(_) => 200, + Body::BipedLarge(_) => 1440, + Body::Object(_) => 1000, + Body::Golem(_) => 1680, + Body::Critter(_) => 320, + Body::QuadrupedLow(_) => 640, } } pub fn base_health_increase(&self) -> u32 { match self { - Body::Humanoid(_) => 5, - Body::QuadrupedSmall(_) => 4, - Body::QuadrupedMedium(_) => 7, - Body::BirdMedium(_) => 4, - Body::FishMedium(_) => 3, - Body::Dragon(_) => 26, - Body::BirdSmall(_) => 2, - Body::FishSmall(_) => 2, - Body::BipedLarge(_) => 14, + Body::Humanoid(_) => 50, + Body::QuadrupedSmall(_) => 40, + Body::QuadrupedMedium(_) => 70, + Body::BirdMedium(_) => 40, + Body::FishMedium(_) => 30, + Body::Dragon(_) => 260, + Body::BirdSmall(_) => 20, + Body::FishSmall(_) => 20, + Body::BipedLarge(_) => 140, Body::Object(_) => 0, - Body::Golem(_) => 17, - Body::Critter(_) => 3, - Body::QuadrupedLow(_) => 6, + Body::Golem(_) => 170, + Body::Critter(_) => 30, + Body::QuadrupedLow(_) => 60, } } @@ -205,19 +205,19 @@ impl Body { pub fn base_dmg(&self) -> u32 { match self { - Body::Humanoid(_) => 6, - Body::QuadrupedSmall(_) => 8, - Body::QuadrupedMedium(_) => 12, - Body::BirdMedium(_) => 7, - Body::FishMedium(_) => 6, - Body::Dragon(_) => 90, - Body::BirdSmall(_) => 5, - Body::FishSmall(_) => 3, - Body::BipedLarge(_) => 36, + Body::Humanoid(_) => 60, + Body::QuadrupedSmall(_) => 80, + Body::QuadrupedMedium(_) => 120, + Body::BirdMedium(_) => 70, + Body::FishMedium(_) => 60, + Body::Dragon(_) => 900, + Body::BirdSmall(_) => 50, + Body::FishSmall(_) => 30, + Body::BipedLarge(_) => 360, Body::Object(_) => 0, - Body::Golem(_) => 36, - Body::Critter(_) => 7, - Body::QuadrupedLow(_) => 11, + Body::Golem(_) => 360, + Body::Critter(_) => 70, + Body::QuadrupedLow(_) => 110, } } diff --git a/common/src/comp/damage.rs b/common/src/comp/damage.rs index e2e6449975..d43268aa51 100644 --- a/common/src/comp/damage.rs +++ b/common/src/comp/damage.rs @@ -33,8 +33,8 @@ impl Damage { self.healthchange *= 1.0 - loadout.get_damage_reduction(); // Min damage - if self.healthchange > -1.0 { - self.healthchange = -1.0; + if self.healthchange > -10.0 { + self.healthchange = -10.0; } }, DamageSource::Projectile => { @@ -50,8 +50,8 @@ impl Damage { self.healthchange *= 1.0 - loadout.get_damage_reduction(); // Min damage - if self.healthchange > -1.0 { - self.healthchange = -1.0; + if self.healthchange > -10.0 { + self.healthchange = -10.0; } }, DamageSource::Explosion => { @@ -67,8 +67,8 @@ impl Damage { self.healthchange *= 1.0 - loadout.get_damage_reduction(); // Min damage - if self.healthchange > -1.0 { - self.healthchange = -1.0; + if self.healthchange > -10.0 { + self.healthchange = -10.0; } }, _ => {}, diff --git a/common/src/comp/inventory/item/tool.rs b/common/src/comp/inventory/item/tool.rs index f5dcefb4fd..5a083b94be 100644 --- a/common/src/comp/inventory/item/tool.rs +++ b/common/src/comp/inventory/item/tool.rs @@ -52,21 +52,89 @@ pub enum SwordKind { LongFine5, CultPurp0, } + #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)] pub enum AxeKind { BasicAxe, + OrcAxe0, + WornIronAxe0, + WornIronAxe1, + WornIronAxe2, + WornIronAxe3, + WornIronAxe4, + BronzeAxe0, + BronzeAxe1, + IronAxe0, + IronAxe1, + IronAxe2, + IronAxe3, + IronAxe4, + IronAxe5, + IronAxe6, + IronAxe7, + IronAxe8, + IronAxe9, + SteelAxe0, + SteelAxe1, + SteelAxe2, + SteelAxe3, + SteelAxe4, + SteelAxe5, + SteelAxe6, + BloodsteelAxe0, + BloodsteelAxe1, + BloodsteelAxe2, + CobaltAxe0, + MalachiteAxe0, } #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)] pub enum HammerKind { BasicHammer, + FlimsyHammer, + WoodHammer0, + StoneHammer0, + StoneHammer1, + StoneHammer2, + StoneHammer3, + WornIronHammer0, + WornIronHammer1, + WornIronHammer2, + WornIronHammer3, + BronzeHammer0, + BronzeHammer1, + IronHammer0, + IronHammer1, + IronHammer2, + IronHammer3, + IronHammer4, + IronHammer5, + IronHammer6, + IronHammer7, + IronHammer8, + SteelHammer0, + SteelHammer1, + SteelHammer2, + SteelHammer3, + SteelHammer4, + SteelHammer5, + CobaltHammer0, + CobaltHammer1, + RunicHammer, + RamsheadHammer, + Mjolnir, } #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)] pub enum BowKind { ShortBow0, - ShortBow1, - LongBow0, - LongBow1, - RareBow0, + WoodShortbow0, + WoodShortbow1, + LeafyShortbow0, + WoodLongbow0, + WoodLongbow1, + LeafyLongbow0, + HornLongbow0, + IronLongbow0, + RareLongbow, } #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)] pub enum DaggerKind { @@ -74,8 +142,11 @@ pub enum DaggerKind { } #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)] pub enum StaffKind { - BasicStaff, Sceptre, + BasicStaff, + BoneStaff, + AmethystStaff, + CultistStaff, } #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)] pub enum ShieldKind { @@ -168,10 +239,16 @@ impl From for ToolCategory { } } -#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)] +#[derive(Clone, Copy, Debug, PartialEq, Serialize, Deserialize)] +pub struct Stats { + equip_time_millis: u32, + power: f32, +} + +#[derive(Clone, Copy, Debug, PartialEq, Serialize, Deserialize)] pub struct Tool { pub kind: ToolKind, - equip_time_millis: u32, + pub stats: Stats, // TODO: item specific abilities } @@ -179,11 +256,19 @@ impl Tool { pub fn empty() -> Self { Self { kind: ToolKind::Empty, - equip_time_millis: 0, + stats: Stats { + equip_time_millis: 0, + power: 1.00, + }, } } - pub fn equip_time(&self) -> Duration { Duration::from_millis(self.equip_time_millis as u64) } + // Keep power between 0.5 and 2.00 + pub fn base_power(&self) -> f32 { self.stats.power } + + pub fn equip_time(&self) -> Duration { + Duration::from_millis(self.stats.equip_time_millis as u64) + } pub fn get_abilities(&self) -> Vec { use CharacterAbility::*; @@ -191,40 +276,28 @@ impl Tool { use ToolKind::*; match self.kind { - Sword(SwordKind::CultPurp0) => vec![ - TripleStrike { - base_damage: 10, - needs_timing: false, - }, - DashMelee { - energy_cost: 700, - buildup_duration: Duration::from_millis(500), - recover_duration: Duration::from_millis(500), - base_damage: 20, - }, - ], Sword(_) => vec![ TripleStrike { - base_damage: 5, + base_damage: (60.0 * self.base_power()) as u32, needs_timing: false, }, DashMelee { energy_cost: 700, buildup_duration: Duration::from_millis(500), recover_duration: Duration::from_millis(500), - base_damage: 10, + base_damage: (120.0 * self.base_power()) as u32, }, ], Axe(_) => vec![ TripleStrike { - base_damage: 7, + base_damage: (80.0 * self.base_power()) as u32, needs_timing: true, }, SpinMelee { energy_cost: 100, buildup_duration: Duration::from_millis(125), recover_duration: Duration::from_millis(125), - base_damage: 5, + base_damage: (60.0 * self.base_power()) as u32, }, ], Hammer(_) => vec![ @@ -232,7 +305,7 @@ impl Tool { energy_cost: 0, buildup_duration: Duration::from_millis(700), recover_duration: Duration::from_millis(300), - base_healthchange: -10, + base_healthchange: (-120.0 * self.base_power()) as i32, range: 3.5, max_angle: 60.0, }, @@ -241,14 +314,14 @@ impl Tool { movement_duration: Duration::from_millis(500), buildup_duration: Duration::from_millis(1000), recover_duration: Duration::from_millis(100), - base_damage: 20, + base_damage: (240.0 * self.base_power()) as u32, }, ], Farming(_) => vec![BasicMelee { energy_cost: 1, buildup_duration: Duration::from_millis(700), recover_duration: Duration::from_millis(150), - base_healthchange: -5, + base_healthchange: (-50.0 * self.base_power()) as i32, range: 3.0, max_angle: 60.0, }], @@ -257,11 +330,11 @@ impl Tool { energy_cost: 0, holdable: true, prepare_duration: Duration::from_millis(100), - recover_duration: Duration::from_millis(500), + recover_duration: Duration::from_millis(400), projectile: Projectile { hit_solid: vec![projectile::Effect::Stick], hit_entity: vec![ - projectile::Effect::Damage(-3), + projectile::Effect::Damage((-40.0 * self.base_power()) as i32), projectile::Effect::Knockback(10.0), projectile::Effect::RewardEnergy(100), projectile::Effect::Vanish, @@ -276,8 +349,8 @@ impl Tool { ChargedRanged { energy_cost: 0, energy_drain: 300, - initial_damage: 3, - max_damage: 15, + initial_damage: (40.0 * self.base_power()) as u32, + max_damage: (200.0 * self.base_power()) as u32, initial_knockback: 10.0, max_knockback: 20.0, prepare_duration: Duration::from_millis(100), @@ -292,7 +365,7 @@ impl Tool { energy_cost: 0, buildup_duration: Duration::from_millis(100), recover_duration: Duration::from_millis(400), - base_healthchange: -5, + base_healthchange: (-50.0 * self.base_power()) as i32, range: 3.5, max_angle: 60.0, }, @@ -300,15 +373,33 @@ impl Tool { energy_cost: 700, buildup_duration: Duration::from_millis(500), recover_duration: Duration::from_millis(500), - base_damage: 20, + base_damage: (100.0 * self.base_power()) as u32, }, ], - Staff(StaffKind::BasicStaff) => vec![ + Staff(StaffKind::Sceptre) => vec![ + BasicMelee { + energy_cost: 0, + buildup_duration: Duration::from_millis(0), + recover_duration: Duration::from_millis(300), + base_healthchange: (-10.0 * self.base_power()) as i32, + range: 10.0, + max_angle: 45.0, + }, + BasicMelee { + energy_cost: 350, + buildup_duration: Duration::from_millis(0), + recover_duration: Duration::from_millis(1000), + base_healthchange: (150.0 * self.base_power()) as i32, + range: 10.0, + max_angle: 45.0, + }, + ], + Staff(_) => vec![ BasicMelee { energy_cost: 0, buildup_duration: Duration::from_millis(100), recover_duration: Duration::from_millis(300), - base_healthchange: -3, + base_healthchange: (-40.0 * self.base_power()) as i32, range: 10.0, max_angle: 45.0, }, @@ -320,7 +411,7 @@ impl Tool { projectile: Projectile { hit_solid: vec![projectile::Effect::Vanish], hit_entity: vec![ - projectile::Effect::Damage(-3), + projectile::Effect::Damage((-40.0 * self.base_power()) as i32), projectile::Effect::RewardEnergy(150), projectile::Effect::Vanish, ], @@ -342,11 +433,15 @@ impl Tool { recover_duration: Duration::from_millis(50), projectile: Projectile { hit_solid: vec![ - projectile::Effect::Explode { power: 1.4 }, + projectile::Effect::Explode { + power: 1.4 * self.base_power(), + }, projectile::Effect::Vanish, ], hit_entity: vec![ - projectile::Effect::Explode { power: 1.4 }, + projectile::Effect::Explode { + power: 1.4 * self.base_power(), + }, projectile::Effect::Vanish, ], time_left: Duration::from_secs(20), @@ -361,30 +456,12 @@ impl Tool { projectile_gravity: None, }, ], - Staff(StaffKind::Sceptre) => vec![ - BasicMelee { - energy_cost: 0, - buildup_duration: Duration::from_millis(0), - recover_duration: Duration::from_millis(300), - base_healthchange: -1, - range: 10.0, - max_angle: 45.0, - }, - BasicMelee { - energy_cost: 350, - buildup_duration: Duration::from_millis(0), - recover_duration: Duration::from_millis(1000), - base_healthchange: 15, - range: 10.0, - max_angle: 45.0, - }, - ], Shield(_) => vec![ BasicMelee { energy_cost: 0, buildup_duration: Duration::from_millis(100), recover_duration: Duration::from_millis(400), - base_healthchange: -4, + base_healthchange: (-40.0 * self.base_power()) as i32, range: 3.0, max_angle: 120.0, }, @@ -427,7 +504,7 @@ impl Tool { energy_cost: 0, buildup_duration: Duration::from_millis(0), recover_duration: Duration::from_millis(1000), - base_healthchange: -2, + base_healthchange: -20, range: 5.0, max_angle: 60.0, }], diff --git a/common/src/loadout_builder.rs b/common/src/loadout_builder.rs index b3b65bd5bd..276ea59cf3 100644 --- a/common/src/loadout_builder.rs +++ b/common/src/loadout_builder.rs @@ -66,7 +66,7 @@ impl LoadoutBuilder { pub fn animal(body: Body) -> Self { Self(Loadout { active_item: Some(ItemConfig { - item: assets::load_expect_cloned("common.items.weapons.empty"), + item: assets::load_expect_cloned("common.items.weapons.empty.empty"), ability1: Some(CharacterAbility::BasicMelee { energy_cost: 10, buildup_duration: Duration::from_millis(600), diff --git a/common/src/states/leap_melee.rs b/common/src/states/leap_melee.rs index 44bc647f54..d908952de4 100644 --- a/common/src/states/leap_melee.rs +++ b/common/src/states/leap_melee.rs @@ -7,7 +7,7 @@ use serde::{Deserialize, Serialize}; use std::time::Duration; use vek::Vec3; -const LEAP_SPEED: f32 = 16.0; +const LEAP_SPEED: f32 = 24.0; #[derive(Copy, Clone, Debug, PartialEq, Serialize, Deserialize, Eq, Hash)] pub struct Data { @@ -43,7 +43,8 @@ impl CharacterBehavior for Data { + 0.25 * data.inputs.move_dir.try_normalized().unwrap_or_default()) .try_normalized() .unwrap_or_default() - * LEAP_SPEED; + * LEAP_SPEED + * (1.0 - data.inputs.look_dir.z.abs()); update.character = CharacterState::LeapMelee(Data { movement_duration: self diff --git a/server/src/cmd.rs b/server/src/cmd.rs index 2667cee3ac..d65c62ab29 100644 --- a/server/src/cmd.rs +++ b/server/src/cmd.rs @@ -367,7 +367,7 @@ fn handle_health( .write_storage::() .get_mut(target) { - stats.health.set_to(hp, comp::HealthSource::Command); + stats.health.set_to(hp * 10, comp::HealthSource::Command); } else { server.notify_client( client, diff --git a/server/src/events/entity_manipulation.rs b/server/src/events/entity_manipulation.rs index 521acfbed1..259cd87859 100644 --- a/server/src/events/entity_manipulation.rs +++ b/server/src/events/entity_manipulation.rs @@ -162,7 +162,7 @@ pub fn handle_land_on_ground(server: &Server, entity: EcsEntity, vel: Vec3) let state = &server.state; if vel.z <= -30.0 { if let Some(stats) = state.ecs().write_storage::().get_mut(entity) { - let falldmg = vel.z.powi(2) / 20.0 - 40.0; + let falldmg = (vel.z.powi(2) / 20.0 - 40.0) * 10.0; let mut damage = Damage { healthchange: -falldmg, source: DamageSource::Falling, @@ -238,7 +238,7 @@ pub fn handle_explosion(server: &Server, pos: Vec3, power: f32, owner: Opti && distance_squared < hit_range.powi(2) { // Weapon gives base damage - let dmg = (1.0 - distance_squared / hit_range.powi(2)) * power * 10.0; + let dmg = (1.0 - distance_squared / hit_range.powi(2)) * power * 130.0; let mut damage = Damage { healthchange: -dmg, diff --git a/server/src/migrations/2020-07-29-204534_power_stat_for_weapons/down.sql b/server/src/migrations/2020-07-29-204534_power_stat_for_weapons/down.sql new file mode 100644 index 0000000000..291a97c5ce --- /dev/null +++ b/server/src/migrations/2020-07-29-204534_power_stat_for_weapons/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/2020-07-29-204534_power_stat_for_weapons/up.sql b/server/src/migrations/2020-07-29-204534_power_stat_for_weapons/up.sql new file mode 100644 index 0000000000..b3e63eb7ba --- /dev/null +++ b/server/src/migrations/2020-07-29-204534_power_stat_for_weapons/up.sql @@ -0,0 +1,154 @@ +-- Your SQL goes here + +UPDATE + inventory +SET + items = json_replace( + -- Replace inventory slots. + items, + '$.slots', + ( + -- Replace each item in the inventory, by splitting the json into an array, applying our changes, + -- and then re-aggregating. + -- + -- NOTE: SQLite does not seem to provide a way to guarantee the order is the same after aggregation! + -- For now, it *does* seem to order by slots.key, but this doesn't seem to be guaranteed by anything. + -- For explicitness, we still include the ORDER BY, even though it seems to have no effect. + SELECT json_group_array( + -- We use json_replace to restrict this migration's effect to items with the kind 'Tool'. + json_replace( + slots.value, + '$.kind.Tool', + CASE + -- ONLY run the migration when the stats.power field doesn't exist for this Tool. + -- We basically use this as a check to see if the migration has run or not. + WHEN json_type(slots.value, '$.kind.Tool.stats.power') IS NULL + THEN ( + WITH + -- First, we construct the contents of the new stats field: + stats(key,value) AS (VALUES + -- the old equip_time_millis value, which we know exists since we are a Tool and the migration has not run yet. + ('equip_time_millis', json_extract(slots.value, '$.kind.Tool.equip_time_millis')), + -- a new placeholder power value, which we know isn't overwriting anything since the migration hasn't run yet. + ('power', json('0.5')) + ), + -- Next, we construct what's called a json PATCH--a generalized replacement for json_set and json_remove: + patch(key,value) AS (VALUES + -- *removes* the old equip_time_millis field, by setting it to null in the patch. + ('equip_time_millis', json('null')), + -- *inserts* the new stats field, by setting it to the contents of the stats object we constructed earlier. + ('stats', (SELECT json_group_object(stats.key, stats.value) FROM stats)) + ) + -- Finally, we execute the patch against the contents of $.kind.Tool, which we know exists since we are a Tool. + SELECT json_patch( + json_extract(slots.value, '$.kind.Tool'), + json_group_object(patch.key, patch.value) + ) FROM patch + ) + ELSE + -- The migration has already run, so just use the existing value for the Tool. + json_extract(slots.value, '$.kind.Tool') + END + ) + ) + -- Extract all item slots + FROM json_each(json_extract(items, '$.slots')) AS slots + ORDER BY slots.key + ) + ) +; + +-- NOTE: The only change you should need to make to this migration when copying from this file, +-- is to replace the part below where it says +-- "THE VALUE BELOW SHOULD BE COPY PASTED FROM THE MIGRATION FOR items" +-- with the part below the json_group_array() in the migration for inventory (above). +UPDATE + loadout +SET + items = ( + WITH + -- Specify all loadout slots and the JSON path to their items. + slot_keys(key, item_path) AS (VALUES + -- Option + ('active_item', '$.item'), + ('second_item', '$.item'), + -- Option + ('lantern', '$'), + + ('shoulder', '$'), + ('chest', '$'), + ('belt', '$'), + ('hand', '$'), + ('pants', '$'), + ('foot', '$'), + ('back', '$'), + ('ring', '$'), + ('neck', '$'), + ('head', '$'), + ('tabard', '$') + ), + -- Extract the base value and item value from each loadout slot. + slots(key, base_value, item_path, value) AS ( + -- NOTE: Normally, using string concatenation || to construct a path like this would be a + -- bad idea, but since we statically know every string in the path doesn't need to be + -- escaped, it should be okay here. + SELECT + key, + json_extract(items, '$.' || key), + item_path, + json_extract(json_extract(items, '$.' || key), item_path) + FROM slot_keys + ) + -- Reconstruct each loadout slot and group them all back together. + SELECT json_group_object( + slots.key, + -- Since the actual item value may be nested inside an item_path, and we want to avoid accidentally + -- updating NULL items, we use json_replace to construct a patch that touches just that subfield. + json_replace( + slots.base_value, + slots.item_path, + + -- ************************************************************************************* + -- ******** THE VALUE BELOW SHOULD BE COPY PASTED FROM THE MIGRATION FOR items ********* + -- ************************************************************************************* + + -- We use json_replace to restrict this migration's effect to items with the kind 'Tool'. + json_replace( + slots.value, + '$.kind.Tool', + CASE + -- ONLY run the migration when the stats.power field doesn't exist for this Tool. + -- We basically use this as a check to see if the migration has run or not. + WHEN json_type(slots.value, '$.kind.Tool.stats.power') IS NULL + THEN ( + WITH + -- First, we construct the contents of the new stats field: + stats(key,value) AS (VALUES + -- the old equip_time_millis value, which we know exists since we are a Tool and the migration has not run yet. + ('equip_time_millis', json_extract(slots.value, '$.kind.Tool.equip_time_millis')), + -- a new placeholder power value, which we know isn't overwriting anything since the migration hasn't run yet. + ('power', json('0.5')) + ), + -- Next, we construct what's called a json PATCH--a generalized replacement for json_set and json_remove: + patch(key,value) AS (VALUES + -- *removes* the old equip_time_millis field, by setting it to null in the patch. + ('equip_time_millis', json('null')), + -- *inserts* the new stats field, by setting it to the contents of the stats object we constructed earlier. + ('stats', (SELECT json_group_object(stats.key, stats.value) FROM stats)) + ) + -- Finally, we execute the patch against the contents of $.kind.Tool, which we know exists since we are a Tool. + SELECT json_patch( + json_extract(slots.value, '$.kind.Tool'), + json_group_object(patch.key, patch.value) + ) FROM patch + ) + ELSE + -- The migration has already run, so just use the existing value for the Tool. + json_extract(slots.value, '$.kind.Tool') + END + ) + ) + ) + FROM slots + ) +; \ No newline at end of file diff --git a/server/src/sys/terrain.rs b/server/src/sys/terrain.rs index e28727675d..9d2775e194 100644 --- a/server/src/sys/terrain.rs +++ b/server/src/sys/terrain.rs @@ -132,12 +132,12 @@ impl<'a> System<'a> for Sys { } else { Some(ItemConfig { // We need the empty item so npcs can attack - item: assets::load_expect_cloned("common.items.weapons.empty"), + item: assets::load_expect_cloned("common.items.weapons.empty.empty"), ability1: Some(CharacterAbility::BasicMelee { energy_cost: 0, buildup_duration: Duration::from_millis(0), recover_duration: Duration::from_millis(400), - base_healthchange: -6, + base_healthchange: -60, range: 5.0, max_angle: 80.0, }), @@ -258,7 +258,7 @@ impl<'a> System<'a> for Sys { energy_cost: 0, buildup_duration: Duration::from_millis(800), recover_duration: Duration::from_millis(200), - base_healthchange: -10, + base_healthchange: -100, range: 3.5, max_angle: 60.0, }), diff --git a/tools/Cargo.toml b/tools/Cargo.toml new file mode 100644 index 0000000000..4cde9d623f --- /dev/null +++ b/tools/Cargo.toml @@ -0,0 +1,10 @@ +[package] +name = "tools" +version = "0.1.0" +authors = ["Sam "] +edition = "2018" + +[dependencies] +common = { package = "veloren-common", path = "../common" } +csv = "1.1.3" +structopt = "0.3.13" \ No newline at end of file diff --git a/tools/src/main.rs b/tools/src/main.rs new file mode 100644 index 0000000000..d71ad426ef --- /dev/null +++ b/tools/src/main.rs @@ -0,0 +1,165 @@ +use std::{ + error::Error, + ffi::OsString, + path::{Component, PathBuf}, +}; +use structopt::StructOpt; + +use common::{assets, comp}; +use comp::item::{ + armor::{ArmorKind, Protection}, + tool::ToolKind, +}; + +#[derive(StructOpt)] +struct Cli { + /// Available arguments: "armor_stats", "weapon_stats" + function: String, +} + +fn armor_stats() -> Result<(), Box> { + let mut wtr = csv::Writer::from_path("armorstats.csv")?; + wtr.write_record(&["Path", "Kind", "Name", "Protection"])?; + + for folder in + assets::read_dir("common.items.armor").expect("Failed to iterate over armor folders!") + { + match folder { + Ok(folder) => { + let mut glob_folder = folder.path().display().to_string().replace("/", "."); + glob_folder.push_str(".*"); + + for file in std::fs::read_dir(folder.path())?.filter_map(|f| f.ok()) { + let asset_identifier = &file + .path() + .components() + .skip_while(|s| s != &Component::Normal(&OsString::from("common"))) + .inspect(|s| { + dbg!(&s); + }) + .collect::() + .with_extension("") + .display() + .to_string() + .replace("/", "."); + + let asset = assets::load_expect_cloned::(asset_identifier); + + match asset.kind { + comp::item::ItemKind::Armor(armor) => { + let protection = match armor.get_protection() { + Protection::Invincible => "Invincible".to_string(), + Protection::Normal(value) => value.to_string(), + }; + let kind = match armor.kind { + ArmorKind::Shoulder(_) => "Shoulder".to_string(), + ArmorKind::Chest(_) => "Chest".to_string(), + ArmorKind::Belt(_) => "Belt".to_string(), + ArmorKind::Hand(_) => "Hand".to_string(), + ArmorKind::Pants(_) => "Pants".to_string(), + ArmorKind::Foot(_) => "Foot".to_string(), + ArmorKind::Back(_) => "Back".to_string(), + ArmorKind::Ring(_) => "Ring".to_string(), + ArmorKind::Neck(_) => "Neck".to_string(), + ArmorKind::Head(_) => "Head".to_string(), + ArmorKind::Tabard(_) => "Tabard".to_string(), + }; + + wtr.write_record(&[ + asset_identifier, + &kind, + asset.name(), + &protection, + ])?; + }, + // Skip non-armor + _ => println!("Skipping non-armor item: {:?}", asset), + } + } + }, + Err(e) => println!("Skipping folder due to {}", e), + } + } + + wtr.flush()?; + Ok(()) +} + +fn weapon_stats() -> Result<(), Box> { + let mut wtr = csv::Writer::from_path("weaponstats.csv")?; + wtr.write_record(&["Path", "Kind", "Name", "Power", "Equip Time (ms)"])?; + + for folder in + assets::read_dir("common.items.weapons").expect("Failed to iterate over weapon folders!") + { + match folder { + Ok(folder) => { + let mut glob_folder = folder.path().display().to_string().replace("/", "."); + glob_folder.push_str(".*"); + for file in std::fs::read_dir(folder.path())?.filter_map(|f| f.ok()) { + let asset_identifier = &file + .path() + .components() + .skip_while(|s| s != &Component::Normal(&OsString::from("common"))) + .inspect(|s| { + dbg!(&s); + }) + .collect::() + .with_extension("") + .display() + .to_string() + .replace("/", "."); + let asset = assets::load_expect_cloned::(asset_identifier); + + match asset.kind { + comp::item::ItemKind::Tool(tool) => { + let power = tool.base_power().to_string(); + let equip_time = tool.equip_time().subsec_millis().to_string(); + let kind = match tool.kind { + ToolKind::Sword(_) => "Sword".to_string(), + ToolKind::Axe(_) => "Axe".to_string(), + ToolKind::Hammer(_) => "Hammer".to_string(), + ToolKind::Bow(_) => "Bow".to_string(), + ToolKind::Dagger(_) => "Dagger".to_string(), + ToolKind::Staff(_) => "Staff".to_string(), + ToolKind::Shield(_) => "Shield".to_string(), + ToolKind::Debug(_) => "Debug".to_string(), + ToolKind::Farming(_) => "Farming".to_string(), + ToolKind::Empty => "Empty".to_string(), + }; + + wtr.write_record(&[ + asset_identifier, + &kind, + asset.name(), + &power, + &equip_time, + ])?; + }, + // Skip non-armor + _ => println!("Skipping non-weapon item: {:?}", asset), + } + } + }, + Err(e) => println!("Skipping folder due to {}", e), + } + } + + wtr.flush()?; + Ok(()) +} + +fn main() { + let args = Cli::from_args(); + if args.function.eq_ignore_ascii_case("armor_stats") { + if let Err(e) = armor_stats() { + println!("Error: {}", e) + } + } else if args.function.eq_ignore_ascii_case("weapon_stats") { + if let Err(e) = weapon_stats() { + println!("Error: {}", e) + } + } else { + println!("Invalid argument, available arguments:\n\"armor_stats\"\n\"weapon_stats\"") + } +} diff --git a/voxygen/src/audio/sfx/event_mapper/combat/tests.rs b/voxygen/src/audio/sfx/event_mapper/combat/tests.rs index 71fdc1097a..cd177dae6c 100644 --- a/voxygen/src/audio/sfx/event_mapper/combat/tests.rs +++ b/voxygen/src/audio/sfx/event_mapper/combat/tests.rs @@ -78,7 +78,7 @@ fn maps_basic_melee() { &CharacterState::BasicMelee(states::basic_melee::Data { buildup_duration: Duration::default(), recover_duration: Duration::default(), - base_healthchange: 1, + base_healthchange: 10, range: 1.0, max_angle: 1.0, exhausted: false, diff --git a/voxygen/src/hud/hotbar.rs b/voxygen/src/hud/hotbar.rs index ca5f842644..1b9653482c 100644 --- a/voxygen/src/hud/hotbar.rs +++ b/voxygen/src/hud/hotbar.rs @@ -76,13 +76,13 @@ impl State { .map(|i| &i.item.kind) .filter(|kind| { use common::comp::item::{ - tool::{DebugKind, StaffKind, Tool, ToolKind}, + tool::{DebugKind, Tool, ToolKind}, ItemKind, }; matches!( kind, ItemKind::Tool(Tool { - kind: ToolKind::Staff(StaffKind::BasicStaff), + kind: ToolKind::Staff(_), .. }) | ItemKind::Tool(Tool { kind: ToolKind::Debug(DebugKind::Boost), diff --git a/voxygen/src/hud/mod.rs b/voxygen/src/hud/mod.rs index 468abcdb4f..b8219a08d1 100644 --- a/voxygen/src/hud/mod.rs +++ b/voxygen/src/hud/mod.rs @@ -747,7 +747,8 @@ impl Hud { .read_storage::() .get(client.entity()) .map_or(Vec3::zero(), |pos| pos.0); - + // SCT Output values are called hp_damage and floater.hp_change + // Numbers are currently divided by 10 and rounded if global_state.settings.gameplay.sct { // Render Player SCT numbers let mut player_sct_bg_id_walker = self.ids.player_sct_bgs.walk(); @@ -771,6 +772,8 @@ impl Hud { // Calculate total change // Ignores healing let hp_damage = floaters.iter().fold(0, |acc, f| f.hp_change.min(0) + acc); + // Divide by 10 to stay in the same dimension as the HP display + let hp_dmg_rounded_abs = ((hp_damage + 5) / 10).abs(); let max_hp_frac = hp_damage.abs() as f32 / stats.health.maximum() as f32; let timer = floaters .last() @@ -790,7 +793,7 @@ impl Hud { // Timer sets text transparency let hp_fade = ((crate::ecs::sys::floater::MY_HP_SHOWTIME - timer) * 0.25) + 0.2; - Text::new(&format!("{}", (hp_damage).abs())) + Text::new(&format!("{}", hp_dmg_rounded_abs)) .font_size(font_size) .font_id(self.fonts.cyri.conrod_id) .color(if hp_damage < 0 { @@ -800,7 +803,7 @@ impl Hud { }) .mid_bottom_with_margin_on(ui_widgets.window, 297.0 + y) .set(player_sct_bg_id, ui_widgets); - Text::new(&format!("{}", (hp_damage).abs())) + Text::new(&format!("{}", hp_dmg_rounded_abs)) .font_size(font_size) .font_id(self.fonts.cyri.conrod_id) .color(if hp_damage < 0 { @@ -864,13 +867,13 @@ impl Hud { let hp_fade = ((crate::ecs::sys::floater::MY_HP_SHOWTIME - floater.timer) * 0.25) + 0.2; - Text::new(&format!("{}", (floater.hp_change).abs())) + Text::new(&format!("{}", (floater.hp_change / 10).abs())) .font_size(font_size) .font_id(self.fonts.cyri.conrod_id) .color(Color::Rgba(0.0, 0.0, 0.0, hp_fade)) .x_y(x, y - 3.0) .set(player_sct_bg_id, ui_widgets); - Text::new(&format!("{}", (floater.hp_change).abs())) + Text::new(&format!("{}", (floater.hp_change / 10).abs())) .font_size(font_size) .font_id(self.fonts.cyri.conrod_id) .color(if floater.hp_change < 0 { @@ -1118,6 +1121,8 @@ impl Hud { acc } }); + // Divide by 10 to stay in the same dimension as the HP display + let hp_dmg_rounded_abs = ((hp_damage + 5) / 10).abs(); let max_hp_frac = hp_damage.abs() as f32 / stats.health.maximum() as f32; let timer = floaters .last() @@ -1140,14 +1145,14 @@ impl Hud { // Timer sets text transparency let fade = ((crate::ecs::sys::floater::HP_SHOWTIME - timer) * 0.25) + 0.2; - Text::new(&format!("{}", (hp_damage).abs())) + Text::new(&format!("{}", hp_dmg_rounded_abs)) .font_size(font_size) .font_id(self.fonts.cyri.conrod_id) .color(Color::Rgba(0.0, 0.0, 0.0, fade)) .x_y(0.0, y - 3.0) .position_ingame(ingame_pos) .set(sct_bg_id, ui_widgets); - Text::new(&format!("{}", hp_damage.abs())) + Text::new(&format!("{}", hp_dmg_rounded_abs)) .font_size(font_size) .font_id(self.fonts.cyri.conrod_id) .x_y(0.0, y) @@ -1188,7 +1193,7 @@ impl Hud { * 0.25) + 0.2; - Text::new(&format!("{}", (floater.hp_change).abs())) + Text::new(&format!("{}", (floater.hp_change / 10).abs())) .font_size(font_size) .font_id(self.fonts.cyri.conrod_id) .color(if floater.hp_change < 0 { @@ -1199,7 +1204,7 @@ impl Hud { .x_y(0.0, y - 3.0) .position_ingame(ingame_pos) .set(sct_bg_id, ui_widgets); - Text::new(&format!("{}", (floater.hp_change).abs())) + Text::new(&format!("{}", (floater.hp_change / 10).abs())) .font_size(font_size) .font_id(self.fonts.cyri.conrod_id) .x_y(0.0, y) diff --git a/voxygen/src/hud/skillbar.rs b/voxygen/src/hud/skillbar.rs index 2e41c7a135..412131b3cd 100644 --- a/voxygen/src/hud/skillbar.rs +++ b/voxygen/src/hud/skillbar.rs @@ -1179,8 +1179,8 @@ impl<'a> Widget for Skillbar<'a> { if let BarNumbers::Values = bar_values { let hp_text = format!( "{}/{}", - self.stats.health.current() as u32, - self.stats.health.maximum() as u32 + (self.stats.health.current() / 10) as u32, + (self.stats.health.maximum() / 10) as u32 ); Text::new(&hp_text) .mid_top_with_margin_on(state.ids.healthbar_bg, 6.0 * scale) diff --git a/voxygen/src/hud/util.rs b/voxygen/src/hud/util.rs index 5b8c15cbb9..983053e345 100644 --- a/voxygen/src/hud/util.rs +++ b/voxygen/src/hud/util.rs @@ -1,5 +1,6 @@ use common::comp::item::{ armor::{Armor, ArmorKind, Protection}, + tool::{Tool, ToolKind}, Item, ItemKind, }; use std::borrow::Cow; @@ -20,7 +21,7 @@ pub fn loadout_slot_text<'a>( pub fn item_text<'a>(item: &'a Item) -> (&'_ str, Cow<'a, str>) { let desc = match item.kind { ItemKind::Armor(armor) => Cow::Owned(armor_desc(armor, item.description())), - // ItemKind::Tool => {}, + ItemKind::Tool(tool) => Cow::Owned(tool_desc(tool, item.description())), /*ItemKind::Consumable(kind, effect, ..) => { Cow::Owned(consumable_desc(consumable, item.description())) },*/ @@ -64,7 +65,37 @@ fn armor_desc(armor: Armor, desc: &str) -> String { } } // Weapon/Tool Description +fn tool_desc(tool: Tool, desc: &str) -> String { + // TODO: localization + let kind = match tool.kind { + ToolKind::Sword(_) => "Sword", + ToolKind::Axe(_) => "Axe", + ToolKind::Hammer(_) => "Hammer", + ToolKind::Bow(_) => "Bow", + ToolKind::Dagger(_) => "Dagger", + ToolKind::Staff(_) => "Staff", + ToolKind::Shield(_) => "Shield", + ToolKind::Debug(_) => "Debug", + ToolKind::Farming(_) => "Farming Tool", + ToolKind::Empty => "Empty", + }; + let power = tool.base_power(); + if !desc.is_empty() { + format!( + "{}\n\nPower: {:0.1}\n\n{}\n\n", + kind, + power * 10.0, + desc + ) + } else { + format!( + "{}\n\nPower: {:0.1}\n\n", + kind, + power * 10.0 + ) + } +} // Consumable Description /*fn consumable_desc(consumable: Consumable, desc: &str) -> String { // TODO: localization