From d5ccc33abc7b24c1b27b9b08e4cbf09ea85579de Mon Sep 17 00:00:00 2001 From: Sam Date: Fri, 19 Feb 2021 18:45:48 -0500 Subject: [PATCH] Factored out duplicate code into closures, consolidated ability handling logic to a single function. --- .../abilities/weapon_ability_manifest.ron | 52 ++--- .../{debug_stick.ron => admin_stick.ron} | 2 +- assets/common/items/debug/admin_sword.ron | 2 +- .../items/npc_weapons/bow/saurok_bow.ron | 2 +- .../npc_weapons/hammer/cyclops_hammer.ron | 2 +- .../items/npc_weapons/hammer/ogre_hammer.ron | 2 +- .../items/npc_weapons/hammer/troll_hammer.ron | 2 +- .../npc_weapons/hammer/wendigo_hammer.ron | 2 +- .../npc_weapons/staff/mindflayer_staff.ron | 2 +- .../items/npc_weapons/staff/ogre_staff.ron | 2 +- .../items/npc_weapons/staff/saurok_staff.ron | 2 +- .../npc_weapons/sword/dullahan_sword.ron | 2 +- .../items/npc_weapons/sword/saurok_sword.ron | 2 +- .../items/npc_weapons/unique/beast_claws.ron | 2 +- .../items/npc_weapons/unique/quadlowbasic.ron | 2 +- .../npc_weapons/unique/quadlowbreathe.ron | 2 +- .../items/npc_weapons/unique/quadlowquick.ron | 2 +- .../npc_weapons/unique/quadlowranged.ron | 2 +- .../items/npc_weapons/unique/quadlowtail.ron | 2 +- .../items/npc_weapons/unique/quadmedbasic.ron | 2 +- .../npc_weapons/unique/quadmedcharge.ron | 2 +- .../items/npc_weapons/unique/quadmedhoof.ron | 2 +- .../items/npc_weapons/unique/quadmedjump.ron | 2 +- .../items/npc_weapons/unique/quadmedquick.ron | 2 +- .../npc_weapons/unique/quadsmallbasic.ron | 2 +- .../npc_weapons/unique/stone_golems_fist.ron | 2 +- .../npc_weapons/unique/theropodbasic.ron | 2 +- .../items/npc_weapons/unique/theropodbird.ron | 2 +- .../items/weapons/axe/bloodsteel_axe-0.ron | 2 +- .../items/weapons/axe/bloodsteel_axe-1.ron | 2 +- .../items/weapons/axe/bloodsteel_axe-2.ron | 2 +- .../common/items/weapons/axe/bronze_axe-0.ron | 2 +- .../common/items/weapons/axe/bronze_axe-1.ron | 2 +- .../common/items/weapons/axe/cobalt_axe-0.ron | 2 +- .../common/items/weapons/axe/iron_axe-0.ron | 2 +- .../common/items/weapons/axe/iron_axe-1.ron | 2 +- .../common/items/weapons/axe/iron_axe-2.ron | 2 +- .../common/items/weapons/axe/iron_axe-3.ron | 2 +- .../common/items/weapons/axe/iron_axe-4.ron | 2 +- .../common/items/weapons/axe/iron_axe-5.ron | 2 +- .../common/items/weapons/axe/iron_axe-6.ron | 2 +- .../common/items/weapons/axe/iron_axe-7.ron | 2 +- .../common/items/weapons/axe/iron_axe-8.ron | 2 +- .../common/items/weapons/axe/iron_axe-9.ron | 2 +- .../items/weapons/axe/malachite_axe-0.ron | 2 +- assets/common/items/weapons/axe/orc_axe-0.ron | 2 +- .../common/items/weapons/axe/starter_axe.ron | 2 +- .../common/items/weapons/axe/steel_axe-0.ron | 2 +- .../common/items/weapons/axe/steel_axe-1.ron | 2 +- .../common/items/weapons/axe/steel_axe-2.ron | 2 +- .../common/items/weapons/axe/steel_axe-3.ron | 2 +- .../common/items/weapons/axe/steel_axe-4.ron | 2 +- .../common/items/weapons/axe/steel_axe-5.ron | 2 +- .../common/items/weapons/axe/steel_axe-6.ron | 2 +- .../items/weapons/axe/worn_iron_axe-0.ron | 2 +- .../items/weapons/axe/worn_iron_axe-1.ron | 2 +- .../items/weapons/axe/worn_iron_axe-2.ron | 2 +- .../items/weapons/axe/worn_iron_axe-3.ron | 2 +- .../items/weapons/axe/worn_iron_axe-4.ron | 2 +- .../items/weapons/axe_1h/bloodsteel-0.ron | 3 +- .../items/weapons/axe_1h/bloodsteel-1.ron | 3 +- .../common/items/weapons/axe_1h/bronze-0.ron | 3 +- .../common/items/weapons/axe_1h/bronze-1.ron | 3 +- .../common/items/weapons/axe_1h/cobalt-0.ron | 3 +- .../common/items/weapons/axe_1h/cobalt-1.ron | 3 +- assets/common/items/weapons/axe_1h/iron-0.ron | 3 +- assets/common/items/weapons/axe_1h/iron-1.ron | 3 +- assets/common/items/weapons/axe_1h/iron-2.ron | 3 +- assets/common/items/weapons/axe_1h/iron-3.ron | 3 +- .../common/items/weapons/axe_1h/steel-0.ron | 3 +- .../common/items/weapons/axe_1h/steel-1.ron | 3 +- .../common/items/weapons/axe_1h/steel-2.ron | 3 +- .../common/items/weapons/axe_1h/stone-0.ron | 3 +- .../common/items/weapons/axe_1h/stone-1.ron | 3 +- assets/common/items/weapons/axe_1h/wood-0.ron | 3 +- assets/common/items/weapons/axe_1h/wood-1.ron | 3 +- .../items/weapons/bow/horn_longbow-0.ron | 2 +- .../items/weapons/bow/iron_longbow-0.ron | 2 +- .../items/weapons/bow/leafy_longbow-0.ron | 2 +- .../items/weapons/bow/leafy_shortbow-0.ron | 2 +- .../weapons/bow/nature_ore_longbow-0.ron | 2 +- .../common/items/weapons/bow/rare_longbow.ron | 2 +- .../common/items/weapons/bow/starter_bow.ron | 2 +- .../items/weapons/bow/wood_longbow-0.ron | 2 +- .../items/weapons/bow/wood_longbow-1.ron | 2 +- .../items/weapons/bow/wood_shortbow-0.ron | 2 +- .../items/weapons/bow/wood_shortbow-1.ron | 2 +- .../common/items/weapons/dagger/basic_0.ron | 2 +- .../common/items/weapons/dagger/cultist_0.ron | 2 +- .../items/weapons/dagger/starter_dagger.ron | 2 +- assets/common/items/weapons/empty/empty.ron | 2 +- .../items/weapons/hammer/bronze_hammer-0.ron | 2 +- .../items/weapons/hammer/bronze_hammer-1.ron | 2 +- .../items/weapons/hammer/cobalt_hammer-0.ron | 2 +- .../items/weapons/hammer/cobalt_hammer-1.ron | 2 +- .../weapons/hammer/cultist_purp_2h-0.ron | 2 +- .../items/weapons/hammer/flimsy_hammer.ron | 2 +- .../common/items/weapons/hammer/hammer_1.ron | 2 +- .../items/weapons/hammer/iron_hammer-0.ron | 2 +- .../items/weapons/hammer/iron_hammer-1.ron | 2 +- .../items/weapons/hammer/iron_hammer-2.ron | 2 +- .../items/weapons/hammer/iron_hammer-3.ron | 2 +- .../items/weapons/hammer/iron_hammer-4.ron | 2 +- .../items/weapons/hammer/iron_hammer-5.ron | 2 +- .../items/weapons/hammer/iron_hammer-6.ron | 2 +- .../items/weapons/hammer/iron_hammer-7.ron | 2 +- .../items/weapons/hammer/iron_hammer-8.ron | 2 +- .../common/items/weapons/hammer/mjolnir.ron | 2 +- .../items/weapons/hammer/ramshead_hammer.ron | 2 +- .../items/weapons/hammer/runic_hammer.ron | 2 +- .../items/weapons/hammer/starter_hammer.ron | 2 +- .../items/weapons/hammer/steel_hammer-0.ron | 2 +- .../items/weapons/hammer/steel_hammer-1.ron | 2 +- .../items/weapons/hammer/steel_hammer-2.ron | 2 +- .../items/weapons/hammer/steel_hammer-3.ron | 2 +- .../items/weapons/hammer/steel_hammer-4.ron | 2 +- .../items/weapons/hammer/steel_hammer-5.ron | 2 +- .../items/weapons/hammer/stone_hammer-0.ron | 2 +- .../items/weapons/hammer/stone_hammer-1.ron | 2 +- .../items/weapons/hammer/stone_hammer-2.ron | 2 +- .../items/weapons/hammer/stone_hammer-3.ron | 2 +- .../items/weapons/hammer/wood_hammer-0.ron | 2 +- .../weapons/hammer/worn_iron_hammer-0.ron | 2 +- .../weapons/hammer/worn_iron_hammer-1.ron | 2 +- .../weapons/hammer/worn_iron_hammer-2.ron | 2 +- .../weapons/hammer/worn_iron_hammer-3.ron | 2 +- .../items/weapons/hammer_1h/bloodsteel-0.ron | 3 +- .../items/weapons/hammer_1h/bloodsteel-1.ron | 3 +- .../items/weapons/hammer_1h/bronze-0.ron | 3 +- .../items/weapons/hammer_1h/bronze-1.ron | 3 +- .../items/weapons/hammer_1h/cobalt-0.ron | 3 +- .../items/weapons/hammer_1h/cobalt-1.ron | 3 +- .../common/items/weapons/hammer_1h/iron-0.ron | 3 +- .../common/items/weapons/hammer_1h/iron-1.ron | 3 +- .../common/items/weapons/hammer_1h/iron-2.ron | 3 +- .../items/weapons/hammer_1h/steel-0.ron | 3 +- .../items/weapons/hammer_1h/steel-1.ron | 3 +- .../items/weapons/hammer_1h/steel-2.ron | 3 +- .../items/weapons/hammer_1h/stone-0.ron | 3 +- .../items/weapons/hammer_1h/stone-1.ron | 3 +- .../common/items/weapons/hammer_1h/wood-0.ron | 3 +- .../common/items/weapons/hammer_1h/wood-1.ron | 3 +- assets/common/items/weapons/sceptre/fork0.ron | 2 +- .../common/items/weapons/sceptre/loops0.ron | 2 +- assets/common/items/weapons/sceptre/moon0.ron | 2 +- .../items/weapons/sceptre/root_evil.ron | 2 +- .../items/weapons/sceptre/root_green0.ron | 2 +- .../weapons/sceptre/sceptre_velorite_0.ron | 2 +- .../items/weapons/sceptre/staff_nature.ron | 2 +- .../items/weapons/sceptre/starter_sceptre.ron | 2 +- .../items/weapons/sceptre/totem_green.ron | 4 +- .../common/items/weapons/shield/shield_1.ron | 2 +- .../items/weapons/staff/amethyst_staff.ron | 2 +- .../common/items/weapons/staff/bone_staff.ron | 2 +- .../items/weapons/staff/cultist_staff.ron | 2 +- assets/common/items/weapons/staff/staff_1.ron | 2 +- .../items/weapons/staff/starter_staff.ron | 2 +- .../items/weapons/sword/cultist_purp_2h-0.ron | 2 +- .../weapons/sword/frost_cleaver_2h-0.ron | 2 +- .../weapons/sword/frost_cleaver_2h-1.ron | 2 +- .../weapons/sword/greatsword_2h_dam-0.ron | 2 +- .../weapons/sword/greatsword_2h_dam-1.ron | 2 +- .../weapons/sword/greatsword_2h_dam-2.ron | 2 +- .../weapons/sword/greatsword_2h_fine-0.ron | 2 +- .../weapons/sword/greatsword_2h_fine-1.ron | 2 +- .../weapons/sword/greatsword_2h_fine-2.ron | 2 +- .../weapons/sword/greatsword_2h_orn-0.ron | 2 +- .../weapons/sword/greatsword_2h_orn-1.ron | 2 +- .../weapons/sword/greatsword_2h_orn-2.ron | 2 +- .../weapons/sword/greatsword_2h_simple-0.ron | 2 +- .../weapons/sword/greatsword_2h_simple-1.ron | 2 +- .../weapons/sword/greatsword_2h_simple-2.ron | 2 +- .../items/weapons/sword/long_2h_dam-0.ron | 2 +- .../items/weapons/sword/long_2h_dam-1.ron | 2 +- .../items/weapons/sword/long_2h_dam-2.ron | 2 +- .../items/weapons/sword/long_2h_dam-3.ron | 2 +- .../items/weapons/sword/long_2h_dam-4.ron | 2 +- .../items/weapons/sword/long_2h_dam-5.ron | 2 +- .../items/weapons/sword/long_2h_fine-0.ron | 2 +- .../items/weapons/sword/long_2h_fine-1.ron | 2 +- .../items/weapons/sword/long_2h_fine-2.ron | 2 +- .../items/weapons/sword/long_2h_fine-3.ron | 2 +- .../items/weapons/sword/long_2h_fine-4.ron | 2 +- .../items/weapons/sword/long_2h_fine-5.ron | 2 +- .../items/weapons/sword/long_2h_orn-0.ron | 2 +- .../items/weapons/sword/long_2h_orn-1.ron | 2 +- .../items/weapons/sword/long_2h_orn-2.ron | 2 +- .../items/weapons/sword/long_2h_orn-3.ron | 2 +- .../items/weapons/sword/long_2h_orn-4.ron | 2 +- .../items/weapons/sword/long_2h_orn-5.ron | 2 +- .../items/weapons/sword/long_2h_simple-0.ron | 2 +- .../items/weapons/sword/long_2h_simple-1.ron | 2 +- .../items/weapons/sword/long_2h_simple-2.ron | 2 +- .../items/weapons/sword/long_2h_simple-3.ron | 2 +- .../items/weapons/sword/long_2h_simple-4.ron | 2 +- .../items/weapons/sword/long_2h_simple-5.ron | 2 +- .../items/weapons/sword/short_sword_0.ron | 2 +- .../items/weapons/sword/starter_sword.ron | 2 +- .../common/items/weapons/sword/wood_sword.ron | 2 +- .../weapons/sword/zweihander_sword_0.ron | 2 +- assets/common/items/weapons/tool/broom.ron | 2 +- .../common/items/weapons/tool/fishing_rod.ron | 2 +- assets/common/items/weapons/tool/hoe.ron | 2 +- assets/common/items/weapons/tool/pickaxe.ron | 2 +- .../common/items/weapons/tool/pitchfork.ron | 2 +- assets/common/items/weapons/tool/rake.ron | 2 +- assets/common/items/weapons/tool/shovel-0.ron | 2 +- assets/common/items/weapons/tool/shovel-1.ron | 2 +- assets/voxygen/item_image_manifest.ron | 2 +- .../voxel/humanoid_main_weapon_manifest.ron | 2 +- client/src/lib.rs | 2 +- common/net/src/msg/client.rs | 3 +- common/src/bin/csv_export/main.rs | 4 +- common/src/bin/csv_import/main.rs | 12 +- common/src/comp/body.rs | 2 +- common/src/comp/inventory/item/tool.rs | 22 +- common/src/comp/inventory/test.rs | 2 +- common/src/states/utils.rs | 194 +++++------------- server/src/events/interaction.rs | 2 +- .../up.sql | 4 +- server/src/sys/msg/in_game.rs | 2 +- voxygen/anim/src/character/idle.rs | 2 +- voxygen/anim/src/character/jump.rs | 2 +- voxygen/anim/src/character/run.rs | 2 +- voxygen/anim/src/character/stand.rs | 2 +- voxygen/anim/src/character/swim.rs | 2 +- .../audio/sfx/event_mapper/combat/tests.rs | 14 +- voxygen/src/hud/hotbar.rs | 19 +- voxygen/src/hud/skillbar.rs | 26 +-- voxygen/src/hud/slots.rs | 26 +-- voxygen/src/hud/util.rs | 4 +- 231 files changed, 399 insertions(+), 454 deletions(-) rename assets/common/items/debug/{debug_stick.ron => admin_stick.ron} (94%) diff --git a/assets/common/abilities/weapon_ability_manifest.ron b/assets/common/abilities/weapon_ability_manifest.ron index 66c39105f2..465d1a4040 100644 --- a/assets/common/abilities/weapon_ability_manifest.ron +++ b/assets/common/abilities/weapon_ability_manifest.ron @@ -4,149 +4,149 @@ Sword: ( primary: "common.abilities.sword.triplestrike", secondary: "common.abilities.sword.dash", - skills: [ + abilities: [ (Some(Sword(UnlockSpin)), "common.abilities.sword.spin"), ], ), Axe: ( primary: "common.abilities.axe.doublestrike", secondary: "common.abilities.axe.spin", - skills: [ + abilities: [ (Some(Axe(UnlockLeap)), "common.abilities.axe.leap"), ], ), Hammer: ( primary: "common.abilities.hammer.singlestrike", secondary: "common.abilities.hammer.charged", - skills: [ + abilities: [ (Some(Hammer(UnlockLeap)), "common.abilities.hammer.leap"), ], ), Bow: ( primary: "common.abilities.bow.basic", secondary: "common.abilities.bow.charged", - skills: [ + abilities: [ (Some(Bow(UnlockRepeater)), "common.abilities.bow.repeater"), ], ), Staff: ( primary: "common.abilities.staff.firebomb", secondary: "common.abilities.staff.flamethrower", - skills: [ + abilities: [ (Some(Staff(UnlockShockwave)), "common.abilities.staff.fireshockwave"), ], ), Sceptre: ( primary: "common.abilities.sceptre.healingbeam", secondary: "common.abilities.sceptre.healingbomb", - skills: [], + abilities: [], ), Dagger: ( primary: "common.abilities.dagger.tempbasic", secondary: "common.abilities.dagger.tempbasic", - skills: [], + abilities: [], ), Shield: ( primary: "common.abilities.shield.tempbasic", secondary: "common.abilities.shield.block", - skills: [], + abilities: [], ), Unique(StoneGolemFist): ( primary: "common.abilities.unique.stonegolemfist.basic", secondary: "common.abilities.unique.stonegolemfist.shockwave", - skills: [ + abilities: [ (None, "common.abilities.unique.stonegolemfist.spin"), ], ), Unique(BeastClaws): ( primary: "common.abilities.unique.beastclaws.basic", secondary: "common.abilities.unique.beastclaws.basic", - skills: [], + abilities: [], ), Unique(QuadMedQuick): ( primary: "common.abilities.unique.quadmedquick.triplestrike", secondary: "common.abilities.unique.quadmedquick.dash", - skills: [], + abilities: [], ), Unique(QuadMedJump): ( primary: "common.abilities.unique.quadmedjump.leap", secondary: "common.abilities.unique.quadmedjump.doublestrike", - skills: [ + abilities: [ (None, "common.abilities.unique.quadmedjump.quickleap"), ], ), Unique(QuadMedCharge): ( primary: "common.abilities.unique.quadmedcharge.doublestrike", secondary: "common.abilities.unique.quadmedcharge.dash", - skills: [], + abilities: [], ), Unique(QuadMedHoof): ( primary: "common.abilities.unique.quadmedhoof.basic", secondary: "common.abilities.unique.quadmedhoof.basic", - skills: [], + abilities: [], ), Unique(QuadMedBasic): ( primary: "common.abilities.unique.quadmedbasic.singlestrike", secondary: "common.abilities.unique.quadmedbasic.triplestrike", - skills: [], + abilities: [], ), Unique(QuadLowRanged): ( primary: "common.abilities.unique.quadlowranged.singlestrike", secondary: "common.abilities.unique.quadlowranged.firebomb", - skills: [], + abilities: [], ), Unique(QuadLowBreathe): ( primary: "common.abilities.unique.quadlowbreathe.flamethrower", secondary: "common.abilities.unique.quadlowbreathe.triplestrike", - skills: [ + abilities: [ (None, "common.abilities.unique.quadlowbreathe.dash"), ], ), Unique(QuadLowTail): ( primary: "common.abilities.unique.quadlowtail.charged", secondary: "common.abilities.unique.quadlowtail.triplestrike", - skills: [], + abilities: [], ), Unique(QuadLowQuick): ( primary: "common.abilities.unique.quadlowquick.dash", secondary: "common.abilities.unique.quadlowquick.quadstrike", - skills: [], + abilities: [], ), Unique(QuadLowBasic): ( primary: "common.abilities.unique.quadlowbasic.triplestrike", secondary: "common.abilities.unique.quadlowbasic.singlestrike", - skills: [], + abilities: [], ), Unique(QuadSmallBasic): ( primary: "common.abilities.unique.quadsmallbasic.singlestrike", secondary: "common.abilities.unique.quadsmallbasic.singlestrike", - skills: [], + abilities: [], ), Unique(TheropodBasic): ( primary: "common.abilities.unique.theropodbasic.triplestrike", secondary: "common.abilities.unique.theropodbasic.triplestrike", - skills: [], + abilities: [], ), Unique(TheropodBird): ( primary: "common.abilities.unique.theropodbird.triplestrike", secondary: "common.abilities.unique.theropodbird.triplestrike", - skills: [], + abilities: [], ), Debug: ( primary: "common.abilities.debug.forwardboost", secondary: "common.abilities.debug.upboost", - skills: [ + abilities: [ (None, "common.abilities.debug.possess"), ], ), Farming: ( primary: "common.abilities.farming.basic", secondary: "common.abilities.farming.basic", - skills: [], + abilities: [], ), Empty: ( primary: "common.abilities.empty.basic", secondary: "common.abilities.empty.basic", - skills: [], + abilities: [], ), }) diff --git a/assets/common/items/debug/debug_stick.ron b/assets/common/items/debug/admin_stick.ron similarity index 94% rename from assets/common/items/debug/debug_stick.ron rename to assets/common/items/debug/admin_stick.ron index 7ae3c6044d..f74a1affb4 100644 --- a/assets/common/items/debug/debug_stick.ron +++ b/assets/common/items/debug/admin_stick.ron @@ -4,7 +4,7 @@ ItemDef( kind: Tool( ( kind: Debug, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 0, power: 1.00, diff --git a/assets/common/items/debug/admin_sword.ron b/assets/common/items/debug/admin_sword.ron index 20cf2eae24..4b4c3ce2e9 100644 --- a/assets/common/items/debug/admin_sword.ron +++ b/assets/common/items/debug/admin_sword.ron @@ -4,7 +4,7 @@ ItemDef( kind: Tool( ( kind: Sword, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 0, power: 1000.0, diff --git a/assets/common/items/npc_weapons/bow/saurok_bow.ron b/assets/common/items/npc_weapons/bow/saurok_bow.ron index fd312e2f52..9ada115ab9 100644 --- a/assets/common/items/npc_weapons/bow/saurok_bow.ron +++ b/assets/common/items/npc_weapons/bow/saurok_bow.ron @@ -4,7 +4,7 @@ ItemDef( kind: Tool( ( kind: Bow, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 500, power: 1.00, diff --git a/assets/common/items/npc_weapons/hammer/cyclops_hammer.ron b/assets/common/items/npc_weapons/hammer/cyclops_hammer.ron index 177b429616..e6b31337a2 100644 --- a/assets/common/items/npc_weapons/hammer/cyclops_hammer.ron +++ b/assets/common/items/npc_weapons/hammer/cyclops_hammer.ron @@ -4,7 +4,7 @@ ItemDef( kind: Tool( ( kind: Hammer, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 500, power: 1.00, diff --git a/assets/common/items/npc_weapons/hammer/ogre_hammer.ron b/assets/common/items/npc_weapons/hammer/ogre_hammer.ron index f6bd586a7a..a21f130741 100644 --- a/assets/common/items/npc_weapons/hammer/ogre_hammer.ron +++ b/assets/common/items/npc_weapons/hammer/ogre_hammer.ron @@ -4,7 +4,7 @@ ItemDef( kind: Tool( ( kind: Hammer, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 500, power: 1.00, diff --git a/assets/common/items/npc_weapons/hammer/troll_hammer.ron b/assets/common/items/npc_weapons/hammer/troll_hammer.ron index 2b1103d795..3c02d6ac09 100644 --- a/assets/common/items/npc_weapons/hammer/troll_hammer.ron +++ b/assets/common/items/npc_weapons/hammer/troll_hammer.ron @@ -4,7 +4,7 @@ ItemDef( kind: Tool( ( kind: Hammer, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 500, power: 1.00, diff --git a/assets/common/items/npc_weapons/hammer/wendigo_hammer.ron b/assets/common/items/npc_weapons/hammer/wendigo_hammer.ron index 4dc5ffa268..29bcedb2db 100644 --- a/assets/common/items/npc_weapons/hammer/wendigo_hammer.ron +++ b/assets/common/items/npc_weapons/hammer/wendigo_hammer.ron @@ -4,7 +4,7 @@ ItemDef( kind: Tool( ( kind: Hammer, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 500, power: 1.00, diff --git a/assets/common/items/npc_weapons/staff/mindflayer_staff.ron b/assets/common/items/npc_weapons/staff/mindflayer_staff.ron index 13bc4f47e4..b2d6edebde 100644 --- a/assets/common/items/npc_weapons/staff/mindflayer_staff.ron +++ b/assets/common/items/npc_weapons/staff/mindflayer_staff.ron @@ -4,7 +4,7 @@ ItemDef( kind: Tool( ( kind: Staff, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 300, power: 3.0, diff --git a/assets/common/items/npc_weapons/staff/ogre_staff.ron b/assets/common/items/npc_weapons/staff/ogre_staff.ron index 1c9c6db06b..ad1d611cfa 100644 --- a/assets/common/items/npc_weapons/staff/ogre_staff.ron +++ b/assets/common/items/npc_weapons/staff/ogre_staff.ron @@ -4,7 +4,7 @@ ItemDef( kind: Tool( ( kind: Staff, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 500, power: 1.00, diff --git a/assets/common/items/npc_weapons/staff/saurok_staff.ron b/assets/common/items/npc_weapons/staff/saurok_staff.ron index 6be290640c..e38a3df78c 100644 --- a/assets/common/items/npc_weapons/staff/saurok_staff.ron +++ b/assets/common/items/npc_weapons/staff/saurok_staff.ron @@ -4,7 +4,7 @@ ItemDef( kind: Tool( ( kind: Staff, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 500, power: 1.00, diff --git a/assets/common/items/npc_weapons/sword/dullahan_sword.ron b/assets/common/items/npc_weapons/sword/dullahan_sword.ron index f4952d61d3..42183d263b 100644 --- a/assets/common/items/npc_weapons/sword/dullahan_sword.ron +++ b/assets/common/items/npc_weapons/sword/dullahan_sword.ron @@ -4,7 +4,7 @@ ItemDef( kind: Tool( ( kind: Sword, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 500, power: 1.00, diff --git a/assets/common/items/npc_weapons/sword/saurok_sword.ron b/assets/common/items/npc_weapons/sword/saurok_sword.ron index c62a3f3cfd..82fd5efcc7 100644 --- a/assets/common/items/npc_weapons/sword/saurok_sword.ron +++ b/assets/common/items/npc_weapons/sword/saurok_sword.ron @@ -4,7 +4,7 @@ ItemDef( kind: Tool( ( kind: Sword, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 500, power: 1.00, diff --git a/assets/common/items/npc_weapons/unique/beast_claws.ron b/assets/common/items/npc_weapons/unique/beast_claws.ron index 3f4f4c3ddb..3ca1a633af 100644 --- a/assets/common/items/npc_weapons/unique/beast_claws.ron +++ b/assets/common/items/npc_weapons/unique/beast_claws.ron @@ -4,7 +4,7 @@ ItemDef( kind: Tool( ( kind: Unique(BeastClaws), - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 500, power: 1.00, diff --git a/assets/common/items/npc_weapons/unique/quadlowbasic.ron b/assets/common/items/npc_weapons/unique/quadlowbasic.ron index 942f95115e..9bdfebcbfc 100644 --- a/assets/common/items/npc_weapons/unique/quadlowbasic.ron +++ b/assets/common/items/npc_weapons/unique/quadlowbasic.ron @@ -4,7 +4,7 @@ ItemDef( kind: Tool( ( kind: Unique(QuadLowBasic), - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 10, power: 1.00, diff --git a/assets/common/items/npc_weapons/unique/quadlowbreathe.ron b/assets/common/items/npc_weapons/unique/quadlowbreathe.ron index 9e38496121..1c931dab3b 100644 --- a/assets/common/items/npc_weapons/unique/quadlowbreathe.ron +++ b/assets/common/items/npc_weapons/unique/quadlowbreathe.ron @@ -4,7 +4,7 @@ ItemDef( kind: Tool( ( kind: Unique(QuadLowBreathe), - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 10, power: 1.00, diff --git a/assets/common/items/npc_weapons/unique/quadlowquick.ron b/assets/common/items/npc_weapons/unique/quadlowquick.ron index ea0414a384..7b4adbd6d1 100644 --- a/assets/common/items/npc_weapons/unique/quadlowquick.ron +++ b/assets/common/items/npc_weapons/unique/quadlowquick.ron @@ -4,7 +4,7 @@ ItemDef( kind: Tool( ( kind: Unique(QuadLowQuick), - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 10, power: 1.00, diff --git a/assets/common/items/npc_weapons/unique/quadlowranged.ron b/assets/common/items/npc_weapons/unique/quadlowranged.ron index edc1781afe..137bd49ae8 100644 --- a/assets/common/items/npc_weapons/unique/quadlowranged.ron +++ b/assets/common/items/npc_weapons/unique/quadlowranged.ron @@ -4,7 +4,7 @@ ItemDef( kind: Tool( ( kind: Unique(QuadLowRanged), - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 10, power: 1.00, diff --git a/assets/common/items/npc_weapons/unique/quadlowtail.ron b/assets/common/items/npc_weapons/unique/quadlowtail.ron index 58309079c2..cbb22e5ab5 100644 --- a/assets/common/items/npc_weapons/unique/quadlowtail.ron +++ b/assets/common/items/npc_weapons/unique/quadlowtail.ron @@ -4,7 +4,7 @@ ItemDef( kind: Tool( ( kind: Unique(QuadLowTail), - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 10, power: 1.00, diff --git a/assets/common/items/npc_weapons/unique/quadmedbasic.ron b/assets/common/items/npc_weapons/unique/quadmedbasic.ron index 9412e5fb5f..fc9de7cbe8 100644 --- a/assets/common/items/npc_weapons/unique/quadmedbasic.ron +++ b/assets/common/items/npc_weapons/unique/quadmedbasic.ron @@ -4,7 +4,7 @@ ItemDef( kind: Tool( ( kind: Unique(QuadMedBasic), - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 10, power: 1.00, diff --git a/assets/common/items/npc_weapons/unique/quadmedcharge.ron b/assets/common/items/npc_weapons/unique/quadmedcharge.ron index 66326ba98a..1527fddf63 100644 --- a/assets/common/items/npc_weapons/unique/quadmedcharge.ron +++ b/assets/common/items/npc_weapons/unique/quadmedcharge.ron @@ -4,7 +4,7 @@ ItemDef( kind: Tool( ( kind: Unique(QuadMedCharge), - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 10, power: 1.00, diff --git a/assets/common/items/npc_weapons/unique/quadmedhoof.ron b/assets/common/items/npc_weapons/unique/quadmedhoof.ron index d214c1635c..3a40927bd1 100644 --- a/assets/common/items/npc_weapons/unique/quadmedhoof.ron +++ b/assets/common/items/npc_weapons/unique/quadmedhoof.ron @@ -4,7 +4,7 @@ ItemDef( kind: Tool( ( kind: Unique(QuadMedHoof), - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 10, power: 1.00, diff --git a/assets/common/items/npc_weapons/unique/quadmedjump.ron b/assets/common/items/npc_weapons/unique/quadmedjump.ron index dd86b1bebc..6ebf329afa 100644 --- a/assets/common/items/npc_weapons/unique/quadmedjump.ron +++ b/assets/common/items/npc_weapons/unique/quadmedjump.ron @@ -4,7 +4,7 @@ ItemDef( kind: Tool( ( kind: Unique(QuadMedJump), - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 10, power: 1.00, diff --git a/assets/common/items/npc_weapons/unique/quadmedquick.ron b/assets/common/items/npc_weapons/unique/quadmedquick.ron index daacf96d39..083baa1664 100644 --- a/assets/common/items/npc_weapons/unique/quadmedquick.ron +++ b/assets/common/items/npc_weapons/unique/quadmedquick.ron @@ -4,7 +4,7 @@ ItemDef( kind: Tool( ( kind: Unique(QuadMedQuick), - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 10, power: 1.00, diff --git a/assets/common/items/npc_weapons/unique/quadsmallbasic.ron b/assets/common/items/npc_weapons/unique/quadsmallbasic.ron index 770acda813..3a85b22377 100644 --- a/assets/common/items/npc_weapons/unique/quadsmallbasic.ron +++ b/assets/common/items/npc_weapons/unique/quadsmallbasic.ron @@ -4,7 +4,7 @@ ItemDef( kind: Tool( ( kind: Unique(QuadSmallBasic), - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 10, power: 1.00, diff --git a/assets/common/items/npc_weapons/unique/stone_golems_fist.ron b/assets/common/items/npc_weapons/unique/stone_golems_fist.ron index 2af80459e6..7302e61b0b 100644 --- a/assets/common/items/npc_weapons/unique/stone_golems_fist.ron +++ b/assets/common/items/npc_weapons/unique/stone_golems_fist.ron @@ -4,7 +4,7 @@ ItemDef( kind: Tool( ( kind: Unique(StoneGolemFist), - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 500, power: 1.00, diff --git a/assets/common/items/npc_weapons/unique/theropodbasic.ron b/assets/common/items/npc_weapons/unique/theropodbasic.ron index cd94ec39e2..352a99734c 100644 --- a/assets/common/items/npc_weapons/unique/theropodbasic.ron +++ b/assets/common/items/npc_weapons/unique/theropodbasic.ron @@ -4,7 +4,7 @@ ItemDef( kind: Tool( ( kind: Unique(TheropodBasic), - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 10, power: 1.00, diff --git a/assets/common/items/npc_weapons/unique/theropodbird.ron b/assets/common/items/npc_weapons/unique/theropodbird.ron index 1e2f3f933f..f2be3234e2 100644 --- a/assets/common/items/npc_weapons/unique/theropodbird.ron +++ b/assets/common/items/npc_weapons/unique/theropodbird.ron @@ -4,7 +4,7 @@ ItemDef( kind: Tool( ( kind: Unique(TheropodBird), - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 10, power: 1.00, diff --git a/assets/common/items/weapons/axe/bloodsteel_axe-0.ron b/assets/common/items/weapons/axe/bloodsteel_axe-0.ron index 791e7dd40a..045677ae3f 100644 --- a/assets/common/items/weapons/axe/bloodsteel_axe-0.ron +++ b/assets/common/items/weapons/axe/bloodsteel_axe-0.ron @@ -3,7 +3,7 @@ ItemDef( description: "Dark rituals call for metal alloys to be formed in the blood of an animal carcass to ensure the resultant axe thirsts for future kills.", kind: Tool(( kind: Axe, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 400, power: 1.6, diff --git a/assets/common/items/weapons/axe/bloodsteel_axe-1.ron b/assets/common/items/weapons/axe/bloodsteel_axe-1.ron index 45e3a4ea0f..7019bbee07 100644 --- a/assets/common/items/weapons/axe/bloodsteel_axe-1.ron +++ b/assets/common/items/weapons/axe/bloodsteel_axe-1.ron @@ -3,7 +3,7 @@ ItemDef( description: "Dark rituals call for metal alloys to be formed in the blood of an animal carcass to ensure the resultant axe thirsts for future kills.", kind: Tool(( kind: Axe, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 400, power: 1.6, diff --git a/assets/common/items/weapons/axe/bloodsteel_axe-2.ron b/assets/common/items/weapons/axe/bloodsteel_axe-2.ron index 31a163f6ae..dc80a82fd2 100644 --- a/assets/common/items/weapons/axe/bloodsteel_axe-2.ron +++ b/assets/common/items/weapons/axe/bloodsteel_axe-2.ron @@ -3,7 +3,7 @@ ItemDef( description: "Some tribes call for metal alloys to be formed in the blood of an animal carcass to ensure the resultant axe is honed for striking their enemy\'s veins.", kind: Tool(( kind: Axe, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 400, power: 1.6, diff --git a/assets/common/items/weapons/axe/bronze_axe-0.ron b/assets/common/items/weapons/axe/bronze_axe-0.ron index f7a87cf37a..f4c85f5776 100644 --- a/assets/common/items/weapons/axe/bronze_axe-0.ron +++ b/assets/common/items/weapons/axe/bronze_axe-0.ron @@ -3,7 +3,7 @@ ItemDef( description: "A fine quality metal alloy axe.", kind: Tool(( kind: Axe, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 400, power: 1.0, diff --git a/assets/common/items/weapons/axe/bronze_axe-1.ron b/assets/common/items/weapons/axe/bronze_axe-1.ron index a367894890..3dc4648c32 100644 --- a/assets/common/items/weapons/axe/bronze_axe-1.ron +++ b/assets/common/items/weapons/axe/bronze_axe-1.ron @@ -3,7 +3,7 @@ ItemDef( description: "While the metal alloy is relatively simple, this unique circular axe has a unique appearance.", kind: Tool(( kind: Axe, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 400, power: 1.0, diff --git a/assets/common/items/weapons/axe/cobalt_axe-0.ron b/assets/common/items/weapons/axe/cobalt_axe-0.ron index 205cc29215..170f1e45cb 100644 --- a/assets/common/items/weapons/axe/cobalt_axe-0.ron +++ b/assets/common/items/weapons/axe/cobalt_axe-0.ron @@ -3,7 +3,7 @@ ItemDef( description: "The lustrous bluish gray axe provides a certain stylish class to the weapon.", kind: Tool(( kind: Axe, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 400, power: 1.8, diff --git a/assets/common/items/weapons/axe/iron_axe-0.ron b/assets/common/items/weapons/axe/iron_axe-0.ron index 25be0787c6..73bfd8f1d6 100644 --- a/assets/common/items/weapons/axe/iron_axe-0.ron +++ b/assets/common/items/weapons/axe/iron_axe-0.ron @@ -3,7 +3,7 @@ ItemDef( description: "Heavy iron hammered into rough blades, a simple tool for killing.", kind: Tool(( kind: Axe, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 400, power: 1.2, diff --git a/assets/common/items/weapons/axe/iron_axe-1.ron b/assets/common/items/weapons/axe/iron_axe-1.ron index 81ad5e8d52..d3cee4dd0a 100644 --- a/assets/common/items/weapons/axe/iron_axe-1.ron +++ b/assets/common/items/weapons/axe/iron_axe-1.ron @@ -3,7 +3,7 @@ ItemDef( description: "Heavy iron axe, likely created for ritual execution.", kind: Tool(( kind: Axe, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 400, power: 1.2, diff --git a/assets/common/items/weapons/axe/iron_axe-2.ron b/assets/common/items/weapons/axe/iron_axe-2.ron index 3ef6efd283..9bdeebaad5 100644 --- a/assets/common/items/weapons/axe/iron_axe-2.ron +++ b/assets/common/items/weapons/axe/iron_axe-2.ron @@ -3,7 +3,7 @@ ItemDef( description: "The iron axe head is split into two distinct curves, giving it a unique appearance.", kind: Tool(( kind: Axe, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 400, power: 1.2, diff --git a/assets/common/items/weapons/axe/iron_axe-3.ron b/assets/common/items/weapons/axe/iron_axe-3.ron index 0882e61ca5..df2f42319b 100644 --- a/assets/common/items/weapons/axe/iron_axe-3.ron +++ b/assets/common/items/weapons/axe/iron_axe-3.ron @@ -3,7 +3,7 @@ ItemDef( description: "Tried and true iron armaments, mass produced for killing.", kind: Tool(( kind: Axe, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 400, power: 1.2, diff --git a/assets/common/items/weapons/axe/iron_axe-4.ron b/assets/common/items/weapons/axe/iron_axe-4.ron index 18e85f33f7..64dd21a82a 100644 --- a/assets/common/items/weapons/axe/iron_axe-4.ron +++ b/assets/common/items/weapons/axe/iron_axe-4.ron @@ -3,7 +3,7 @@ ItemDef( description: "This axe has a heavy iron head used to cleave nearly anything.", kind: Tool(( kind: Axe, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 400, power: 1.2, diff --git a/assets/common/items/weapons/axe/iron_axe-5.ron b/assets/common/items/weapons/axe/iron_axe-5.ron index eabfa21d67..5d666dd2fe 100644 --- a/assets/common/items/weapons/axe/iron_axe-5.ron +++ b/assets/common/items/weapons/axe/iron_axe-5.ron @@ -3,7 +3,7 @@ ItemDef( description: "While heavy, this iron forged axe is quite easy to swing, at least for those with the muscle backing it.", kind: Tool(( kind: Axe, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 400, power: 1.2, diff --git a/assets/common/items/weapons/axe/iron_axe-6.ron b/assets/common/items/weapons/axe/iron_axe-6.ron index aad41d4fda..9521085760 100644 --- a/assets/common/items/weapons/axe/iron_axe-6.ron +++ b/assets/common/items/weapons/axe/iron_axe-6.ron @@ -3,7 +3,7 @@ ItemDef( description: "A simple dual bitted iron forged axe.", kind: Tool(( kind: Axe, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 400, power: 1.2, diff --git a/assets/common/items/weapons/axe/iron_axe-7.ron b/assets/common/items/weapons/axe/iron_axe-7.ron index d57201f062..d580e411aa 100644 --- a/assets/common/items/weapons/axe/iron_axe-7.ron +++ b/assets/common/items/weapons/axe/iron_axe-7.ron @@ -3,7 +3,7 @@ ItemDef( description: "Double bitted axe head, decorated iron construction.", kind: Tool(( kind: Axe, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 400, power: 1.2, diff --git a/assets/common/items/weapons/axe/iron_axe-8.ron b/assets/common/items/weapons/axe/iron_axe-8.ron index fab3a01765..830608dcc8 100644 --- a/assets/common/items/weapons/axe/iron_axe-8.ron +++ b/assets/common/items/weapons/axe/iron_axe-8.ron @@ -3,7 +3,7 @@ ItemDef( description: "Several sharp axe heads forged with points to mimic animal fangs.", kind: Tool(( kind: Axe, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 400, power: 1.2, diff --git a/assets/common/items/weapons/axe/iron_axe-9.ron b/assets/common/items/weapons/axe/iron_axe-9.ron index ad9d5b3f7c..a903851ba4 100644 --- a/assets/common/items/weapons/axe/iron_axe-9.ron +++ b/assets/common/items/weapons/axe/iron_axe-9.ron @@ -3,7 +3,7 @@ ItemDef( description: "Strikes from this axe look like wolf bites in flesh.", kind: Tool(( kind: Axe, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 400, power: 1.2, diff --git a/assets/common/items/weapons/axe/malachite_axe-0.ron b/assets/common/items/weapons/axe/malachite_axe-0.ron index 1b9343c316..acd69ae2a6 100644 --- a/assets/common/items/weapons/axe/malachite_axe-0.ron +++ b/assets/common/items/weapons/axe/malachite_axe-0.ron @@ -3,7 +3,7 @@ ItemDef( description: "Etched axe head decorated with malachite on the blades to provide magical properties.", kind: Tool(( kind: Axe, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 400, power: 2.0, diff --git a/assets/common/items/weapons/axe/orc_axe-0.ron b/assets/common/items/weapons/axe/orc_axe-0.ron index 0dbb5bffbb..279b0ad6da 100644 --- a/assets/common/items/weapons/axe/orc_axe-0.ron +++ b/assets/common/items/weapons/axe/orc_axe-0.ron @@ -3,7 +3,7 @@ ItemDef( description: "A rough cut axe created by orcs to cleave beasts in two.", kind: Tool(( kind: Axe, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 400, power: 0.6, diff --git a/assets/common/items/weapons/axe/starter_axe.ron b/assets/common/items/weapons/axe/starter_axe.ron index 3d5da1de6f..b38ce04023 100644 --- a/assets/common/items/weapons/axe/starter_axe.ron +++ b/assets/common/items/weapons/axe/starter_axe.ron @@ -3,7 +3,7 @@ ItemDef( description: "Every dent tells the story of a chopped tree.", kind: Tool(( kind: Axe, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 400, power: 0.5, diff --git a/assets/common/items/weapons/axe/steel_axe-0.ron b/assets/common/items/weapons/axe/steel_axe-0.ron index e95e0a73ca..533acd3779 100644 --- a/assets/common/items/weapons/axe/steel_axe-0.ron +++ b/assets/common/items/weapons/axe/steel_axe-0.ron @@ -3,7 +3,7 @@ ItemDef( description: "Well crafted metal alloy axe that slices more cleanly than its iron counterparts.", kind: Tool(( kind: Axe, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 400, power: 1.4, diff --git a/assets/common/items/weapons/axe/steel_axe-1.ron b/assets/common/items/weapons/axe/steel_axe-1.ron index 447b3c706e..566e655988 100644 --- a/assets/common/items/weapons/axe/steel_axe-1.ron +++ b/assets/common/items/weapons/axe/steel_axe-1.ron @@ -3,7 +3,7 @@ ItemDef( description: "Double bitted, well polished, and spiked axe head.", kind: Tool(( kind: Axe, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 400, power: 1.4, diff --git a/assets/common/items/weapons/axe/steel_axe-2.ron b/assets/common/items/weapons/axe/steel_axe-2.ron index 3f5bc83dbd..96886e9a31 100644 --- a/assets/common/items/weapons/axe/steel_axe-2.ron +++ b/assets/common/items/weapons/axe/steel_axe-2.ron @@ -3,7 +3,7 @@ ItemDef( description: "A simple metal alloy axe.", kind: Tool(( kind: Axe, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 400, power: 1.4, diff --git a/assets/common/items/weapons/axe/steel_axe-3.ron b/assets/common/items/weapons/axe/steel_axe-3.ron index 4790c17ebf..63624c94c1 100644 --- a/assets/common/items/weapons/axe/steel_axe-3.ron +++ b/assets/common/items/weapons/axe/steel_axe-3.ron @@ -3,7 +3,7 @@ ItemDef( description: "The blade of this steel axe is forged in a manner to resemble a crescent moon.", kind: Tool(( kind: Axe, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 400, power: 1.4, diff --git a/assets/common/items/weapons/axe/steel_axe-4.ron b/assets/common/items/weapons/axe/steel_axe-4.ron index 83fc7d01bd..7bc4fc94c3 100644 --- a/assets/common/items/weapons/axe/steel_axe-4.ron +++ b/assets/common/items/weapons/axe/steel_axe-4.ron @@ -3,7 +3,7 @@ ItemDef( description: "The blade of this axe resembles a full moon.", kind: Tool(( kind: Axe, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 400, power: 1.4, diff --git a/assets/common/items/weapons/axe/steel_axe-5.ron b/assets/common/items/weapons/axe/steel_axe-5.ron index 50d2850d94..aa61348583 100644 --- a/assets/common/items/weapons/axe/steel_axe-5.ron +++ b/assets/common/items/weapons/axe/steel_axe-5.ron @@ -3,7 +3,7 @@ ItemDef( description: "Druidic rituals formed this axe in the dark of night. Made to look like the wings of an owl swooping in on a kill.", kind: Tool(( kind: Axe, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 400, power: 1.4, diff --git a/assets/common/items/weapons/axe/steel_axe-6.ron b/assets/common/items/weapons/axe/steel_axe-6.ron index e06358fa07..106ca98b9c 100644 --- a/assets/common/items/weapons/axe/steel_axe-6.ron +++ b/assets/common/items/weapons/axe/steel_axe-6.ron @@ -3,7 +3,7 @@ ItemDef( description: "This axe is designed to mimic the playing card suit, swiftly slicing through the air.", kind: Tool(( kind: Axe, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 400, power: 1.4, diff --git a/assets/common/items/weapons/axe/worn_iron_axe-0.ron b/assets/common/items/weapons/axe/worn_iron_axe-0.ron index 4a73c4f954..5903909611 100644 --- a/assets/common/items/weapons/axe/worn_iron_axe-0.ron +++ b/assets/common/items/weapons/axe/worn_iron_axe-0.ron @@ -3,7 +3,7 @@ ItemDef( description: "Rough cut axe of dwarven origin, it\'s very old, but still usable.", kind: Tool(( kind: Axe, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 400, power: 0.8, diff --git a/assets/common/items/weapons/axe/worn_iron_axe-1.ron b/assets/common/items/weapons/axe/worn_iron_axe-1.ron index caee3f011e..6272d2ffec 100644 --- a/assets/common/items/weapons/axe/worn_iron_axe-1.ron +++ b/assets/common/items/weapons/axe/worn_iron_axe-1.ron @@ -3,7 +3,7 @@ ItemDef( description: "Light elven axe, scratched from eons of use. Still usable in some manner.", kind: Tool(( kind: Axe, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 400, power: 0.8, diff --git a/assets/common/items/weapons/axe/worn_iron_axe-2.ron b/assets/common/items/weapons/axe/worn_iron_axe-2.ron index 7104e29f71..de359ef66f 100644 --- a/assets/common/items/weapons/axe/worn_iron_axe-2.ron +++ b/assets/common/items/weapons/axe/worn_iron_axe-2.ron @@ -3,7 +3,7 @@ ItemDef( description: "There\'s nothing too remarkable about this old axe.", kind: Tool(( kind: Axe, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 400, power: 0.8, diff --git a/assets/common/items/weapons/axe/worn_iron_axe-3.ron b/assets/common/items/weapons/axe/worn_iron_axe-3.ron index 6674327d0f..ff2bc2a145 100644 --- a/assets/common/items/weapons/axe/worn_iron_axe-3.ron +++ b/assets/common/items/weapons/axe/worn_iron_axe-3.ron @@ -3,7 +3,7 @@ ItemDef( description: "Rough cut iron makes it hard to tell that this axe is even used, other than how old it feels.", kind: Tool(( kind: Axe, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 400, power: 0.8, diff --git a/assets/common/items/weapons/axe/worn_iron_axe-4.ron b/assets/common/items/weapons/axe/worn_iron_axe-4.ron index a521494fcd..bce871c0dc 100644 --- a/assets/common/items/weapons/axe/worn_iron_axe-4.ron +++ b/assets/common/items/weapons/axe/worn_iron_axe-4.ron @@ -3,7 +3,7 @@ ItemDef( description: "An axe formed with the intent of making the blade seem like a beetle. With how brittle it has gotten over the years, one would be mistaken in thinking it was made from beetle shell.", kind: Tool(( kind: Axe, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 400, power: 0.8, diff --git a/assets/common/items/weapons/axe_1h/bloodsteel-0.ron b/assets/common/items/weapons/axe_1h/bloodsteel-0.ron index ff83344551..24138d8a83 100644 --- a/assets/common/items/weapons/axe_1h/bloodsteel-0.ron +++ b/assets/common/items/weapons/axe_1h/bloodsteel-0.ron @@ -3,7 +3,7 @@ ItemDef( description: "Infused with blood.", kind: Tool(( kind: Axe, - hands: OneHand, + hands: One, stats: ( equip_time_millis: 400, power: 1.5, @@ -12,4 +12,5 @@ ItemDef( ), )), quality: High, + tags: [], ) \ No newline at end of file diff --git a/assets/common/items/weapons/axe_1h/bloodsteel-1.ron b/assets/common/items/weapons/axe_1h/bloodsteel-1.ron index c70238529d..473c843d3f 100644 --- a/assets/common/items/weapons/axe_1h/bloodsteel-1.ron +++ b/assets/common/items/weapons/axe_1h/bloodsteel-1.ron @@ -3,7 +3,7 @@ ItemDef( description: "Infused with blood.", kind: Tool(( kind: Axe, - hands: OneHand, + hands: One, stats: ( equip_time_millis: 400, power: 2.0, @@ -12,4 +12,5 @@ ItemDef( ), )), quality: High, + tags: [], ) \ No newline at end of file diff --git a/assets/common/items/weapons/axe_1h/bronze-0.ron b/assets/common/items/weapons/axe_1h/bronze-0.ron index 82f6f2ecd6..003273bd53 100644 --- a/assets/common/items/weapons/axe_1h/bronze-0.ron +++ b/assets/common/items/weapons/axe_1h/bronze-0.ron @@ -3,7 +3,7 @@ ItemDef( description: "Forged from bronze.", kind: Tool(( kind: Axe, - hands: OneHand, + hands: One, stats: ( equip_time_millis: 400, power: 1.0, @@ -12,4 +12,5 @@ ItemDef( ), )), quality: Moderate, + tags: [], ) \ No newline at end of file diff --git a/assets/common/items/weapons/axe_1h/bronze-1.ron b/assets/common/items/weapons/axe_1h/bronze-1.ron index d3d8bb8867..c8c3d0e763 100644 --- a/assets/common/items/weapons/axe_1h/bronze-1.ron +++ b/assets/common/items/weapons/axe_1h/bronze-1.ron @@ -3,7 +3,7 @@ ItemDef( description: "Forged from bronze.", kind: Tool(( kind: Axe, - hands: OneHand, + hands: One, stats: ( equip_time_millis: 400, power: 1.1, @@ -12,4 +12,5 @@ ItemDef( ), )), quality: Moderate, + tags: [], ) \ No newline at end of file diff --git a/assets/common/items/weapons/axe_1h/cobalt-0.ron b/assets/common/items/weapons/axe_1h/cobalt-0.ron index 52ff231f01..3b33d948c7 100644 --- a/assets/common/items/weapons/axe_1h/cobalt-0.ron +++ b/assets/common/items/weapons/axe_1h/cobalt-0.ron @@ -3,7 +3,7 @@ ItemDef( description: "Forged from cobalt.", kind: Tool(( kind: Axe, - hands: OneHand, + hands: One, stats: ( equip_time_millis: 400, power: 1.6, @@ -12,4 +12,5 @@ ItemDef( ), )), quality: High, + tags: [], ) \ No newline at end of file diff --git a/assets/common/items/weapons/axe_1h/cobalt-1.ron b/assets/common/items/weapons/axe_1h/cobalt-1.ron index 79a1ef2e47..25d6847031 100644 --- a/assets/common/items/weapons/axe_1h/cobalt-1.ron +++ b/assets/common/items/weapons/axe_1h/cobalt-1.ron @@ -3,7 +3,7 @@ ItemDef( description: "Forged from cobalt.", kind: Tool(( kind: Axe, - hands: OneHand, + hands: One, stats: ( equip_time_millis: 400, power: 1.75, @@ -12,4 +12,5 @@ ItemDef( ), )), quality: High, + tags: [], ) \ No newline at end of file diff --git a/assets/common/items/weapons/axe_1h/iron-0.ron b/assets/common/items/weapons/axe_1h/iron-0.ron index c6c42687dd..75e37781ee 100644 --- a/assets/common/items/weapons/axe_1h/iron-0.ron +++ b/assets/common/items/weapons/axe_1h/iron-0.ron @@ -3,7 +3,7 @@ ItemDef( description: "Forged from iron.", kind: Tool(( kind: Axe, - hands: OneHand, + hands: One, stats: ( equip_time_millis: 400, power: 1.1, @@ -12,4 +12,5 @@ ItemDef( ), )), quality: Moderate, + tags: [], ) \ No newline at end of file diff --git a/assets/common/items/weapons/axe_1h/iron-1.ron b/assets/common/items/weapons/axe_1h/iron-1.ron index 56e6e46af9..ae5a84dd21 100644 --- a/assets/common/items/weapons/axe_1h/iron-1.ron +++ b/assets/common/items/weapons/axe_1h/iron-1.ron @@ -3,7 +3,7 @@ ItemDef( description: "Forged from iron.", kind: Tool(( kind: Axe, - hands: OneHand, + hands: One, stats: ( equip_time_millis: 400, power: 1.3, @@ -12,4 +12,5 @@ ItemDef( ), )), quality: Moderate, + tags: [], ) \ No newline at end of file diff --git a/assets/common/items/weapons/axe_1h/iron-2.ron b/assets/common/items/weapons/axe_1h/iron-2.ron index e0866cb192..5b442e5e5d 100644 --- a/assets/common/items/weapons/axe_1h/iron-2.ron +++ b/assets/common/items/weapons/axe_1h/iron-2.ron @@ -3,7 +3,7 @@ ItemDef( description: "Forged from iron.", kind: Tool(( kind: Axe, - hands: OneHand, + hands: One, stats: ( equip_time_millis: 400, power: 1.0, @@ -12,4 +12,5 @@ ItemDef( ), )), quality: Moderate, + tags: [], ) \ No newline at end of file diff --git a/assets/common/items/weapons/axe_1h/iron-3.ron b/assets/common/items/weapons/axe_1h/iron-3.ron index 0e73baf4b9..a5bb837ecc 100644 --- a/assets/common/items/weapons/axe_1h/iron-3.ron +++ b/assets/common/items/weapons/axe_1h/iron-3.ron @@ -3,7 +3,7 @@ ItemDef( description: "Forged from iron.", kind: Tool(( kind: Axe, - hands: OneHand, + hands: One, stats: ( equip_time_millis: 400, power: 1.2, @@ -12,4 +12,5 @@ ItemDef( ), )), quality: Moderate, + tags: [], ) \ No newline at end of file diff --git a/assets/common/items/weapons/axe_1h/steel-0.ron b/assets/common/items/weapons/axe_1h/steel-0.ron index f431a5037d..578aa0c691 100644 --- a/assets/common/items/weapons/axe_1h/steel-0.ron +++ b/assets/common/items/weapons/axe_1h/steel-0.ron @@ -3,7 +3,7 @@ ItemDef( description: "Forged from steel.", kind: Tool(( kind: Axe, - hands: OneHand, + hands: One, stats: ( equip_time_millis: 400, power: 1.5, @@ -12,4 +12,5 @@ ItemDef( ), )), quality: Moderate, + tags: [], ) \ No newline at end of file diff --git a/assets/common/items/weapons/axe_1h/steel-1.ron b/assets/common/items/weapons/axe_1h/steel-1.ron index e1125715e9..d5b9f4d1d5 100644 --- a/assets/common/items/weapons/axe_1h/steel-1.ron +++ b/assets/common/items/weapons/axe_1h/steel-1.ron @@ -3,7 +3,7 @@ ItemDef( description: "Forged from steel.", kind: Tool(( kind: Axe, - hands: OneHand, + hands: One, stats: ( equip_time_millis: 400, power: 1.4, @@ -12,4 +12,5 @@ ItemDef( ), )), quality: Moderate, + tags: [], ) \ No newline at end of file diff --git a/assets/common/items/weapons/axe_1h/steel-2.ron b/assets/common/items/weapons/axe_1h/steel-2.ron index d6da77ad50..4dc66c5165 100644 --- a/assets/common/items/weapons/axe_1h/steel-2.ron +++ b/assets/common/items/weapons/axe_1h/steel-2.ron @@ -3,7 +3,7 @@ ItemDef( description: "Forged from steel.", kind: Tool(( kind: Axe, - hands: OneHand, + hands: One, stats: ( equip_time_millis: 400, power: 1.3, @@ -12,4 +12,5 @@ ItemDef( ), )), quality: Moderate, + tags: [], ) \ No newline at end of file diff --git a/assets/common/items/weapons/axe_1h/stone-0.ron b/assets/common/items/weapons/axe_1h/stone-0.ron index bf58d6e712..dc0b887530 100644 --- a/assets/common/items/weapons/axe_1h/stone-0.ron +++ b/assets/common/items/weapons/axe_1h/stone-0.ron @@ -3,7 +3,7 @@ ItemDef( description: "Chiseled from stone.", kind: Tool(( kind: Axe, - hands: OneHand, + hands: One, stats: ( equip_time_millis: 400, power: 0.8, @@ -12,4 +12,5 @@ ItemDef( ), )), quality: Common, + tags: [], ) \ No newline at end of file diff --git a/assets/common/items/weapons/axe_1h/stone-1.ron b/assets/common/items/weapons/axe_1h/stone-1.ron index 5617e4c08a..46675a54ab 100644 --- a/assets/common/items/weapons/axe_1h/stone-1.ron +++ b/assets/common/items/weapons/axe_1h/stone-1.ron @@ -3,7 +3,7 @@ ItemDef( description: "Chiseled from stone.", kind: Tool(( kind: Axe, - hands: OneHand, + hands: One, stats: ( equip_time_millis: 400, power: 0.7, @@ -12,4 +12,5 @@ ItemDef( ), )), quality: Common, + tags: [], ) \ No newline at end of file diff --git a/assets/common/items/weapons/axe_1h/wood-0.ron b/assets/common/items/weapons/axe_1h/wood-0.ron index f24973cc0e..b979a83cc2 100644 --- a/assets/common/items/weapons/axe_1h/wood-0.ron +++ b/assets/common/items/weapons/axe_1h/wood-0.ron @@ -3,7 +3,7 @@ ItemDef( description: "Carved from wood.", kind: Tool(( kind: Axe, - hands: OneHand, + hands: One, stats: ( equip_time_millis: 400, power: 0.8, @@ -12,4 +12,5 @@ ItemDef( ), )), quality: Low, + tags: [], ) \ No newline at end of file diff --git a/assets/common/items/weapons/axe_1h/wood-1.ron b/assets/common/items/weapons/axe_1h/wood-1.ron index 811983a753..91983a4eb1 100644 --- a/assets/common/items/weapons/axe_1h/wood-1.ron +++ b/assets/common/items/weapons/axe_1h/wood-1.ron @@ -3,7 +3,7 @@ ItemDef( description: "Carved from wood.", kind: Tool(( kind: Axe, - hands: OneHand, + hands: One, stats: ( equip_time_millis: 400, power: 0.5, @@ -12,4 +12,5 @@ ItemDef( ), )), quality: Low, + tags: [], ) \ No newline at end of file diff --git a/assets/common/items/weapons/bow/horn_longbow-0.ron b/assets/common/items/weapons/bow/horn_longbow-0.ron index 7d5261affe..8b974b6e43 100644 --- a/assets/common/items/weapons/bow/horn_longbow-0.ron +++ b/assets/common/items/weapons/bow/horn_longbow-0.ron @@ -3,7 +3,7 @@ ItemDef( description: "You don\'t recognize the creature these horns belong to.", kind: Tool(( kind: Bow, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 400, power: 1.5, diff --git a/assets/common/items/weapons/bow/iron_longbow-0.ron b/assets/common/items/weapons/bow/iron_longbow-0.ron index b9c5f3e655..a4f0b43aeb 100644 --- a/assets/common/items/weapons/bow/iron_longbow-0.ron +++ b/assets/common/items/weapons/bow/iron_longbow-0.ron @@ -3,7 +3,7 @@ ItemDef( description: "Has an insignia on it.", kind: Tool(( kind: Bow, - hands: TwoHand, + hands: Two, 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 index 3f8b500ba7..2641fbd4d9 100644 --- a/assets/common/items/weapons/bow/leafy_longbow-0.ron +++ b/assets/common/items/weapons/bow/leafy_longbow-0.ron @@ -3,7 +3,7 @@ ItemDef( description: "There\'s a new leaf starting to grow.", kind: Tool(( kind: Bow, - hands: TwoHand, + hands: Two, 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 index 44b3a4dc9f..c689a17293 100644 --- a/assets/common/items/weapons/bow/leafy_shortbow-0.ron +++ b/assets/common/items/weapons/bow/leafy_shortbow-0.ron @@ -3,7 +3,7 @@ ItemDef( description: "The wood still seems alive.", kind: Tool(( kind: Bow, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 400, power: 1.0, diff --git a/assets/common/items/weapons/bow/nature_ore_longbow-0.ron b/assets/common/items/weapons/bow/nature_ore_longbow-0.ron index 0eee4678e6..bc5ba875cc 100644 --- a/assets/common/items/weapons/bow/nature_ore_longbow-0.ron +++ b/assets/common/items/weapons/bow/nature_ore_longbow-0.ron @@ -3,7 +3,7 @@ ItemDef( description: "Infused with Velorite power.", kind: Tool(( kind: Bow, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 400, power: 2.0, diff --git a/assets/common/items/weapons/bow/rare_longbow.ron b/assets/common/items/weapons/bow/rare_longbow.ron index af94638957..3e4acc826c 100644 --- a/assets/common/items/weapons/bow/rare_longbow.ron +++ b/assets/common/items/weapons/bow/rare_longbow.ron @@ -3,7 +3,7 @@ ItemDef( description: "You can sense power resting in the bow.", kind: Tool(( kind: Bow, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 400, power: 2.0, diff --git a/assets/common/items/weapons/bow/starter_bow.ron b/assets/common/items/weapons/bow/starter_bow.ron index aec91c6401..66d311c0f6 100644 --- a/assets/common/items/weapons/bow/starter_bow.ron +++ b/assets/common/items/weapons/bow/starter_bow.ron @@ -3,7 +3,7 @@ ItemDef( description: "Someone carved their initials into it.", kind: Tool(( kind: Bow, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 400, power: 0.5, diff --git a/assets/common/items/weapons/bow/wood_longbow-0.ron b/assets/common/items/weapons/bow/wood_longbow-0.ron index 740fc61e62..9ffffd93ab 100644 --- a/assets/common/items/weapons/bow/wood_longbow-0.ron +++ b/assets/common/items/weapons/bow/wood_longbow-0.ron @@ -3,7 +3,7 @@ ItemDef( description: "It\'s been well used.", kind: Tool(( kind: Bow, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 400, power: 1.0, diff --git a/assets/common/items/weapons/bow/wood_longbow-1.ron b/assets/common/items/weapons/bow/wood_longbow-1.ron index 32b0699d14..a86ea56d15 100644 --- a/assets/common/items/weapons/bow/wood_longbow-1.ron +++ b/assets/common/items/weapons/bow/wood_longbow-1.ron @@ -3,7 +3,7 @@ ItemDef( description: "It\'s hard to pull all the way back.", kind: Tool(( kind: Bow, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 400, power: 1.0, diff --git a/assets/common/items/weapons/bow/wood_shortbow-0.ron b/assets/common/items/weapons/bow/wood_shortbow-0.ron index 13e0535410..5df7538387 100644 --- a/assets/common/items/weapons/bow/wood_shortbow-0.ron +++ b/assets/common/items/weapons/bow/wood_shortbow-0.ron @@ -3,7 +3,7 @@ ItemDef( description: "Strips of leather are wrapped around the handle.", kind: Tool(( kind: Bow, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 400, power: 0.8, diff --git a/assets/common/items/weapons/bow/wood_shortbow-1.ron b/assets/common/items/weapons/bow/wood_shortbow-1.ron index f8fb135c91..df1497b478 100644 --- a/assets/common/items/weapons/bow/wood_shortbow-1.ron +++ b/assets/common/items/weapons/bow/wood_shortbow-1.ron @@ -3,7 +3,7 @@ ItemDef( description: "Works on the ground too.", kind: Tool(( kind: Bow, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 400, power: 0.75, diff --git a/assets/common/items/weapons/dagger/basic_0.ron b/assets/common/items/weapons/dagger/basic_0.ron index 2d3d30da5d..3b2490852a 100644 --- a/assets/common/items/weapons/dagger/basic_0.ron +++ b/assets/common/items/weapons/dagger/basic_0.ron @@ -3,7 +3,7 @@ ItemDef( description: "Opens letters quickly.", kind: Tool(( kind: Dagger, - hands: OneHand, + hands: One, stats: ( equip_time_millis: 0, power: 1.8, diff --git a/assets/common/items/weapons/dagger/cultist_0.ron b/assets/common/items/weapons/dagger/cultist_0.ron index f664662b78..c364188ee9 100644 --- a/assets/common/items/weapons/dagger/cultist_0.ron +++ b/assets/common/items/weapons/dagger/cultist_0.ron @@ -3,7 +3,7 @@ ItemDef( description: "This belonged to an evil Cult Leader.", kind: Tool(( kind: Dagger, - hands: OneHand, + hands: One, stats: ( equip_time_millis: 0, power: 2.0, diff --git a/assets/common/items/weapons/dagger/starter_dagger.ron b/assets/common/items/weapons/dagger/starter_dagger.ron index 7be9a95796..87be7764cf 100644 --- a/assets/common/items/weapons/dagger/starter_dagger.ron +++ b/assets/common/items/weapons/dagger/starter_dagger.ron @@ -3,7 +3,7 @@ ItemDef( description: "Easily concealed.", kind: Tool(( kind: Dagger, - hands: OneHand, + hands: One, stats: ( equip_time_millis: 300, power: 1.0, diff --git a/assets/common/items/weapons/empty/empty.ron b/assets/common/items/weapons/empty/empty.ron index 3ee1a2838e..c199f96117 100644 --- a/assets/common/items/weapons/empty/empty.ron +++ b/assets/common/items/weapons/empty/empty.ron @@ -3,7 +3,7 @@ ItemDef( description: "This item may grant abilities, but is invisible", kind: Tool(( kind: Empty, - hands: OneHand, + hands: One, stats: ( equip_time_millis: 200, power: 1.0, diff --git a/assets/common/items/weapons/hammer/bronze_hammer-0.ron b/assets/common/items/weapons/hammer/bronze_hammer-0.ron index 5b2762a5a7..2eb3812ed1 100644 --- a/assets/common/items/weapons/hammer/bronze_hammer-0.ron +++ b/assets/common/items/weapons/hammer/bronze_hammer-0.ron @@ -3,7 +3,7 @@ ItemDef( description: "A heavy hammer forged from a simple metal alloy.", kind: Tool(( kind: Hammer, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 500, power: 1.0, diff --git a/assets/common/items/weapons/hammer/bronze_hammer-1.ron b/assets/common/items/weapons/hammer/bronze_hammer-1.ron index 278fa804a2..369391eaaa 100644 --- a/assets/common/items/weapons/hammer/bronze_hammer-1.ron +++ b/assets/common/items/weapons/hammer/bronze_hammer-1.ron @@ -3,7 +3,7 @@ ItemDef( description: "The entire head of this club is forged from bronze alloy.", kind: Tool(( kind: Hammer, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 500, power: 1.0, diff --git a/assets/common/items/weapons/hammer/cobalt_hammer-0.ron b/assets/common/items/weapons/hammer/cobalt_hammer-0.ron index 4678c420db..49e6dab061 100644 --- a/assets/common/items/weapons/hammer/cobalt_hammer-0.ron +++ b/assets/common/items/weapons/hammer/cobalt_hammer-0.ron @@ -3,7 +3,7 @@ ItemDef( description: "The bluish gray tinge to the metal of this hammer head provides a slight classiness to the weapon.", kind: Tool(( kind: Hammer, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 500, power: 1.6, diff --git a/assets/common/items/weapons/hammer/cobalt_hammer-1.ron b/assets/common/items/weapons/hammer/cobalt_hammer-1.ron index 7919e80ec7..8433b21268 100644 --- a/assets/common/items/weapons/hammer/cobalt_hammer-1.ron +++ b/assets/common/items/weapons/hammer/cobalt_hammer-1.ron @@ -3,7 +3,7 @@ ItemDef( description: "The decorative hooked head of this mace is formed from a bluish gray metal.", kind: Tool(( kind: Hammer, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 500, power: 1.6, diff --git a/assets/common/items/weapons/hammer/cultist_purp_2h-0.ron b/assets/common/items/weapons/hammer/cultist_purp_2h-0.ron index ad1253c33a..bdbbc3d7ed 100644 --- a/assets/common/items/weapons/hammer/cultist_purp_2h-0.ron +++ b/assets/common/items/weapons/hammer/cultist_purp_2h-0.ron @@ -3,7 +3,7 @@ ItemDef( description: "This belonged to an evil Cult Leader.", kind: Tool(( kind: Hammer, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 500, power: 2.0, diff --git a/assets/common/items/weapons/hammer/flimsy_hammer.ron b/assets/common/items/weapons/hammer/flimsy_hammer.ron index ddfc1078be..fd417558e1 100644 --- a/assets/common/items/weapons/hammer/flimsy_hammer.ron +++ b/assets/common/items/weapons/hammer/flimsy_hammer.ron @@ -3,7 +3,7 @@ ItemDef( description: "The head is barely secured.", kind: Tool(( kind: Hammer, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 500, power: 0.5, diff --git a/assets/common/items/weapons/hammer/hammer_1.ron b/assets/common/items/weapons/hammer/hammer_1.ron index 980f6fadd5..d11cf784e8 100644 --- a/assets/common/items/weapons/hammer/hammer_1.ron +++ b/assets/common/items/weapons/hammer/hammer_1.ron @@ -3,7 +3,7 @@ ItemDef( description: "Breaks bones like sticks and stones.", kind: Tool(( kind: Hammer, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 500, power: 0.5, diff --git a/assets/common/items/weapons/hammer/iron_hammer-0.ron b/assets/common/items/weapons/hammer/iron_hammer-0.ron index 06afa97520..44acc9e3da 100644 --- a/assets/common/items/weapons/hammer/iron_hammer-0.ron +++ b/assets/common/items/weapons/hammer/iron_hammer-0.ron @@ -3,7 +3,7 @@ ItemDef( description: "This heavy, solid chunk iron hammer head is simple and brutal in its design.", kind: Tool(( kind: Hammer, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 500, power: 1.2, diff --git a/assets/common/items/weapons/hammer/iron_hammer-1.ron b/assets/common/items/weapons/hammer/iron_hammer-1.ron index 0c2a7f3f37..66ea001a67 100644 --- a/assets/common/items/weapons/hammer/iron_hammer-1.ron +++ b/assets/common/items/weapons/hammer/iron_hammer-1.ron @@ -3,7 +3,7 @@ ItemDef( description: "This heavy, square iron hammer is designed for squashing heads like watermelons.", kind: Tool(( kind: Hammer, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 500, power: 1.2, diff --git a/assets/common/items/weapons/hammer/iron_hammer-2.ron b/assets/common/items/weapons/hammer/iron_hammer-2.ron index cbb78a8f5c..d95175c65f 100644 --- a/assets/common/items/weapons/hammer/iron_hammer-2.ron +++ b/assets/common/items/weapons/hammer/iron_hammer-2.ron @@ -3,7 +3,7 @@ ItemDef( description: "A decorative iron mace, great for smashing.", kind: Tool(( kind: Hammer, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 500, power: 1.2, diff --git a/assets/common/items/weapons/hammer/iron_hammer-3.ron b/assets/common/items/weapons/hammer/iron_hammer-3.ron index f0cbfa041e..57b0dee283 100644 --- a/assets/common/items/weapons/hammer/iron_hammer-3.ron +++ b/assets/common/items/weapons/hammer/iron_hammer-3.ron @@ -3,7 +3,7 @@ ItemDef( description: "The decorative iron mace has a crowning tip on top.", kind: Tool(( kind: Hammer, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 500, power: 1.2, diff --git a/assets/common/items/weapons/hammer/iron_hammer-4.ron b/assets/common/items/weapons/hammer/iron_hammer-4.ron index 83b4ae8ad5..bd9e83e434 100644 --- a/assets/common/items/weapons/hammer/iron_hammer-4.ron +++ b/assets/common/items/weapons/hammer/iron_hammer-4.ron @@ -3,7 +3,7 @@ ItemDef( description: "Worn head shows that this hammer had been used for many years to make other weapons, now relegated to being a weapon in its own right.", kind: Tool(( kind: Hammer, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 500, power: 1.2, diff --git a/assets/common/items/weapons/hammer/iron_hammer-5.ron b/assets/common/items/weapons/hammer/iron_hammer-5.ron index 2b11a8177e..f0d479b2f7 100644 --- a/assets/common/items/weapons/hammer/iron_hammer-5.ron +++ b/assets/common/items/weapons/hammer/iron_hammer-5.ron @@ -3,7 +3,7 @@ ItemDef( description: "A hybrid fusion of a warhammer and a polearm.", kind: Tool(( kind: Hammer, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 500, power: 1.2, diff --git a/assets/common/items/weapons/hammer/iron_hammer-6.ron b/assets/common/items/weapons/hammer/iron_hammer-6.ron index 97987c0339..d960437e92 100644 --- a/assets/common/items/weapons/hammer/iron_hammer-6.ron +++ b/assets/common/items/weapons/hammer/iron_hammer-6.ron @@ -3,7 +3,7 @@ ItemDef( description: "A rough shaped iron hammer with spikes for added destruction.", kind: Tool(( kind: Hammer, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 500, power: 1.2, diff --git a/assets/common/items/weapons/hammer/iron_hammer-7.ron b/assets/common/items/weapons/hammer/iron_hammer-7.ron index f2d77db194..90bd20a9bd 100644 --- a/assets/common/items/weapons/hammer/iron_hammer-7.ron +++ b/assets/common/items/weapons/hammer/iron_hammer-7.ron @@ -3,7 +3,7 @@ ItemDef( description: "This iron forged hammer is roughly shaped into the shape of a fist holding the hammer head.", kind: Tool(( kind: Hammer, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 500, power: 1.2, diff --git a/assets/common/items/weapons/hammer/iron_hammer-8.ron b/assets/common/items/weapons/hammer/iron_hammer-8.ron index 16d1da5f40..0d540e8535 100644 --- a/assets/common/items/weapons/hammer/iron_hammer-8.ron +++ b/assets/common/items/weapons/hammer/iron_hammer-8.ron @@ -3,7 +3,7 @@ ItemDef( description: "This hammer has a spike on the opposite end, making it dangerous when swung either direction.", kind: Tool(( kind: Hammer, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 500, power: 1.2, diff --git a/assets/common/items/weapons/hammer/mjolnir.ron b/assets/common/items/weapons/hammer/mjolnir.ron index 7c8fb2efb5..9c6ef685e5 100644 --- a/assets/common/items/weapons/hammer/mjolnir.ron +++ b/assets/common/items/weapons/hammer/mjolnir.ron @@ -3,7 +3,7 @@ ItemDef( description: "It\'s crackling with lightning.", kind: Tool(( kind: Hammer, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 500, power: 4.0, diff --git a/assets/common/items/weapons/hammer/ramshead_hammer.ron b/assets/common/items/weapons/hammer/ramshead_hammer.ron index 6044a0afae..48cd876d09 100644 --- a/assets/common/items/weapons/hammer/ramshead_hammer.ron +++ b/assets/common/items/weapons/hammer/ramshead_hammer.ron @@ -3,7 +3,7 @@ ItemDef( description: "You feel an evil presence in the hammer.", kind: Tool(( kind: Hammer, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 500, power: 1.8, diff --git a/assets/common/items/weapons/hammer/runic_hammer.ron b/assets/common/items/weapons/hammer/runic_hammer.ron index 4151293086..4f8cb9aa4f 100644 --- a/assets/common/items/weapons/hammer/runic_hammer.ron +++ b/assets/common/items/weapons/hammer/runic_hammer.ron @@ -3,7 +3,7 @@ ItemDef( description: "There are strange runes inscribed into it.", kind: Tool(( kind: Hammer, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 500, power: 1.8, diff --git a/assets/common/items/weapons/hammer/starter_hammer.ron b/assets/common/items/weapons/hammer/starter_hammer.ron index a3eeff214b..3e7bdd0c07 100644 --- a/assets/common/items/weapons/hammer/starter_hammer.ron +++ b/assets/common/items/weapons/hammer/starter_hammer.ron @@ -3,7 +3,7 @@ ItemDef( description: "\'Property of...\' The rest is missing.", kind: Tool(( kind: Hammer, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 500, power: 0.5, diff --git a/assets/common/items/weapons/hammer/steel_hammer-0.ron b/assets/common/items/weapons/hammer/steel_hammer-0.ron index 316dbad324..5766a3e76d 100644 --- a/assets/common/items/weapons/hammer/steel_hammer-0.ron +++ b/assets/common/items/weapons/hammer/steel_hammer-0.ron @@ -3,7 +3,7 @@ ItemDef( description: "While lighter and more durable than its iron counterparts, it is nonetheless just as deadly.", kind: Tool(( kind: Hammer, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 500, power: 1.4, diff --git a/assets/common/items/weapons/hammer/steel_hammer-1.ron b/assets/common/items/weapons/hammer/steel_hammer-1.ron index 0721f05ff2..24208d8ac2 100644 --- a/assets/common/items/weapons/hammer/steel_hammer-1.ron +++ b/assets/common/items/weapons/hammer/steel_hammer-1.ron @@ -3,7 +3,7 @@ ItemDef( description: "The lighter attributes of the metal alloy are barely noticed when forged into such a wide hammer head.", kind: Tool(( kind: Hammer, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 500, power: 1.4, diff --git a/assets/common/items/weapons/hammer/steel_hammer-2.ron b/assets/common/items/weapons/hammer/steel_hammer-2.ron index 48bad3c269..705b58d630 100644 --- a/assets/common/items/weapons/hammer/steel_hammer-2.ron +++ b/assets/common/items/weapons/hammer/steel_hammer-2.ron @@ -3,7 +3,7 @@ ItemDef( description: "A heavy and wide baton made of a durable metal alloy, decorated with spikes.", kind: Tool(( kind: Hammer, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 500, power: 1.4, diff --git a/assets/common/items/weapons/hammer/steel_hammer-3.ron b/assets/common/items/weapons/hammer/steel_hammer-3.ron index 25679693fd..040fe85c7b 100644 --- a/assets/common/items/weapons/hammer/steel_hammer-3.ron +++ b/assets/common/items/weapons/hammer/steel_hammer-3.ron @@ -3,7 +3,7 @@ ItemDef( description: "A heavy, spiked steel ball tip provides a great smashing weapon.", kind: Tool(( kind: Hammer, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 500, power: 1.4, diff --git a/assets/common/items/weapons/hammer/steel_hammer-4.ron b/assets/common/items/weapons/hammer/steel_hammer-4.ron index 0dd2895884..ff82a2d7f7 100644 --- a/assets/common/items/weapons/hammer/steel_hammer-4.ron +++ b/assets/common/items/weapons/hammer/steel_hammer-4.ron @@ -3,7 +3,7 @@ ItemDef( description: "This destructive hammer was likely wielded by a vicious killer.", kind: Tool(( kind: Hammer, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 500, power: 1.4, diff --git a/assets/common/items/weapons/hammer/steel_hammer-5.ron b/assets/common/items/weapons/hammer/steel_hammer-5.ron index 3411c1c07d..f4c9b22c45 100644 --- a/assets/common/items/weapons/hammer/steel_hammer-5.ron +++ b/assets/common/items/weapons/hammer/steel_hammer-5.ron @@ -3,7 +3,7 @@ ItemDef( description: "A spiked ball designed to resemble the stars lining the night sky.", kind: Tool(( kind: Hammer, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 500, power: 1.4, diff --git a/assets/common/items/weapons/hammer/stone_hammer-0.ron b/assets/common/items/weapons/hammer/stone_hammer-0.ron index 996c1e5bb3..c6bcef5b88 100644 --- a/assets/common/items/weapons/hammer/stone_hammer-0.ron +++ b/assets/common/items/weapons/hammer/stone_hammer-0.ron @@ -3,7 +3,7 @@ ItemDef( description: "Bloodied stone tied to a branch, simple but functional as a weapon.", kind: Tool(( kind: Hammer, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 500, power: 0.7, diff --git a/assets/common/items/weapons/hammer/stone_hammer-1.ron b/assets/common/items/weapons/hammer/stone_hammer-1.ron index d975cca1ee..c96aa3bffb 100644 --- a/assets/common/items/weapons/hammer/stone_hammer-1.ron +++ b/assets/common/items/weapons/hammer/stone_hammer-1.ron @@ -3,7 +3,7 @@ ItemDef( description: "A rough stone, crumbling on the striking surfaces. Still usable as a weapon.", kind: Tool(( kind: Hammer, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 500, power: 0.7, diff --git a/assets/common/items/weapons/hammer/stone_hammer-2.ron b/assets/common/items/weapons/hammer/stone_hammer-2.ron index 345e60f909..9e1e952a13 100644 --- a/assets/common/items/weapons/hammer/stone_hammer-2.ron +++ b/assets/common/items/weapons/hammer/stone_hammer-2.ron @@ -3,7 +3,7 @@ ItemDef( description: "A rock tied to a stick, still good for smashing, but not very strong.", kind: Tool(( kind: Hammer, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 500, power: 0.7, diff --git a/assets/common/items/weapons/hammer/stone_hammer-3.ron b/assets/common/items/weapons/hammer/stone_hammer-3.ron index f12e84737a..1ef0425581 100644 --- a/assets/common/items/weapons/hammer/stone_hammer-3.ron +++ b/assets/common/items/weapons/hammer/stone_hammer-3.ron @@ -3,7 +3,7 @@ ItemDef( description: "A heavy rock with a slot worn through to fasten it in place. Brutal in its simple design, but still functional.", kind: Tool(( kind: Hammer, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 500, power: 0.7, diff --git a/assets/common/items/weapons/hammer/wood_hammer-0.ron b/assets/common/items/weapons/hammer/wood_hammer-0.ron index b19d87f53d..9f5f3a68f1 100644 --- a/assets/common/items/weapons/hammer/wood_hammer-0.ron +++ b/assets/common/items/weapons/hammer/wood_hammer-0.ron @@ -3,7 +3,7 @@ ItemDef( description: "Hardened wood, subjected to many different elements to provide a enough strength to be a weapon.", kind: Tool(( kind: Hammer, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 500, power: 0.6, diff --git a/assets/common/items/weapons/hammer/worn_iron_hammer-0.ron b/assets/common/items/weapons/hammer/worn_iron_hammer-0.ron index 14a7da11da..14dfcf1345 100644 --- a/assets/common/items/weapons/hammer/worn_iron_hammer-0.ron +++ b/assets/common/items/weapons/hammer/worn_iron_hammer-0.ron @@ -3,7 +3,7 @@ ItemDef( description: "While the dwarves excel at rough hewn weapons, this one has seen its fair share of battles, might still serve well enough for a few more.", kind: Tool(( kind: Hammer, - hands: TwoHand, + hands: Two, 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 index 259edfd10d..39961d8ba2 100644 --- a/assets/common/items/weapons/hammer/worn_iron_hammer-1.ron +++ b/assets/common/items/weapons/hammer/worn_iron_hammer-1.ron @@ -3,7 +3,7 @@ ItemDef( description: "Elven hammers are lighter than most. This one has seen its fair share of wear and tear.", kind: Tool(( kind: Hammer, - hands: TwoHand, + hands: Two, 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 index 851d992dfb..756d018c62 100644 --- a/assets/common/items/weapons/hammer/worn_iron_hammer-2.ron +++ b/assets/common/items/weapons/hammer/worn_iron_hammer-2.ron @@ -3,7 +3,7 @@ ItemDef( description: "An unremarkable mace, that has seen a lot of use.", kind: Tool(( kind: Hammer, - hands: TwoHand, + hands: Two, 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 index 1326a8fa78..ed2fc859f1 100644 --- a/assets/common/items/weapons/hammer/worn_iron_hammer-3.ron +++ b/assets/common/items/weapons/hammer/worn_iron_hammer-3.ron @@ -3,7 +3,7 @@ ItemDef( description: "A heavy orc crafted hammer, missing chunks from heavy use.", kind: Tool(( kind: Hammer, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 500, power: 0.85, diff --git a/assets/common/items/weapons/hammer_1h/bloodsteel-0.ron b/assets/common/items/weapons/hammer_1h/bloodsteel-0.ron index a0b4ab1100..9ed34579a8 100644 --- a/assets/common/items/weapons/hammer_1h/bloodsteel-0.ron +++ b/assets/common/items/weapons/hammer_1h/bloodsteel-0.ron @@ -3,7 +3,7 @@ ItemDef( description: "Infused with blood.", kind: Tool(( kind: Hammer, - hands: OneHand, + hands: One, stats: ( equip_time_millis: 500, power: 1.6, @@ -12,4 +12,5 @@ ItemDef( ), )), quality: High, + tags: [], ) \ No newline at end of file diff --git a/assets/common/items/weapons/hammer_1h/bloodsteel-1.ron b/assets/common/items/weapons/hammer_1h/bloodsteel-1.ron index ad7f1ec476..5379cb2279 100644 --- a/assets/common/items/weapons/hammer_1h/bloodsteel-1.ron +++ b/assets/common/items/weapons/hammer_1h/bloodsteel-1.ron @@ -3,7 +3,7 @@ ItemDef( description: "Infused with blood.", kind: Tool(( kind: Hammer, - hands: OneHand, + hands: One, stats: ( equip_time_millis: 500, power: 1.8, @@ -12,4 +12,5 @@ ItemDef( ), )), quality: High, + tags: [], ) \ No newline at end of file diff --git a/assets/common/items/weapons/hammer_1h/bronze-0.ron b/assets/common/items/weapons/hammer_1h/bronze-0.ron index f463e093b7..1090cde1de 100644 --- a/assets/common/items/weapons/hammer_1h/bronze-0.ron +++ b/assets/common/items/weapons/hammer_1h/bronze-0.ron @@ -3,7 +3,7 @@ ItemDef( description: "Casted from brass.", kind: Tool(( kind: Hammer, - hands: OneHand, + hands: One, stats: ( equip_time_millis: 500, power: 1.2, @@ -12,4 +12,5 @@ ItemDef( ), )), quality: Moderate, + tags: [], ) \ No newline at end of file diff --git a/assets/common/items/weapons/hammer_1h/bronze-1.ron b/assets/common/items/weapons/hammer_1h/bronze-1.ron index 5dd99c28b9..589e53b27a 100644 --- a/assets/common/items/weapons/hammer_1h/bronze-1.ron +++ b/assets/common/items/weapons/hammer_1h/bronze-1.ron @@ -3,7 +3,7 @@ ItemDef( description: "Forged from bronze.", kind: Tool(( kind: Hammer, - hands: OneHand, + hands: One, stats: ( equip_time_millis: 500, power: 1.0, @@ -12,4 +12,5 @@ ItemDef( ), )), quality: Moderate, + tags: [], ) \ No newline at end of file diff --git a/assets/common/items/weapons/hammer_1h/cobalt-0.ron b/assets/common/items/weapons/hammer_1h/cobalt-0.ron index 53d4d5466a..a0c1099bcc 100644 --- a/assets/common/items/weapons/hammer_1h/cobalt-0.ron +++ b/assets/common/items/weapons/hammer_1h/cobalt-0.ron @@ -3,7 +3,7 @@ ItemDef( description: "Forged from cobalt.", kind: Tool(( kind: Hammer, - hands: OneHand, + hands: One, stats: ( equip_time_millis: 500, power: 1.6, @@ -12,4 +12,5 @@ ItemDef( ), )), quality: High, + tags: [], ) \ No newline at end of file diff --git a/assets/common/items/weapons/hammer_1h/cobalt-1.ron b/assets/common/items/weapons/hammer_1h/cobalt-1.ron index dc4ce86b28..d93c1cf2c4 100644 --- a/assets/common/items/weapons/hammer_1h/cobalt-1.ron +++ b/assets/common/items/weapons/hammer_1h/cobalt-1.ron @@ -3,7 +3,7 @@ ItemDef( description: "Forged from cobalt.", kind: Tool(( kind: Hammer, - hands: OneHand, + hands: One, stats: ( equip_time_millis: 500, power: 1.5, @@ -12,4 +12,5 @@ ItemDef( ), )), quality: High, + tags: [], ) \ No newline at end of file diff --git a/assets/common/items/weapons/hammer_1h/iron-0.ron b/assets/common/items/weapons/hammer_1h/iron-0.ron index 9bedecb2b8..63df955a76 100644 --- a/assets/common/items/weapons/hammer_1h/iron-0.ron +++ b/assets/common/items/weapons/hammer_1h/iron-0.ron @@ -3,7 +3,7 @@ ItemDef( description: "Forged from iron.", kind: Tool(( kind: Hammer, - hands: OneHand, + hands: One, stats: ( equip_time_millis: 500, power: 1.4, @@ -12,4 +12,5 @@ ItemDef( ), )), quality: Moderate, + tags: [], ) \ No newline at end of file diff --git a/assets/common/items/weapons/hammer_1h/iron-1.ron b/assets/common/items/weapons/hammer_1h/iron-1.ron index 6d8a34bbec..87d7151a75 100644 --- a/assets/common/items/weapons/hammer_1h/iron-1.ron +++ b/assets/common/items/weapons/hammer_1h/iron-1.ron @@ -3,7 +3,7 @@ ItemDef( description: "Forged from iron.", kind: Tool(( kind: Hammer, - hands: OneHand, + hands: One, stats: ( equip_time_millis: 500, power: 1.3, @@ -12,4 +12,5 @@ ItemDef( ), )), quality: Moderate, + tags: [], ) \ No newline at end of file diff --git a/assets/common/items/weapons/hammer_1h/iron-2.ron b/assets/common/items/weapons/hammer_1h/iron-2.ron index 7349f7f7b8..f439868139 100644 --- a/assets/common/items/weapons/hammer_1h/iron-2.ron +++ b/assets/common/items/weapons/hammer_1h/iron-2.ron @@ -3,7 +3,7 @@ ItemDef( description: "Forged from iron.", kind: Tool(( kind: Hammer, - hands: OneHand, + hands: One, stats: ( equip_time_millis: 500, power: 1.1, @@ -12,4 +12,5 @@ ItemDef( ), )), quality: Moderate, + tags: [], ) \ No newline at end of file diff --git a/assets/common/items/weapons/hammer_1h/steel-0.ron b/assets/common/items/weapons/hammer_1h/steel-0.ron index 98ea85e301..446cd92b5b 100644 --- a/assets/common/items/weapons/hammer_1h/steel-0.ron +++ b/assets/common/items/weapons/hammer_1h/steel-0.ron @@ -3,7 +3,7 @@ ItemDef( description: "Forged from steel.", kind: Tool(( kind: Hammer, - hands: OneHand, + hands: One, stats: ( equip_time_millis: 500, power: 1.5, @@ -12,4 +12,5 @@ ItemDef( ), )), quality: Moderate, + tags: [], ) \ No newline at end of file diff --git a/assets/common/items/weapons/hammer_1h/steel-1.ron b/assets/common/items/weapons/hammer_1h/steel-1.ron index a15346b6fc..2675db788d 100644 --- a/assets/common/items/weapons/hammer_1h/steel-1.ron +++ b/assets/common/items/weapons/hammer_1h/steel-1.ron @@ -3,7 +3,7 @@ ItemDef( description: "Inset with an amethyst.", kind: Tool(( kind: Hammer, - hands: OneHand, + hands: One, stats: ( equip_time_millis: 500, power: 1.4, @@ -12,4 +12,5 @@ ItemDef( ), )), quality: Moderate, + tags: [], ) \ No newline at end of file diff --git a/assets/common/items/weapons/hammer_1h/steel-2.ron b/assets/common/items/weapons/hammer_1h/steel-2.ron index cd2ecec83c..2364628d7f 100644 --- a/assets/common/items/weapons/hammer_1h/steel-2.ron +++ b/assets/common/items/weapons/hammer_1h/steel-2.ron @@ -3,7 +3,7 @@ ItemDef( description: "Inlaid with gold.", kind: Tool(( kind: Hammer, - hands: OneHand, + hands: One, stats: ( equip_time_millis: 500, power: 1.2, @@ -12,4 +12,5 @@ ItemDef( ), )), quality: Moderate, + tags: [], ) \ No newline at end of file diff --git a/assets/common/items/weapons/hammer_1h/stone-0.ron b/assets/common/items/weapons/hammer_1h/stone-0.ron index 778b4071da..5e70888a6a 100644 --- a/assets/common/items/weapons/hammer_1h/stone-0.ron +++ b/assets/common/items/weapons/hammer_1h/stone-0.ron @@ -3,7 +3,7 @@ ItemDef( description: "Bone(s?)", kind: Tool(( kind: Hammer, - hands: OneHand, + hands: One, stats: ( equip_time_millis: 500, power: 0.7, @@ -12,4 +12,5 @@ ItemDef( ), )), quality: Common, + tags: [], ) \ No newline at end of file diff --git a/assets/common/items/weapons/hammer_1h/stone-1.ron b/assets/common/items/weapons/hammer_1h/stone-1.ron index db730bcdaa..8430318b44 100644 --- a/assets/common/items/weapons/hammer_1h/stone-1.ron +++ b/assets/common/items/weapons/hammer_1h/stone-1.ron @@ -3,7 +3,7 @@ ItemDef( description: "Chiseled from stone.", kind: Tool(( kind: Hammer, - hands: OneHand, + hands: One, stats: ( equip_time_millis: 500, power: 1.0, @@ -12,4 +12,5 @@ ItemDef( ), )), quality: Common, + tags: [], ) \ No newline at end of file diff --git a/assets/common/items/weapons/hammer_1h/wood-0.ron b/assets/common/items/weapons/hammer_1h/wood-0.ron index 2ca5a5f8f4..e75be1d533 100644 --- a/assets/common/items/weapons/hammer_1h/wood-0.ron +++ b/assets/common/items/weapons/hammer_1h/wood-0.ron @@ -3,7 +3,7 @@ ItemDef( description: "All that remains of a tree...", kind: Tool(( kind: Hammer, - hands: OneHand, + hands: One, stats: ( equip_time_millis: 500, power: 0.8, @@ -12,4 +12,5 @@ ItemDef( ), )), quality: Low, + tags: [], ) \ No newline at end of file diff --git a/assets/common/items/weapons/hammer_1h/wood-1.ron b/assets/common/items/weapons/hammer_1h/wood-1.ron index 3550389d2e..d7fcc49fe8 100644 --- a/assets/common/items/weapons/hammer_1h/wood-1.ron +++ b/assets/common/items/weapons/hammer_1h/wood-1.ron @@ -3,7 +3,7 @@ ItemDef( description: "Carved from wood.", kind: Tool(( kind: Hammer, - hands: OneHand, + hands: One, stats: ( equip_time_millis: 500, power: 0.5, @@ -12,4 +12,5 @@ ItemDef( ), )), quality: Low, + tags: [], ) \ No newline at end of file diff --git a/assets/common/items/weapons/sceptre/fork0.ron b/assets/common/items/weapons/sceptre/fork0.ron index b709dbc2d9..d30f79301b 100644 --- a/assets/common/items/weapons/sceptre/fork0.ron +++ b/assets/common/items/weapons/sceptre/fork0.ron @@ -3,7 +3,7 @@ ItemDef( description: "Shamanistic energies brought this piece of wood to life again.", kind: Tool(( kind: Sceptre, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 400, power: 2.0, diff --git a/assets/common/items/weapons/sceptre/loops0.ron b/assets/common/items/weapons/sceptre/loops0.ron index af8004f7ce..2cd8527a5e 100644 --- a/assets/common/items/weapons/sceptre/loops0.ron +++ b/assets/common/items/weapons/sceptre/loops0.ron @@ -3,7 +3,7 @@ ItemDef( description: "Do you really want to live forever?", kind: Tool(( kind: Sceptre, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 400, power: 1.2, diff --git a/assets/common/items/weapons/sceptre/moon0.ron b/assets/common/items/weapons/sceptre/moon0.ron index c4d517a038..2daab8c053 100644 --- a/assets/common/items/weapons/sceptre/moon0.ron +++ b/assets/common/items/weapons/sceptre/moon0.ron @@ -3,7 +3,7 @@ ItemDef( description: "Trusty companion by day and night.", kind: Tool(( kind: Sceptre, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 400, power: 1.6, diff --git a/assets/common/items/weapons/sceptre/root_evil.ron b/assets/common/items/weapons/sceptre/root_evil.ron index 55887a8dce..496aef8c61 100644 --- a/assets/common/items/weapons/sceptre/root_evil.ron +++ b/assets/common/items/weapons/sceptre/root_evil.ron @@ -3,7 +3,7 @@ ItemDef( description: "\'Everything comes at a price...\'", kind: Tool(( kind: Sceptre, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 400, power: 4.0, diff --git a/assets/common/items/weapons/sceptre/root_green0.ron b/assets/common/items/weapons/sceptre/root_green0.ron index f0a056484e..655380b9a2 100644 --- a/assets/common/items/weapons/sceptre/root_green0.ron +++ b/assets/common/items/weapons/sceptre/root_green0.ron @@ -3,7 +3,7 @@ ItemDef( description: "Sparkles from living energy.", kind: Tool(( kind: Sceptre, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 400, power: 3.5, diff --git a/assets/common/items/weapons/sceptre/sceptre_velorite_0.ron b/assets/common/items/weapons/sceptre/sceptre_velorite_0.ron index 8f87a6ccdf..83ff7db798 100644 --- a/assets/common/items/weapons/sceptre/sceptre_velorite_0.ron +++ b/assets/common/items/weapons/sceptre/sceptre_velorite_0.ron @@ -3,7 +3,7 @@ ItemDef( description: "Heals your allies with the mystical Velorite aura.", kind: Tool(( kind: Sceptre, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 400, power: 1.2, diff --git a/assets/common/items/weapons/sceptre/staff_nature.ron b/assets/common/items/weapons/sceptre/staff_nature.ron index 3ce85733fe..459b49280a 100644 --- a/assets/common/items/weapons/sceptre/staff_nature.ron +++ b/assets/common/items/weapons/sceptre/staff_nature.ron @@ -3,7 +3,7 @@ ItemDef( description: "Heals your allies with the power of nature.", kind: Tool(( kind: Sceptre, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 400, power: 0.91, diff --git a/assets/common/items/weapons/sceptre/starter_sceptre.ron b/assets/common/items/weapons/sceptre/starter_sceptre.ron index e4464ff19e..7f8adc23a3 100644 --- a/assets/common/items/weapons/sceptre/starter_sceptre.ron +++ b/assets/common/items/weapons/sceptre/starter_sceptre.ron @@ -3,7 +3,7 @@ ItemDef( description: "Heals your allies with the power of nature.", kind: Tool(( kind: Sceptre, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 400, power: 0.5, diff --git a/assets/common/items/weapons/sceptre/totem_green.ron b/assets/common/items/weapons/sceptre/totem_green.ron index 199deffb4f..cbe3fa2f88 100644 --- a/assets/common/items/weapons/sceptre/totem_green.ron +++ b/assets/common/items/weapons/sceptre/totem_green.ron @@ -1,9 +1,9 @@ ItemDef( name: "Gnarling Pride", - description: "Territory marker of a Gnarling tribe.\r\n Infused with healing powers.", + description: "Territory marker of a Gnarling tribe.\nInfused with healing powers.", kind: Tool(( kind: Sceptre, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 400, power: 1.0, diff --git a/assets/common/items/weapons/shield/shield_1.ron b/assets/common/items/weapons/shield/shield_1.ron index 61ab248937..dfecf944ee 100644 --- a/assets/common/items/weapons/shield/shield_1.ron +++ b/assets/common/items/weapons/shield/shield_1.ron @@ -3,7 +3,7 @@ ItemDef( description: "Should withstand a few more hits, hopefully...", kind: Tool(( kind: Shield, - hands: OneHand, + hands: One, stats: ( equip_time_millis: 400, power: 1.0, diff --git a/assets/common/items/weapons/staff/amethyst_staff.ron b/assets/common/items/weapons/staff/amethyst_staff.ron index 151f274516..ac176501f4 100644 --- a/assets/common/items/weapons/staff/amethyst_staff.ron +++ b/assets/common/items/weapons/staff/amethyst_staff.ron @@ -3,7 +3,7 @@ ItemDef( description: "The amethyst faintly glows.", kind: Tool(( kind: Staff, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 300, power: 1.5, diff --git a/assets/common/items/weapons/staff/bone_staff.ron b/assets/common/items/weapons/staff/bone_staff.ron index 9b3afe8840..2009e3b7c3 100644 --- a/assets/common/items/weapons/staff/bone_staff.ron +++ b/assets/common/items/weapons/staff/bone_staff.ron @@ -3,7 +3,7 @@ ItemDef( description: "There\'s a red gem suspended in the bones.", kind: Tool(( kind: Staff, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 300, power: 1.0, diff --git a/assets/common/items/weapons/staff/cultist_staff.ron b/assets/common/items/weapons/staff/cultist_staff.ron index d6f0b1a358..e3976b61c4 100644 --- a/assets/common/items/weapons/staff/cultist_staff.ron +++ b/assets/common/items/weapons/staff/cultist_staff.ron @@ -3,7 +3,7 @@ ItemDef( description: "The fire gives off no heat.", kind: Tool(( kind: Staff, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 300, power: 2.0, diff --git a/assets/common/items/weapons/staff/staff_1.ron b/assets/common/items/weapons/staff/staff_1.ron index 6113530222..b720135ef0 100644 --- a/assets/common/items/weapons/staff/staff_1.ron +++ b/assets/common/items/weapons/staff/staff_1.ron @@ -3,7 +3,7 @@ ItemDef( description: "Walking stick with a sharpened end.", kind: Tool(( kind: Staff, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 200, power: 0.5, diff --git a/assets/common/items/weapons/staff/starter_staff.ron b/assets/common/items/weapons/staff/starter_staff.ron index d256ab6e8c..1190c9fbcf 100644 --- a/assets/common/items/weapons/staff/starter_staff.ron +++ b/assets/common/items/weapons/staff/starter_staff.ron @@ -3,7 +3,7 @@ ItemDef( description: "Smells like resin and magic.", kind: Tool(( kind: Staff, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 300, power: 0.5, 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 7cb2ff1d13..b3175b6c2a 100644 --- a/assets/common/items/weapons/sword/cultist_purp_2h-0.ron +++ b/assets/common/items/weapons/sword/cultist_purp_2h-0.ron @@ -3,7 +3,7 @@ ItemDef( description: "This belonged to an evil Cult Leader.", kind: Tool(( kind: Sword, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 500, power: 2.0, diff --git a/assets/common/items/weapons/sword/frost_cleaver_2h-0.ron b/assets/common/items/weapons/sword/frost_cleaver_2h-0.ron index c460a58783..50ae1251dd 100644 --- a/assets/common/items/weapons/sword/frost_cleaver_2h-0.ron +++ b/assets/common/items/weapons/sword/frost_cleaver_2h-0.ron @@ -3,7 +3,7 @@ ItemDef( description: "Radiates a freezing aura.", kind: Tool(( kind: Sword, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 500, power: 1.7, diff --git a/assets/common/items/weapons/sword/frost_cleaver_2h-1.ron b/assets/common/items/weapons/sword/frost_cleaver_2h-1.ron index 40b6764ae2..d2bc2105ab 100644 --- a/assets/common/items/weapons/sword/frost_cleaver_2h-1.ron +++ b/assets/common/items/weapons/sword/frost_cleaver_2h-1.ron @@ -3,7 +3,7 @@ ItemDef( description: "Forged from a single piece of eternal ice.", kind: Tool(( kind: Sword, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 500, power: 1.95, 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 b57a2d2490..7476dc759b 100644 --- a/assets/common/items/weapons/sword/greatsword_2h_dam-0.ron +++ b/assets/common/items/weapons/sword/greatsword_2h_dam-0.ron @@ -3,7 +3,7 @@ ItemDef( description: "The blade has been chipped quite a few times.", kind: Tool(( kind: Sword, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 500, power: 0.8, 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 79add07682..129bda61f0 100644 --- a/assets/common/items/weapons/sword/greatsword_2h_dam-1.ron +++ b/assets/common/items/weapons/sword/greatsword_2h_dam-1.ron @@ -3,7 +3,7 @@ ItemDef( description: "The blade has been chipped quite a few times.", kind: Tool(( kind: Sword, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 500, power: 0.8, 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 0039aafe22..eb69c646d3 100644 --- a/assets/common/items/weapons/sword/greatsword_2h_dam-2.ron +++ b/assets/common/items/weapons/sword/greatsword_2h_dam-2.ron @@ -3,7 +3,7 @@ ItemDef( description: "The blade has been chipped quite a few times.", kind: Tool(( kind: Sword, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 500, power: 0.8, 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 8f7cd8c5e9..a9b5f746c9 100644 --- a/assets/common/items/weapons/sword/greatsword_2h_fine-0.ron +++ b/assets/common/items/weapons/sword/greatsword_2h_fine-0.ron @@ -3,7 +3,7 @@ ItemDef( description: "It\'s been polished and sharpened recently.", kind: Tool(( kind: Sword, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 500, power: 1.4, 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 4674c05611..532c23a82f 100644 --- a/assets/common/items/weapons/sword/greatsword_2h_fine-1.ron +++ b/assets/common/items/weapons/sword/greatsword_2h_fine-1.ron @@ -3,7 +3,7 @@ ItemDef( description: "It\'s been polished and sharpened recently.", kind: Tool(( kind: Sword, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 500, power: 1.4, 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 1f90ae26aa..2ce295e216 100644 --- a/assets/common/items/weapons/sword/greatsword_2h_fine-2.ron +++ b/assets/common/items/weapons/sword/greatsword_2h_fine-2.ron @@ -3,7 +3,7 @@ ItemDef( description: "It\'s been polished and sharpened recently.", kind: Tool(( kind: Sword, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 500, power: 1.4, 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 86dada5368..083b0c2813 100644 --- a/assets/common/items/weapons/sword/greatsword_2h_orn-0.ron +++ b/assets/common/items/weapons/sword/greatsword_2h_orn-0.ron @@ -3,7 +3,7 @@ ItemDef( description: "The sword\'s almost a work of art.", kind: Tool(( kind: Sword, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 500, power: 1.7, 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 86dada5368..083b0c2813 100644 --- a/assets/common/items/weapons/sword/greatsword_2h_orn-1.ron +++ b/assets/common/items/weapons/sword/greatsword_2h_orn-1.ron @@ -3,7 +3,7 @@ ItemDef( description: "The sword\'s almost a work of art.", kind: Tool(( kind: Sword, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 500, power: 1.7, 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 ce1c1337ff..015e267374 100644 --- a/assets/common/items/weapons/sword/greatsword_2h_orn-2.ron +++ b/assets/common/items/weapons/sword/greatsword_2h_orn-2.ron @@ -3,7 +3,7 @@ ItemDef( description: "The sword\'s almost a work of art.", kind: Tool(( kind: Sword, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 500, power: 1.7, 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 bd1b6a39ca..7d074c0aad 100644 --- a/assets/common/items/weapons/sword/greatsword_2h_simple-0.ron +++ b/assets/common/items/weapons/sword/greatsword_2h_simple-0.ron @@ -3,7 +3,7 @@ ItemDef( description: "It\'s been well used.", kind: Tool(( kind: Sword, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 500, power: 1.1, 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 bd1b6a39ca..7d074c0aad 100644 --- a/assets/common/items/weapons/sword/greatsword_2h_simple-1.ron +++ b/assets/common/items/weapons/sword/greatsword_2h_simple-1.ron @@ -3,7 +3,7 @@ ItemDef( description: "It\'s been well used.", kind: Tool(( kind: Sword, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 500, power: 1.1, 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 9a2503df42..a94d87d5ae 100644 --- a/assets/common/items/weapons/sword/greatsword_2h_simple-2.ron +++ b/assets/common/items/weapons/sword/greatsword_2h_simple-2.ron @@ -3,7 +3,7 @@ ItemDef( description: "It\'s been well used.", kind: Tool(( kind: Sword, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 500, power: 1.1, 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 8a6d1c302f..e311f47e44 100644 --- a/assets/common/items/weapons/sword/long_2h_dam-0.ron +++ b/assets/common/items/weapons/sword/long_2h_dam-0.ron @@ -3,7 +3,7 @@ ItemDef( description: "It\'s slightly cracked.", kind: Tool(( kind: Sword, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 500, power: 0.6, 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 8a6d1c302f..e311f47e44 100644 --- a/assets/common/items/weapons/sword/long_2h_dam-1.ron +++ b/assets/common/items/weapons/sword/long_2h_dam-1.ron @@ -3,7 +3,7 @@ ItemDef( description: "It\'s slightly cracked.", kind: Tool(( kind: Sword, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 500, power: 0.6, 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 8a6d1c302f..e311f47e44 100644 --- a/assets/common/items/weapons/sword/long_2h_dam-2.ron +++ b/assets/common/items/weapons/sword/long_2h_dam-2.ron @@ -3,7 +3,7 @@ ItemDef( description: "It\'s slightly cracked.", kind: Tool(( kind: Sword, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 500, power: 0.6, 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 8a6d1c302f..e311f47e44 100644 --- a/assets/common/items/weapons/sword/long_2h_dam-3.ron +++ b/assets/common/items/weapons/sword/long_2h_dam-3.ron @@ -3,7 +3,7 @@ ItemDef( description: "It\'s slightly cracked.", kind: Tool(( kind: Sword, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 500, power: 0.6, 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 8a6d1c302f..e311f47e44 100644 --- a/assets/common/items/weapons/sword/long_2h_dam-4.ron +++ b/assets/common/items/weapons/sword/long_2h_dam-4.ron @@ -3,7 +3,7 @@ ItemDef( description: "It\'s slightly cracked.", kind: Tool(( kind: Sword, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 500, power: 0.6, 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 8a6d1c302f..e311f47e44 100644 --- a/assets/common/items/weapons/sword/long_2h_dam-5.ron +++ b/assets/common/items/weapons/sword/long_2h_dam-5.ron @@ -3,7 +3,7 @@ ItemDef( description: "It\'s slightly cracked.", kind: Tool(( kind: Sword, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 500, power: 0.6, 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 475c5c4562..52ee1dc773 100644 --- a/assets/common/items/weapons/sword/long_2h_fine-0.ron +++ b/assets/common/items/weapons/sword/long_2h_fine-0.ron @@ -3,7 +3,7 @@ ItemDef( description: "It shines when you hold it up to the light.", kind: Tool(( kind: Sword, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 500, power: 1.2, 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 475c5c4562..52ee1dc773 100644 --- a/assets/common/items/weapons/sword/long_2h_fine-1.ron +++ b/assets/common/items/weapons/sword/long_2h_fine-1.ron @@ -3,7 +3,7 @@ ItemDef( description: "It shines when you hold it up to the light.", kind: Tool(( kind: Sword, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 500, power: 1.2, 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 475c5c4562..52ee1dc773 100644 --- a/assets/common/items/weapons/sword/long_2h_fine-2.ron +++ b/assets/common/items/weapons/sword/long_2h_fine-2.ron @@ -3,7 +3,7 @@ ItemDef( description: "It shines when you hold it up to the light.", kind: Tool(( kind: Sword, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 500, power: 1.2, 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 860ebc6d2f..866a443fc7 100644 --- a/assets/common/items/weapons/sword/long_2h_fine-3.ron +++ b/assets/common/items/weapons/sword/long_2h_fine-3.ron @@ -3,7 +3,7 @@ ItemDef( description: "It shines when you hold it up to the light.", kind: Tool(( kind: Sword, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 500, power: 1.2, 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 475c5c4562..52ee1dc773 100644 --- a/assets/common/items/weapons/sword/long_2h_fine-4.ron +++ b/assets/common/items/weapons/sword/long_2h_fine-4.ron @@ -3,7 +3,7 @@ ItemDef( description: "It shines when you hold it up to the light.", kind: Tool(( kind: Sword, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 500, power: 1.2, 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 876bb89542..2858c3e710 100644 --- a/assets/common/items/weapons/sword/long_2h_fine-5.ron +++ b/assets/common/items/weapons/sword/long_2h_fine-5.ron @@ -3,7 +3,7 @@ ItemDef( description: "It shines when you hold it up to the light.", kind: Tool(( kind: Sword, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 500, power: 1.2, 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 90b3e8b40f..0404b5302e 100644 --- a/assets/common/items/weapons/sword/long_2h_orn-0.ron +++ b/assets/common/items/weapons/sword/long_2h_orn-0.ron @@ -3,7 +3,7 @@ ItemDef( description: "It\'s probably the weapon of some noble.", kind: Tool(( kind: Sword, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 500, power: 1.5, 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 b7debe3489..99cc5766ad 100644 --- a/assets/common/items/weapons/sword/long_2h_orn-1.ron +++ b/assets/common/items/weapons/sword/long_2h_orn-1.ron @@ -3,7 +3,7 @@ ItemDef( description: "It\'s probably the weapon of some noble.", kind: Tool(( kind: Sword, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 500, power: 1.5, 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 90b3e8b40f..0404b5302e 100644 --- a/assets/common/items/weapons/sword/long_2h_orn-2.ron +++ b/assets/common/items/weapons/sword/long_2h_orn-2.ron @@ -3,7 +3,7 @@ ItemDef( description: "It\'s probably the weapon of some noble.", kind: Tool(( kind: Sword, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 500, power: 1.5, 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 90b3e8b40f..0404b5302e 100644 --- a/assets/common/items/weapons/sword/long_2h_orn-3.ron +++ b/assets/common/items/weapons/sword/long_2h_orn-3.ron @@ -3,7 +3,7 @@ ItemDef( description: "It\'s probably the weapon of some noble.", kind: Tool(( kind: Sword, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 500, power: 1.5, 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 b7debe3489..99cc5766ad 100644 --- a/assets/common/items/weapons/sword/long_2h_orn-4.ron +++ b/assets/common/items/weapons/sword/long_2h_orn-4.ron @@ -3,7 +3,7 @@ ItemDef( description: "It\'s probably the weapon of some noble.", kind: Tool(( kind: Sword, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 500, power: 1.5, 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 b7debe3489..99cc5766ad 100644 --- a/assets/common/items/weapons/sword/long_2h_orn-5.ron +++ b/assets/common/items/weapons/sword/long_2h_orn-5.ron @@ -3,7 +3,7 @@ ItemDef( description: "It\'s probably the weapon of some noble.", kind: Tool(( kind: Sword, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 500, power: 1.5, 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 e9cccaceae..d8ca455f9a 100644 --- a/assets/common/items/weapons/sword/long_2h_simple-0.ron +++ b/assets/common/items/weapons/sword/long_2h_simple-0.ron @@ -3,7 +3,7 @@ ItemDef( description: "It was well maintained by it\'s previous owner.", kind: Tool(( kind: Sword, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 500, power: 0.9, 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 e9cccaceae..d8ca455f9a 100644 --- a/assets/common/items/weapons/sword/long_2h_simple-1.ron +++ b/assets/common/items/weapons/sword/long_2h_simple-1.ron @@ -3,7 +3,7 @@ ItemDef( description: "It was well maintained by it\'s previous owner.", kind: Tool(( kind: Sword, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 500, power: 0.9, 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 1072b4485d..5f41e99460 100644 --- a/assets/common/items/weapons/sword/long_2h_simple-2.ron +++ b/assets/common/items/weapons/sword/long_2h_simple-2.ron @@ -3,7 +3,7 @@ ItemDef( description: "It was well maintained by it\'s previous owner.", kind: Tool(( kind: Sword, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 500, power: 0.9, 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 e9cccaceae..d8ca455f9a 100644 --- a/assets/common/items/weapons/sword/long_2h_simple-3.ron +++ b/assets/common/items/weapons/sword/long_2h_simple-3.ron @@ -3,7 +3,7 @@ ItemDef( description: "It was well maintained by it\'s previous owner.", kind: Tool(( kind: Sword, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 500, power: 0.9, 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 e9cccaceae..d8ca455f9a 100644 --- a/assets/common/items/weapons/sword/long_2h_simple-4.ron +++ b/assets/common/items/weapons/sword/long_2h_simple-4.ron @@ -3,7 +3,7 @@ ItemDef( description: "It was well maintained by it\'s previous owner.", kind: Tool(( kind: Sword, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 500, power: 0.9, 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 e9cccaceae..d8ca455f9a 100644 --- a/assets/common/items/weapons/sword/long_2h_simple-5.ron +++ b/assets/common/items/weapons/sword/long_2h_simple-5.ron @@ -3,7 +3,7 @@ ItemDef( description: "It was well maintained by it\'s previous owner.", kind: Tool(( kind: Sword, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 500, power: 0.9, diff --git a/assets/common/items/weapons/sword/short_sword_0.ron b/assets/common/items/weapons/sword/short_sword_0.ron index a0ce167a16..ad78e5affc 100644 --- a/assets/common/items/weapons/sword/short_sword_0.ron +++ b/assets/common/items/weapons/sword/short_sword_0.ron @@ -3,7 +3,7 @@ ItemDef( description: "There\'s blood encrusted on the blade.", kind: Tool(( kind: Sword, - hands: TwoHand, + hands: Two, 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 2f1e206ab1..faaeaea880 100644 --- a/assets/common/items/weapons/sword/starter_sword.ron +++ b/assets/common/items/weapons/sword/starter_sword.ron @@ -3,7 +3,7 @@ ItemDef( description: "Held together by Rust and hope.", kind: Tool(( kind: Sword, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 300, power: 0.5, diff --git a/assets/common/items/weapons/sword/wood_sword.ron b/assets/common/items/weapons/sword/wood_sword.ron index 6a63bc3cea..3ad9b2ab9e 100644 --- a/assets/common/items/weapons/sword/wood_sword.ron +++ b/assets/common/items/weapons/sword/wood_sword.ron @@ -3,7 +3,7 @@ ItemDef( description: "The resin glows.", kind: Tool(( kind: Sword, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 400, power: 0.8, diff --git a/assets/common/items/weapons/sword/zweihander_sword_0.ron b/assets/common/items/weapons/sword/zweihander_sword_0.ron index f702125cae..c4dade8430 100644 --- a/assets/common/items/weapons/sword/zweihander_sword_0.ron +++ b/assets/common/items/weapons/sword/zweihander_sword_0.ron @@ -3,7 +3,7 @@ ItemDef( description: "It\'s a big sword, and sharp too.", kind: Tool(( kind: Sword, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 500, power: 1.5, diff --git a/assets/common/items/weapons/tool/broom.ron b/assets/common/items/weapons/tool/broom.ron index fd9c8f2beb..1e7f2feda0 100644 --- a/assets/common/items/weapons/tool/broom.ron +++ b/assets/common/items/weapons/tool/broom.ron @@ -3,7 +3,7 @@ ItemDef( description: "It\'s beginning to fall apart.", kind: Tool(( kind: Farming, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 400, power: 1.0, diff --git a/assets/common/items/weapons/tool/fishing_rod.ron b/assets/common/items/weapons/tool/fishing_rod.ron index 553ec71071..e672813a66 100644 --- a/assets/common/items/weapons/tool/fishing_rod.ron +++ b/assets/common/items/weapons/tool/fishing_rod.ron @@ -3,7 +3,7 @@ ItemDef( description: "Smells of fish.", kind: Tool(( kind: Farming, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 400, power: 1.0, diff --git a/assets/common/items/weapons/tool/hoe.ron b/assets/common/items/weapons/tool/hoe.ron index a488bf9648..cc7c631abc 100644 --- a/assets/common/items/weapons/tool/hoe.ron +++ b/assets/common/items/weapons/tool/hoe.ron @@ -3,7 +3,7 @@ ItemDef( description: "It\'s stained with dirt.", kind: Tool(( kind: Farming, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 400, power: 1.0, diff --git a/assets/common/items/weapons/tool/pickaxe.ron b/assets/common/items/weapons/tool/pickaxe.ron index 02d9a85bdf..0c1e14d01b 100644 --- a/assets/common/items/weapons/tool/pickaxe.ron +++ b/assets/common/items/weapons/tool/pickaxe.ron @@ -3,7 +3,7 @@ ItemDef( description: "It has a chipped edge.", kind: Tool(( kind: Farming, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 400, power: 1.0, diff --git a/assets/common/items/weapons/tool/pitchfork.ron b/assets/common/items/weapons/tool/pitchfork.ron index b01baa6833..53ea6a471c 100644 --- a/assets/common/items/weapons/tool/pitchfork.ron +++ b/assets/common/items/weapons/tool/pitchfork.ron @@ -3,7 +3,7 @@ ItemDef( description: "One of the prongs is broken.", kind: Tool(( kind: Farming, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 400, power: 1.0, diff --git a/assets/common/items/weapons/tool/rake.ron b/assets/common/items/weapons/tool/rake.ron index 89cb00382d..cd582b1a3e 100644 --- a/assets/common/items/weapons/tool/rake.ron +++ b/assets/common/items/weapons/tool/rake.ron @@ -3,7 +3,7 @@ ItemDef( description: "Held together with twine.", kind: Tool(( kind: Farming, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 400, power: 1.0, diff --git a/assets/common/items/weapons/tool/shovel-0.ron b/assets/common/items/weapons/tool/shovel-0.ron index 7b9a978c50..1da67f9e4b 100644 --- a/assets/common/items/weapons/tool/shovel-0.ron +++ b/assets/common/items/weapons/tool/shovel-0.ron @@ -3,7 +3,7 @@ ItemDef( description: "It\'s covered in manure.", kind: Tool(( kind: Farming, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 400, power: 1.0, diff --git a/assets/common/items/weapons/tool/shovel-1.ron b/assets/common/items/weapons/tool/shovel-1.ron index 2c17245178..bf58d91c20 100644 --- a/assets/common/items/weapons/tool/shovel-1.ron +++ b/assets/common/items/weapons/tool/shovel-1.ron @@ -3,7 +3,7 @@ ItemDef( description: "It\'s been recently cleaned.", kind: Tool(( kind: Farming, - hands: TwoHand, + hands: Two, stats: ( equip_time_millis: 400, power: 1.0, diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron index f20b59e15c..cd14924f2c 100644 --- a/assets/voxygen/item_image_manifest.ron +++ b/assets/voxygen/item_image_manifest.ron @@ -1719,7 +1719,7 @@ (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 1.1, ), // Debug Items - Tool("common.items.debug.debug_stick"): VoxTrans( + Tool("common.items.debug.admin_stick"): VoxTrans( "voxel.weapon.tool.broom_belzeshrub_purple", (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.1, ), diff --git a/assets/voxygen/voxel/humanoid_main_weapon_manifest.ron b/assets/voxygen/voxel/humanoid_main_weapon_manifest.ron index e7f835df82..b430b3b0e0 100644 --- a/assets/voxygen/voxel/humanoid_main_weapon_manifest.ron +++ b/assets/voxygen/voxel/humanoid_main_weapon_manifest.ron @@ -730,7 +730,7 @@ color: None ), // Misc - "common.items.debug.debug_stick": ( + "common.items.debug.admin_stick": ( vox_spec: ("weapon.tool.broom_belzeshrub_purple", (-3.0, -4.0, -4.0)), color: None ), diff --git a/client/src/lib.rs b/client/src/lib.rs index 2c26d00f86..9b1a37d46f 100644 --- a/client/src/lib.rs +++ b/client/src/lib.rs @@ -1083,7 +1083,7 @@ impl Client { "Couldn't access controller component on client entity" ); } - self.send_msg_err(ClientGeneral::ControllerInputs(inputs))?; + self.send_msg_err(ClientGeneral::ControllerInputs(Box::new(inputs)))?; } // 2) Build up a list of events for this frame, to be passed to the frontend. diff --git a/common/net/src/msg/client.rs b/common/net/src/msg/client.rs index 6228372536..84ae660132 100644 --- a/common/net/src/msg/client.rs +++ b/common/net/src/msg/client.rs @@ -46,7 +46,6 @@ pub struct ClientRegister { /// Messages sent from the client to the server #[derive(Debug, Clone, Serialize, Deserialize)] -#[allow(clippy::large_enum_variant)] pub enum ClientGeneral { //Only in Character Screen RequestCharacterList, @@ -60,7 +59,7 @@ pub enum ClientGeneral { Spectate, //Only in game // Large enum variant allowed for clippy because of this - ControllerInputs(comp::ControllerInputs), + ControllerInputs(Box), ControlEvent(comp::ControlEvent), ControlAction(comp::ControlAction), SetViewDistance(u32), diff --git a/common/src/bin/csv_export/main.rs b/common/src/bin/csv_export/main.rs index 77ca87dc98..7b876c6470 100644 --- a/common/src/bin/csv_export/main.rs +++ b/common/src/bin/csv_export/main.rs @@ -132,8 +132,8 @@ fn get_tool_kind(kind: &ToolKind) -> String { fn get_tool_hands(tool: &Tool) -> String { match tool.hands { - Hands::OneHand => "OneHand".to_string(), - Hands::TwoHand => "TwoHand".to_string(), + Hands::One => "One".to_string(), + Hands::Two => "Two".to_string(), } } diff --git a/common/src/bin/csv_import/main.rs b/common/src/bin/csv_import/main.rs index 98e3a13966..ad55be1467 100644 --- a/common/src/bin/csv_import/main.rs +++ b/common/src/bin/csv_import/main.rs @@ -206,18 +206,14 @@ fn weapon_stats() -> Result<(), Box> { let hands = if let Some(hands_raw) = record.get(3) { match hands_raw { - "OneHand" | "One" | "1" | "1h" => { - comp::item::tool::Hands::OneHand - }, - "TwoHand" | "Two" | "2" | "2h" => { - comp::item::tool::Hands::TwoHand - }, + "One" | "1" | "1h" => comp::item::tool::Hands::One, + "Two" | "2" | "2h" => comp::item::tool::Hands::Two, _ => { eprintln!( "Unknown hand variant for {:?}", item.item_definition_id() ); - comp::item::tool::Hands::TwoHand + comp::item::tool::Hands::Two }, } } else { @@ -225,7 +221,7 @@ fn weapon_stats() -> Result<(), Box> { "Could not unwrap hand for {:?}", item.item_definition_id() ); - comp::item::tool::Hands::TwoHand + comp::item::tool::Hands::Two }; let tool = comp::item::tool::Tool::new( diff --git a/common/src/comp/body.rs b/common/src/comp/body.rs index b7d646636d..0e09c027c4 100644 --- a/common/src/comp/body.rs +++ b/common/src/comp/body.rs @@ -452,7 +452,7 @@ impl Body { } } - /// Returns the eye height for this humanoid. + /// Returns the eye height for this creature. pub fn eye_height(&self) -> f32 { self.height() * 0.9 } pub fn default_light_offset(&self) -> Vec3 { diff --git a/common/src/comp/inventory/item/tool.rs b/common/src/comp/inventory/item/tool.rs index d473aa3a53..9e2d527ac8 100644 --- a/common/src/comp/inventory/item/tool.rs +++ b/common/src/comp/inventory/item/tool.rs @@ -29,8 +29,8 @@ pub enum ToolKind { #[derive(Clone, Copy, Debug, Serialize, Deserialize)] pub enum Hands { - OneHand, - TwoHand, + One, + Two, } #[derive(Clone, Copy, Debug, Serialize, Deserialize)] @@ -45,8 +45,10 @@ impl From<&Tool> for Stats { fn from(tool: &Tool) -> Self { let raw_stats = tool.stats; let (power, speed) = match tool.hands { - Hands::OneHand => (0.67, 1.33), - Hands::TwoHand => (1.5, 0.75), + Hands::One => (0.67, 1.33), + // TODO: Restore this when one-handed weapons are made accessible + // Hands::Two => (1.5, 0.75), + Hands::Two => (1.0, 1.0), }; Self { equip_time_millis: raw_stats.equip_time_millis, @@ -91,7 +93,7 @@ impl Tool { pub fn empty() -> Self { Self { kind: ToolKind::Empty, - hands: Hands::OneHand, + hands: Hands::One, stats: Stats { equip_time_millis: 0, power: 1.00, @@ -129,12 +131,12 @@ impl Tool { pub struct AbilitySet { pub primary: T, pub secondary: T, - pub skills: Vec<(Option, T)>, + pub abilities: Vec<(Option, T)>, } impl AbilitySet { pub fn modified_by_tool(self, tool: &Tool) -> Self { - let stats: Stats = tool.into(); + let stats: Stats = Stats::from(tool); self.map(|a| a.adjusted_by_stats(stats.power, stats.poise_strength, stats.speed)) } } @@ -144,7 +146,7 @@ impl AbilitySet { AbilitySet { primary: f(self.primary), secondary: f(self.secondary), - skills: self.skills.into_iter().map(|(s, x)| (s, f(x))).collect(), + abilities: self.abilities.into_iter().map(|(s, x)| (s, f(x))).collect(), } } @@ -152,7 +154,7 @@ impl AbilitySet { AbilitySet { primary: f(&self.primary), secondary: f(&self.secondary), - skills: self.skills.iter().map(|(s, x)| (*s, f(x))).collect(), + abilities: self.abilities.iter().map(|(s, x)| (*s, f(x))).collect(), } } } @@ -162,7 +164,7 @@ impl Default for AbilitySet { AbilitySet { primary: CharacterAbility::default(), secondary: CharacterAbility::default(), - skills: vec![], + abilities: vec![], } } } diff --git a/common/src/comp/inventory/test.rs b/common/src/comp/inventory/test.rs index 8438b6b08d..8f6f749046 100644 --- a/common/src/comp/inventory/test.rs +++ b/common/src/comp/inventory/test.rs @@ -6,7 +6,7 @@ use crate::comp::{ use lazy_static::lazy_static; lazy_static! { static ref TEST_ITEMS: Vec = vec![Item::new_from_asset_expect( - "common.items.debug.debug_stick" + "common.items.debug.admin_stick" ),]; } diff --git a/common/src/states/utils.rs b/common/src/states/utils.rs index 7d85adff95..fd6bba8b15 100644 --- a/common/src/states/utils.rs +++ b/common/src/states/utils.rs @@ -2,7 +2,9 @@ use crate::{ comp::{ inventory::slot::EquipSlot, item::{Hands, ItemKind, Tool, ToolKind}, - quadruped_low, quadruped_medium, theropod, Body, CharacterState, LoadoutManip, StateUpdate, + quadruped_low, quadruped_medium, + skills::Skill, + theropod, Body, CharacterAbility, CharacterState, LoadoutManip, StateUpdate, }, consts::{FRIC_GROUND, GRAVITY}, event::{LocalEvent, ServerEvent}, @@ -400,157 +402,84 @@ pub fn handle_jump(data: &JoinData, update: &mut StateUpdate) { } } -pub fn handle_ability1_input(data: &JoinData, update: &mut StateUpdate) { - if data.inputs.primary.is_pressed() { +fn handle_ability_pressed(data: &JoinData, update: &mut StateUpdate, ability_key: AbilityKey) { + let hands = |equip_slot| match data.inventory.equipped(equip_slot).map(|i| i.kind()) { + Some(ItemKind::Tool(tool)) => Some(tool.hands), + _ => None, + }; + + // Mouse1 and Skill1 always use the MainHand slot + let always_main_hand = matches!(ability_key, AbilityKey::Mouse1 | AbilityKey::Skill1); + // skill_index used to select ability for the AbilityKey::Skill2 input + let (equip_slot, skill_index) = if always_main_hand { + (Some(EquipSlot::Mainhand), 0) + } else { + let hands = (hands(EquipSlot::Mainhand), hands(EquipSlot::Offhand)); + match hands { + (Some(Hands::Two), _) => (Some(EquipSlot::Mainhand), 1), + (_, Some(Hands::One)) => (Some(EquipSlot::Offhand), 0), + (Some(Hands::One), _) => (Some(EquipSlot::Mainhand), 1), + (_, _) => (None, 0), + } + }; + + let unlocked = |(s, a): (Option, CharacterAbility)| { + s.map_or(true, |s| data.stats.skill_set.has_skill(s)) + .then_some(a) + }; + + if let Some(equip_slot) = equip_slot { if let Some(ability) = data .inventory - .equipped(EquipSlot::Mainhand) - .map(|i| &i.item_config_expect().abilities.primary) + .equipped(equip_slot) + .map(|i| &i.item_config_expect().abilities) + .and_then(|abilities| match ability_key { + AbilityKey::Mouse1 => Some(abilities.primary.clone()), + AbilityKey::Mouse2 => Some(abilities.secondary.clone()), + AbilityKey::Skill1 => abilities.abilities.get(0).cloned().and_then(unlocked), + AbilityKey::Skill2 => abilities + .abilities + .get(skill_index) + .cloned() + .and_then(unlocked), + AbilityKey::Dodge => None, + }) .map(|a| { - let tool = unwrap_tool_data(data, EquipSlot::Mainhand).map(|t| t.kind); - a.clone().adjusted_by_skills(&data.stats.skill_set, tool) + let tool = unwrap_tool_data(data, equip_slot).map(|t| t.kind); + a.adjusted_by_skills(&data.stats.skill_set, tool) }) .filter(|ability| ability.requirements_paid(data, update)) { update.character = ( &ability, - AbilityInfo::from_key(data, AbilityKey::Mouse1, false), + AbilityInfo::from_key(data, ability_key, matches!(equip_slot, EquipSlot::Offhand)), ) .into(); } } } +pub fn handle_ability1_input(data: &JoinData, update: &mut StateUpdate) { + if data.inputs.primary.is_pressed() { + handle_ability_pressed(data, update, AbilityKey::Mouse1); + } +} + pub fn handle_ability2_input(data: &JoinData, update: &mut StateUpdate) { if data.inputs.secondary.is_pressed() { - let active_tool_hands = match data - .inventory - .equipped(EquipSlot::Mainhand) - .map(|i| i.kind()) - { - Some(ItemKind::Tool(tool)) => Some(tool.hands), - _ => None, - }; - - let second_tool_hands = match data - .inventory - .equipped(EquipSlot::Offhand) - .map(|i| i.kind()) - { - Some(ItemKind::Tool(tool)) => Some(tool.hands), - _ => None, - }; - - let equip_slot = match (active_tool_hands, second_tool_hands) { - (Some(Hands::TwoHand), _) => Some(EquipSlot::Mainhand), - (_, Some(Hands::OneHand)) => Some(EquipSlot::Offhand), - (Some(Hands::OneHand), _) => Some(EquipSlot::Mainhand), - (_, _) => None, - }; - - if let Some(equip_slot) = equip_slot { - if let Some(ability) = data - .inventory - .equipped(equip_slot) - .map(|i| &i.item_config_expect().abilities.secondary) - .map(|a| { - let tool = unwrap_tool_data(data, equip_slot).map(|t| t.kind); - a.clone().adjusted_by_skills(&data.stats.skill_set, tool) - }) - .filter(|ability| ability.requirements_paid(data, update)) - { - update.character = ( - &ability, - AbilityInfo::from_key( - data, - AbilityKey::Mouse2, - matches!(equip_slot, EquipSlot::Offhand), - ), - ) - .into(); - } - } + handle_ability_pressed(data, update, AbilityKey::Mouse2); } } pub fn handle_ability3_input(data: &JoinData, update: &mut StateUpdate) { if data.inputs.ability3.is_pressed() { - if let Some(ability) = data - .inventory - .equipped(EquipSlot::Mainhand) - .and_then(|i| i.item_config_expect().abilities.skills.get(0)) - .and_then(|(s, a)| { - s.map_or(true, |s| data.stats.skill_set.has_skill(s)) - .then_some(a) - }) - .map(|a| { - let tool = unwrap_tool_data(data, EquipSlot::Mainhand).map(|t| t.kind); - a.clone().adjusted_by_skills(&data.stats.skill_set, tool) - }) - .filter(|ability| ability.requirements_paid(data, update)) - { - update.character = ( - &ability, - AbilityInfo::from_key(data, AbilityKey::Skill1, false), - ) - .into(); - } + handle_ability_pressed(data, update, AbilityKey::Skill1); } } pub fn handle_ability4_input(data: &JoinData, update: &mut StateUpdate) { if data.inputs.ability4.is_pressed() { - let active_tool_hands = match data - .inventory - .equipped(EquipSlot::Mainhand) - .map(|i| i.kind()) - { - Some(ItemKind::Tool(tool)) => Some(tool.hands), - _ => None, - }; - - let second_tool_hands = match data - .inventory - .equipped(EquipSlot::Offhand) - .map(|i| i.kind()) - { - Some(ItemKind::Tool(tool)) => Some(tool.hands), - _ => None, - }; - - let (equip_slot, skill_index) = match (active_tool_hands, second_tool_hands) { - (Some(Hands::TwoHand), _) => (Some(EquipSlot::Mainhand), 1), - (_, Some(Hands::OneHand)) => (Some(EquipSlot::Offhand), 0), - (Some(Hands::OneHand), _) => (Some(EquipSlot::Mainhand), 1), - (_, _) => (None, 0), - }; - - if let Some(equip_slot) = equip_slot { - if let Some(ability) = data - .inventory - .equipped(equip_slot) - .and_then(|i| i.item_config_expect().abilities.skills.get(skill_index)) - .and_then(|(s, a)| { - s.map_or(true, |s| data.stats.skill_set.has_skill(s)) - .then_some(a) - }) - .map(|a| { - let tool = unwrap_tool_data(data, equip_slot).map(|t| t.kind); - a.clone().adjusted_by_skills(&data.stats.skill_set, tool) - }) - .filter(|ability| ability.requirements_paid(data, update)) - { - update.character = ( - &ability, - AbilityInfo::from_key( - data, - AbilityKey::Skill2, - matches!(equip_slot, EquipSlot::Offhand), - ), - ) - .into(); - } - } + handle_ability_pressed(data, update, AbilityKey::Skill2); } } @@ -716,15 +645,6 @@ impl AbilityInfo { Self { tool, hand, key } } - - /// For audio sfx test - pub fn empty_info() -> Self { - Self { - tool: None, - hand: None, - key: AbilityKey::Mouse1, - } - } } #[derive(Clone, Copy, Debug, PartialEq, Serialize, Deserialize)] @@ -737,8 +657,8 @@ pub enum HandInfo { impl HandInfo { pub fn from_main_tool(tool: &Tool) -> Self { match tool.hands { - Hands::TwoHand => Self::TwoHanded, - Hands::OneHand => Self::MainHand, + Hands::Two => Self::TwoHanded, + Hands::One => Self::MainHand, } } } diff --git a/server/src/events/interaction.rs b/server/src/events/interaction.rs index f9e33cb3f8..93ab93643a 100644 --- a/server/src/events/interaction.rs +++ b/server/src/events/interaction.rs @@ -226,7 +226,7 @@ pub fn handle_possess(server: &Server, possessor_uid: Uid, possesse_uid: Uid) { .expect("Could not read inventory component while possessing") .or_insert(Inventory::new_empty()); - let debug_item = comp::Item::new_from_asset_expect("common.items.debug.debug_stick"); + let debug_item = comp::Item::new_from_asset_expect("common.items.debug.admin_stick"); if let item::ItemKind::Tool(_) = debug_item.kind() { inventory .swap( diff --git a/server/src/migrations/2021-02-12-054315_purge_duplicate_items/up.sql b/server/src/migrations/2021-02-12-054315_purge_duplicate_items/up.sql index 939703c0eb..0048bcb03a 100644 --- a/server/src/migrations/2021-02-12-054315_purge_duplicate_items/up.sql +++ b/server/src/migrations/2021-02-12-054315_purge_duplicate_items/up.sql @@ -1,9 +1,9 @@ UPDATE item SET item_definition_id = 'common.items.debug.admin_sword' WHERE item_definition_id = 'common.items.debug.cultist_purp_2h_boss-0'; UPDATE item -SET item_definition_id = 'common.items.debug.debug_stick' WHERE item_definition_id = 'common.items.debug.boost'; +SET item_definition_id = 'common.items.debug.admin_stick' WHERE item_definition_id = 'common.items.debug.boost'; UPDATE item -SET item_definition_id = 'common.items.debug.debug_stick' WHERE item_definition_id = 'common.items.debug.possess'; +SET item_definition_id = 'common.items.debug.admin_stick' WHERE item_definition_id = 'common.items.debug.possess'; UPDATE item SET item_definition_id = 'common.items.weapons.malachite_axe-0' WHERE item_definition_id = 'common.items.npc_weapons.malachite_axe-0'; UPDATE item diff --git a/server/src/sys/msg/in_game.rs b/server/src/sys/msg/in_game.rs index 1d90ff70a5..c8076c9bc6 100644 --- a/server/src/sys/msg/in_game.rs +++ b/server/src/sys/msg/in_game.rs @@ -71,7 +71,7 @@ impl Sys { ClientGeneral::ControllerInputs(inputs) => { if matches!(presence.kind, PresenceKind::Character(_)) { if let Some(controller) = controllers.get_mut(entity) { - controller.inputs.update_with_new(inputs); + controller.inputs.update_with_new(*inputs); } } }, diff --git a/voxygen/anim/src/character/idle.rs b/voxygen/anim/src/character/idle.rs index 5bccb863bc..df357c49d2 100644 --- a/voxygen/anim/src/character/idle.rs +++ b/voxygen/anim/src/character/idle.rs @@ -144,7 +144,7 @@ impl Animation for IdleAnimation { next.torso.position = Vec3::new(0.0, 0.0, 0.0) * s_a.scaler; next.second.scale = match hands { - (Some(Hands::OneHand), Some(Hands::OneHand)) => Vec3::one(), + (Some(Hands::One), Some(Hands::One)) => Vec3::one(), (_, _) => Vec3::zero(), }; diff --git a/voxygen/anim/src/character/jump.rs b/voxygen/anim/src/character/jump.rs index c947138521..b012388d12 100644 --- a/voxygen/anim/src/character/jump.rs +++ b/voxygen/anim/src/character/jump.rs @@ -182,7 +182,7 @@ impl Animation for JumpAnimation { next.torso.scale = Vec3::one() / 11.0 * s_a.scaler; next.second.scale = match hands { - (Some(Hands::OneHand), Some(Hands::OneHand)) => Vec3::one(), + (Some(Hands::One), Some(Hands::One)) => Vec3::one(), (_, _) => Vec3::zero(), }; diff --git a/voxygen/anim/src/character/run.rs b/voxygen/anim/src/character/run.rs index 886738bf95..fb95b4879e 100644 --- a/voxygen/anim/src/character/run.rs +++ b/voxygen/anim/src/character/run.rs @@ -266,7 +266,7 @@ impl Animation for RunAnimation { next.torso.scale = Vec3::one() / 11.0 * s_a.scaler; next.second.scale = match hands { - (Some(Hands::OneHand), Some(Hands::OneHand)) => Vec3::one(), + (Some(Hands::One), Some(Hands::One)) => Vec3::one(), (_, _) => Vec3::zero(), }; diff --git a/voxygen/anim/src/character/stand.rs b/voxygen/anim/src/character/stand.rs index c9eba1140e..1ec77e6f04 100644 --- a/voxygen/anim/src/character/stand.rs +++ b/voxygen/anim/src/character/stand.rs @@ -151,7 +151,7 @@ impl Animation for StandAnimation { next.torso.position = Vec3::new(0.0, 0.0, 0.0) * s_a.scaler; next.second.scale = match hands { - (Some(Hands::OneHand), Some(Hands::OneHand)) => Vec3::one(), + (Some(Hands::One), Some(Hands::One)) => Vec3::one(), (_, _) => Vec3::zero(), }; diff --git a/voxygen/anim/src/character/swim.rs b/voxygen/anim/src/character/swim.rs index d3c5f4780d..26878b9436 100644 --- a/voxygen/anim/src/character/swim.rs +++ b/voxygen/anim/src/character/swim.rs @@ -234,7 +234,7 @@ impl Animation for SwimAnimation { next.torso.scale = Vec3::one() / 11.0 * s_a.scaler; next.second.scale = match hands { - (Some(Hands::OneHand), Some(Hands::OneHand)) => Vec3::one(), + (Some(Hands::One), Some(Hands::One)) => Vec3::one(), (_, _) => Vec3::zero(), }; diff --git a/voxygen/src/audio/sfx/event_mapper/combat/tests.rs b/voxygen/src/audio/sfx/event_mapper/combat/tests.rs index 38b810e31a..be2525eb86 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() { knockback: 0.0, range: 1.0, max_angle: 1.0, - ability_info: states::utils::AbilityInfo::empty_info(), + ability_info: empty_info(), }, timer: Duration::default(), stage_section: states::utils::StageSection::Buildup, @@ -132,7 +132,7 @@ fn matches_ability_stage() { max_speed_increase: 0.8, scales_from_combo: 2, is_interruptible: true, - ability_info: states::utils::AbilityInfo::empty_info(), + ability_info: empty_info(), }, stage: 1, combo: 0, @@ -191,7 +191,7 @@ fn ignores_different_ability_stage() { max_speed_increase: 0.8, scales_from_combo: 2, is_interruptible: true, - ability_info: states::utils::AbilityInfo::empty_info(), + ability_info: empty_info(), }, stage: 1, combo: 0, @@ -215,3 +215,11 @@ fn ignores_different_ability_stage() { ) ); } + +fn empty_ability_info() -> states::utils::AbilityInfo { + Self { + tool: None, + hand: None, + key: states::utils::AbilityKey::Mouse1, + } +} diff --git a/voxygen/src/hud/hotbar.rs b/voxygen/src/hud/hotbar.rs index ef26b6ded9..a717c96b01 100644 --- a/voxygen/src/hud/hotbar.rs +++ b/voxygen/src/hud/hotbar.rs @@ -82,7 +82,7 @@ impl State { inventory.equipped(EquipSlot::Mainhand).map_or(false, |i| { i.item_config_expect() .abilities - .skills + .abilities .get(0) .as_ref() .map_or(false, |(s, _)| { @@ -116,21 +116,18 @@ impl State { let stats = client.state().ecs().read_storage::(); let stat = stats.get(client.entity()); let should_be_present = if let (Some(inventory), Some(stat)) = (inventory, stat) { - let active_tool_hands = match inventory.equipped(EquipSlot::Mainhand).map(|i| i.kind()) - { + let hands = |equip_slot| match inventory.equipped(equip_slot).map(|i| i.kind()) { Some(ItemKind::Tool(tool)) => Some(tool.hands), _ => None, }; - let second_tool_hands = match inventory.equipped(EquipSlot::Offhand).map(|i| i.kind()) { - Some(ItemKind::Tool(tool)) => Some(tool.hands), - _ => None, - }; + let active_tool_hands = hands(EquipSlot::Mainhand); + let second_tool_hands = hands(EquipSlot::Offhand); let (equip_slot, skill_index) = match (active_tool_hands, second_tool_hands) { - (Some(Hands::TwoHand), _) => (Some(EquipSlot::Mainhand), 1), - (_, Some(Hands::OneHand)) => (Some(EquipSlot::Offhand), 0), - (Some(Hands::OneHand), _) => (Some(EquipSlot::Mainhand), 1), + (Some(Hands::Two), _) => (Some(EquipSlot::Mainhand), 1), + (_, Some(Hands::One)) => (Some(EquipSlot::Offhand), 0), + (Some(Hands::One), _) => (Some(EquipSlot::Mainhand), 1), (_, _) => (None, 0), }; @@ -138,7 +135,7 @@ impl State { inventory.equipped(equip_slot).map_or(false, |i| { i.item_config_expect() .abilities - .skills + .abilities .get(skill_index) .as_ref() .map_or(false, |(s, _)| { diff --git a/voxygen/src/hud/skillbar.rs b/voxygen/src/hud/skillbar.rs index ddf8c2a930..bdfd3ee807 100644 --- a/voxygen/src/hud/skillbar.rs +++ b/voxygen/src/hud/skillbar.rs @@ -456,28 +456,22 @@ impl<'a> Widget for Skillbar<'a> { _ => None, }), hotbar::SlotContents::Ability4 => { - let active_tool_hands = match content_source + let hands = |equip_slot| match content_source .1 - .equipped(EquipSlot::Mainhand) + .equipped(equip_slot) .map(|i| i.kind()) { Some(ItemKind::Tool(tool)) => Some(tool.hands), _ => None, }; - let second_tool_hands = match content_source - .1 - .equipped(EquipSlot::Offhand) - .map(|i| i.kind()) - { - Some(ItemKind::Tool(tool)) => Some(tool.hands), - _ => None, - }; + let active_tool_hands = hands(EquipSlot::Mainhand); + let second_tool_hands = hands(EquipSlot::Offhand); let equip_slot = match (active_tool_hands, second_tool_hands) { - (Some(Hands::TwoHand), _) => Some(EquipSlot::Mainhand), - (_, Some(Hands::OneHand)) => Some(EquipSlot::Offhand), - (Some(Hands::OneHand), _) => Some(EquipSlot::Mainhand), + (Some(Hands::Two), _) => Some(EquipSlot::Mainhand), + (_, Some(Hands::One)) => Some(EquipSlot::Offhand), + (Some(Hands::One), _) => Some(EquipSlot::Mainhand), (_, _) => None, }; @@ -600,9 +594,9 @@ impl<'a> Widget for Skillbar<'a> { let second_tool = get_tool(self.inventory, EquipSlot::Offhand); let tool = match (active_tool.map(|x| x.hands), second_tool.map(|x| x.hands)) { - (Some(Hands::TwoHand), _) => active_tool, - (_, Some(Hands::OneHand)) => second_tool, - (Some(Hands::OneHand), _) => active_tool, + (Some(Hands::Two), _) => active_tool, + (_, Some(Hands::One)) => second_tool, + (Some(Hands::One), _) => active_tool, (_, _) => None, }; diff --git a/voxygen/src/hud/slots.rs b/voxygen/src/hud/slots.rs index c5a61300e6..338555b6d4 100644 --- a/voxygen/src/hud/slots.rs +++ b/voxygen/src/hud/slots.rs @@ -126,7 +126,7 @@ impl<'a> SlotKey, HotbarImageSource<'a>> for HotbarSlot { hotbar_image(tool.kind).map(|i| { ( i, - if let Some(skill) = tool.get_abilities(ability_map).skills.get(0) { + if let Some(skill) = tool.get_abilities(ability_map).abilities.get(0) { if energy.current() >= skill.1.get_energy_cost() { Some(Color::Rgba(1.0, 1.0, 1.0, 1.0)) } else { @@ -140,22 +140,18 @@ impl<'a> SlotKey, HotbarImageSource<'a>> for HotbarSlot { }) }, hotbar::SlotContents::Ability4 => { - let active_tool_hands = - match inventory.equipped(EquipSlot::Mainhand).map(|i| i.kind()) { - Some(ItemKind::Tool(tool)) => Some(tool.hands), - _ => None, - }; + let hands = |equip_slot| match inventory.equipped(equip_slot).map(|i| i.kind()) { + Some(ItemKind::Tool(tool)) => Some(tool.hands), + _ => None, + }; - let second_tool_hands = - match inventory.equipped(EquipSlot::Offhand).map(|i| i.kind()) { - Some(ItemKind::Tool(tool)) => Some(tool.hands), - _ => None, - }; + let active_tool_hands = hands(EquipSlot::Mainhand); + let second_tool_hands = hands(EquipSlot::Offhand); let (equip_slot, skill_index) = match (active_tool_hands, second_tool_hands) { - (Some(Hands::TwoHand), _) => (Some(EquipSlot::Mainhand), 1), - (_, Some(Hands::OneHand)) => (Some(EquipSlot::Offhand), 0), - (Some(Hands::OneHand), _) => (Some(EquipSlot::Mainhand), 1), + (Some(Hands::Two), _) => (Some(EquipSlot::Mainhand), 1), + (_, Some(Hands::One)) => (Some(EquipSlot::Offhand), 0), + (Some(Hands::One), _) => (Some(EquipSlot::Mainhand), 1), (_, _) => (None, 0), }; @@ -170,7 +166,7 @@ impl<'a> SlotKey, HotbarImageSource<'a>> for HotbarSlot { ( i, if let Some(skill) = - tool.get_abilities(ability_map).skills.get(skill_index) + tool.get_abilities(ability_map).abilities.get(skill_index) { if energy.current() >= skill.1.get_energy_cost() { Some(Color::Rgba(1.0, 1.0, 1.0, 1.0)) diff --git a/voxygen/src/hud/util.rs b/voxygen/src/hud/util.rs index bb1b626e59..7f66264869 100644 --- a/voxygen/src/hud/util.rs +++ b/voxygen/src/hud/util.rs @@ -119,8 +119,8 @@ fn tool_desc(tool: &Tool, desc: &str) -> String { //let poise_strength = tool.base_poise_strength(); let speed = tool.base_speed(); let hands = match tool.hands { - Hands::OneHand => "One", - Hands::TwoHand => "Two", + Hands::One => "One", + Hands::Two => "Two", }; if !desc.is_empty() {