From bfc82f723633e2024f4721c6f8c071b2b036a82b Mon Sep 17 00:00:00 2001 From: heydabop Date: Mon, 1 Mar 2021 15:06:39 -0600 Subject: [PATCH] Fixes #974 - convert tool/weapon equip time to floating point seconds --- .../modular/damage/sword/metal_blade.ron | 2 +- assets/common/items/debug/admin_stick.ron | 2 +- assets/common/items/debug/admin_sword.ron | 2 +- .../items/npc_weapons/axe/minotaur_axe.ron | 2 +- .../biped_small/adlet/adlet_bow.ron | 2 +- .../biped_small/adlet/gnoll_staff.ron | 2 +- .../biped_small/adlet/wooden_spear.ron | 2 +- .../biped_small/gnarling/adlet_bow.ron | 2 +- .../biped_small/gnarling/gnoll_staff.ron | 2 +- .../biped_small/gnarling/wooden_spear.ron | 2 +- .../biped_small/haniwa/adlet_bow.ron | 2 +- .../biped_small/haniwa/gnoll_staff.ron | 2 +- .../biped_small/haniwa/wooden_spear.ron | 2 +- .../biped_small/myrmidon/adlet_bow.ron | 2 +- .../biped_small/myrmidon/gnoll_staff.ron | 2 +- .../biped_small/myrmidon/wooden_spear.ron | 2 +- .../biped_small/sahagin/adlet_bow.ron | 2 +- .../biped_small/sahagin/gnoll_staff.ron | 2 +- .../biped_small/sahagin/wooden_spear.ron | 2 +- .../items/npc_weapons/bow/saurok_bow.ron | 2 +- .../npc_weapons/hammer/cyclops_hammer.ron | 2 +- .../npc_weapons/hammer/harvester_scythe.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 +- .../items/npc_weapons/hammer/yeti_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 +- .../items/npc_weapons/unique/quadlowbeam.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/npc_weapons/unique/tidal_claws.ron | 2 +- .../items/npc_weapons/unique/turret.ron | 2 +- .../npc_weapons/unique/wendigo_magic.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/bronze_axe-2.ron | 2 +- .../common/items/weapons/axe/cobalt_axe-0.ron | 2 +- .../common/items/weapons/axe/cobalt_axe-1.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 +- assets/common/items/weapons/axe/parashu.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 | 2 +- .../items/weapons/axe_1h/bloodsteel-1.ron | 2 +- .../common/items/weapons/axe_1h/bronze-0.ron | 2 +- .../common/items/weapons/axe_1h/bronze-1.ron | 2 +- .../common/items/weapons/axe_1h/cobalt-0.ron | 2 +- .../common/items/weapons/axe_1h/cobalt-1.ron | 2 +- assets/common/items/weapons/axe_1h/iron-0.ron | 2 +- assets/common/items/weapons/axe_1h/iron-1.ron | 2 +- assets/common/items/weapons/axe_1h/iron-2.ron | 2 +- assets/common/items/weapons/axe_1h/iron-3.ron | 2 +- .../items/weapons/axe_1h/orichalcum-0.ron | 2 +- .../common/items/weapons/axe_1h/steel-0.ron | 2 +- .../common/items/weapons/axe_1h/steel-1.ron | 2 +- .../common/items/weapons/axe_1h/steel-2.ron | 2 +- .../common/items/weapons/axe_1h/stone-0.ron | 2 +- .../common/items/weapons/axe_1h/stone-1.ron | 2 +- assets/common/items/weapons/axe_1h/wood-0.ron | 2 +- assets/common/items/weapons/axe_1h/wood-1.ron | 2 +- assets/common/items/weapons/bow/bone-0.ron | 2 +- assets/common/items/weapons/bow/bone-1.ron | 2 +- assets/common/items/weapons/bow/bone-2.ron | 2 +- assets/common/items/weapons/bow/bone-3.ron | 2 +- assets/common/items/weapons/bow/eldwood-0.ron | 2 +- assets/common/items/weapons/bow/eldwood-1.ron | 2 +- assets/common/items/weapons/bow/eldwood-2.ron | 2 +- .../common/items/weapons/bow/frostwood-0.ron | 2 +- .../common/items/weapons/bow/frostwood-1.ron | 2 +- .../common/items/weapons/bow/frostwood-2.ron | 2 +- .../common/items/weapons/bow/hardwood-0.ron | 2 +- .../common/items/weapons/bow/hardwood-1.ron | 2 +- .../common/items/weapons/bow/hardwood-2.ron | 2 +- .../common/items/weapons/bow/hardwood-3.ron | 2 +- .../common/items/weapons/bow/hardwood-4.ron | 2 +- .../common/items/weapons/bow/hardwood-5.ron | 2 +- assets/common/items/weapons/bow/metal-0.ron | 2 +- assets/common/items/weapons/bow/metal-1.ron | 2 +- assets/common/items/weapons/bow/metal-2.ron | 2 +- assets/common/items/weapons/bow/metal-3.ron | 2 +- assets/common/items/weapons/bow/metal-4.ron | 2 +- assets/common/items/weapons/bow/rawwood-0.ron | 2 +- assets/common/items/weapons/bow/rawwood-1.ron | 2 +- assets/common/items/weapons/bow/sagitta.ron | 2 +- assets/common/items/weapons/bow/starter.ron | 2 +- assets/common/items/weapons/bow/velorite.ron | 2 +- assets/common/items/weapons/bow/wood-0.ron | 2 +- assets/common/items/weapons/bow/wood-1.ron | 2 +- assets/common/items/weapons/bow/wood-2.ron | 2 +- assets/common/items/weapons/bow/wood-3.ron | 2 +- assets/common/items/weapons/bow/wood-4.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 | 2 +- .../items/weapons/hammer_1h/bloodsteel-1.ron | 2 +- .../items/weapons/hammer_1h/bronze-0.ron | 2 +- .../items/weapons/hammer_1h/bronze-1.ron | 2 +- .../items/weapons/hammer_1h/cobalt-0.ron | 2 +- .../items/weapons/hammer_1h/cobalt-1.ron | 2 +- .../common/items/weapons/hammer_1h/iron-0.ron | 2 +- .../common/items/weapons/hammer_1h/iron-1.ron | 2 +- .../common/items/weapons/hammer_1h/iron-2.ron | 2 +- .../items/weapons/hammer_1h/orichalcum-0.ron | 2 +- .../items/weapons/hammer_1h/steel-0.ron | 2 +- .../items/weapons/hammer_1h/steel-1.ron | 2 +- .../items/weapons/hammer_1h/steel-2.ron | 2 +- .../items/weapons/hammer_1h/stone-0.ron | 2 +- .../items/weapons/hammer_1h/stone-1.ron | 2 +- .../common/items/weapons/hammer_1h/wood-0.ron | 2 +- .../common/items/weapons/hammer_1h/wood-1.ron | 2 +- 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 | 2 +- .../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/bloodsteel-0.ron | 2 +- .../items/weapons/sword/bloodsteel-1.ron | 2 +- .../items/weapons/sword/bloodsteel-2.ron | 2 +- .../common/items/weapons/sword/bronze-0.ron | 2 +- .../common/items/weapons/sword/bronze-1.ron | 2 +- .../common/items/weapons/sword/bronze-2.ron | 2 +- .../common/items/weapons/sword/caladbolg.ron | 2 +- .../common/items/weapons/sword/cobalt-0.ron | 2 +- .../common/items/weapons/sword/cobalt-1.ron | 2 +- .../common/items/weapons/sword/cobalt-2.ron | 2 +- .../common/items/weapons/sword/cobalt-3.ron | 2 +- assets/common/items/weapons/sword/cultist.ron | 2 +- assets/common/items/weapons/sword/frost-0.ron | 2 +- assets/common/items/weapons/sword/frost-1.ron | 2 +- assets/common/items/weapons/sword/iron-0.ron | 2 +- assets/common/items/weapons/sword/iron-1.ron | 2 +- assets/common/items/weapons/sword/iron-10.ron | 2 +- assets/common/items/weapons/sword/iron-2.ron | 2 +- assets/common/items/weapons/sword/iron-3.ron | 2 +- assets/common/items/weapons/sword/iron-4.ron | 2 +- assets/common/items/weapons/sword/iron-5.ron | 2 +- assets/common/items/weapons/sword/iron-6.ron | 2 +- assets/common/items/weapons/sword/iron-7.ron | 2 +- assets/common/items/weapons/sword/iron-8.ron | 2 +- assets/common/items/weapons/sword/iron-9.ron | 2 +- assets/common/items/weapons/sword/starter.ron | 2 +- assets/common/items/weapons/sword/steel-0.ron | 2 +- assets/common/items/weapons/sword/steel-1.ron | 2 +- assets/common/items/weapons/sword/steel-2.ron | 2 +- assets/common/items/weapons/sword/steel-3.ron | 2 +- assets/common/items/weapons/sword/steel-4.ron | 2 +- assets/common/items/weapons/sword/steel-5.ron | 2 +- assets/common/items/weapons/sword/steel-6.ron | 2 +- assets/common/items/weapons/sword/steel-7.ron | 2 +- assets/common/items/weapons/sword/steel-8.ron | 2 +- assets/common/items/weapons/sword/stone-0.ron | 2 +- assets/common/items/weapons/sword/stone-1.ron | 2 +- assets/common/items/weapons/sword/stone-2.ron | 2 +- assets/common/items/weapons/sword/wood-0.ron | 2 +- assets/common/items/weapons/sword/wood-1.ron | 2 +- assets/common/items/weapons/sword/wood-2.ron | 2 +- .../items/weapons/sword_1h/bloodsteel-0.ron | 2 +- .../items/weapons/sword_1h/bloodsteel-1.ron | 2 +- .../items/weapons/sword_1h/bloodsteel-2.ron | 2 +- .../items/weapons/sword_1h/bronze-0.ron | 2 +- .../items/weapons/sword_1h/bronze-1.ron | 2 +- .../items/weapons/sword_1h/bronze-2.ron | 2 +- .../items/weapons/sword_1h/cobalt-0.ron | 2 +- .../items/weapons/sword_1h/cobalt-1.ron | 2 +- .../items/weapons/sword_1h/cobalt-2.ron | 2 +- .../items/weapons/sword_1h/cobalt-3.ron | 2 +- .../common/items/weapons/sword_1h/iron-0.ron | 2 +- .../common/items/weapons/sword_1h/iron-1.ron | 2 +- .../common/items/weapons/sword_1h/iron-2.ron | 2 +- .../common/items/weapons/sword_1h/iron-3.ron | 2 +- .../common/items/weapons/sword_1h/iron-4.ron | 2 +- .../items/weapons/sword_1h/obsidian-0.ron | 2 +- .../items/weapons/sword_1h/orichalcum-0.ron | 2 +- .../items/weapons/sword_1h/orichalcum-1.ron | 2 +- .../common/items/weapons/sword_1h/steel-0.ron | 2 +- .../common/items/weapons/sword_1h/steel-1.ron | 2 +- .../common/items/weapons/sword_1h/steel-2.ron | 2 +- .../common/items/weapons/sword_1h/steel-3.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/common/material_stats_manifest.ron | 16 +++++------ common/src/bin/csv_import/main.rs | 4 +-- common/src/comp/inventory/item/modular.rs | 2 +- common/src/comp/inventory/item/tool.rs | 27 +++++++++---------- voxygen/src/hud/util.rs | 2 +- 280 files changed, 299 insertions(+), 302 deletions(-) diff --git a/assets/common/items/crafting_ing/modular/damage/sword/metal_blade.ron b/assets/common/items/crafting_ing/modular/damage/sword/metal_blade.ron index 5f28c9e674..72354697ca 100644 --- a/assets/common/items/crafting_ing/modular/damage/sword/metal_blade.ron +++ b/assets/common/items/crafting_ing/modular/damage/sword/metal_blade.ron @@ -5,7 +5,7 @@ ItemDef( toolkind: Sword, modkind: Damage, stats: ( - equip_time_millis: 250, + equip_time_secs: 0.25, power: 1.0, poise_strength: 0.75, speed: 0.0, diff --git a/assets/common/items/debug/admin_stick.ron b/assets/common/items/debug/admin_stick.ron index dc8f57c976..b2b941c85f 100644 --- a/assets/common/items/debug/admin_stick.ron +++ b/assets/common/items/debug/admin_stick.ron @@ -6,7 +6,7 @@ ItemDef( kind: Debug, hands: Two, stats: Direct(( - equip_time_millis: 0, + equip_time_secs: 0.0, power: 1.00, poise_strength: 1.00, speed: 1.0 diff --git a/assets/common/items/debug/admin_sword.ron b/assets/common/items/debug/admin_sword.ron index 0d59c59107..dfe65e228f 100644 --- a/assets/common/items/debug/admin_sword.ron +++ b/assets/common/items/debug/admin_sword.ron @@ -6,7 +6,7 @@ ItemDef( kind: Sword, hands: Two, stats: Direct(( - equip_time_millis: 0, + equip_time_secs: 0.0, power: 1000.0, poise_strength: 1000.0, speed: 1.0 diff --git a/assets/common/items/npc_weapons/axe/minotaur_axe.ron b/assets/common/items/npc_weapons/axe/minotaur_axe.ron index 81fc250ae6..77cbccee25 100644 --- a/assets/common/items/npc_weapons/axe/minotaur_axe.ron +++ b/assets/common/items/npc_weapons/axe/minotaur_axe.ron @@ -6,7 +6,7 @@ ItemDef( kind: AxeSimple, hands: Two, stats: Direct(( - equip_time_millis: 500, + equip_time_secs: 0.5, power: 1.8, poise_strength: 1.00, speed: 1.0 diff --git a/assets/common/items/npc_weapons/biped_small/adlet/adlet_bow.ron b/assets/common/items/npc_weapons/biped_small/adlet/adlet_bow.ron index 4e0dc79778..e2f537f4b0 100644 --- a/assets/common/items/npc_weapons/biped_small/adlet/adlet_bow.ron +++ b/assets/common/items/npc_weapons/biped_small/adlet/adlet_bow.ron @@ -6,7 +6,7 @@ ItemDef( kind: Bow, hands: Two, stats: Direct(( - equip_time_millis: 0, + equip_time_secs: 0.0, power: 0.7, poise_strength: 0.8, speed: 0.3 diff --git a/assets/common/items/npc_weapons/biped_small/adlet/gnoll_staff.ron b/assets/common/items/npc_weapons/biped_small/adlet/gnoll_staff.ron index 181c5d8382..be0e40f4b9 100644 --- a/assets/common/items/npc_weapons/biped_small/adlet/gnoll_staff.ron +++ b/assets/common/items/npc_weapons/biped_small/adlet/gnoll_staff.ron @@ -6,7 +6,7 @@ ItemDef( kind: StaffSimple, hands: Two, stats: Direct(( - equip_time_millis: 0, + equip_time_secs: 0.0, power: 0.7, poise_strength: 0.8, speed: 0.5 diff --git a/assets/common/items/npc_weapons/biped_small/adlet/wooden_spear.ron b/assets/common/items/npc_weapons/biped_small/adlet/wooden_spear.ron index a78f795b25..c78851f595 100644 --- a/assets/common/items/npc_weapons/biped_small/adlet/wooden_spear.ron +++ b/assets/common/items/npc_weapons/biped_small/adlet/wooden_spear.ron @@ -6,7 +6,7 @@ ItemDef( kind: Spear, hands: Two, stats: Direct(( - equip_time_millis: 0, + equip_time_secs: 0.0, power: 0.7, poise_strength: 0.8, speed: 1.0 diff --git a/assets/common/items/npc_weapons/biped_small/gnarling/adlet_bow.ron b/assets/common/items/npc_weapons/biped_small/gnarling/adlet_bow.ron index d7c6609b52..3df2fb30dd 100644 --- a/assets/common/items/npc_weapons/biped_small/gnarling/adlet_bow.ron +++ b/assets/common/items/npc_weapons/biped_small/gnarling/adlet_bow.ron @@ -6,7 +6,7 @@ ItemDef( kind: Bow, hands: Two, stats: Direct(( - equip_time_millis: 0, + equip_time_secs: 0.0, power: 0.3, poise_strength: 0.8, speed: 0.7 diff --git a/assets/common/items/npc_weapons/biped_small/gnarling/gnoll_staff.ron b/assets/common/items/npc_weapons/biped_small/gnarling/gnoll_staff.ron index f3fdc1f4da..08a3b00d26 100644 --- a/assets/common/items/npc_weapons/biped_small/gnarling/gnoll_staff.ron +++ b/assets/common/items/npc_weapons/biped_small/gnarling/gnoll_staff.ron @@ -6,7 +6,7 @@ ItemDef( kind: StaffSimple, hands: Two, stats: Direct(( - equip_time_millis: 0, + equip_time_secs: 0.0, power: 0.3, poise_strength: 0.8, speed: 0.8 diff --git a/assets/common/items/npc_weapons/biped_small/gnarling/wooden_spear.ron b/assets/common/items/npc_weapons/biped_small/gnarling/wooden_spear.ron index 82f65af672..158f71e428 100644 --- a/assets/common/items/npc_weapons/biped_small/gnarling/wooden_spear.ron +++ b/assets/common/items/npc_weapons/biped_small/gnarling/wooden_spear.ron @@ -6,7 +6,7 @@ ItemDef( kind: Spear, hands: Two, stats: Direct(( - equip_time_millis: 0, + equip_time_secs: 0.0, power: 0.3, poise_strength: 0.8, speed: 1.0 diff --git a/assets/common/items/npc_weapons/biped_small/haniwa/adlet_bow.ron b/assets/common/items/npc_weapons/biped_small/haniwa/adlet_bow.ron index 02abadbeb0..67754213a2 100644 --- a/assets/common/items/npc_weapons/biped_small/haniwa/adlet_bow.ron +++ b/assets/common/items/npc_weapons/biped_small/haniwa/adlet_bow.ron @@ -5,7 +5,7 @@ ItemDef( kind: Bow, hands: Two, stats: Direct(( - equip_time_millis: 0, + equip_time_secs: 0.0, power: 1.6, poise_strength: 0.8, speed: 0.3 diff --git a/assets/common/items/npc_weapons/biped_small/haniwa/gnoll_staff.ron b/assets/common/items/npc_weapons/biped_small/haniwa/gnoll_staff.ron index 1dcbea0401..df4b020848 100644 --- a/assets/common/items/npc_weapons/biped_small/haniwa/gnoll_staff.ron +++ b/assets/common/items/npc_weapons/biped_small/haniwa/gnoll_staff.ron @@ -5,7 +5,7 @@ ItemDef( kind: StaffSimple, hands: Two, stats: Direct(( - equip_time_millis: 0, + equip_time_secs: 0.0, power: 1.8, poise_strength: 0.8, speed: 0.6 diff --git a/assets/common/items/npc_weapons/biped_small/haniwa/wooden_spear.ron b/assets/common/items/npc_weapons/biped_small/haniwa/wooden_spear.ron index 6b8c622c64..73d2c47314 100644 --- a/assets/common/items/npc_weapons/biped_small/haniwa/wooden_spear.ron +++ b/assets/common/items/npc_weapons/biped_small/haniwa/wooden_spear.ron @@ -5,7 +5,7 @@ ItemDef( kind: Spear, hands: Two, stats: Direct(( - equip_time_millis: 0, + equip_time_secs: 0.0, power: 1.4, poise_strength: 0.8, speed: 1.0 diff --git a/assets/common/items/npc_weapons/biped_small/myrmidon/adlet_bow.ron b/assets/common/items/npc_weapons/biped_small/myrmidon/adlet_bow.ron index a0d0238b80..fa41ece35a 100644 --- a/assets/common/items/npc_weapons/biped_small/myrmidon/adlet_bow.ron +++ b/assets/common/items/npc_weapons/biped_small/myrmidon/adlet_bow.ron @@ -6,7 +6,7 @@ ItemDef( kind: Bow, hands: Two, stats: Direct(( - equip_time_millis: 0, + equip_time_secs: 0.0, power: 1.1, poise_strength: 0.8, speed: 0.5 diff --git a/assets/common/items/npc_weapons/biped_small/myrmidon/gnoll_staff.ron b/assets/common/items/npc_weapons/biped_small/myrmidon/gnoll_staff.ron index ce0a8d0dea..68beef20b4 100644 --- a/assets/common/items/npc_weapons/biped_small/myrmidon/gnoll_staff.ron +++ b/assets/common/items/npc_weapons/biped_small/myrmidon/gnoll_staff.ron @@ -6,7 +6,7 @@ ItemDef( kind: StaffSimple, hands: Two, stats: Direct(( - equip_time_millis: 0, + equip_time_secs: 0.0, power: 1.7, poise_strength: 0.8, speed: 0.7 diff --git a/assets/common/items/npc_weapons/biped_small/myrmidon/wooden_spear.ron b/assets/common/items/npc_weapons/biped_small/myrmidon/wooden_spear.ron index 2894c9f361..06463a5231 100644 --- a/assets/common/items/npc_weapons/biped_small/myrmidon/wooden_spear.ron +++ b/assets/common/items/npc_weapons/biped_small/myrmidon/wooden_spear.ron @@ -6,7 +6,7 @@ ItemDef( kind: Spear, hands: Two, stats: Direct(( - equip_time_millis: 0, + equip_time_secs: 0.0, power: 1.7, poise_strength: 0.8, speed: 1.0 diff --git a/assets/common/items/npc_weapons/biped_small/sahagin/adlet_bow.ron b/assets/common/items/npc_weapons/biped_small/sahagin/adlet_bow.ron index ce348f0f10..38ba184f05 100644 --- a/assets/common/items/npc_weapons/biped_small/sahagin/adlet_bow.ron +++ b/assets/common/items/npc_weapons/biped_small/sahagin/adlet_bow.ron @@ -6,7 +6,7 @@ ItemDef( kind: Bow, hands: Two, stats: Direct(( - equip_time_millis: 0, + equip_time_secs: 0.0, power: 1.1, poise_strength: 0.8, speed: 0.3 diff --git a/assets/common/items/npc_weapons/biped_small/sahagin/gnoll_staff.ron b/assets/common/items/npc_weapons/biped_small/sahagin/gnoll_staff.ron index 435ac291ff..766a9ee68f 100644 --- a/assets/common/items/npc_weapons/biped_small/sahagin/gnoll_staff.ron +++ b/assets/common/items/npc_weapons/biped_small/sahagin/gnoll_staff.ron @@ -6,7 +6,7 @@ ItemDef( kind: StaffSimple, hands: Two, stats: Direct(( - equip_time_millis: 0, + equip_time_secs: 0.0, power: 1.1, poise_strength: 0.8, speed: 0.8 diff --git a/assets/common/items/npc_weapons/biped_small/sahagin/wooden_spear.ron b/assets/common/items/npc_weapons/biped_small/sahagin/wooden_spear.ron index b346ba2068..af201c4dba 100644 --- a/assets/common/items/npc_weapons/biped_small/sahagin/wooden_spear.ron +++ b/assets/common/items/npc_weapons/biped_small/sahagin/wooden_spear.ron @@ -6,7 +6,7 @@ ItemDef( kind: Spear, hands: Two, stats: Direct(( - equip_time_millis: 0, + equip_time_secs: 0.0, power: 1.1, poise_strength: 0.8, speed: 1.0 diff --git a/assets/common/items/npc_weapons/bow/saurok_bow.ron b/assets/common/items/npc_weapons/bow/saurok_bow.ron index 37e3f8bea8..77c81426bd 100644 --- a/assets/common/items/npc_weapons/bow/saurok_bow.ron +++ b/assets/common/items/npc_weapons/bow/saurok_bow.ron @@ -6,7 +6,7 @@ ItemDef( kind: BowSimple, hands: Two, stats: Direct(( - equip_time_millis: 500, + equip_time_secs: 0.5, power: 1.00, poise_strength: 1.00, speed: 1.0 diff --git a/assets/common/items/npc_weapons/hammer/cyclops_hammer.ron b/assets/common/items/npc_weapons/hammer/cyclops_hammer.ron index 7c10458ed1..8ef9112c84 100644 --- a/assets/common/items/npc_weapons/hammer/cyclops_hammer.ron +++ b/assets/common/items/npc_weapons/hammer/cyclops_hammer.ron @@ -6,7 +6,7 @@ ItemDef( kind: HammerSimple, hands: Two, stats: Direct(( - equip_time_millis: 500, + equip_time_secs: 0.5, power: 1.00, poise_strength: 1.00, speed: 1.0 diff --git a/assets/common/items/npc_weapons/hammer/harvester_scythe.ron b/assets/common/items/npc_weapons/hammer/harvester_scythe.ron index cd37197f19..8c90236706 100644 --- a/assets/common/items/npc_weapons/hammer/harvester_scythe.ron +++ b/assets/common/items/npc_weapons/hammer/harvester_scythe.ron @@ -6,7 +6,7 @@ ItemDef( kind: HammerSimple, hands: Two, stats: Direct(( - equip_time_millis: 1, + equip_time_secs: 0.001, power: 1.6, poise_strength: 1.00, speed: 1.0 diff --git a/assets/common/items/npc_weapons/hammer/ogre_hammer.ron b/assets/common/items/npc_weapons/hammer/ogre_hammer.ron index 0ab8068dff..e868ef4be5 100644 --- a/assets/common/items/npc_weapons/hammer/ogre_hammer.ron +++ b/assets/common/items/npc_weapons/hammer/ogre_hammer.ron @@ -6,7 +6,7 @@ ItemDef( kind: HammerSimple, hands: Two, stats: Direct(( - equip_time_millis: 500, + equip_time_secs: 0.5, power: 1.00, poise_strength: 1.00, speed: 1.0 diff --git a/assets/common/items/npc_weapons/hammer/troll_hammer.ron b/assets/common/items/npc_weapons/hammer/troll_hammer.ron index 1f04179292..96c885dac1 100644 --- a/assets/common/items/npc_weapons/hammer/troll_hammer.ron +++ b/assets/common/items/npc_weapons/hammer/troll_hammer.ron @@ -6,7 +6,7 @@ ItemDef( kind: HammerSimple, hands: Two, stats: Direct(( - equip_time_millis: 500, + equip_time_secs: 0.5, power: 1.00, poise_strength: 1.00, speed: 1.0 diff --git a/assets/common/items/npc_weapons/hammer/wendigo_hammer.ron b/assets/common/items/npc_weapons/hammer/wendigo_hammer.ron index 4078c0db3d..fce40ec088 100644 --- a/assets/common/items/npc_weapons/hammer/wendigo_hammer.ron +++ b/assets/common/items/npc_weapons/hammer/wendigo_hammer.ron @@ -6,7 +6,7 @@ ItemDef( kind: Hammer, hands: Two, stats: Direct(( - equip_time_millis: 500, + equip_time_secs: 0.5, power: 1.00, poise_strength: 1.00, speed: 1.0 diff --git a/assets/common/items/npc_weapons/hammer/yeti_hammer.ron b/assets/common/items/npc_weapons/hammer/yeti_hammer.ron index bc8bdd9f16..4a877e41ba 100644 --- a/assets/common/items/npc_weapons/hammer/yeti_hammer.ron +++ b/assets/common/items/npc_weapons/hammer/yeti_hammer.ron @@ -6,7 +6,7 @@ ItemDef( kind: HammerSimple, hands: Two, stats: Direct(( - equip_time_millis: 0, + equip_time_secs: 0.0, power: 2.0, poise_strength: 1.00, speed: 1.0 diff --git a/assets/common/items/npc_weapons/staff/mindflayer_staff.ron b/assets/common/items/npc_weapons/staff/mindflayer_staff.ron index d371f99043..4ba9ac21f2 100644 --- a/assets/common/items/npc_weapons/staff/mindflayer_staff.ron +++ b/assets/common/items/npc_weapons/staff/mindflayer_staff.ron @@ -6,7 +6,7 @@ ItemDef( kind: StaffSimple, hands: Two, stats: Direct(( - equip_time_millis: 1, + equip_time_secs: 0.001, power: 3.0, poise_strength: 1.00, speed: 1.5, diff --git a/assets/common/items/npc_weapons/staff/ogre_staff.ron b/assets/common/items/npc_weapons/staff/ogre_staff.ron index c4cca908ff..4c67432d3a 100644 --- a/assets/common/items/npc_weapons/staff/ogre_staff.ron +++ b/assets/common/items/npc_weapons/staff/ogre_staff.ron @@ -6,7 +6,7 @@ ItemDef( kind: StaffSimple, hands: Two, stats: Direct(( - equip_time_millis: 500, + equip_time_secs: 0.5, power: 1.00, poise_strength: 1.00, speed: 1.0 diff --git a/assets/common/items/npc_weapons/staff/saurok_staff.ron b/assets/common/items/npc_weapons/staff/saurok_staff.ron index 8ee0b015e4..71550581e1 100644 --- a/assets/common/items/npc_weapons/staff/saurok_staff.ron +++ b/assets/common/items/npc_weapons/staff/saurok_staff.ron @@ -6,7 +6,7 @@ ItemDef( kind: StaffSimple, hands: Two, stats: Direct(( - equip_time_millis: 500, + equip_time_secs: 0.5, power: 1.00, poise_strength: 1.00, speed: 1.0 diff --git a/assets/common/items/npc_weapons/sword/dullahan_sword.ron b/assets/common/items/npc_weapons/sword/dullahan_sword.ron index d3b3ba1b8e..68b6215c32 100644 --- a/assets/common/items/npc_weapons/sword/dullahan_sword.ron +++ b/assets/common/items/npc_weapons/sword/dullahan_sword.ron @@ -6,7 +6,7 @@ ItemDef( kind: SwordSimple, hands: Two, stats: Direct(( - equip_time_millis: 500, + equip_time_secs: 0.5, power: 1.00, poise_strength: 1.00, speed: 1.0 diff --git a/assets/common/items/npc_weapons/sword/saurok_sword.ron b/assets/common/items/npc_weapons/sword/saurok_sword.ron index 722280e1c3..66357e54ff 100644 --- a/assets/common/items/npc_weapons/sword/saurok_sword.ron +++ b/assets/common/items/npc_weapons/sword/saurok_sword.ron @@ -6,7 +6,7 @@ ItemDef( kind: SwordSimple, hands: Two, stats: Direct(( - equip_time_millis: 500, + equip_time_secs: 0.5, power: 1.00, poise_strength: 1.00, speed: 1.0 diff --git a/assets/common/items/npc_weapons/unique/beast_claws.ron b/assets/common/items/npc_weapons/unique/beast_claws.ron index 3b2ca645d4..4caf610525 100644 --- a/assets/common/items/npc_weapons/unique/beast_claws.ron +++ b/assets/common/items/npc_weapons/unique/beast_claws.ron @@ -6,7 +6,7 @@ ItemDef( kind: Unique(BeastClaws), hands: Two, stats: Direct(( - equip_time_millis: 500, + equip_time_secs: 0.5, power: 1.00, poise_strength: 1.00, speed: 1.0, diff --git a/assets/common/items/npc_weapons/unique/quadlowbasic.ron b/assets/common/items/npc_weapons/unique/quadlowbasic.ron index 0ab936cb0d..768e0918bf 100644 --- a/assets/common/items/npc_weapons/unique/quadlowbasic.ron +++ b/assets/common/items/npc_weapons/unique/quadlowbasic.ron @@ -6,7 +6,7 @@ ItemDef( kind: Unique(QuadLowBasic), hands: Two, stats: Direct(( - equip_time_millis: 10, + equip_time_secs: 0.01, power: 1.00, poise_strength: 1.00, speed: 1.00, diff --git a/assets/common/items/npc_weapons/unique/quadlowbeam.ron b/assets/common/items/npc_weapons/unique/quadlowbeam.ron index 1fd8921aad..eadd6b0c51 100644 --- a/assets/common/items/npc_weapons/unique/quadlowbeam.ron +++ b/assets/common/items/npc_weapons/unique/quadlowbeam.ron @@ -6,7 +6,7 @@ ItemDef( kind: Unique(QuadLowBeam), hands: Two, stats: Direct(( - equip_time_millis: 10, + equip_time_secs: 0.01, power: 1.00, poise_strength: 1.00, speed: 1.00, diff --git a/assets/common/items/npc_weapons/unique/quadlowbreathe.ron b/assets/common/items/npc_weapons/unique/quadlowbreathe.ron index bbaedc1882..e74df8d23e 100644 --- a/assets/common/items/npc_weapons/unique/quadlowbreathe.ron +++ b/assets/common/items/npc_weapons/unique/quadlowbreathe.ron @@ -6,7 +6,7 @@ ItemDef( kind: Unique(QuadLowBreathe), hands: Two, stats: Direct(( - equip_time_millis: 10, + equip_time_secs: 0.01, power: 1.00, poise_strength: 1.00, speed: 1.00, diff --git a/assets/common/items/npc_weapons/unique/quadlowquick.ron b/assets/common/items/npc_weapons/unique/quadlowquick.ron index f9b6c922c9..7b53cfd239 100644 --- a/assets/common/items/npc_weapons/unique/quadlowquick.ron +++ b/assets/common/items/npc_weapons/unique/quadlowquick.ron @@ -6,7 +6,7 @@ ItemDef( kind: Unique(QuadLowQuick), hands: Two, stats: Direct(( - equip_time_millis: 10, + equip_time_secs: 0.01, power: 1.00, poise_strength: 1.00, speed: 1.00, diff --git a/assets/common/items/npc_weapons/unique/quadlowranged.ron b/assets/common/items/npc_weapons/unique/quadlowranged.ron index b4a03cf800..5aeb436b71 100644 --- a/assets/common/items/npc_weapons/unique/quadlowranged.ron +++ b/assets/common/items/npc_weapons/unique/quadlowranged.ron @@ -6,7 +6,7 @@ ItemDef( kind: Unique(QuadLowRanged), hands: Two, stats: Direct(( - equip_time_millis: 10, + equip_time_secs: 0.01, power: 1.00, poise_strength: 1.00, speed: 1.00, diff --git a/assets/common/items/npc_weapons/unique/quadlowtail.ron b/assets/common/items/npc_weapons/unique/quadlowtail.ron index 66c3b04260..d15f0bc5cd 100644 --- a/assets/common/items/npc_weapons/unique/quadlowtail.ron +++ b/assets/common/items/npc_weapons/unique/quadlowtail.ron @@ -6,7 +6,7 @@ ItemDef( kind: Unique(QuadLowTail), hands: Two, stats: Direct(( - equip_time_millis: 10, + equip_time_secs: 0.01, power: 1.00, poise_strength: 1.00, speed: 1.00, diff --git a/assets/common/items/npc_weapons/unique/quadmedbasic.ron b/assets/common/items/npc_weapons/unique/quadmedbasic.ron index 685acf28c7..ab8e4a663c 100644 --- a/assets/common/items/npc_weapons/unique/quadmedbasic.ron +++ b/assets/common/items/npc_weapons/unique/quadmedbasic.ron @@ -6,7 +6,7 @@ ItemDef( kind: Unique(QuadMedBasic), hands: Two, stats: Direct(( - equip_time_millis: 10, + equip_time_secs: 0.01, power: 1.00, poise_strength: 1.00, speed: 1.00, diff --git a/assets/common/items/npc_weapons/unique/quadmedcharge.ron b/assets/common/items/npc_weapons/unique/quadmedcharge.ron index d5a2cdc78b..924680916d 100644 --- a/assets/common/items/npc_weapons/unique/quadmedcharge.ron +++ b/assets/common/items/npc_weapons/unique/quadmedcharge.ron @@ -6,7 +6,7 @@ ItemDef( kind: Unique(QuadMedCharge), hands: Two, stats: Direct(( - equip_time_millis: 10, + equip_time_secs: 0.01, power: 1.00, poise_strength: 1.00, speed: 1.00, diff --git a/assets/common/items/npc_weapons/unique/quadmedhoof.ron b/assets/common/items/npc_weapons/unique/quadmedhoof.ron index 0317efe916..acabf52056 100644 --- a/assets/common/items/npc_weapons/unique/quadmedhoof.ron +++ b/assets/common/items/npc_weapons/unique/quadmedhoof.ron @@ -6,7 +6,7 @@ ItemDef( kind: Unique(QuadMedHoof), hands: Two, stats: Direct(( - equip_time_millis: 10, + equip_time_secs: 0.01, power: 1.00, poise_strength: 1.00, speed: 1.00, diff --git a/assets/common/items/npc_weapons/unique/quadmedjump.ron b/assets/common/items/npc_weapons/unique/quadmedjump.ron index e3d4fa0c8f..e03942f132 100644 --- a/assets/common/items/npc_weapons/unique/quadmedjump.ron +++ b/assets/common/items/npc_weapons/unique/quadmedjump.ron @@ -6,7 +6,7 @@ ItemDef( kind: Unique(QuadMedJump), hands: Two, stats: Direct(( - equip_time_millis: 10, + equip_time_secs: 0.01, power: 1.00, poise_strength: 1.00, speed: 1.0, diff --git a/assets/common/items/npc_weapons/unique/quadmedquick.ron b/assets/common/items/npc_weapons/unique/quadmedquick.ron index 22feaa6aa8..b900cebbbd 100644 --- a/assets/common/items/npc_weapons/unique/quadmedquick.ron +++ b/assets/common/items/npc_weapons/unique/quadmedquick.ron @@ -6,7 +6,7 @@ ItemDef( kind: Unique(QuadMedQuick), hands: Two, stats: Direct(( - equip_time_millis: 10, + equip_time_secs: 0.01, power: 1.00, poise_strength: 1.00, speed: 1.0, diff --git a/assets/common/items/npc_weapons/unique/quadsmallbasic.ron b/assets/common/items/npc_weapons/unique/quadsmallbasic.ron index 336ed47645..180578c447 100644 --- a/assets/common/items/npc_weapons/unique/quadsmallbasic.ron +++ b/assets/common/items/npc_weapons/unique/quadsmallbasic.ron @@ -6,7 +6,7 @@ ItemDef( kind: Unique(QuadSmallBasic), hands: Two, stats: Direct(( - equip_time_millis: 10, + equip_time_secs: 0.01, power: 1.00, poise_strength: 1.00, speed: 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 1f811801a9..bedb130b8b 100644 --- a/assets/common/items/npc_weapons/unique/stone_golems_fist.ron +++ b/assets/common/items/npc_weapons/unique/stone_golems_fist.ron @@ -6,7 +6,7 @@ ItemDef( kind: Unique(StoneGolemFist), hands: Two, stats: Direct(( - equip_time_millis: 1, + equip_time_secs: 0.001, power: 1.00, poise_strength: 1.00, speed: 1.0 diff --git a/assets/common/items/npc_weapons/unique/theropodbasic.ron b/assets/common/items/npc_weapons/unique/theropodbasic.ron index fcfaea939c..7dc980852a 100644 --- a/assets/common/items/npc_weapons/unique/theropodbasic.ron +++ b/assets/common/items/npc_weapons/unique/theropodbasic.ron @@ -6,7 +6,7 @@ ItemDef( kind: Unique(TheropodBasic), hands: Two, stats: Direct(( - equip_time_millis: 10, + equip_time_secs: 0.01, power: 1.00, poise_strength: 1.00, speed: 1.00, diff --git a/assets/common/items/npc_weapons/unique/theropodbird.ron b/assets/common/items/npc_weapons/unique/theropodbird.ron index 205b916b54..f51fe4ac09 100644 --- a/assets/common/items/npc_weapons/unique/theropodbird.ron +++ b/assets/common/items/npc_weapons/unique/theropodbird.ron @@ -6,7 +6,7 @@ ItemDef( kind: Unique(TheropodBird), hands: Two, stats: Direct(( - equip_time_millis: 10, + equip_time_secs: 0.01, power: 1.00, poise_strength: 1.00, speed: 1.00, diff --git a/assets/common/items/npc_weapons/unique/tidal_claws.ron b/assets/common/items/npc_weapons/unique/tidal_claws.ron index 4d8bf64ec5..08343ecaa9 100644 --- a/assets/common/items/npc_weapons/unique/tidal_claws.ron +++ b/assets/common/items/npc_weapons/unique/tidal_claws.ron @@ -6,7 +6,7 @@ ItemDef( kind: Unique(TidalClaws), hands: Two, stats: Direct(( - equip_time_millis: 500, + equip_time_secs: 0.5, power: 1.00, poise_strength: 1.00, speed: 1.0, diff --git a/assets/common/items/npc_weapons/unique/turret.ron b/assets/common/items/npc_weapons/unique/turret.ron index fcca6452c1..6e3ba66261 100644 --- a/assets/common/items/npc_weapons/unique/turret.ron +++ b/assets/common/items/npc_weapons/unique/turret.ron @@ -6,7 +6,7 @@ ItemDef( kind: Unique(ObjectTurret), hands: Two, stats: Direct(( - equip_time_millis: 10, + equip_time_secs: 0.01, power: 1.00, poise_strength: 1.00, speed: 1.00, diff --git a/assets/common/items/npc_weapons/unique/wendigo_magic.ron b/assets/common/items/npc_weapons/unique/wendigo_magic.ron index 3892f757d0..e957eb5e5a 100644 --- a/assets/common/items/npc_weapons/unique/wendigo_magic.ron +++ b/assets/common/items/npc_weapons/unique/wendigo_magic.ron @@ -6,7 +6,7 @@ ItemDef( kind: Unique(WendigoMagic), hands: Two, stats: Direct(( - equip_time_millis: 500, + equip_time_secs: 0.5, power: 1.00, poise_strength: 1.00, speed: 1.0, diff --git a/assets/common/items/weapons/axe/bloodsteel_axe-0.ron b/assets/common/items/weapons/axe/bloodsteel_axe-0.ron index ae77701cc3..d3b190e36b 100644 --- a/assets/common/items/weapons/axe/bloodsteel_axe-0.ron +++ b/assets/common/items/weapons/axe/bloodsteel_axe-0.ron @@ -5,7 +5,7 @@ ItemDef( kind: Axe, hands: Two, stats: Direct(( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 1.6, poise_strength: 1.4, speed: 1.0, diff --git a/assets/common/items/weapons/axe/bloodsteel_axe-1.ron b/assets/common/items/weapons/axe/bloodsteel_axe-1.ron index 06163034c5..238cc66874 100644 --- a/assets/common/items/weapons/axe/bloodsteel_axe-1.ron +++ b/assets/common/items/weapons/axe/bloodsteel_axe-1.ron @@ -5,7 +5,7 @@ ItemDef( kind: Axe, hands: Two, stats: Direct(( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 1.6, poise_strength: 1.8, speed: 1.0, diff --git a/assets/common/items/weapons/axe/bloodsteel_axe-2.ron b/assets/common/items/weapons/axe/bloodsteel_axe-2.ron index ca005ed334..ca5e855ab6 100644 --- a/assets/common/items/weapons/axe/bloodsteel_axe-2.ron +++ b/assets/common/items/weapons/axe/bloodsteel_axe-2.ron @@ -5,7 +5,7 @@ ItemDef( kind: Axe, hands: Two, stats: Direct(( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 1.6, poise_strength: 1.8, speed: 1.0, diff --git a/assets/common/items/weapons/axe/bronze_axe-0.ron b/assets/common/items/weapons/axe/bronze_axe-0.ron index 5a013aa046..71967f169c 100644 --- a/assets/common/items/weapons/axe/bronze_axe-0.ron +++ b/assets/common/items/weapons/axe/bronze_axe-0.ron @@ -5,7 +5,7 @@ ItemDef( kind: Axe, hands: Two, stats: Direct(( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 1.0, poise_strength: 0.9, speed: 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 551d6ebcc0..de8bbd4ffd 100644 --- a/assets/common/items/weapons/axe/bronze_axe-1.ron +++ b/assets/common/items/weapons/axe/bronze_axe-1.ron @@ -5,7 +5,7 @@ ItemDef( kind: Axe, hands: Two, stats: Direct(( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 1.0, poise_strength: 1.5, speed: 1.0, diff --git a/assets/common/items/weapons/axe/bronze_axe-2.ron b/assets/common/items/weapons/axe/bronze_axe-2.ron index 673ab08b7f..29668fee4b 100644 --- a/assets/common/items/weapons/axe/bronze_axe-2.ron +++ b/assets/common/items/weapons/axe/bronze_axe-2.ron @@ -5,7 +5,7 @@ ItemDef( kind: Axe, hands: Two, stats: Direct(( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 1.0, poise_strength: 1.4, speed: 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 c50fb8d418..078ad75ea9 100644 --- a/assets/common/items/weapons/axe/cobalt_axe-0.ron +++ b/assets/common/items/weapons/axe/cobalt_axe-0.ron @@ -5,7 +5,7 @@ ItemDef( kind: Axe, hands: Two, stats: Direct(( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 1.8, poise_strength: 1.0, speed: 1.0, diff --git a/assets/common/items/weapons/axe/cobalt_axe-1.ron b/assets/common/items/weapons/axe/cobalt_axe-1.ron index 8607fcf969..400b24fbc5 100644 --- a/assets/common/items/weapons/axe/cobalt_axe-1.ron +++ b/assets/common/items/weapons/axe/cobalt_axe-1.ron @@ -5,7 +5,7 @@ ItemDef( kind: Axe, hands: Two, stats: Direct(( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 1.8, poise_strength: 1.0, speed: 1.0, diff --git a/assets/common/items/weapons/axe/iron_axe-0.ron b/assets/common/items/weapons/axe/iron_axe-0.ron index d9911dc030..6f2b392951 100644 --- a/assets/common/items/weapons/axe/iron_axe-0.ron +++ b/assets/common/items/weapons/axe/iron_axe-0.ron @@ -5,7 +5,7 @@ ItemDef( kind: Axe, hands: Two, stats: Direct(( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 1.2, poise_strength: 1.7, speed: 1.0, diff --git a/assets/common/items/weapons/axe/iron_axe-1.ron b/assets/common/items/weapons/axe/iron_axe-1.ron index 4aca7f736e..30a2a3e3ff 100644 --- a/assets/common/items/weapons/axe/iron_axe-1.ron +++ b/assets/common/items/weapons/axe/iron_axe-1.ron @@ -5,7 +5,7 @@ ItemDef( kind: Axe, hands: Two, stats: Direct(( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 1.2, poise_strength: 1.4, speed: 1.0, diff --git a/assets/common/items/weapons/axe/iron_axe-2.ron b/assets/common/items/weapons/axe/iron_axe-2.ron index 383782454a..1bada4e0d2 100644 --- a/assets/common/items/weapons/axe/iron_axe-2.ron +++ b/assets/common/items/weapons/axe/iron_axe-2.ron @@ -5,7 +5,7 @@ ItemDef( kind: Axe, hands: Two, stats: Direct(( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 1.2, poise_strength: 1.1, speed: 1.0, diff --git a/assets/common/items/weapons/axe/iron_axe-3.ron b/assets/common/items/weapons/axe/iron_axe-3.ron index 1406ad3e9f..058a44168f 100644 --- a/assets/common/items/weapons/axe/iron_axe-3.ron +++ b/assets/common/items/weapons/axe/iron_axe-3.ron @@ -5,7 +5,7 @@ ItemDef( kind: Axe, hands: Two, stats: Direct(( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 1.2, poise_strength: 1.6, speed: 1.0, diff --git a/assets/common/items/weapons/axe/iron_axe-4.ron b/assets/common/items/weapons/axe/iron_axe-4.ron index c46fdae2fa..3047c53e7b 100644 --- a/assets/common/items/weapons/axe/iron_axe-4.ron +++ b/assets/common/items/weapons/axe/iron_axe-4.ron @@ -5,7 +5,7 @@ ItemDef( kind: Axe, hands: Two, stats: Direct(( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 1.2, poise_strength: 1.4, speed: 1.0, diff --git a/assets/common/items/weapons/axe/iron_axe-5.ron b/assets/common/items/weapons/axe/iron_axe-5.ron index 00379b0a61..c6ce58abc0 100644 --- a/assets/common/items/weapons/axe/iron_axe-5.ron +++ b/assets/common/items/weapons/axe/iron_axe-5.ron @@ -5,7 +5,7 @@ ItemDef( kind: Axe, hands: Two, stats: Direct(( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 1.2, poise_strength: 1.8, speed: 1.0, diff --git a/assets/common/items/weapons/axe/iron_axe-6.ron b/assets/common/items/weapons/axe/iron_axe-6.ron index 219ce1b923..1b5d841ba8 100644 --- a/assets/common/items/weapons/axe/iron_axe-6.ron +++ b/assets/common/items/weapons/axe/iron_axe-6.ron @@ -5,7 +5,7 @@ ItemDef( kind: Axe, hands: Two, stats: Direct(( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 1.2, poise_strength: 1.3, speed: 1.0, diff --git a/assets/common/items/weapons/axe/iron_axe-7.ron b/assets/common/items/weapons/axe/iron_axe-7.ron index 31b889c726..98647e199d 100644 --- a/assets/common/items/weapons/axe/iron_axe-7.ron +++ b/assets/common/items/weapons/axe/iron_axe-7.ron @@ -5,7 +5,7 @@ ItemDef( kind: Axe, hands: Two, stats: Direct(( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 1.2, poise_strength: 1.6, speed: 1.0, diff --git a/assets/common/items/weapons/axe/iron_axe-8.ron b/assets/common/items/weapons/axe/iron_axe-8.ron index cbaad7165b..a27df5896e 100644 --- a/assets/common/items/weapons/axe/iron_axe-8.ron +++ b/assets/common/items/weapons/axe/iron_axe-8.ron @@ -5,7 +5,7 @@ ItemDef( kind: Axe, hands: Two, stats: Direct(( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 1.2, poise_strength: 0.6, speed: 1.0, diff --git a/assets/common/items/weapons/axe/iron_axe-9.ron b/assets/common/items/weapons/axe/iron_axe-9.ron index c65a01804c..d3557a3ccc 100644 --- a/assets/common/items/weapons/axe/iron_axe-9.ron +++ b/assets/common/items/weapons/axe/iron_axe-9.ron @@ -5,7 +5,7 @@ ItemDef( kind: Axe, hands: Two, stats: Direct(( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 1.2, poise_strength: 0.3, speed: 1.0, diff --git a/assets/common/items/weapons/axe/malachite_axe-0.ron b/assets/common/items/weapons/axe/malachite_axe-0.ron index bc08b5d4c0..84d3d61484 100644 --- a/assets/common/items/weapons/axe/malachite_axe-0.ron +++ b/assets/common/items/weapons/axe/malachite_axe-0.ron @@ -5,7 +5,7 @@ ItemDef( kind: Axe, hands: Two, stats: Direct(( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 2.0, poise_strength: 1.1, speed: 1.0, diff --git a/assets/common/items/weapons/axe/orc_axe-0.ron b/assets/common/items/weapons/axe/orc_axe-0.ron index ebef7c0bb9..bfeb68447f 100644 --- a/assets/common/items/weapons/axe/orc_axe-0.ron +++ b/assets/common/items/weapons/axe/orc_axe-0.ron @@ -5,7 +5,7 @@ ItemDef( kind: Axe, hands: Two, stats: Direct(( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 0.6, poise_strength: 1.5, speed: 1.0, diff --git a/assets/common/items/weapons/axe/parashu.ron b/assets/common/items/weapons/axe/parashu.ron index 932c189188..1cf59e80ea 100644 --- a/assets/common/items/weapons/axe/parashu.ron +++ b/assets/common/items/weapons/axe/parashu.ron @@ -5,7 +5,7 @@ ItemDef( kind: Axe, hands: Two, stats: Direct(( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 2.5, poise_strength: 1.8, speed: 0.8, diff --git a/assets/common/items/weapons/axe/starter_axe.ron b/assets/common/items/weapons/axe/starter_axe.ron index 7adeb6c8f3..e4a4673db3 100644 --- a/assets/common/items/weapons/axe/starter_axe.ron +++ b/assets/common/items/weapons/axe/starter_axe.ron @@ -5,7 +5,7 @@ ItemDef( kind: Axe, hands: Two, stats: Direct(( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 0.5, poise_strength: 2.0, speed: 1.0, diff --git a/assets/common/items/weapons/axe/steel_axe-0.ron b/assets/common/items/weapons/axe/steel_axe-0.ron index baa203d0cb..87344996cf 100644 --- a/assets/common/items/weapons/axe/steel_axe-0.ron +++ b/assets/common/items/weapons/axe/steel_axe-0.ron @@ -5,7 +5,7 @@ ItemDef( kind: Axe, hands: Two, stats: Direct(( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 1.4, poise_strength: 1.2, speed: 1.0, diff --git a/assets/common/items/weapons/axe/steel_axe-1.ron b/assets/common/items/weapons/axe/steel_axe-1.ron index d5f009e54f..8f1cca27f9 100644 --- a/assets/common/items/weapons/axe/steel_axe-1.ron +++ b/assets/common/items/weapons/axe/steel_axe-1.ron @@ -5,7 +5,7 @@ ItemDef( kind: Axe, hands: Two, stats: Direct(( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 1.4, poise_strength: 1.2, speed: 1.0, diff --git a/assets/common/items/weapons/axe/steel_axe-2.ron b/assets/common/items/weapons/axe/steel_axe-2.ron index 3d4ab8a1ad..0348a9e350 100644 --- a/assets/common/items/weapons/axe/steel_axe-2.ron +++ b/assets/common/items/weapons/axe/steel_axe-2.ron @@ -5,7 +5,7 @@ ItemDef( kind: Axe, hands: Two, stats: Direct(( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 1.4, poise_strength: 1.2, speed: 1.0, diff --git a/assets/common/items/weapons/axe/steel_axe-3.ron b/assets/common/items/weapons/axe/steel_axe-3.ron index 6ff278dfbe..7e8a341104 100644 --- a/assets/common/items/weapons/axe/steel_axe-3.ron +++ b/assets/common/items/weapons/axe/steel_axe-3.ron @@ -5,7 +5,7 @@ ItemDef( kind: Axe, hands: Two, stats: Direct(( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 1.4, poise_strength: 1.1, speed: 1.0, diff --git a/assets/common/items/weapons/axe/steel_axe-4.ron b/assets/common/items/weapons/axe/steel_axe-4.ron index 090cb5e936..3e5136d64a 100644 --- a/assets/common/items/weapons/axe/steel_axe-4.ron +++ b/assets/common/items/weapons/axe/steel_axe-4.ron @@ -5,7 +5,7 @@ ItemDef( kind: Axe, hands: Two, stats: Direct(( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 1.4, poise_strength: 1.2, speed: 1.0, diff --git a/assets/common/items/weapons/axe/steel_axe-5.ron b/assets/common/items/weapons/axe/steel_axe-5.ron index 3e6fb5d55e..2d7566f456 100644 --- a/assets/common/items/weapons/axe/steel_axe-5.ron +++ b/assets/common/items/weapons/axe/steel_axe-5.ron @@ -5,7 +5,7 @@ ItemDef( kind: Axe, hands: Two, stats: Direct(( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 1.4, poise_strength: 1.5, speed: 1.0, diff --git a/assets/common/items/weapons/axe/steel_axe-6.ron b/assets/common/items/weapons/axe/steel_axe-6.ron index e07fe8da15..34c0fc31bc 100644 --- a/assets/common/items/weapons/axe/steel_axe-6.ron +++ b/assets/common/items/weapons/axe/steel_axe-6.ron @@ -5,7 +5,7 @@ ItemDef( kind: Axe, hands: Two, stats: Direct(( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 1.4, poise_strength: 1.0, speed: 1.0, 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 141a072b26..9e027c662f 100644 --- a/assets/common/items/weapons/axe/worn_iron_axe-0.ron +++ b/assets/common/items/weapons/axe/worn_iron_axe-0.ron @@ -5,7 +5,7 @@ ItemDef( kind: Axe, hands: Two, stats: Direct(( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 0.8, poise_strength: 0.4, speed: 1.0, 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 49a1011180..17d519780c 100644 --- a/assets/common/items/weapons/axe/worn_iron_axe-1.ron +++ b/assets/common/items/weapons/axe/worn_iron_axe-1.ron @@ -5,7 +5,7 @@ ItemDef( kind: Axe, hands: Two, stats: Direct(( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 0.8, poise_strength: 0.4, speed: 1.0, 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 e29a215ce9..0e8e1144c3 100644 --- a/assets/common/items/weapons/axe/worn_iron_axe-2.ron +++ b/assets/common/items/weapons/axe/worn_iron_axe-2.ron @@ -5,7 +5,7 @@ ItemDef( kind: Axe, hands: Two, stats: Direct(( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 0.8, poise_strength: 0.7, speed: 1.0, 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 839a008de9..43fb5038f8 100644 --- a/assets/common/items/weapons/axe/worn_iron_axe-3.ron +++ b/assets/common/items/weapons/axe/worn_iron_axe-3.ron @@ -5,7 +5,7 @@ ItemDef( kind: Axe, hands: Two, stats: Direct(( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 0.8, poise_strength: 1.1, speed: 1.0, 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 fbc053bc68..dfacdeb712 100644 --- a/assets/common/items/weapons/axe/worn_iron_axe-4.ron +++ b/assets/common/items/weapons/axe/worn_iron_axe-4.ron @@ -5,7 +5,7 @@ ItemDef( kind: Axe, hands: Two, stats: Direct(( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 0.8, poise_strength: 0.5, speed: 1.0, diff --git a/assets/common/items/weapons/axe_1h/bloodsteel-0.ron b/assets/common/items/weapons/axe_1h/bloodsteel-0.ron index 9e59d2e0e8..70ff3a9b5d 100644 --- a/assets/common/items/weapons/axe_1h/bloodsteel-0.ron +++ b/assets/common/items/weapons/axe_1h/bloodsteel-0.ron @@ -5,7 +5,7 @@ ItemDef( kind: Axe, hands: One, stats: Direct(( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 1.5, poise_strength: 1.0, speed: 1.3, diff --git a/assets/common/items/weapons/axe_1h/bloodsteel-1.ron b/assets/common/items/weapons/axe_1h/bloodsteel-1.ron index 473c843d3f..b706746c75 100644 --- a/assets/common/items/weapons/axe_1h/bloodsteel-1.ron +++ b/assets/common/items/weapons/axe_1h/bloodsteel-1.ron @@ -5,7 +5,7 @@ ItemDef( kind: Axe, hands: One, stats: ( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 2.0, poise_strength: 1.0, speed: 0.8, diff --git a/assets/common/items/weapons/axe_1h/bronze-0.ron b/assets/common/items/weapons/axe_1h/bronze-0.ron index 003273bd53..db727cd4c6 100644 --- a/assets/common/items/weapons/axe_1h/bronze-0.ron +++ b/assets/common/items/weapons/axe_1h/bronze-0.ron @@ -5,7 +5,7 @@ ItemDef( kind: Axe, hands: One, stats: ( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 1.0, poise_strength: 1.0, speed: 1.1, diff --git a/assets/common/items/weapons/axe_1h/bronze-1.ron b/assets/common/items/weapons/axe_1h/bronze-1.ron index c8c3d0e763..b5c0ec0af9 100644 --- a/assets/common/items/weapons/axe_1h/bronze-1.ron +++ b/assets/common/items/weapons/axe_1h/bronze-1.ron @@ -5,7 +5,7 @@ ItemDef( kind: Axe, hands: One, stats: ( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 1.1, poise_strength: 1.0, speed: 1.0, diff --git a/assets/common/items/weapons/axe_1h/cobalt-0.ron b/assets/common/items/weapons/axe_1h/cobalt-0.ron index 3b33d948c7..e98e19ad22 100644 --- a/assets/common/items/weapons/axe_1h/cobalt-0.ron +++ b/assets/common/items/weapons/axe_1h/cobalt-0.ron @@ -5,7 +5,7 @@ ItemDef( kind: Axe, hands: One, stats: ( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 1.6, poise_strength: 1.0, speed: 1.0, diff --git a/assets/common/items/weapons/axe_1h/cobalt-1.ron b/assets/common/items/weapons/axe_1h/cobalt-1.ron index 25d6847031..2fe42ea912 100644 --- a/assets/common/items/weapons/axe_1h/cobalt-1.ron +++ b/assets/common/items/weapons/axe_1h/cobalt-1.ron @@ -5,7 +5,7 @@ ItemDef( kind: Axe, hands: One, stats: ( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 1.75, poise_strength: 1.0, speed: 0.85, diff --git a/assets/common/items/weapons/axe_1h/iron-0.ron b/assets/common/items/weapons/axe_1h/iron-0.ron index 75e37781ee..88fe64b8c8 100644 --- a/assets/common/items/weapons/axe_1h/iron-0.ron +++ b/assets/common/items/weapons/axe_1h/iron-0.ron @@ -5,7 +5,7 @@ ItemDef( kind: Axe, hands: One, stats: ( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 1.1, poise_strength: 1.0, speed: 1.1, diff --git a/assets/common/items/weapons/axe_1h/iron-1.ron b/assets/common/items/weapons/axe_1h/iron-1.ron index ae5a84dd21..3438dbd5c4 100644 --- a/assets/common/items/weapons/axe_1h/iron-1.ron +++ b/assets/common/items/weapons/axe_1h/iron-1.ron @@ -5,7 +5,7 @@ ItemDef( kind: Axe, hands: One, stats: ( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 1.3, poise_strength: 1.0, speed: 0.9, diff --git a/assets/common/items/weapons/axe_1h/iron-2.ron b/assets/common/items/weapons/axe_1h/iron-2.ron index 5b442e5e5d..d062ed6746 100644 --- a/assets/common/items/weapons/axe_1h/iron-2.ron +++ b/assets/common/items/weapons/axe_1h/iron-2.ron @@ -5,7 +5,7 @@ ItemDef( kind: Axe, hands: One, stats: ( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 1.0, poise_strength: 1.0, speed: 1.2, diff --git a/assets/common/items/weapons/axe_1h/iron-3.ron b/assets/common/items/weapons/axe_1h/iron-3.ron index a5bb837ecc..e91bfe9830 100644 --- a/assets/common/items/weapons/axe_1h/iron-3.ron +++ b/assets/common/items/weapons/axe_1h/iron-3.ron @@ -5,7 +5,7 @@ ItemDef( kind: Axe, hands: One, stats: ( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 1.2, poise_strength: 1.0, speed: 1.0, diff --git a/assets/common/items/weapons/axe_1h/orichalcum-0.ron b/assets/common/items/weapons/axe_1h/orichalcum-0.ron index cfd64ef1a2..ebfa2d84c2 100644 --- a/assets/common/items/weapons/axe_1h/orichalcum-0.ron +++ b/assets/common/items/weapons/axe_1h/orichalcum-0.ron @@ -5,7 +5,7 @@ ItemDef( kind: Axe, hands: One, stats: ( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 2.0, poise_strength: 1.0, speed: 1.0, diff --git a/assets/common/items/weapons/axe_1h/steel-0.ron b/assets/common/items/weapons/axe_1h/steel-0.ron index 578aa0c691..1225ac4021 100644 --- a/assets/common/items/weapons/axe_1h/steel-0.ron +++ b/assets/common/items/weapons/axe_1h/steel-0.ron @@ -5,7 +5,7 @@ ItemDef( kind: Axe, hands: One, stats: ( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 1.5, poise_strength: 1.0, speed: 0.9, diff --git a/assets/common/items/weapons/axe_1h/steel-1.ron b/assets/common/items/weapons/axe_1h/steel-1.ron index d5b9f4d1d5..9fe5d8834a 100644 --- a/assets/common/items/weapons/axe_1h/steel-1.ron +++ b/assets/common/items/weapons/axe_1h/steel-1.ron @@ -5,7 +5,7 @@ ItemDef( kind: Axe, hands: One, stats: ( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 1.4, poise_strength: 1.0, speed: 1.0, diff --git a/assets/common/items/weapons/axe_1h/steel-2.ron b/assets/common/items/weapons/axe_1h/steel-2.ron index 4dc66c5165..c5d72f5c49 100644 --- a/assets/common/items/weapons/axe_1h/steel-2.ron +++ b/assets/common/items/weapons/axe_1h/steel-2.ron @@ -5,7 +5,7 @@ ItemDef( kind: Axe, hands: One, stats: ( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 1.3, poise_strength: 1.0, speed: 1.1, diff --git a/assets/common/items/weapons/axe_1h/stone-0.ron b/assets/common/items/weapons/axe_1h/stone-0.ron index dc0b887530..e030d7bb0e 100644 --- a/assets/common/items/weapons/axe_1h/stone-0.ron +++ b/assets/common/items/weapons/axe_1h/stone-0.ron @@ -5,7 +5,7 @@ ItemDef( kind: Axe, hands: One, stats: ( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 0.8, poise_strength: 1.0, speed: 1.0, diff --git a/assets/common/items/weapons/axe_1h/stone-1.ron b/assets/common/items/weapons/axe_1h/stone-1.ron index 46675a54ab..ea6ac1b1e9 100644 --- a/assets/common/items/weapons/axe_1h/stone-1.ron +++ b/assets/common/items/weapons/axe_1h/stone-1.ron @@ -5,7 +5,7 @@ ItemDef( kind: Axe, hands: One, stats: ( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 0.7, poise_strength: 1.0, speed: 1.1, diff --git a/assets/common/items/weapons/axe_1h/wood-0.ron b/assets/common/items/weapons/axe_1h/wood-0.ron index b979a83cc2..7028a83aea 100644 --- a/assets/common/items/weapons/axe_1h/wood-0.ron +++ b/assets/common/items/weapons/axe_1h/wood-0.ron @@ -5,7 +5,7 @@ ItemDef( kind: Axe, hands: One, stats: ( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 0.8, poise_strength: 1.0, speed: 0.8, diff --git a/assets/common/items/weapons/axe_1h/wood-1.ron b/assets/common/items/weapons/axe_1h/wood-1.ron index 91983a4eb1..2f42c72aee 100644 --- a/assets/common/items/weapons/axe_1h/wood-1.ron +++ b/assets/common/items/weapons/axe_1h/wood-1.ron @@ -5,7 +5,7 @@ ItemDef( kind: Axe, hands: One, stats: ( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 0.5, poise_strength: 1.0, speed: 1.1, diff --git a/assets/common/items/weapons/bow/bone-0.ron b/assets/common/items/weapons/bow/bone-0.ron index 4e8f9ba91e..df7cb62bf0 100644 --- a/assets/common/items/weapons/bow/bone-0.ron +++ b/assets/common/items/weapons/bow/bone-0.ron @@ -5,7 +5,7 @@ ItemDef( kind: Bow, hands: Two, stats: Direct(( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 0.9, poise_strength: 0.8, speed: 1.1, diff --git a/assets/common/items/weapons/bow/bone-1.ron b/assets/common/items/weapons/bow/bone-1.ron index 74d1066e7a..62a89315fb 100644 --- a/assets/common/items/weapons/bow/bone-1.ron +++ b/assets/common/items/weapons/bow/bone-1.ron @@ -5,7 +5,7 @@ ItemDef( kind: Bow, hands: Two, stats: Direct(( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 1.2, poise_strength: 0.8, speed: 0.8, diff --git a/assets/common/items/weapons/bow/bone-2.ron b/assets/common/items/weapons/bow/bone-2.ron index e648d6477a..6d93079bb1 100644 --- a/assets/common/items/weapons/bow/bone-2.ron +++ b/assets/common/items/weapons/bow/bone-2.ron @@ -5,7 +5,7 @@ ItemDef( kind: Bow, hands: Two, stats: Direct(( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 1.0, poise_strength: 0.8, speed: 1.0, diff --git a/assets/common/items/weapons/bow/bone-3.ron b/assets/common/items/weapons/bow/bone-3.ron index 27ac25aa26..aa2d2a5144 100644 --- a/assets/common/items/weapons/bow/bone-3.ron +++ b/assets/common/items/weapons/bow/bone-3.ron @@ -5,7 +5,7 @@ ItemDef( kind: Bow, hands: Two, stats: Direct(( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 1.1, poise_strength: 0.8, speed: 0.9, diff --git a/assets/common/items/weapons/bow/eldwood-0.ron b/assets/common/items/weapons/bow/eldwood-0.ron index 9aaf8790f7..a13aade1e3 100644 --- a/assets/common/items/weapons/bow/eldwood-0.ron +++ b/assets/common/items/weapons/bow/eldwood-0.ron @@ -5,7 +5,7 @@ ItemDef( kind: Bow, hands: Two, stats: Direct(( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 1.8, poise_strength: 0.8, speed: 1.0, diff --git a/assets/common/items/weapons/bow/eldwood-1.ron b/assets/common/items/weapons/bow/eldwood-1.ron index 863d37da3d..4a8e7953f2 100644 --- a/assets/common/items/weapons/bow/eldwood-1.ron +++ b/assets/common/items/weapons/bow/eldwood-1.ron @@ -5,7 +5,7 @@ ItemDef( kind: Bow, hands: Two, stats: Direct(( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 1.6, poise_strength: 0.8, speed: 1.2, diff --git a/assets/common/items/weapons/bow/eldwood-2.ron b/assets/common/items/weapons/bow/eldwood-2.ron index faffd799b2..de2ff7677e 100644 --- a/assets/common/items/weapons/bow/eldwood-2.ron +++ b/assets/common/items/weapons/bow/eldwood-2.ron @@ -5,7 +5,7 @@ ItemDef( kind: Bow, hands: Two, stats: Direct(( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 2.0, poise_strength: 0.8, speed: 0.8, diff --git a/assets/common/items/weapons/bow/frostwood-0.ron b/assets/common/items/weapons/bow/frostwood-0.ron index fc2eeda6af..a1d997137f 100644 --- a/assets/common/items/weapons/bow/frostwood-0.ron +++ b/assets/common/items/weapons/bow/frostwood-0.ron @@ -5,7 +5,7 @@ ItemDef( kind: Bow, hands: Two, stats: Direct(( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 1.4, poise_strength: 0.8, speed: 1.2, diff --git a/assets/common/items/weapons/bow/frostwood-1.ron b/assets/common/items/weapons/bow/frostwood-1.ron index 46f8045f1c..0cc1eb609b 100644 --- a/assets/common/items/weapons/bow/frostwood-1.ron +++ b/assets/common/items/weapons/bow/frostwood-1.ron @@ -5,7 +5,7 @@ ItemDef( kind: Bow, hands: Two, stats: Direct(( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 1.6, poise_strength: 0.8, speed: 1.0, diff --git a/assets/common/items/weapons/bow/frostwood-2.ron b/assets/common/items/weapons/bow/frostwood-2.ron index e45c34fcd3..4dd74f9966 100644 --- a/assets/common/items/weapons/bow/frostwood-2.ron +++ b/assets/common/items/weapons/bow/frostwood-2.ron @@ -5,7 +5,7 @@ ItemDef( kind: Bow, hands: Two, stats: Direct(( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 1.7, poise_strength: 0.8, speed: 0.9, diff --git a/assets/common/items/weapons/bow/hardwood-0.ron b/assets/common/items/weapons/bow/hardwood-0.ron index 7614564428..14a40af6ef 100644 --- a/assets/common/items/weapons/bow/hardwood-0.ron +++ b/assets/common/items/weapons/bow/hardwood-0.ron @@ -5,7 +5,7 @@ ItemDef( kind: Bow, hands: Two, stats: Direct(( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 1.2, poise_strength: 0.8, speed: 1.0, diff --git a/assets/common/items/weapons/bow/hardwood-1.ron b/assets/common/items/weapons/bow/hardwood-1.ron index 6cb1c52721..ebe5d42ce8 100644 --- a/assets/common/items/weapons/bow/hardwood-1.ron +++ b/assets/common/items/weapons/bow/hardwood-1.ron @@ -5,7 +5,7 @@ ItemDef( kind: Bow, hands: Two, stats: Direct(( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 1.4, poise_strength: 0.8, speed: 0.8, diff --git a/assets/common/items/weapons/bow/hardwood-2.ron b/assets/common/items/weapons/bow/hardwood-2.ron index 0453c0d035..5835ad1c44 100644 --- a/assets/common/items/weapons/bow/hardwood-2.ron +++ b/assets/common/items/weapons/bow/hardwood-2.ron @@ -5,7 +5,7 @@ ItemDef( kind: Bow, hands: Two, stats: Direct(( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 1.1, poise_strength: 0.8, speed: 1.1, diff --git a/assets/common/items/weapons/bow/hardwood-3.ron b/assets/common/items/weapons/bow/hardwood-3.ron index b915905350..e0f0487fe4 100644 --- a/assets/common/items/weapons/bow/hardwood-3.ron +++ b/assets/common/items/weapons/bow/hardwood-3.ron @@ -5,7 +5,7 @@ ItemDef( kind: Bow, hands: Two, stats: Direct(( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 0.9, poise_strength: 0.8, speed: 1.3, diff --git a/assets/common/items/weapons/bow/hardwood-4.ron b/assets/common/items/weapons/bow/hardwood-4.ron index 573acf778a..27c029e941 100644 --- a/assets/common/items/weapons/bow/hardwood-4.ron +++ b/assets/common/items/weapons/bow/hardwood-4.ron @@ -5,7 +5,7 @@ ItemDef( kind: Bow, hands: Two, stats: Direct(( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 1.0, poise_strength: 0.8, speed: 1.2, diff --git a/assets/common/items/weapons/bow/hardwood-5.ron b/assets/common/items/weapons/bow/hardwood-5.ron index 9a60c8a114..860b179983 100644 --- a/assets/common/items/weapons/bow/hardwood-5.ron +++ b/assets/common/items/weapons/bow/hardwood-5.ron @@ -5,7 +5,7 @@ ItemDef( kind: Bow, hands: Two, stats: Direct(( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 1.3, poise_strength: 0.8, speed: 0.9, diff --git a/assets/common/items/weapons/bow/metal-0.ron b/assets/common/items/weapons/bow/metal-0.ron index 69e5c5a6d9..5c607e3e2e 100644 --- a/assets/common/items/weapons/bow/metal-0.ron +++ b/assets/common/items/weapons/bow/metal-0.ron @@ -5,7 +5,7 @@ ItemDef( kind: Bow, hands: Two, stats: Direct(( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 1.4, poise_strength: 0.8, speed: 1.0, diff --git a/assets/common/items/weapons/bow/metal-1.ron b/assets/common/items/weapons/bow/metal-1.ron index bb917d2f90..a85a4b20f6 100644 --- a/assets/common/items/weapons/bow/metal-1.ron +++ b/assets/common/items/weapons/bow/metal-1.ron @@ -5,7 +5,7 @@ ItemDef( kind: Bow, hands: Two, stats: Direct(( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 1.2, poise_strength: 0.8, speed: 1.2, diff --git a/assets/common/items/weapons/bow/metal-2.ron b/assets/common/items/weapons/bow/metal-2.ron index da08553c8a..7d6bffb67c 100644 --- a/assets/common/items/weapons/bow/metal-2.ron +++ b/assets/common/items/weapons/bow/metal-2.ron @@ -5,7 +5,7 @@ ItemDef( kind: Bow, hands: Two, stats: Direct(( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 1.3, poise_strength: 0.8, speed: 1.1, diff --git a/assets/common/items/weapons/bow/metal-3.ron b/assets/common/items/weapons/bow/metal-3.ron index 8ef8934379..4f09dd7d61 100644 --- a/assets/common/items/weapons/bow/metal-3.ron +++ b/assets/common/items/weapons/bow/metal-3.ron @@ -5,7 +5,7 @@ ItemDef( kind: Bow, hands: Two, stats: Direct(( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 1.5, poise_strength: 0.8, speed: 0.9, diff --git a/assets/common/items/weapons/bow/metal-4.ron b/assets/common/items/weapons/bow/metal-4.ron index 858bd7b5cf..7c9a30a1f6 100644 --- a/assets/common/items/weapons/bow/metal-4.ron +++ b/assets/common/items/weapons/bow/metal-4.ron @@ -5,7 +5,7 @@ ItemDef( kind: Bow, hands: Two, stats: Direct(( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 1.6, poise_strength: 0.8, speed: 0.8, diff --git a/assets/common/items/weapons/bow/rawwood-0.ron b/assets/common/items/weapons/bow/rawwood-0.ron index bd7f5162f8..f7f610e953 100644 --- a/assets/common/items/weapons/bow/rawwood-0.ron +++ b/assets/common/items/weapons/bow/rawwood-0.ron @@ -5,7 +5,7 @@ ItemDef( kind: Bow, hands: Two, stats: Direct(( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 0.7, poise_strength: 0.8, speed: 0.9, diff --git a/assets/common/items/weapons/bow/rawwood-1.ron b/assets/common/items/weapons/bow/rawwood-1.ron index 2ccb1a8cba..515a0ddc68 100644 --- a/assets/common/items/weapons/bow/rawwood-1.ron +++ b/assets/common/items/weapons/bow/rawwood-1.ron @@ -5,7 +5,7 @@ ItemDef( kind: Bow, hands: Two, stats: Direct(( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 0.6, poise_strength: 0.8, speed: 1.0, diff --git a/assets/common/items/weapons/bow/sagitta.ron b/assets/common/items/weapons/bow/sagitta.ron index 88a9e6ad6e..3ad0f8e0ed 100644 --- a/assets/common/items/weapons/bow/sagitta.ron +++ b/assets/common/items/weapons/bow/sagitta.ron @@ -5,7 +5,7 @@ ItemDef( kind: Bow, hands: Two, stats: Direct(( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 2.5, poise_strength: 0.8, speed: 0.8, diff --git a/assets/common/items/weapons/bow/starter.ron b/assets/common/items/weapons/bow/starter.ron index cea23874db..d46f8276a2 100644 --- a/assets/common/items/weapons/bow/starter.ron +++ b/assets/common/items/weapons/bow/starter.ron @@ -5,7 +5,7 @@ ItemDef( kind: Bow, hands: Two, stats: Direct(( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 0.5, poise_strength: 0.3, speed: 1.0, diff --git a/assets/common/items/weapons/bow/velorite.ron b/assets/common/items/weapons/bow/velorite.ron index da913eeb5a..5a69837f7e 100644 --- a/assets/common/items/weapons/bow/velorite.ron +++ b/assets/common/items/weapons/bow/velorite.ron @@ -5,7 +5,7 @@ ItemDef( kind: Bow, hands: Two, stats: Direct(( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 2.0, poise_strength: 1.1, speed: 1.0, diff --git a/assets/common/items/weapons/bow/wood-0.ron b/assets/common/items/weapons/bow/wood-0.ron index 5bb641a6b8..75435263ef 100644 --- a/assets/common/items/weapons/bow/wood-0.ron +++ b/assets/common/items/weapons/bow/wood-0.ron @@ -5,7 +5,7 @@ ItemDef( kind: Bow, hands: Two, stats: Direct(( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 0.9, poise_strength: 0.8, speed: 0.9, diff --git a/assets/common/items/weapons/bow/wood-1.ron b/assets/common/items/weapons/bow/wood-1.ron index 0654451dc9..f356d0e402 100644 --- a/assets/common/items/weapons/bow/wood-1.ron +++ b/assets/common/items/weapons/bow/wood-1.ron @@ -5,7 +5,7 @@ ItemDef( kind: Bow, hands: Two, stats: Direct(( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 0.7, poise_strength: 0.8, speed: 1.1, diff --git a/assets/common/items/weapons/bow/wood-2.ron b/assets/common/items/weapons/bow/wood-2.ron index 812d4d062c..10c65a3a40 100644 --- a/assets/common/items/weapons/bow/wood-2.ron +++ b/assets/common/items/weapons/bow/wood-2.ron @@ -5,7 +5,7 @@ ItemDef( kind: Bow, hands: Two, stats: Direct(( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 0.8, poise_strength: 0.8, speed: 1.0, diff --git a/assets/common/items/weapons/bow/wood-3.ron b/assets/common/items/weapons/bow/wood-3.ron index e041a1a2aa..85a000bbef 100644 --- a/assets/common/items/weapons/bow/wood-3.ron +++ b/assets/common/items/weapons/bow/wood-3.ron @@ -5,7 +5,7 @@ ItemDef( kind: Bow, hands: Two, stats: Direct(( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 1.0, poise_strength: 0.8, speed: 0.8, diff --git a/assets/common/items/weapons/bow/wood-4.ron b/assets/common/items/weapons/bow/wood-4.ron index d18abce394..fc026b0b31 100644 --- a/assets/common/items/weapons/bow/wood-4.ron +++ b/assets/common/items/weapons/bow/wood-4.ron @@ -5,7 +5,7 @@ ItemDef( kind: Bow, hands: Two, stats: Direct(( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 0.6, poise_strength: 0.8, speed: 1.2, diff --git a/assets/common/items/weapons/dagger/basic_0.ron b/assets/common/items/weapons/dagger/basic_0.ron index 2798ee2162..04b28e71bb 100644 --- a/assets/common/items/weapons/dagger/basic_0.ron +++ b/assets/common/items/weapons/dagger/basic_0.ron @@ -5,7 +5,7 @@ ItemDef( kind: Dagger, hands: One, stats: Direct(( - equip_time_millis: 0, + equip_time_secs: 0.0, power: 1.8, poise_strength: 2.0, speed: 1.0, diff --git a/assets/common/items/weapons/dagger/cultist_0.ron b/assets/common/items/weapons/dagger/cultist_0.ron index 62ae319739..e7f72999a1 100644 --- a/assets/common/items/weapons/dagger/cultist_0.ron +++ b/assets/common/items/weapons/dagger/cultist_0.ron @@ -5,7 +5,7 @@ ItemDef( kind: Dagger, hands: One, stats: Direct(( - equip_time_millis: 0, + equip_time_secs: 0.0, power: 2.0, poise_strength: 1.0, speed: 1.0, diff --git a/assets/common/items/weapons/dagger/starter_dagger.ron b/assets/common/items/weapons/dagger/starter_dagger.ron index ea66b26fe3..8e96415a3c 100644 --- a/assets/common/items/weapons/dagger/starter_dagger.ron +++ b/assets/common/items/weapons/dagger/starter_dagger.ron @@ -5,7 +5,7 @@ ItemDef( kind: Dagger, hands: One, stats: Direct(( - equip_time_millis: 300, + equip_time_secs: 0.3, power: 1.0, poise_strength: 0.5, speed: 1.0, diff --git a/assets/common/items/weapons/empty/empty.ron b/assets/common/items/weapons/empty/empty.ron index 2788925af7..5a2e6c9c07 100644 --- a/assets/common/items/weapons/empty/empty.ron +++ b/assets/common/items/weapons/empty/empty.ron @@ -5,7 +5,7 @@ ItemDef( kind: Empty, hands: One, stats: Direct(( - equip_time_millis: 200, + equip_time_secs: 0.2, power: 1.0, poise_strength: 1.0, speed: 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 4ecd533128..d409ebb89a 100644 --- a/assets/common/items/weapons/hammer/bronze_hammer-0.ron +++ b/assets/common/items/weapons/hammer/bronze_hammer-0.ron @@ -5,7 +5,7 @@ ItemDef( kind: Hammer, hands: Two, stats: Direct(( - equip_time_millis: 500, + equip_time_secs: 0.5, power: 1.0, poise_strength: 0.9, speed: 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 5035e5d154..12bb129388 100644 --- a/assets/common/items/weapons/hammer/bronze_hammer-1.ron +++ b/assets/common/items/weapons/hammer/bronze_hammer-1.ron @@ -5,7 +5,7 @@ ItemDef( kind: Hammer, hands: Two, stats: Direct(( - equip_time_millis: 500, + equip_time_secs: 0.5, power: 1.0, poise_strength: 1.0, speed: 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 e60c583534..585b3b4a27 100644 --- a/assets/common/items/weapons/hammer/cobalt_hammer-0.ron +++ b/assets/common/items/weapons/hammer/cobalt_hammer-0.ron @@ -5,7 +5,7 @@ ItemDef( kind: Hammer, hands: Two, stats: Direct(( - equip_time_millis: 500, + equip_time_secs: 0.5, power: 1.6, poise_strength: 1.5, speed: 1.0, diff --git a/assets/common/items/weapons/hammer/cobalt_hammer-1.ron b/assets/common/items/weapons/hammer/cobalt_hammer-1.ron index 7c4a7162f0..33942bf553 100644 --- a/assets/common/items/weapons/hammer/cobalt_hammer-1.ron +++ b/assets/common/items/weapons/hammer/cobalt_hammer-1.ron @@ -5,7 +5,7 @@ ItemDef( kind: Hammer, hands: Two, stats: Direct(( - equip_time_millis: 500, + equip_time_secs: 0.5, power: 1.6, poise_strength: 1.4, speed: 1.0, 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 f3538a28a8..b6ab771652 100644 --- a/assets/common/items/weapons/hammer/cultist_purp_2h-0.ron +++ b/assets/common/items/weapons/hammer/cultist_purp_2h-0.ron @@ -5,7 +5,7 @@ ItemDef( kind: Hammer, hands: Two, stats: Direct(( - equip_time_millis: 500, + equip_time_secs: 0.5, power: 2.0, poise_strength: 1.0, speed: 1.0, diff --git a/assets/common/items/weapons/hammer/flimsy_hammer.ron b/assets/common/items/weapons/hammer/flimsy_hammer.ron index c28ac25674..ceb02aad51 100644 --- a/assets/common/items/weapons/hammer/flimsy_hammer.ron +++ b/assets/common/items/weapons/hammer/flimsy_hammer.ron @@ -5,7 +5,7 @@ ItemDef( kind: Hammer, hands: Two, stats: Direct(( - equip_time_millis: 500, + equip_time_secs: 0.5, power: 0.5, poise_strength: 0.4, speed: 1.0, diff --git a/assets/common/items/weapons/hammer/hammer_1.ron b/assets/common/items/weapons/hammer/hammer_1.ron index 36c761e3cc..283ef91e14 100644 --- a/assets/common/items/weapons/hammer/hammer_1.ron +++ b/assets/common/items/weapons/hammer/hammer_1.ron @@ -5,7 +5,7 @@ ItemDef( kind: Hammer, hands: Two, stats: Direct(( - equip_time_millis: 500, + equip_time_secs: 0.5, power: 0.5, poise_strength: 0.8, speed: 1.0, diff --git a/assets/common/items/weapons/hammer/iron_hammer-0.ron b/assets/common/items/weapons/hammer/iron_hammer-0.ron index 2f4e6e19e6..0899c43251 100644 --- a/assets/common/items/weapons/hammer/iron_hammer-0.ron +++ b/assets/common/items/weapons/hammer/iron_hammer-0.ron @@ -5,7 +5,7 @@ ItemDef( kind: Hammer, hands: Two, stats: Direct(( - equip_time_millis: 500, + equip_time_secs: 0.5, power: 1.2, poise_strength: 1.4, speed: 1.0, diff --git a/assets/common/items/weapons/hammer/iron_hammer-1.ron b/assets/common/items/weapons/hammer/iron_hammer-1.ron index efb1b9e40c..77e7a05685 100644 --- a/assets/common/items/weapons/hammer/iron_hammer-1.ron +++ b/assets/common/items/weapons/hammer/iron_hammer-1.ron @@ -5,7 +5,7 @@ ItemDef( kind: Hammer, hands: Two, stats: Direct(( - equip_time_millis: 500, + equip_time_secs: 0.5, power: 1.2, poise_strength: 0.9, speed: 1.0, diff --git a/assets/common/items/weapons/hammer/iron_hammer-2.ron b/assets/common/items/weapons/hammer/iron_hammer-2.ron index 0e2358dfd0..d7ea0770d6 100644 --- a/assets/common/items/weapons/hammer/iron_hammer-2.ron +++ b/assets/common/items/weapons/hammer/iron_hammer-2.ron @@ -5,7 +5,7 @@ ItemDef( kind: Hammer, hands: Two, stats: Direct(( - equip_time_millis: 500, + equip_time_secs: 0.5, power: 1.2, poise_strength: 1.4, speed: 1.0, diff --git a/assets/common/items/weapons/hammer/iron_hammer-3.ron b/assets/common/items/weapons/hammer/iron_hammer-3.ron index fc524992ce..a1ed65f483 100644 --- a/assets/common/items/weapons/hammer/iron_hammer-3.ron +++ b/assets/common/items/weapons/hammer/iron_hammer-3.ron @@ -5,7 +5,7 @@ ItemDef( kind: Hammer, hands: Two, stats: Direct(( - equip_time_millis: 500, + equip_time_secs: 0.5, power: 1.2, poise_strength: 1.0, speed: 1.0, diff --git a/assets/common/items/weapons/hammer/iron_hammer-4.ron b/assets/common/items/weapons/hammer/iron_hammer-4.ron index ffc556a078..bec365f66c 100644 --- a/assets/common/items/weapons/hammer/iron_hammer-4.ron +++ b/assets/common/items/weapons/hammer/iron_hammer-4.ron @@ -5,7 +5,7 @@ ItemDef( kind: Hammer, hands: Two, stats: Direct(( - equip_time_millis: 500, + equip_time_secs: 0.5, power: 1.2, poise_strength: 1.0, speed: 1.0, diff --git a/assets/common/items/weapons/hammer/iron_hammer-5.ron b/assets/common/items/weapons/hammer/iron_hammer-5.ron index 14b02b048b..e2fbd4521c 100644 --- a/assets/common/items/weapons/hammer/iron_hammer-5.ron +++ b/assets/common/items/weapons/hammer/iron_hammer-5.ron @@ -5,7 +5,7 @@ ItemDef( kind: Hammer, hands: Two, stats: Direct(( - equip_time_millis: 500, + equip_time_secs: 0.5, power: 1.2, poise_strength: 0.8, speed: 1.0, diff --git a/assets/common/items/weapons/hammer/iron_hammer-6.ron b/assets/common/items/weapons/hammer/iron_hammer-6.ron index 0f4c85beeb..3e98b77ad5 100644 --- a/assets/common/items/weapons/hammer/iron_hammer-6.ron +++ b/assets/common/items/weapons/hammer/iron_hammer-6.ron @@ -5,7 +5,7 @@ ItemDef( kind: Hammer, hands: Two, stats: Direct(( - equip_time_millis: 500, + equip_time_secs: 0.5, power: 1.2, poise_strength: 1.4, speed: 1.0, diff --git a/assets/common/items/weapons/hammer/iron_hammer-7.ron b/assets/common/items/weapons/hammer/iron_hammer-7.ron index 4ff94bd769..8112bbc51f 100644 --- a/assets/common/items/weapons/hammer/iron_hammer-7.ron +++ b/assets/common/items/weapons/hammer/iron_hammer-7.ron @@ -5,7 +5,7 @@ ItemDef( kind: Hammer, hands: Two, stats: Direct(( - equip_time_millis: 500, + equip_time_secs: 0.5, power: 1.2, poise_strength: 1.1, speed: 1.0, diff --git a/assets/common/items/weapons/hammer/iron_hammer-8.ron b/assets/common/items/weapons/hammer/iron_hammer-8.ron index 14bc9cd770..de68d17fe3 100644 --- a/assets/common/items/weapons/hammer/iron_hammer-8.ron +++ b/assets/common/items/weapons/hammer/iron_hammer-8.ron @@ -5,7 +5,7 @@ ItemDef( kind: Hammer, hands: Two, stats: Direct(( - equip_time_millis: 500, + equip_time_secs: 0.5, power: 1.2, poise_strength: 0.8, speed: 1.0, diff --git a/assets/common/items/weapons/hammer/mjolnir.ron b/assets/common/items/weapons/hammer/mjolnir.ron index 534be5da25..09ba718eb9 100644 --- a/assets/common/items/weapons/hammer/mjolnir.ron +++ b/assets/common/items/weapons/hammer/mjolnir.ron @@ -5,7 +5,7 @@ ItemDef( kind: Hammer, hands: Two, stats: Direct(( - equip_time_millis: 500, + equip_time_secs: 0.5, power: 4.0, poise_strength: 2.0, speed: 0.5, diff --git a/assets/common/items/weapons/hammer/ramshead_hammer.ron b/assets/common/items/weapons/hammer/ramshead_hammer.ron index e58b18f747..d0a4230b4c 100644 --- a/assets/common/items/weapons/hammer/ramshead_hammer.ron +++ b/assets/common/items/weapons/hammer/ramshead_hammer.ron @@ -5,7 +5,7 @@ ItemDef( kind: Hammer, hands: Two, stats: Direct(( - equip_time_millis: 500, + equip_time_secs: 0.5, power: 1.8, poise_strength: 1.7, speed: 1.0, diff --git a/assets/common/items/weapons/hammer/runic_hammer.ron b/assets/common/items/weapons/hammer/runic_hammer.ron index fdd2b0b04b..ee33512ade 100644 --- a/assets/common/items/weapons/hammer/runic_hammer.ron +++ b/assets/common/items/weapons/hammer/runic_hammer.ron @@ -5,7 +5,7 @@ ItemDef( kind: Hammer, hands: Two, stats: Direct(( - equip_time_millis: 500, + equip_time_secs: 0.5, power: 1.8, poise_strength: 1.8, speed: 1.0, diff --git a/assets/common/items/weapons/hammer/starter_hammer.ron b/assets/common/items/weapons/hammer/starter_hammer.ron index 832af40a99..2321b7fb5f 100644 --- a/assets/common/items/weapons/hammer/starter_hammer.ron +++ b/assets/common/items/weapons/hammer/starter_hammer.ron @@ -5,7 +5,7 @@ ItemDef( kind: Hammer, hands: Two, stats: Direct(( - equip_time_millis: 500, + equip_time_secs: 0.5, power: 0.5, poise_strength: 0.9, speed: 1.0, diff --git a/assets/common/items/weapons/hammer/steel_hammer-0.ron b/assets/common/items/weapons/hammer/steel_hammer-0.ron index cf2a27e242..a3a14b0815 100644 --- a/assets/common/items/weapons/hammer/steel_hammer-0.ron +++ b/assets/common/items/weapons/hammer/steel_hammer-0.ron @@ -5,7 +5,7 @@ ItemDef( kind: Hammer, hands: Two, stats: Direct(( - equip_time_millis: 500, + equip_time_secs: 0.5, power: 1.4, poise_strength: 1.5, speed: 1.0, diff --git a/assets/common/items/weapons/hammer/steel_hammer-1.ron b/assets/common/items/weapons/hammer/steel_hammer-1.ron index df94e11f3d..5bab87a4ab 100644 --- a/assets/common/items/weapons/hammer/steel_hammer-1.ron +++ b/assets/common/items/weapons/hammer/steel_hammer-1.ron @@ -5,7 +5,7 @@ ItemDef( kind: Hammer, hands: Two, stats: Direct(( - equip_time_millis: 500, + equip_time_secs: 0.5, power: 1.4, poise_strength: 1.3, speed: 1.0, diff --git a/assets/common/items/weapons/hammer/steel_hammer-2.ron b/assets/common/items/weapons/hammer/steel_hammer-2.ron index 96b6da84d9..9d3a3f1e56 100644 --- a/assets/common/items/weapons/hammer/steel_hammer-2.ron +++ b/assets/common/items/weapons/hammer/steel_hammer-2.ron @@ -5,7 +5,7 @@ ItemDef( kind: Hammer, hands: Two, stats: Direct(( - equip_time_millis: 500, + equip_time_secs: 0.5, power: 1.4, poise_strength: 1.0, speed: 1.0, diff --git a/assets/common/items/weapons/hammer/steel_hammer-3.ron b/assets/common/items/weapons/hammer/steel_hammer-3.ron index dd1abc559d..9d99a52cd3 100644 --- a/assets/common/items/weapons/hammer/steel_hammer-3.ron +++ b/assets/common/items/weapons/hammer/steel_hammer-3.ron @@ -5,7 +5,7 @@ ItemDef( kind: Hammer, hands: Two, stats: Direct(( - equip_time_millis: 500, + equip_time_secs: 0.5, power: 1.4, poise_strength: 1.7, speed: 1.0, diff --git a/assets/common/items/weapons/hammer/steel_hammer-4.ron b/assets/common/items/weapons/hammer/steel_hammer-4.ron index 819ec8c602..bb72a635a9 100644 --- a/assets/common/items/weapons/hammer/steel_hammer-4.ron +++ b/assets/common/items/weapons/hammer/steel_hammer-4.ron @@ -5,7 +5,7 @@ ItemDef( kind: Hammer, hands: Two, stats: Direct(( - equip_time_millis: 500, + equip_time_secs: 0.5, power: 1.4, poise_strength: 1.5, speed: 1.0, diff --git a/assets/common/items/weapons/hammer/steel_hammer-5.ron b/assets/common/items/weapons/hammer/steel_hammer-5.ron index 698ccd3a68..2b9fb74138 100644 --- a/assets/common/items/weapons/hammer/steel_hammer-5.ron +++ b/assets/common/items/weapons/hammer/steel_hammer-5.ron @@ -5,7 +5,7 @@ ItemDef( kind: Hammer, hands: Two, stats: Direct(( - equip_time_millis: 500, + equip_time_secs: 0.5, power: 1.4, poise_strength: 1.3, speed: 1.0, diff --git a/assets/common/items/weapons/hammer/stone_hammer-0.ron b/assets/common/items/weapons/hammer/stone_hammer-0.ron index 96fb10c470..4a2ba70f0d 100644 --- a/assets/common/items/weapons/hammer/stone_hammer-0.ron +++ b/assets/common/items/weapons/hammer/stone_hammer-0.ron @@ -5,7 +5,7 @@ ItemDef( kind: Hammer, hands: Two, stats: Direct(( - equip_time_millis: 500, + equip_time_secs: 0.5, power: 0.7, poise_strength: 1.7, speed: 1.0, diff --git a/assets/common/items/weapons/hammer/stone_hammer-1.ron b/assets/common/items/weapons/hammer/stone_hammer-1.ron index a481c4a072..d9a804116a 100644 --- a/assets/common/items/weapons/hammer/stone_hammer-1.ron +++ b/assets/common/items/weapons/hammer/stone_hammer-1.ron @@ -5,7 +5,7 @@ ItemDef( kind: Hammer, hands: Two, stats: Direct(( - equip_time_millis: 500, + equip_time_secs: 0.5, power: 0.7, poise_strength: 1.8, speed: 1.0, diff --git a/assets/common/items/weapons/hammer/stone_hammer-2.ron b/assets/common/items/weapons/hammer/stone_hammer-2.ron index d458b1043f..d875268bf1 100644 --- a/assets/common/items/weapons/hammer/stone_hammer-2.ron +++ b/assets/common/items/weapons/hammer/stone_hammer-2.ron @@ -5,7 +5,7 @@ ItemDef( kind: Hammer, hands: Two, stats: Direct(( - equip_time_millis: 500, + equip_time_secs: 0.5, power: 0.7, poise_strength: 1.0, speed: 1.0, diff --git a/assets/common/items/weapons/hammer/stone_hammer-3.ron b/assets/common/items/weapons/hammer/stone_hammer-3.ron index fc84849c95..64833684b4 100644 --- a/assets/common/items/weapons/hammer/stone_hammer-3.ron +++ b/assets/common/items/weapons/hammer/stone_hammer-3.ron @@ -5,7 +5,7 @@ ItemDef( kind: Hammer, hands: Two, stats: Direct(( - equip_time_millis: 500, + equip_time_secs: 0.5, power: 0.7, poise_strength: 1.8, speed: 1.0, diff --git a/assets/common/items/weapons/hammer/wood_hammer-0.ron b/assets/common/items/weapons/hammer/wood_hammer-0.ron index 8cfdc8b40e..efd328c442 100644 --- a/assets/common/items/weapons/hammer/wood_hammer-0.ron +++ b/assets/common/items/weapons/hammer/wood_hammer-0.ron @@ -5,7 +5,7 @@ ItemDef( kind: Hammer, hands: Two, stats: Direct(( - equip_time_millis: 500, + equip_time_secs: 0.5, power: 0.6, poise_strength: 0.8, speed: 1.0, 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 dd1ef660a4..df1a583494 100644 --- a/assets/common/items/weapons/hammer/worn_iron_hammer-0.ron +++ b/assets/common/items/weapons/hammer/worn_iron_hammer-0.ron @@ -5,7 +5,7 @@ ItemDef( kind: Hammer, hands: Two, stats: Direct(( - equip_time_millis: 500, + equip_time_secs: 0.5, power: 0.85, poise_strength: 1.0, speed: 1.0, 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 39df706cfe..53fbc285c2 100644 --- a/assets/common/items/weapons/hammer/worn_iron_hammer-1.ron +++ b/assets/common/items/weapons/hammer/worn_iron_hammer-1.ron @@ -5,7 +5,7 @@ ItemDef( kind: Hammer, hands: Two, stats: Direct(( - equip_time_millis: 500, + equip_time_secs: 0.5, power: 0.85, poise_strength: 0.6, speed: 1.0, 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 af15f236ca..56ff8638b4 100644 --- a/assets/common/items/weapons/hammer/worn_iron_hammer-2.ron +++ b/assets/common/items/weapons/hammer/worn_iron_hammer-2.ron @@ -5,7 +5,7 @@ ItemDef( kind: Hammer, hands: Two, stats: Direct(( - equip_time_millis: 500, + equip_time_secs: 0.5, power: 0.85, poise_strength: 0.7, speed: 1.0, 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 f28e076dc5..fe5c028cca 100644 --- a/assets/common/items/weapons/hammer/worn_iron_hammer-3.ron +++ b/assets/common/items/weapons/hammer/worn_iron_hammer-3.ron @@ -5,7 +5,7 @@ ItemDef( kind: Hammer, hands: Two, stats: Direct(( - equip_time_millis: 500, + equip_time_secs: 0.5, power: 0.85, poise_strength: 1.1, speed: 1.0, diff --git a/assets/common/items/weapons/hammer_1h/bloodsteel-0.ron b/assets/common/items/weapons/hammer_1h/bloodsteel-0.ron index 9ed34579a8..d7f08795cc 100644 --- a/assets/common/items/weapons/hammer_1h/bloodsteel-0.ron +++ b/assets/common/items/weapons/hammer_1h/bloodsteel-0.ron @@ -5,7 +5,7 @@ ItemDef( kind: Hammer, hands: One, stats: ( - equip_time_millis: 500, + equip_time_secs: 0.5, power: 1.6, poise_strength: 1.0, speed: 1.2, diff --git a/assets/common/items/weapons/hammer_1h/bloodsteel-1.ron b/assets/common/items/weapons/hammer_1h/bloodsteel-1.ron index 5379cb2279..80b3a5c0dd 100644 --- a/assets/common/items/weapons/hammer_1h/bloodsteel-1.ron +++ b/assets/common/items/weapons/hammer_1h/bloodsteel-1.ron @@ -5,7 +5,7 @@ ItemDef( kind: Hammer, hands: One, stats: ( - equip_time_millis: 500, + equip_time_secs: 0.5, power: 1.8, poise_strength: 1.0, speed: 1.0, diff --git a/assets/common/items/weapons/hammer_1h/bronze-0.ron b/assets/common/items/weapons/hammer_1h/bronze-0.ron index 1090cde1de..067607bb5e 100644 --- a/assets/common/items/weapons/hammer_1h/bronze-0.ron +++ b/assets/common/items/weapons/hammer_1h/bronze-0.ron @@ -5,7 +5,7 @@ ItemDef( kind: Hammer, hands: One, stats: ( - equip_time_millis: 500, + equip_time_secs: 0.5, power: 1.2, poise_strength: 1.0, speed: 0.8, diff --git a/assets/common/items/weapons/hammer_1h/bronze-1.ron b/assets/common/items/weapons/hammer_1h/bronze-1.ron index 589e53b27a..7647b4b6dc 100644 --- a/assets/common/items/weapons/hammer_1h/bronze-1.ron +++ b/assets/common/items/weapons/hammer_1h/bronze-1.ron @@ -5,7 +5,7 @@ ItemDef( kind: Hammer, hands: One, stats: ( - equip_time_millis: 500, + equip_time_secs: 0.5, power: 1.0, poise_strength: 1.0, speed: 1.0, diff --git a/assets/common/items/weapons/hammer_1h/cobalt-0.ron b/assets/common/items/weapons/hammer_1h/cobalt-0.ron index a0c1099bcc..05471d14c3 100644 --- a/assets/common/items/weapons/hammer_1h/cobalt-0.ron +++ b/assets/common/items/weapons/hammer_1h/cobalt-0.ron @@ -5,7 +5,7 @@ ItemDef( kind: Hammer, hands: One, stats: ( - equip_time_millis: 500, + equip_time_secs: 0.5, power: 1.6, poise_strength: 1.0, speed: 1.0, diff --git a/assets/common/items/weapons/hammer_1h/cobalt-1.ron b/assets/common/items/weapons/hammer_1h/cobalt-1.ron index d93c1cf2c4..f58b3d9901 100644 --- a/assets/common/items/weapons/hammer_1h/cobalt-1.ron +++ b/assets/common/items/weapons/hammer_1h/cobalt-1.ron @@ -5,7 +5,7 @@ ItemDef( kind: Hammer, hands: One, stats: ( - equip_time_millis: 500, + equip_time_secs: 0.5, power: 1.5, poise_strength: 1.0, speed: 1.1, diff --git a/assets/common/items/weapons/hammer_1h/iron-0.ron b/assets/common/items/weapons/hammer_1h/iron-0.ron index 63df955a76..b5ba278597 100644 --- a/assets/common/items/weapons/hammer_1h/iron-0.ron +++ b/assets/common/items/weapons/hammer_1h/iron-0.ron @@ -5,7 +5,7 @@ ItemDef( kind: Hammer, hands: One, stats: ( - equip_time_millis: 500, + equip_time_secs: 0.5, power: 1.4, poise_strength: 1.0, speed: 0.8, diff --git a/assets/common/items/weapons/hammer_1h/iron-1.ron b/assets/common/items/weapons/hammer_1h/iron-1.ron index 87d7151a75..f9d8a6bff6 100644 --- a/assets/common/items/weapons/hammer_1h/iron-1.ron +++ b/assets/common/items/weapons/hammer_1h/iron-1.ron @@ -5,7 +5,7 @@ ItemDef( kind: Hammer, hands: One, stats: ( - equip_time_millis: 500, + equip_time_secs: 0.5, power: 1.3, poise_strength: 1.0, speed: 0.9, diff --git a/assets/common/items/weapons/hammer_1h/iron-2.ron b/assets/common/items/weapons/hammer_1h/iron-2.ron index f439868139..68991cd50c 100644 --- a/assets/common/items/weapons/hammer_1h/iron-2.ron +++ b/assets/common/items/weapons/hammer_1h/iron-2.ron @@ -5,7 +5,7 @@ ItemDef( kind: Hammer, hands: One, stats: ( - equip_time_millis: 500, + equip_time_secs: 0.5, power: 1.1, poise_strength: 1.0, speed: 1.1, diff --git a/assets/common/items/weapons/hammer_1h/orichalcum-0.ron b/assets/common/items/weapons/hammer_1h/orichalcum-0.ron index a5c6c7009b..76a5c5db2a 100644 --- a/assets/common/items/weapons/hammer_1h/orichalcum-0.ron +++ b/assets/common/items/weapons/hammer_1h/orichalcum-0.ron @@ -5,7 +5,7 @@ ItemDef( kind: Axe, hands: One, stats: ( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 2.0, poise_strength: 1.0, speed: 1.0, diff --git a/assets/common/items/weapons/hammer_1h/steel-0.ron b/assets/common/items/weapons/hammer_1h/steel-0.ron index 446cd92b5b..93829715b5 100644 --- a/assets/common/items/weapons/hammer_1h/steel-0.ron +++ b/assets/common/items/weapons/hammer_1h/steel-0.ron @@ -5,7 +5,7 @@ ItemDef( kind: Hammer, hands: One, stats: ( - equip_time_millis: 500, + equip_time_secs: 0.5, power: 1.5, poise_strength: 1.0, speed: 0.9, diff --git a/assets/common/items/weapons/hammer_1h/steel-1.ron b/assets/common/items/weapons/hammer_1h/steel-1.ron index 2675db788d..82a525bd8a 100644 --- a/assets/common/items/weapons/hammer_1h/steel-1.ron +++ b/assets/common/items/weapons/hammer_1h/steel-1.ron @@ -5,7 +5,7 @@ ItemDef( kind: Hammer, hands: One, stats: ( - equip_time_millis: 500, + equip_time_secs: 0.5, power: 1.4, poise_strength: 1.0, speed: 1.0, diff --git a/assets/common/items/weapons/hammer_1h/steel-2.ron b/assets/common/items/weapons/hammer_1h/steel-2.ron index 2364628d7f..c6afbf9858 100644 --- a/assets/common/items/weapons/hammer_1h/steel-2.ron +++ b/assets/common/items/weapons/hammer_1h/steel-2.ron @@ -5,7 +5,7 @@ ItemDef( kind: Hammer, hands: One, stats: ( - equip_time_millis: 500, + equip_time_secs: 0.5, power: 1.2, poise_strength: 1.0, speed: 1.2, diff --git a/assets/common/items/weapons/hammer_1h/stone-0.ron b/assets/common/items/weapons/hammer_1h/stone-0.ron index 5e70888a6a..a4daef28fb 100644 --- a/assets/common/items/weapons/hammer_1h/stone-0.ron +++ b/assets/common/items/weapons/hammer_1h/stone-0.ron @@ -5,7 +5,7 @@ ItemDef( kind: Hammer, hands: One, stats: ( - equip_time_millis: 500, + equip_time_secs: 0.5, power: 0.7, poise_strength: 1.0, speed: 1.1, diff --git a/assets/common/items/weapons/hammer_1h/stone-1.ron b/assets/common/items/weapons/hammer_1h/stone-1.ron index 8430318b44..5f0c25640c 100644 --- a/assets/common/items/weapons/hammer_1h/stone-1.ron +++ b/assets/common/items/weapons/hammer_1h/stone-1.ron @@ -5,7 +5,7 @@ ItemDef( kind: Hammer, hands: One, stats: ( - equip_time_millis: 500, + equip_time_secs: 0.5, power: 1.0, poise_strength: 1.0, speed: 0.8, diff --git a/assets/common/items/weapons/hammer_1h/wood-0.ron b/assets/common/items/weapons/hammer_1h/wood-0.ron index e75be1d533..f5b9151d05 100644 --- a/assets/common/items/weapons/hammer_1h/wood-0.ron +++ b/assets/common/items/weapons/hammer_1h/wood-0.ron @@ -5,7 +5,7 @@ ItemDef( kind: Hammer, hands: One, stats: ( - equip_time_millis: 500, + equip_time_secs: 0.5, power: 0.8, poise_strength: 1.0, speed: 0.8, diff --git a/assets/common/items/weapons/hammer_1h/wood-1.ron b/assets/common/items/weapons/hammer_1h/wood-1.ron index d7fcc49fe8..7e7e7e6410 100644 --- a/assets/common/items/weapons/hammer_1h/wood-1.ron +++ b/assets/common/items/weapons/hammer_1h/wood-1.ron @@ -5,7 +5,7 @@ ItemDef( kind: Hammer, hands: One, stats: ( - equip_time_millis: 500, + equip_time_secs: 0.5, power: 0.5, poise_strength: 1.0, speed: 1.1, diff --git a/assets/common/items/weapons/sceptre/fork0.ron b/assets/common/items/weapons/sceptre/fork0.ron index febd87ee8f..5d709b19a1 100644 --- a/assets/common/items/weapons/sceptre/fork0.ron +++ b/assets/common/items/weapons/sceptre/fork0.ron @@ -5,7 +5,7 @@ ItemDef( kind: Sceptre, hands: Two, stats: Direct(( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 2.0, poise_strength: 1.5, speed: 0.8, diff --git a/assets/common/items/weapons/sceptre/loops0.ron b/assets/common/items/weapons/sceptre/loops0.ron index e384f280d3..0199f08c80 100644 --- a/assets/common/items/weapons/sceptre/loops0.ron +++ b/assets/common/items/weapons/sceptre/loops0.ron @@ -5,7 +5,7 @@ ItemDef( kind: Sceptre, hands: Two, stats: Direct(( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 1.2, poise_strength: 1.5, speed: 1.5, diff --git a/assets/common/items/weapons/sceptre/moon0.ron b/assets/common/items/weapons/sceptre/moon0.ron index f6dfd2db6c..f051a251e7 100644 --- a/assets/common/items/weapons/sceptre/moon0.ron +++ b/assets/common/items/weapons/sceptre/moon0.ron @@ -5,7 +5,7 @@ ItemDef( kind: Sceptre, hands: Two, stats: Direct(( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 1.6, poise_strength: 1.5, speed: 0.5, diff --git a/assets/common/items/weapons/sceptre/root_evil.ron b/assets/common/items/weapons/sceptre/root_evil.ron index 50783cdd53..0e7f3cc38a 100644 --- a/assets/common/items/weapons/sceptre/root_evil.ron +++ b/assets/common/items/weapons/sceptre/root_evil.ron @@ -5,7 +5,7 @@ ItemDef( kind: Sceptre, hands: Two, stats: Direct(( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 4.0, poise_strength: 1.5, speed: 0.5, diff --git a/assets/common/items/weapons/sceptre/root_green0.ron b/assets/common/items/weapons/sceptre/root_green0.ron index c8bfbec7d7..e55b68e017 100644 --- a/assets/common/items/weapons/sceptre/root_green0.ron +++ b/assets/common/items/weapons/sceptre/root_green0.ron @@ -5,7 +5,7 @@ ItemDef( kind: Sceptre, hands: Two, stats: Direct(( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 3.5, poise_strength: 1.5, speed: 0.4, diff --git a/assets/common/items/weapons/sceptre/sceptre_velorite_0.ron b/assets/common/items/weapons/sceptre/sceptre_velorite_0.ron index 48ed1e72d4..c1717c9d73 100644 --- a/assets/common/items/weapons/sceptre/sceptre_velorite_0.ron +++ b/assets/common/items/weapons/sceptre/sceptre_velorite_0.ron @@ -5,7 +5,7 @@ ItemDef( kind: Sceptre, hands: Two, stats: Direct(( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 1.2, poise_strength: 1.5, speed: 1.6, diff --git a/assets/common/items/weapons/sceptre/staff_nature.ron b/assets/common/items/weapons/sceptre/staff_nature.ron index 8594ea00d0..a15600f3d7 100644 --- a/assets/common/items/weapons/sceptre/staff_nature.ron +++ b/assets/common/items/weapons/sceptre/staff_nature.ron @@ -5,7 +5,7 @@ ItemDef( kind: Sceptre, hands: Two, stats: Direct(( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 0.91, poise_strength: 0.5, speed: 1.1, diff --git a/assets/common/items/weapons/sceptre/starter_sceptre.ron b/assets/common/items/weapons/sceptre/starter_sceptre.ron index 787b186f79..bf94d16927 100644 --- a/assets/common/items/weapons/sceptre/starter_sceptre.ron +++ b/assets/common/items/weapons/sceptre/starter_sceptre.ron @@ -5,7 +5,7 @@ ItemDef( kind: Sceptre, hands: Two, stats: Direct(( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 0.5, poise_strength: 0.1, speed: 1.0, diff --git a/assets/common/items/weapons/sceptre/totem_green.ron b/assets/common/items/weapons/sceptre/totem_green.ron index 8df58e4a30..c5a2fd15fd 100644 --- a/assets/common/items/weapons/sceptre/totem_green.ron +++ b/assets/common/items/weapons/sceptre/totem_green.ron @@ -5,7 +5,7 @@ ItemDef( kind: Sceptre, hands: Two, stats: Direct(( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 1.0, poise_strength: 1.5, speed: 1.2, diff --git a/assets/common/items/weapons/shield/shield_1.ron b/assets/common/items/weapons/shield/shield_1.ron index a66f321e58..1a896f6877 100644 --- a/assets/common/items/weapons/shield/shield_1.ron +++ b/assets/common/items/weapons/shield/shield_1.ron @@ -5,7 +5,7 @@ ItemDef( kind: Shield, hands: One, stats: Direct(( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 1.0, poise_strength: 1.0, speed: 1.0, diff --git a/assets/common/items/weapons/staff/amethyst_staff.ron b/assets/common/items/weapons/staff/amethyst_staff.ron index e6e2a39be6..bbe428fc0e 100644 --- a/assets/common/items/weapons/staff/amethyst_staff.ron +++ b/assets/common/items/weapons/staff/amethyst_staff.ron @@ -5,7 +5,7 @@ ItemDef( kind: Staff, hands: Two, stats: Direct(( - equip_time_millis: 300, + equip_time_secs: 0.3, power: 1.5, poise_strength: 1.4, speed: 1.0, diff --git a/assets/common/items/weapons/staff/bone_staff.ron b/assets/common/items/weapons/staff/bone_staff.ron index 041ff07276..359f6c865b 100644 --- a/assets/common/items/weapons/staff/bone_staff.ron +++ b/assets/common/items/weapons/staff/bone_staff.ron @@ -5,7 +5,7 @@ ItemDef( kind: Staff, hands: Two, stats: Direct(( - equip_time_millis: 300, + equip_time_secs: 0.3, power: 1.0, poise_strength: 1.5, speed: 1.0, diff --git a/assets/common/items/weapons/staff/cultist_staff.ron b/assets/common/items/weapons/staff/cultist_staff.ron index df99316d5c..3e35706f60 100644 --- a/assets/common/items/weapons/staff/cultist_staff.ron +++ b/assets/common/items/weapons/staff/cultist_staff.ron @@ -5,7 +5,7 @@ ItemDef( kind: Staff, hands: Two, stats: Direct(( - equip_time_millis: 300, + equip_time_secs: 0.3, power: 2.0, poise_strength: 1.5, speed: 1.0, diff --git a/assets/common/items/weapons/staff/staff_1.ron b/assets/common/items/weapons/staff/staff_1.ron index ab4db158f4..c26f6dc265 100644 --- a/assets/common/items/weapons/staff/staff_1.ron +++ b/assets/common/items/weapons/staff/staff_1.ron @@ -5,7 +5,7 @@ ItemDef( kind: Staff, hands: Two, stats: Direct(( - equip_time_millis: 200, + equip_time_secs: 0.2, power: 0.5, poise_strength: 1.0, speed: 1.0, diff --git a/assets/common/items/weapons/staff/starter_staff.ron b/assets/common/items/weapons/staff/starter_staff.ron index f793ba581b..cd21db9db4 100644 --- a/assets/common/items/weapons/staff/starter_staff.ron +++ b/assets/common/items/weapons/staff/starter_staff.ron @@ -5,7 +5,7 @@ ItemDef( kind: Staff, hands: Two, stats: Direct(( - equip_time_millis: 300, + equip_time_secs: 0.3, power: 0.5, poise_strength: 1.0, speed: 1.0, diff --git a/assets/common/items/weapons/sword/bloodsteel-0.ron b/assets/common/items/weapons/sword/bloodsteel-0.ron index 428ca6b41c..32b0ee20d7 100644 --- a/assets/common/items/weapons/sword/bloodsteel-0.ron +++ b/assets/common/items/weapons/sword/bloodsteel-0.ron @@ -5,7 +5,7 @@ ItemDef( kind: Sword, hands: Two, stats: Direct(( - equip_time_millis: 300, + equip_time_secs: 0.3, power: 1.8, poise_strength: 0.4, speed: 1.0, diff --git a/assets/common/items/weapons/sword/bloodsteel-1.ron b/assets/common/items/weapons/sword/bloodsteel-1.ron index dd939deac9..b63554b64b 100644 --- a/assets/common/items/weapons/sword/bloodsteel-1.ron +++ b/assets/common/items/weapons/sword/bloodsteel-1.ron @@ -5,7 +5,7 @@ ItemDef( kind: Sword, hands: Two, stats: Direct(( - equip_time_millis: 300, + equip_time_secs: 0.3, power: 1.6, poise_strength: 0.4, speed: 1.2, diff --git a/assets/common/items/weapons/sword/bloodsteel-2.ron b/assets/common/items/weapons/sword/bloodsteel-2.ron index b99e7bea1d..c9d4254652 100644 --- a/assets/common/items/weapons/sword/bloodsteel-2.ron +++ b/assets/common/items/weapons/sword/bloodsteel-2.ron @@ -5,7 +5,7 @@ ItemDef( kind: Sword, hands: Two, stats: Direct(( - equip_time_millis: 300, + equip_time_secs: 0.3, power: 2.0, poise_strength: 0.4, speed: 0.8, diff --git a/assets/common/items/weapons/sword/bronze-0.ron b/assets/common/items/weapons/sword/bronze-0.ron index 62cf323676..07cb6e9a53 100644 --- a/assets/common/items/weapons/sword/bronze-0.ron +++ b/assets/common/items/weapons/sword/bronze-0.ron @@ -5,7 +5,7 @@ ItemDef( kind: Sword, hands: Two, stats: Direct(( - equip_time_millis: 300, + equip_time_secs: 0.3, power: 1.1, poise_strength: 0.4, speed: 0.9, diff --git a/assets/common/items/weapons/sword/bronze-1.ron b/assets/common/items/weapons/sword/bronze-1.ron index 33ff213600..e3fa20d076 100644 --- a/assets/common/items/weapons/sword/bronze-1.ron +++ b/assets/common/items/weapons/sword/bronze-1.ron @@ -5,7 +5,7 @@ ItemDef( kind: Sword, hands: Two, stats: Direct(( - equip_time_millis: 300, + equip_time_secs: 0.3, power: 0.9, poise_strength: 0.4, speed: 1.1, diff --git a/assets/common/items/weapons/sword/bronze-2.ron b/assets/common/items/weapons/sword/bronze-2.ron index fef68bd678..e70a7b10ad 100644 --- a/assets/common/items/weapons/sword/bronze-2.ron +++ b/assets/common/items/weapons/sword/bronze-2.ron @@ -5,7 +5,7 @@ ItemDef( kind: Sword, hands: Two, stats: Direct(( - equip_time_millis: 300, + equip_time_secs: 0.3, power: 1.0, poise_strength: 0.4, speed: 1.0, diff --git a/assets/common/items/weapons/sword/caladbolg.ron b/assets/common/items/weapons/sword/caladbolg.ron index 39c8b13bb2..be2e3edc54 100644 --- a/assets/common/items/weapons/sword/caladbolg.ron +++ b/assets/common/items/weapons/sword/caladbolg.ron @@ -5,7 +5,7 @@ ItemDef( kind: Sword, hands: Two, stats: Direct(( - equip_time_millis: 300, + equip_time_secs: 0.3, power: 2.5, poise_strength: 0.4, speed: 0.8, diff --git a/assets/common/items/weapons/sword/cobalt-0.ron b/assets/common/items/weapons/sword/cobalt-0.ron index d09631b9f3..a30b3a8720 100644 --- a/assets/common/items/weapons/sword/cobalt-0.ron +++ b/assets/common/items/weapons/sword/cobalt-0.ron @@ -5,7 +5,7 @@ ItemDef( kind: Sword, hands: Two, stats: Direct(( - equip_time_millis: 300, + equip_time_secs: 0.3, power: 1.5, poise_strength: 0.4, speed: 1.1, diff --git a/assets/common/items/weapons/sword/cobalt-1.ron b/assets/common/items/weapons/sword/cobalt-1.ron index e5806380a5..ba08a15ef5 100644 --- a/assets/common/items/weapons/sword/cobalt-1.ron +++ b/assets/common/items/weapons/sword/cobalt-1.ron @@ -5,7 +5,7 @@ ItemDef( kind: Sword, hands: Two, stats: Direct(( - equip_time_millis: 300, + equip_time_secs: 0.3, power: 1.8, poise_strength: 0.4, speed: 0.8, diff --git a/assets/common/items/weapons/sword/cobalt-2.ron b/assets/common/items/weapons/sword/cobalt-2.ron index e4847fa2cc..0f21a06154 100644 --- a/assets/common/items/weapons/sword/cobalt-2.ron +++ b/assets/common/items/weapons/sword/cobalt-2.ron @@ -5,7 +5,7 @@ ItemDef( kind: Sword, hands: Two, stats: Direct(( - equip_time_millis: 300, + equip_time_secs: 0.3, power: 1.6, poise_strength: 0.4, speed: 1.0, diff --git a/assets/common/items/weapons/sword/cobalt-3.ron b/assets/common/items/weapons/sword/cobalt-3.ron index bd836c2f85..56b08b8191 100644 --- a/assets/common/items/weapons/sword/cobalt-3.ron +++ b/assets/common/items/weapons/sword/cobalt-3.ron @@ -5,7 +5,7 @@ ItemDef( kind: Sword, hands: Two, stats: Direct(( - equip_time_millis: 300, + equip_time_secs: 0.3, power: 1.7, poise_strength: 0.4, speed: 0.9, diff --git a/assets/common/items/weapons/sword/cultist.ron b/assets/common/items/weapons/sword/cultist.ron index 391573e0d4..77febbe9d7 100644 --- a/assets/common/items/weapons/sword/cultist.ron +++ b/assets/common/items/weapons/sword/cultist.ron @@ -5,7 +5,7 @@ ItemDef( kind: Sword, hands: Two, stats: Direct(( - equip_time_millis: 500, + equip_time_secs: 0.5, power: 2.0, poise_strength: 1.5, speed: 1.0, diff --git a/assets/common/items/weapons/sword/frost-0.ron b/assets/common/items/weapons/sword/frost-0.ron index cd8b2b0ea6..127fb8ec10 100644 --- a/assets/common/items/weapons/sword/frost-0.ron +++ b/assets/common/items/weapons/sword/frost-0.ron @@ -5,7 +5,7 @@ ItemDef( kind: Sword, hands: Two, stats: Direct(( - equip_time_millis: 500, + equip_time_secs: 0.5, power: 1.7, poise_strength: 2.0, speed: 1.0, diff --git a/assets/common/items/weapons/sword/frost-1.ron b/assets/common/items/weapons/sword/frost-1.ron index dbf1d464e3..36c2b2a877 100644 --- a/assets/common/items/weapons/sword/frost-1.ron +++ b/assets/common/items/weapons/sword/frost-1.ron @@ -5,7 +5,7 @@ ItemDef( kind: Sword, hands: Two, stats: Direct(( - equip_time_millis: 500, + equip_time_secs: 0.5, power: 1.95, poise_strength: 1.7, speed: 1.0, diff --git a/assets/common/items/weapons/sword/iron-0.ron b/assets/common/items/weapons/sword/iron-0.ron index e7a856c3a6..2f3ce8bb85 100644 --- a/assets/common/items/weapons/sword/iron-0.ron +++ b/assets/common/items/weapons/sword/iron-0.ron @@ -5,7 +5,7 @@ ItemDef( kind: Sword, hands: Two, stats: Direct(( - equip_time_millis: 300, + equip_time_secs: 0.3, power: 1.25, poise_strength: 0.4, speed: 0.95, diff --git a/assets/common/items/weapons/sword/iron-1.ron b/assets/common/items/weapons/sword/iron-1.ron index 5ded191f68..3b27d45527 100644 --- a/assets/common/items/weapons/sword/iron-1.ron +++ b/assets/common/items/weapons/sword/iron-1.ron @@ -5,7 +5,7 @@ ItemDef( kind: Sword, hands: Two, stats: Direct(( - equip_time_millis: 300, + equip_time_secs: 0.3, power: 1.45, poise_strength: 0.4, speed: 0.75, diff --git a/assets/common/items/weapons/sword/iron-10.ron b/assets/common/items/weapons/sword/iron-10.ron index 4ac727086d..1d64973648 100644 --- a/assets/common/items/weapons/sword/iron-10.ron +++ b/assets/common/items/weapons/sword/iron-10.ron @@ -5,7 +5,7 @@ ItemDef( kind: Sword, hands: Two, stats: Direct(( - equip_time_millis: 300, + equip_time_secs: 0.3, power: 1.35, poise_strength: 0.4, speed: 0.85, diff --git a/assets/common/items/weapons/sword/iron-2.ron b/assets/common/items/weapons/sword/iron-2.ron index 418dee3cb5..6701c53eb9 100644 --- a/assets/common/items/weapons/sword/iron-2.ron +++ b/assets/common/items/weapons/sword/iron-2.ron @@ -5,7 +5,7 @@ ItemDef( kind: Sword, hands: Two, stats: Direct(( - equip_time_millis: 300, + equip_time_secs: 0.3, power: 1.1, poise_strength: 0.4, speed: 1.1, diff --git a/assets/common/items/weapons/sword/iron-3.ron b/assets/common/items/weapons/sword/iron-3.ron index 2514580b95..f6bbd9bb18 100644 --- a/assets/common/items/weapons/sword/iron-3.ron +++ b/assets/common/items/weapons/sword/iron-3.ron @@ -5,7 +5,7 @@ ItemDef( kind: Sword, hands: Two, stats: Direct(( - equip_time_millis: 300, + equip_time_secs: 0.3, power: 1.15, poise_strength: 0.4, speed: 1.05, diff --git a/assets/common/items/weapons/sword/iron-4.ron b/assets/common/items/weapons/sword/iron-4.ron index 3ece8d76a1..efe18b2897 100644 --- a/assets/common/items/weapons/sword/iron-4.ron +++ b/assets/common/items/weapons/sword/iron-4.ron @@ -5,7 +5,7 @@ ItemDef( kind: Sword, hands: Two, stats: Direct(( - equip_time_millis: 300, + equip_time_secs: 0.3, power: 1.3, poise_strength: 0.4, speed: 0.9, diff --git a/assets/common/items/weapons/sword/iron-5.ron b/assets/common/items/weapons/sword/iron-5.ron index 1c4e6c48c5..a0c5d806a0 100644 --- a/assets/common/items/weapons/sword/iron-5.ron +++ b/assets/common/items/weapons/sword/iron-5.ron @@ -5,7 +5,7 @@ ItemDef( kind: Sword, hands: Two, stats: Direct(( - equip_time_millis: 300, + equip_time_secs: 0.3, power: 1.05, poise_strength: 0.4, speed: 1.15, diff --git a/assets/common/items/weapons/sword/iron-6.ron b/assets/common/items/weapons/sword/iron-6.ron index 22bac342b5..6b66bb48d8 100644 --- a/assets/common/items/weapons/sword/iron-6.ron +++ b/assets/common/items/weapons/sword/iron-6.ron @@ -5,7 +5,7 @@ ItemDef( kind: Sword, hands: Two, stats: Direct(( - equip_time_millis: 300, + equip_time_secs: 0.3, power: 1.2, poise_strength: 0.4, speed: 1.0, diff --git a/assets/common/items/weapons/sword/iron-7.ron b/assets/common/items/weapons/sword/iron-7.ron index 8fa2ad1022..a2fa0d307c 100644 --- a/assets/common/items/weapons/sword/iron-7.ron +++ b/assets/common/items/weapons/sword/iron-7.ron @@ -5,7 +5,7 @@ ItemDef( kind: Sword, hands: Two, stats: Direct(( - equip_time_millis: 300, + equip_time_secs: 0.3, power: 1.4, poise_strength: 0.4, speed: 0.8, diff --git a/assets/common/items/weapons/sword/iron-8.ron b/assets/common/items/weapons/sword/iron-8.ron index 0f88d130dc..f4ce93492a 100644 --- a/assets/common/items/weapons/sword/iron-8.ron +++ b/assets/common/items/weapons/sword/iron-8.ron @@ -5,7 +5,7 @@ ItemDef( kind: Sword, hands: Two, stats: Direct(( - equip_time_millis: 300, + equip_time_secs: 0.3, power: 1.0, poise_strength: 0.4, speed: 1.2, diff --git a/assets/common/items/weapons/sword/iron-9.ron b/assets/common/items/weapons/sword/iron-9.ron index 2bb8b84033..8560c8042c 100644 --- a/assets/common/items/weapons/sword/iron-9.ron +++ b/assets/common/items/weapons/sword/iron-9.ron @@ -5,7 +5,7 @@ ItemDef( kind: Sword, hands: Two, stats: Direct(( - equip_time_millis: 300, + equip_time_secs: 0.3, power: 0.95, poise_strength: 0.4, speed: 1.25, diff --git a/assets/common/items/weapons/sword/starter.ron b/assets/common/items/weapons/sword/starter.ron index aebc6711c7..a2a93b74ef 100644 --- a/assets/common/items/weapons/sword/starter.ron +++ b/assets/common/items/weapons/sword/starter.ron @@ -5,7 +5,7 @@ ItemDef( kind: Sword, hands: Two, stats: Direct(( - equip_time_millis: 300, + equip_time_secs: 0.3, power: 0.5, poise_strength: 0.4, speed: 1.0, diff --git a/assets/common/items/weapons/sword/steel-0.ron b/assets/common/items/weapons/sword/steel-0.ron index 9916779b2e..ad91eb5b3b 100644 --- a/assets/common/items/weapons/sword/steel-0.ron +++ b/assets/common/items/weapons/sword/steel-0.ron @@ -5,7 +5,7 @@ ItemDef( kind: Sword, hands: Two, stats: Direct(( - equip_time_millis: 300, + equip_time_secs: 0.3, power: 1.4, poise_strength: 0.4, speed: 1.0, diff --git a/assets/common/items/weapons/sword/steel-1.ron b/assets/common/items/weapons/sword/steel-1.ron index d5900b53e9..a06595be06 100644 --- a/assets/common/items/weapons/sword/steel-1.ron +++ b/assets/common/items/weapons/sword/steel-1.ron @@ -5,7 +5,7 @@ ItemDef( kind: Sword, hands: Two, stats: Direct(( - equip_time_millis: 300, + equip_time_secs: 0.3, power: 1.45, poise_strength: 0.4, speed: 0.95, diff --git a/assets/common/items/weapons/sword/steel-2.ron b/assets/common/items/weapons/sword/steel-2.ron index 45b4c63880..6dde404fc0 100644 --- a/assets/common/items/weapons/sword/steel-2.ron +++ b/assets/common/items/weapons/sword/steel-2.ron @@ -5,7 +5,7 @@ ItemDef( kind: Sword, hands: Two, stats: Direct(( - equip_time_millis: 300, + equip_time_secs: 0.3, power: 1.25, poise_strength: 0.4, speed: 1.15, diff --git a/assets/common/items/weapons/sword/steel-3.ron b/assets/common/items/weapons/sword/steel-3.ron index 0e831d6528..d0e7887d59 100644 --- a/assets/common/items/weapons/sword/steel-3.ron +++ b/assets/common/items/weapons/sword/steel-3.ron @@ -5,7 +5,7 @@ ItemDef( kind: Sword, hands: Two, stats: Direct(( - equip_time_millis: 300, + equip_time_secs: 0.3, power: 1.5, poise_strength: 0.4, speed: 0.9, diff --git a/assets/common/items/weapons/sword/steel-4.ron b/assets/common/items/weapons/sword/steel-4.ron index a790d74d81..662bf2a863 100644 --- a/assets/common/items/weapons/sword/steel-4.ron +++ b/assets/common/items/weapons/sword/steel-4.ron @@ -5,7 +5,7 @@ ItemDef( kind: Sword, hands: Two, stats: Direct(( - equip_time_millis: 300, + equip_time_secs: 0.3, power: 1.55, poise_strength: 0.4, speed: 0.85, diff --git a/assets/common/items/weapons/sword/steel-5.ron b/assets/common/items/weapons/sword/steel-5.ron index b1124aecfe..6559479d09 100644 --- a/assets/common/items/weapons/sword/steel-5.ron +++ b/assets/common/items/weapons/sword/steel-5.ron @@ -5,7 +5,7 @@ ItemDef( kind: Sword, hands: Two, stats: Direct(( - equip_time_millis: 300, + equip_time_secs: 0.3, power: 1.2, poise_strength: 0.4, speed: 1.2, diff --git a/assets/common/items/weapons/sword/steel-6.ron b/assets/common/items/weapons/sword/steel-6.ron index c47ebf7fc1..c134123b51 100644 --- a/assets/common/items/weapons/sword/steel-6.ron +++ b/assets/common/items/weapons/sword/steel-6.ron @@ -5,7 +5,7 @@ ItemDef( kind: Sword, hands: Two, stats: Direct(( - equip_time_millis: 300, + equip_time_secs: 0.3, power: 1.3, poise_strength: 0.4, speed: 1.1, diff --git a/assets/common/items/weapons/sword/steel-7.ron b/assets/common/items/weapons/sword/steel-7.ron index 69f6d04cef..3044bb2f1e 100644 --- a/assets/common/items/weapons/sword/steel-7.ron +++ b/assets/common/items/weapons/sword/steel-7.ron @@ -5,7 +5,7 @@ ItemDef( kind: Sword, hands: Two, stats: Direct(( - equip_time_millis: 300, + equip_time_secs: 0.3, power: 1.6, poise_strength: 0.4, speed: 0.8, diff --git a/assets/common/items/weapons/sword/steel-8.ron b/assets/common/items/weapons/sword/steel-8.ron index 5e6b1f0c3d..6a25595c56 100644 --- a/assets/common/items/weapons/sword/steel-8.ron +++ b/assets/common/items/weapons/sword/steel-8.ron @@ -5,7 +5,7 @@ ItemDef( kind: Sword, hands: Two, stats: Direct(( - equip_time_millis: 300, + equip_time_secs: 0.3, power: 1.35, poise_strength: 0.4, speed: 1.05, diff --git a/assets/common/items/weapons/sword/stone-0.ron b/assets/common/items/weapons/sword/stone-0.ron index 882f171508..7acceea5c5 100644 --- a/assets/common/items/weapons/sword/stone-0.ron +++ b/assets/common/items/weapons/sword/stone-0.ron @@ -5,7 +5,7 @@ ItemDef( kind: Sword, hands: Two, stats: Direct(( - equip_time_millis: 300, + equip_time_secs: 0.3, power: 1.0, poise_strength: 0.4, speed: 0.8, diff --git a/assets/common/items/weapons/sword/stone-1.ron b/assets/common/items/weapons/sword/stone-1.ron index 34a451e84b..238db6f571 100644 --- a/assets/common/items/weapons/sword/stone-1.ron +++ b/assets/common/items/weapons/sword/stone-1.ron @@ -5,7 +5,7 @@ ItemDef( kind: Sword, hands: Two, stats: Direct(( - equip_time_millis: 300, + equip_time_secs: 0.3, power: 0.8, poise_strength: 0.4, speed: 1.0, diff --git a/assets/common/items/weapons/sword/stone-2.ron b/assets/common/items/weapons/sword/stone-2.ron index 439590f4c0..6651ac3936 100644 --- a/assets/common/items/weapons/sword/stone-2.ron +++ b/assets/common/items/weapons/sword/stone-2.ron @@ -5,7 +5,7 @@ ItemDef( kind: Sword, hands: Two, stats: Direct(( - equip_time_millis: 300, + equip_time_secs: 0.3, power: 0.9, poise_strength: 0.4, speed: 0.9, diff --git a/assets/common/items/weapons/sword/wood-0.ron b/assets/common/items/weapons/sword/wood-0.ron index 25b3896332..2cd0c30425 100644 --- a/assets/common/items/weapons/sword/wood-0.ron +++ b/assets/common/items/weapons/sword/wood-0.ron @@ -5,7 +5,7 @@ ItemDef( kind: Sword, hands: Two, stats: Direct(( - equip_time_millis: 300, + equip_time_secs: 0.3, power: 0.6, poise_strength: 0.4, speed: 1.0, diff --git a/assets/common/items/weapons/sword/wood-1.ron b/assets/common/items/weapons/sword/wood-1.ron index 8a575e4de7..74eb98a5a6 100644 --- a/assets/common/items/weapons/sword/wood-1.ron +++ b/assets/common/items/weapons/sword/wood-1.ron @@ -5,7 +5,7 @@ ItemDef( kind: Sword, hands: Two, stats: Direct(( - equip_time_millis: 300, + equip_time_secs: 0.3, power: 0.8, poise_strength: 0.4, speed: 0.8, diff --git a/assets/common/items/weapons/sword/wood-2.ron b/assets/common/items/weapons/sword/wood-2.ron index d8b33e4728..e229ed4967 100644 --- a/assets/common/items/weapons/sword/wood-2.ron +++ b/assets/common/items/weapons/sword/wood-2.ron @@ -5,7 +5,7 @@ ItemDef( kind: Sword, hands: Two, stats: Direct(( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 0.5, poise_strength: 0.5, speed: 1.1, diff --git a/assets/common/items/weapons/sword_1h/bloodsteel-0.ron b/assets/common/items/weapons/sword_1h/bloodsteel-0.ron index 0186f5b007..eaac0ee44a 100644 --- a/assets/common/items/weapons/sword_1h/bloodsteel-0.ron +++ b/assets/common/items/weapons/sword_1h/bloodsteel-0.ron @@ -5,7 +5,7 @@ ItemDef( kind: Sword, hands: One, stats: ( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 1.45, poise_strength: 1.0, speed: 1.3, diff --git a/assets/common/items/weapons/sword_1h/bloodsteel-1.ron b/assets/common/items/weapons/sword_1h/bloodsteel-1.ron index acc31f3549..2d8a74b0a0 100644 --- a/assets/common/items/weapons/sword_1h/bloodsteel-1.ron +++ b/assets/common/items/weapons/sword_1h/bloodsteel-1.ron @@ -5,7 +5,7 @@ ItemDef( kind: Sword, hands: One, stats: ( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 2.0, poise_strength: 1.0, speed: 0.75, diff --git a/assets/common/items/weapons/sword_1h/bloodsteel-2.ron b/assets/common/items/weapons/sword_1h/bloodsteel-2.ron index b72acb86b8..aa4916aa8e 100644 --- a/assets/common/items/weapons/sword_1h/bloodsteel-2.ron +++ b/assets/common/items/weapons/sword_1h/bloodsteel-2.ron @@ -5,7 +5,7 @@ ItemDef( kind: Sword, hands: One, stats: ( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 1.75, poise_strength: 1.0, speed: 1.0, diff --git a/assets/common/items/weapons/sword_1h/bronze-0.ron b/assets/common/items/weapons/sword_1h/bronze-0.ron index 72650414ea..fb01404bd2 100644 --- a/assets/common/items/weapons/sword_1h/bronze-0.ron +++ b/assets/common/items/weapons/sword_1h/bronze-0.ron @@ -5,7 +5,7 @@ ItemDef( kind: Sword, hands: One, stats: ( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 0.65, poise_strength: 1.0, speed: 1.1, diff --git a/assets/common/items/weapons/sword_1h/bronze-1.ron b/assets/common/items/weapons/sword_1h/bronze-1.ron index b87e296ab9..8037ff8605 100644 --- a/assets/common/items/weapons/sword_1h/bronze-1.ron +++ b/assets/common/items/weapons/sword_1h/bronze-1.ron @@ -5,7 +5,7 @@ ItemDef( kind: Sword, hands: One, stats: ( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 0.75, poise_strength: 1.0, speed: 1.0, diff --git a/assets/common/items/weapons/sword_1h/bronze-2.ron b/assets/common/items/weapons/sword_1h/bronze-2.ron index 13905573ca..bc8c5b65da 100644 --- a/assets/common/items/weapons/sword_1h/bronze-2.ron +++ b/assets/common/items/weapons/sword_1h/bronze-2.ron @@ -5,7 +5,7 @@ ItemDef( kind: Sword, hands: One, stats: ( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 0.85, poise_strength: 1.0, speed: 0.9, diff --git a/assets/common/items/weapons/sword_1h/cobalt-0.ron b/assets/common/items/weapons/sword_1h/cobalt-0.ron index 22b53da46f..2a3cb87e55 100644 --- a/assets/common/items/weapons/sword_1h/cobalt-0.ron +++ b/assets/common/items/weapons/sword_1h/cobalt-0.ron @@ -5,7 +5,7 @@ ItemDef( kind: Sword, hands: One, stats: ( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 1.3, poise_strength: 1.0, speed: 1.2, diff --git a/assets/common/items/weapons/sword_1h/cobalt-1.ron b/assets/common/items/weapons/sword_1h/cobalt-1.ron index 8a5e1f9fc7..70b67c0060 100644 --- a/assets/common/items/weapons/sword_1h/cobalt-1.ron +++ b/assets/common/items/weapons/sword_1h/cobalt-1.ron @@ -5,7 +5,7 @@ ItemDef( kind: Sword, hands: One, stats: ( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 1.7, poise_strength: 1.0, speed: 0.8, diff --git a/assets/common/items/weapons/sword_1h/cobalt-2.ron b/assets/common/items/weapons/sword_1h/cobalt-2.ron index 1e6251d382..1977007700 100644 --- a/assets/common/items/weapons/sword_1h/cobalt-2.ron +++ b/assets/common/items/weapons/sword_1h/cobalt-2.ron @@ -5,7 +5,7 @@ ItemDef( kind: Sword, hands: One, stats: ( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 1.4, poise_strength: 1.0, speed: 1.1, diff --git a/assets/common/items/weapons/sword_1h/cobalt-3.ron b/assets/common/items/weapons/sword_1h/cobalt-3.ron index 3cdbe8ba81..bc6c007feb 100644 --- a/assets/common/items/weapons/sword_1h/cobalt-3.ron +++ b/assets/common/items/weapons/sword_1h/cobalt-3.ron @@ -5,7 +5,7 @@ ItemDef( kind: Sword, hands: One, stats: ( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 1.6, poise_strength: 1.0, speed: 0.9, diff --git a/assets/common/items/weapons/sword_1h/iron-0.ron b/assets/common/items/weapons/sword_1h/iron-0.ron index 11b89e69fc..53c13be6d9 100644 --- a/assets/common/items/weapons/sword_1h/iron-0.ron +++ b/assets/common/items/weapons/sword_1h/iron-0.ron @@ -5,7 +5,7 @@ ItemDef( kind: Sword, hands: One, stats: ( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 1.0, poise_strength: 1.0, speed: 1.0, diff --git a/assets/common/items/weapons/sword_1h/iron-1.ron b/assets/common/items/weapons/sword_1h/iron-1.ron index f4335f3740..db2466d8a7 100644 --- a/assets/common/items/weapons/sword_1h/iron-1.ron +++ b/assets/common/items/weapons/sword_1h/iron-1.ron @@ -5,7 +5,7 @@ ItemDef( kind: Sword, hands: One, stats: ( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 0.9, poise_strength: 1.0, speed: 1.1, diff --git a/assets/common/items/weapons/sword_1h/iron-2.ron b/assets/common/items/weapons/sword_1h/iron-2.ron index 479d5a0b80..87730a7112 100644 --- a/assets/common/items/weapons/sword_1h/iron-2.ron +++ b/assets/common/items/weapons/sword_1h/iron-2.ron @@ -5,7 +5,7 @@ ItemDef( kind: Sword, hands: One, stats: ( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 1.2, poise_strength: 1.0, speed: 0.8, diff --git a/assets/common/items/weapons/sword_1h/iron-3.ron b/assets/common/items/weapons/sword_1h/iron-3.ron index 8ab9418dae..6257983083 100644 --- a/assets/common/items/weapons/sword_1h/iron-3.ron +++ b/assets/common/items/weapons/sword_1h/iron-3.ron @@ -5,7 +5,7 @@ ItemDef( kind: Sword, hands: One, stats: ( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 0.8, poise_strength: 1.0, speed: 1.2, diff --git a/assets/common/items/weapons/sword_1h/iron-4.ron b/assets/common/items/weapons/sword_1h/iron-4.ron index 6a1fc6ea43..cea0370fc9 100644 --- a/assets/common/items/weapons/sword_1h/iron-4.ron +++ b/assets/common/items/weapons/sword_1h/iron-4.ron @@ -5,7 +5,7 @@ ItemDef( kind: Sword, hands: One, stats: ( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 1.1, poise_strength: 1.0, speed: 0.9, diff --git a/assets/common/items/weapons/sword_1h/obsidian-0.ron b/assets/common/items/weapons/sword_1h/obsidian-0.ron index a7bbcfe291..db312f8de3 100644 --- a/assets/common/items/weapons/sword_1h/obsidian-0.ron +++ b/assets/common/items/weapons/sword_1h/obsidian-0.ron @@ -5,7 +5,7 @@ ItemDef( kind: Sword, hands: One, stats: ( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 1.95, poise_strength: 1.0, speed: 0.8, diff --git a/assets/common/items/weapons/sword_1h/orichalcum-0.ron b/assets/common/items/weapons/sword_1h/orichalcum-0.ron index d325243e10..99e74a3adc 100644 --- a/assets/common/items/weapons/sword_1h/orichalcum-0.ron +++ b/assets/common/items/weapons/sword_1h/orichalcum-0.ron @@ -5,7 +5,7 @@ ItemDef( kind: Sword, hands: One, stats: ( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 2.1, poise_strength: 1.0, speed: 0.9, diff --git a/assets/common/items/weapons/sword_1h/orichalcum-1.ron b/assets/common/items/weapons/sword_1h/orichalcum-1.ron index a6b5bb670c..f48efd7d64 100644 --- a/assets/common/items/weapons/sword_1h/orichalcum-1.ron +++ b/assets/common/items/weapons/sword_1h/orichalcum-1.ron @@ -5,7 +5,7 @@ ItemDef( kind: Sword, hands: One, stats: ( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 1.9, poise_strength: 1.0, speed: 1.1, diff --git a/assets/common/items/weapons/sword_1h/steel-0.ron b/assets/common/items/weapons/sword_1h/steel-0.ron index d7cf2121e7..998c2bedc7 100644 --- a/assets/common/items/weapons/sword_1h/steel-0.ron +++ b/assets/common/items/weapons/sword_1h/steel-0.ron @@ -5,7 +5,7 @@ ItemDef( kind: Sword, hands: One, stats: ( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 1.5, poise_strength: 1.0, speed: 0.75, diff --git a/assets/common/items/weapons/sword_1h/steel-1.ron b/assets/common/items/weapons/sword_1h/steel-1.ron index 56016c62d1..71a2aa1abf 100644 --- a/assets/common/items/weapons/sword_1h/steel-1.ron +++ b/assets/common/items/weapons/sword_1h/steel-1.ron @@ -5,7 +5,7 @@ ItemDef( kind: Sword, hands: One, stats: ( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 1.3, poise_strength: 1.0, speed: .95, diff --git a/assets/common/items/weapons/sword_1h/steel-2.ron b/assets/common/items/weapons/sword_1h/steel-2.ron index eede6c0e38..2ffe879bf8 100644 --- a/assets/common/items/weapons/sword_1h/steel-2.ron +++ b/assets/common/items/weapons/sword_1h/steel-2.ron @@ -5,7 +5,7 @@ ItemDef( kind: Sword, hands: One, stats: ( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 1.05, poise_strength: 1.0, speed: 1.2, diff --git a/assets/common/items/weapons/sword_1h/steel-3.ron b/assets/common/items/weapons/sword_1h/steel-3.ron index 22bc629bef..4b588f7583 100644 --- a/assets/common/items/weapons/sword_1h/steel-3.ron +++ b/assets/common/items/weapons/sword_1h/steel-3.ron @@ -5,7 +5,7 @@ ItemDef( kind: Sword, hands: One, stats: ( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 1.2, poise_strength: 1.0, speed: 1.05, diff --git a/assets/common/items/weapons/tool/broom.ron b/assets/common/items/weapons/tool/broom.ron index ea4722b958..8740dd82b0 100644 --- a/assets/common/items/weapons/tool/broom.ron +++ b/assets/common/items/weapons/tool/broom.ron @@ -5,7 +5,7 @@ ItemDef( kind: Farming, hands: Two, stats: Direct(( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 1.0, poise_strength: 1.0, speed: 1.0, diff --git a/assets/common/items/weapons/tool/fishing_rod.ron b/assets/common/items/weapons/tool/fishing_rod.ron index 0ca7992bc3..4e82e5b915 100644 --- a/assets/common/items/weapons/tool/fishing_rod.ron +++ b/assets/common/items/weapons/tool/fishing_rod.ron @@ -5,7 +5,7 @@ ItemDef( kind: Farming, hands: Two, stats: Direct(( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 1.0, poise_strength: 1.0, speed: 1.0, diff --git a/assets/common/items/weapons/tool/hoe.ron b/assets/common/items/weapons/tool/hoe.ron index e311f62538..4b81521996 100644 --- a/assets/common/items/weapons/tool/hoe.ron +++ b/assets/common/items/weapons/tool/hoe.ron @@ -5,7 +5,7 @@ ItemDef( kind: Farming, hands: Two, stats: Direct(( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 1.0, poise_strength: 1.5, speed: 1.0, diff --git a/assets/common/items/weapons/tool/pickaxe.ron b/assets/common/items/weapons/tool/pickaxe.ron index ce47e34a75..9e873b39f7 100644 --- a/assets/common/items/weapons/tool/pickaxe.ron +++ b/assets/common/items/weapons/tool/pickaxe.ron @@ -5,7 +5,7 @@ ItemDef( kind: Farming, hands: Two, stats: Direct(( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 1.0, poise_strength: 1.0, speed: 1.0, diff --git a/assets/common/items/weapons/tool/pitchfork.ron b/assets/common/items/weapons/tool/pitchfork.ron index fa46363371..7741143d54 100644 --- a/assets/common/items/weapons/tool/pitchfork.ron +++ b/assets/common/items/weapons/tool/pitchfork.ron @@ -5,7 +5,7 @@ ItemDef( kind: Farming, hands: Two, stats: Direct(( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 1.0, poise_strength: 4.0, speed: 1.0, diff --git a/assets/common/items/weapons/tool/rake.ron b/assets/common/items/weapons/tool/rake.ron index 7164f20a0b..c44b545464 100644 --- a/assets/common/items/weapons/tool/rake.ron +++ b/assets/common/items/weapons/tool/rake.ron @@ -5,7 +5,7 @@ ItemDef( kind: Farming, hands: Two, stats: Direct(( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 1.0, poise_strength: 1.0, speed: 1.0, diff --git a/assets/common/items/weapons/tool/shovel-0.ron b/assets/common/items/weapons/tool/shovel-0.ron index 48fb8a81aa..94d7c0a355 100644 --- a/assets/common/items/weapons/tool/shovel-0.ron +++ b/assets/common/items/weapons/tool/shovel-0.ron @@ -5,7 +5,7 @@ ItemDef( kind: Farming, hands: Two, stats: Direct(( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 1.0, poise_strength: 2.0, speed: 1.0, diff --git a/assets/common/items/weapons/tool/shovel-1.ron b/assets/common/items/weapons/tool/shovel-1.ron index 6c647c97df..555f87d653 100644 --- a/assets/common/items/weapons/tool/shovel-1.ron +++ b/assets/common/items/weapons/tool/shovel-1.ron @@ -5,7 +5,7 @@ ItemDef( kind: Farming, hands: Two, stats: Direct(( - equip_time_millis: 400, + equip_time_secs: 0.4, power: 1.0, poise_strength: 2.0, speed: 1.0, diff --git a/assets/common/material_stats_manifest.ron b/assets/common/material_stats_manifest.ron index 4ce0747fcb..9f7ffecd88 100644 --- a/assets/common/material_stats_manifest.ron +++ b/assets/common/material_stats_manifest.ron @@ -1,43 +1,43 @@ -// Keep in mind that material stats are multiplied by the form stats, not added (e.g. equip_time_millis is most sensitive to this) +// Keep in mind that material stats are multiplied by the form stats, not added (e.g. equip_time_secs is most sensitive to this) ({ "common.items.crafting_ing.bloodsteel_ingot": ( - equip_time_millis: 1, + equip_time_secs: 1.0, power: 1.75, poise_strength: 1.75, speed: 1.75, ), "common.items.crafting_ing.bronze_ingot": ( - equip_time_millis: 1, + equip_time_secs: 1.0, power: 0.75, poise_strength: 0.75, speed: 0.75, ), "common.items.crafting_ing.cobalt_ingot": ( - equip_time_millis: 1, + equip_time_secs: 1.0, power: 1.5, poise_strength: 1.5, speed: 1.5, ), "common.items.crafting_ing.copper_ingot": ( - equip_time_millis: 1, + equip_time_secs: 1.0, power: 0.4, poise_strength: 0.4, speed: 0.4, ), "common.items.crafting_ing.iron_ingot": ( - equip_time_millis: 1, + equip_time_secs: 1.0, power: 1.0, poise_strength: 1.0, speed: 1.0, ), "common.items.crafting_ing.steel_ingot": ( - equip_time_millis: 1, + equip_time_secs: 1.0, power: 1.25, poise_strength: 1.25, speed: 1.25, ), "common.items.crafting_ing.tin_ingot": ( - equip_time_millis: 1, + equip_time_secs: 1.0, power: 0.25, poise_strength: 0.25, speed: 0.25, diff --git a/common/src/bin/csv_import/main.rs b/common/src/bin/csv_import/main.rs index ad55be1467..46cbd2b62d 100644 --- a/common/src/bin/csv_import/main.rs +++ b/common/src/bin/csv_import/main.rs @@ -170,7 +170,7 @@ fn weapon_stats() -> Result<(), Box> { if item.item_definition_id() == record.get(0).expect("No file path in csv?") { let kind = tool.kind; - let equip_time_millis: u32 = record + let equip_time_secs: f32 = record .get(8) .expect(&format!( "Error unwrapping equip time for {:?}", @@ -227,7 +227,7 @@ fn weapon_stats() -> Result<(), Box> { let tool = comp::item::tool::Tool::new( kind, hands, - equip_time_millis, + equip_time_secs, power, poise_strength, speed, diff --git a/common/src/comp/inventory/item/modular.rs b/common/src/comp/inventory/item/modular.rs index 89f2d7eff4..4a17daaf6e 100644 --- a/common/src/comp/inventory/item/modular.rs +++ b/common/src/comp/inventory/item/modular.rs @@ -165,7 +165,7 @@ fn make_component_def( toolkind, modkind, stats: tool::Stats { - equip_time_millis: 250, + equip_time_secs: 0.25, power: if matches!(modkind, ModularComponentKind::Damage) { AVERAGE_STAT_VALUE[tier] } else { diff --git a/common/src/comp/inventory/item/tool.rs b/common/src/comp/inventory/item/tool.rs index 55bc5f7139..bdbadd77d5 100644 --- a/common/src/comp/inventory/item/tool.rs +++ b/common/src/comp/inventory/item/tool.rs @@ -69,7 +69,7 @@ pub enum Hands { #[derive(Clone, Copy, Debug, PartialEq, Serialize, Deserialize)] pub struct Stats { - pub equip_time_millis: u32, + pub equip_time_secs: f32, pub power: f32, pub poise_strength: f32, pub speed: f32, @@ -78,7 +78,7 @@ pub struct Stats { impl Stats { pub fn zeroed() -> Stats { Stats { - equip_time_millis: 0, + equip_time_secs: 0.0, power: 0.0, poise_strength: 0.0, speed: 0.0, @@ -101,7 +101,7 @@ impl Asset for Stats { impl AddAssign for Stats { fn add_assign(&mut self, other: Stats) { - self.equip_time_millis += other.equip_time_millis; + self.equip_time_secs += other.equip_time_secs; self.power += other.power; self.poise_strength += other.poise_strength; self.speed += other.speed; @@ -109,10 +109,7 @@ impl AddAssign for Stats { } impl MulAssign for Stats { fn mul_assign(&mut self, other: Stats) { - // equip_time_millis doesn't quite work with mul since it's u32, so we can't - // scale delay down, only up, so it needs to be balanced carefully in - // multiplicative contexts - self.equip_time_millis *= other.equip_time_millis; + self.equip_time_secs *= other.equip_time_secs; self.power *= other.power; self.poise_strength *= other.poise_strength; self.speed *= other.speed; @@ -120,10 +117,10 @@ impl MulAssign for Stats { } impl DivAssign for Stats { fn div_assign(&mut self, scalar: usize) { - self.equip_time_millis /= scalar as u32; + self.equip_time_secs /= scalar as f32; // since averaging occurs when the stats are used multiplicatively, don't permit - // multiplying an equip_time_millis by 0, since that would be overpowered - self.equip_time_millis = self.equip_time_millis.max(1); + // multiplying an equip_time_secs by 0, since that would be overpowered + self.equip_time_secs = self.equip_time_secs.max(0.001); self.power /= scalar as f32; self.poise_strength /= scalar as f32; self.speed /= scalar as f32; @@ -199,7 +196,7 @@ impl From<(&MaterialStatManifest, &[Item], &Tool)> for Stats { Hands::Two => (1.0, 1.0), }; Self { - equip_time_millis: raw_stats.equip_time_millis, + equip_time_secs: raw_stats.equip_time_secs, power: raw_stats.power * power, poise_strength: raw_stats.poise_strength, speed: raw_stats.speed * speed, @@ -221,7 +218,7 @@ impl Tool { pub fn new( kind: ToolKind, hands: Hands, - equip_time_millis: u32, + equip_time_secs: f32, power: f32, poise_strength: f32, speed: f32, @@ -230,7 +227,7 @@ impl Tool { kind, hands, stats: StatKind::Direct(Stats { - equip_time_millis, + equip_time_secs, power, poise_strength, speed, @@ -243,7 +240,7 @@ impl Tool { kind: ToolKind::Empty, hands: Hands::One, stats: StatKind::Direct(Stats { - equip_time_millis: 0, + equip_time_secs: 0.0, power: 1.00, poise_strength: 1.00, speed: 1.00, @@ -268,7 +265,7 @@ impl Tool { } pub fn equip_time(&self, msm: &MaterialStatManifest, components: &[Item]) -> Duration { - Duration::from_millis(self.stats.resolve_stats(msm, components).equip_time_millis as u64) + Duration::from_secs_f32(self.stats.resolve_stats(msm, components).equip_time_secs) } pub fn get_abilities( diff --git a/voxygen/src/hud/util.rs b/voxygen/src/hud/util.rs index 0056771305..7a470feaff 100644 --- a/voxygen/src/hud/util.rs +++ b/voxygen/src/hud/util.rs @@ -254,7 +254,7 @@ mod tests { testmsm.0.insert( "common.items.crafting_ing.bronze_ingot".to_string(), Stats { - equip_time_millis: 0, + equip_time_secs: 0.0, power: 3.0, poise_strength: 5.0, speed: 7.0,