diff --git a/assets/common/items/debug/boost.ron b/assets/common/items/debug/boost.ron index d4f248f1ac..10a95d2195 100644 --- a/assets/common/items/debug/boost.ron +++ b/assets/common/items/debug/boost.ron @@ -6,7 +6,9 @@ ItemDef( kind: Debug, stats: ( equip_time_millis: 0, - power: 1.00), + power: 1.00, + speed: 1.0 + ), ) ), quality: Debug, diff --git a/assets/common/items/debug/cultist_purp_2h_boss-0.ron b/assets/common/items/debug/cultist_purp_2h_boss-0.ron index 32975022cb..0ce9a87270 100644 --- a/assets/common/items/debug/cultist_purp_2h_boss-0.ron +++ b/assets/common/items/debug/cultist_purp_2h_boss-0.ron @@ -6,7 +6,9 @@ ItemDef( kind: Sword, stats: ( equip_time_millis: 0, - power: 1000.0), + power: 1000.0, + speed: 1.0 + ), ) ), quality: Debug, diff --git a/assets/common/items/debug/possess.ron b/assets/common/items/debug/possess.ron index d4f248f1ac..10a95d2195 100644 --- a/assets/common/items/debug/possess.ron +++ b/assets/common/items/debug/possess.ron @@ -6,7 +6,9 @@ ItemDef( kind: Debug, stats: ( equip_time_millis: 0, - power: 1.00), + power: 1.00, + speed: 1.0 + ), ) ), quality: Debug, diff --git a/assets/common/items/npc_weapons/axe/malachite_axe-0.ron b/assets/common/items/npc_weapons/axe/malachite_axe-0.ron index 6b6b627bdf..2a9ac446f8 100644 --- a/assets/common/items/npc_weapons/axe/malachite_axe-0.ron +++ b/assets/common/items/npc_weapons/axe/malachite_axe-0.ron @@ -6,7 +6,9 @@ ItemDef( kind: Axe, stats: ( equip_time_millis: 400, - power: 0.50), + power: 0.50, + speed: 1.0 + ), ) ), quality: Low, diff --git a/assets/common/items/npc_weapons/axe/starter_axe.ron b/assets/common/items/npc_weapons/axe/starter_axe.ron index fc69ede912..b867f649aa 100644 --- a/assets/common/items/npc_weapons/axe/starter_axe.ron +++ b/assets/common/items/npc_weapons/axe/starter_axe.ron @@ -6,7 +6,9 @@ ItemDef( kind: Axe, stats: ( equip_time_millis: 400, - power: 0.50), + power: 0.50, + speed: 1.0 + ), ) ), quality: Low, diff --git a/assets/common/items/npc_weapons/bow/horn_longbow-0.ron b/assets/common/items/npc_weapons/bow/horn_longbow-0.ron index 8029f63b20..3e2b78e8b7 100644 --- a/assets/common/items/npc_weapons/bow/horn_longbow-0.ron +++ b/assets/common/items/npc_weapons/bow/horn_longbow-0.ron @@ -6,7 +6,9 @@ ItemDef( kind: Bow, stats: ( equip_time_millis: 400, - power: 0.5), + power: 0.5, + speed: 1.0 + ), ) ), quality: Low, diff --git a/assets/common/items/npc_weapons/bow/saurok_bow.ron b/assets/common/items/npc_weapons/bow/saurok_bow.ron index e393beae88..d546b84ced 100644 --- a/assets/common/items/npc_weapons/bow/saurok_bow.ron +++ b/assets/common/items/npc_weapons/bow/saurok_bow.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 1.00, + speed: 1.0 ), ) ), diff --git a/assets/common/items/npc_weapons/dagger/starter_dagger.ron b/assets/common/items/npc_weapons/dagger/starter_dagger.ron index 242d50ccbc..63ce0843cc 100644 --- a/assets/common/items/npc_weapons/dagger/starter_dagger.ron +++ b/assets/common/items/npc_weapons/dagger/starter_dagger.ron @@ -6,7 +6,9 @@ ItemDef( kind: Dagger, stats: ( equip_time_millis: 300, - power: 1.00), + power: 1.00, + speed: 1.0 + ), ) ), quality: Low, diff --git a/assets/common/items/npc_weapons/empty/empty.ron b/assets/common/items/npc_weapons/empty/empty.ron index 60b6c3b931..a19e674e7a 100644 --- a/assets/common/items/npc_weapons/empty/empty.ron +++ b/assets/common/items/npc_weapons/empty/empty.ron @@ -6,7 +6,9 @@ ItemDef( kind: Empty, stats: ( equip_time_millis: 200, - power: 1.00), + power: 1.00, + speed: 1.0 + ), ) ), quality: Low, diff --git a/assets/common/items/npc_weapons/hammer/cultist_purp_2h-0.ron b/assets/common/items/npc_weapons/hammer/cultist_purp_2h-0.ron index 2742f70d58..a73d6eb0b9 100644 --- a/assets/common/items/npc_weapons/hammer/cultist_purp_2h-0.ron +++ b/assets/common/items/npc_weapons/hammer/cultist_purp_2h-0.ron @@ -6,7 +6,9 @@ ItemDef( kind: Hammer, stats: ( equip_time_millis: 500, - power: 0.5), + power: 0.5, + speed: 1.0 + ), ) ), quality: Low, diff --git a/assets/common/items/npc_weapons/hammer/cyclops_hammer.ron b/assets/common/items/npc_weapons/hammer/cyclops_hammer.ron index 9ca58e7641..0ed47448cd 100644 --- a/assets/common/items/npc_weapons/hammer/cyclops_hammer.ron +++ b/assets/common/items/npc_weapons/hammer/cyclops_hammer.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 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 7189e590f5..2ddb48d615 100644 --- a/assets/common/items/npc_weapons/hammer/ogre_hammer.ron +++ b/assets/common/items/npc_weapons/hammer/ogre_hammer.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 1.00, + speed: 1.0 ), ) ), diff --git a/assets/common/items/npc_weapons/hammer/starter_hammer.ron b/assets/common/items/npc_weapons/hammer/starter_hammer.ron index 1b8dfb9bd4..35d167e7a8 100644 --- a/assets/common/items/npc_weapons/hammer/starter_hammer.ron +++ b/assets/common/items/npc_weapons/hammer/starter_hammer.ron @@ -6,7 +6,9 @@ ItemDef( kind: Hammer, stats: ( equip_time_millis: 500, - power: 0.50), + power: 0.50, + speed: 1.0 + ), ) ), quality: Low, diff --git a/assets/common/items/npc_weapons/hammer/troll_hammer.ron b/assets/common/items/npc_weapons/hammer/troll_hammer.ron index 0158b54974..173ca7f65d 100644 --- a/assets/common/items/npc_weapons/hammer/troll_hammer.ron +++ b/assets/common/items/npc_weapons/hammer/troll_hammer.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 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 bc76cc0e06..daa3a55f29 100644 --- a/assets/common/items/npc_weapons/hammer/wendigo_hammer.ron +++ b/assets/common/items/npc_weapons/hammer/wendigo_hammer.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 1.00, + speed: 1.0 ), ) ), diff --git a/assets/common/items/npc_weapons/shield/shield_1.ron b/assets/common/items/npc_weapons/shield/shield_1.ron index de62fdaec5..1bb911aa93 100644 --- a/assets/common/items/npc_weapons/shield/shield_1.ron +++ b/assets/common/items/npc_weapons/shield/shield_1.ron @@ -6,7 +6,9 @@ ItemDef( kind: Shield, stats: ( equip_time_millis: 400, - power: 1.00), + power: 1.00, + speed: 1.0 + ), ) ), quality: Low, diff --git a/assets/common/items/npc_weapons/staff/bone_staff.ron b/assets/common/items/npc_weapons/staff/bone_staff.ron index dedf7947ed..a26aeda05b 100644 --- a/assets/common/items/npc_weapons/staff/bone_staff.ron +++ b/assets/common/items/npc_weapons/staff/bone_staff.ron @@ -6,7 +6,9 @@ ItemDef( kind: Staff, stats: ( equip_time_millis: 300, - power: 0.8), + power: 0.8, + speed: 1.0 + ), ) ), quality: Low, diff --git a/assets/common/items/npc_weapons/staff/cultist_staff.ron b/assets/common/items/npc_weapons/staff/cultist_staff.ron index 6193ad7e47..41eda11f81 100644 --- a/assets/common/items/npc_weapons/staff/cultist_staff.ron +++ b/assets/common/items/npc_weapons/staff/cultist_staff.ron @@ -6,7 +6,9 @@ ItemDef( kind: Staff, stats: ( equip_time_millis: 300, - power: 0.8), + power: 0.8, + speed: 1.0 + ), ) ), quality: Low, diff --git a/assets/common/items/npc_weapons/staff/ogre_staff.ron b/assets/common/items/npc_weapons/staff/ogre_staff.ron index 44518db7bb..99d34ea909 100644 --- a/assets/common/items/npc_weapons/staff/ogre_staff.ron +++ b/assets/common/items/npc_weapons/staff/ogre_staff.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 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 4e92877d59..15b1d9d24d 100644 --- a/assets/common/items/npc_weapons/staff/saurok_staff.ron +++ b/assets/common/items/npc_weapons/staff/saurok_staff.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 1.00, + speed: 1.0 ), ) ), diff --git a/assets/common/items/npc_weapons/sword/cultist_purp_2h-0.ron b/assets/common/items/npc_weapons/sword/cultist_purp_2h-0.ron index d52ede4ee0..f1918612ca 100644 --- a/assets/common/items/npc_weapons/sword/cultist_purp_2h-0.ron +++ b/assets/common/items/npc_weapons/sword/cultist_purp_2h-0.ron @@ -6,7 +6,9 @@ ItemDef( kind: Sword, stats: ( equip_time_millis: 500, - power: 0.5), + power: 0.5, + speed: 1.0 + ), ) ), quality: Low, diff --git a/assets/common/items/npc_weapons/sword/cultist_purp_2h_boss-0.ron b/assets/common/items/npc_weapons/sword/cultist_purp_2h_boss-0.ron index c2d0a0ea1c..b757822657 100644 --- a/assets/common/items/npc_weapons/sword/cultist_purp_2h_boss-0.ron +++ b/assets/common/items/npc_weapons/sword/cultist_purp_2h_boss-0.ron @@ -6,7 +6,9 @@ ItemDef( kind: Sword, stats: ( equip_time_millis: 500, - power: 1.0), + power: 1.0, + speed: 1.0 + ), ) ), quality: Low, diff --git a/assets/common/items/npc_weapons/sword/dullahan_sword.ron b/assets/common/items/npc_weapons/sword/dullahan_sword.ron index 1f83990d4c..6dab58cb39 100644 --- a/assets/common/items/npc_weapons/sword/dullahan_sword.ron +++ b/assets/common/items/npc_weapons/sword/dullahan_sword.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 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 1702afc2f7..fe0e59b4b9 100644 --- a/assets/common/items/npc_weapons/sword/saurok_sword.ron +++ b/assets/common/items/npc_weapons/sword/saurok_sword.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 1.00, + speed: 1.0 ), ) ), diff --git a/assets/common/items/npc_weapons/sword/starter_sword.ron b/assets/common/items/npc_weapons/sword/starter_sword.ron index 8e236bb9d0..0e4f7bed26 100644 --- a/assets/common/items/npc_weapons/sword/starter_sword.ron +++ b/assets/common/items/npc_weapons/sword/starter_sword.ron @@ -6,7 +6,9 @@ ItemDef( kind: Sword, stats: ( equip_time_millis: 300, - power: 0.50), + power: 0.50, + speed: 1.0 + ), ) ), quality: Low, diff --git a/assets/common/items/npc_weapons/sword/zweihander_sword_0.ron b/assets/common/items/npc_weapons/sword/zweihander_sword_0.ron index 7f14ed265d..95d9cf4fba 100644 --- a/assets/common/items/npc_weapons/sword/zweihander_sword_0.ron +++ b/assets/common/items/npc_weapons/sword/zweihander_sword_0.ron @@ -6,7 +6,9 @@ ItemDef( kind: Sword, stats: ( equip_time_millis: 500, - power: 0.75), + power: 0.75, + speed: 1.0 + ), ) ), quality: Low, diff --git a/assets/common/items/npc_weapons/tool/broom.ron b/assets/common/items/npc_weapons/tool/broom.ron index a5cece752c..ce72baa6f6 100644 --- a/assets/common/items/npc_weapons/tool/broom.ron +++ b/assets/common/items/npc_weapons/tool/broom.ron @@ -6,7 +6,9 @@ ItemDef( kind: Farming, stats: ( equip_time_millis: 400, - power: 1.5), + power: 1.5, + speed: 1.0 + ), ) ), quality: Low, diff --git a/assets/common/items/npc_weapons/tool/fishing_rod.ron b/assets/common/items/npc_weapons/tool/fishing_rod.ron index 84efc1ae3f..4602d7123d 100644 --- a/assets/common/items/npc_weapons/tool/fishing_rod.ron +++ b/assets/common/items/npc_weapons/tool/fishing_rod.ron @@ -6,7 +6,9 @@ ItemDef( kind: Farming, stats: ( equip_time_millis: 400, - power: 1.5), + power: 1.5, + speed: 1.0 + ), ) ), quality: Low, diff --git a/assets/common/items/npc_weapons/tool/hoe.ron b/assets/common/items/npc_weapons/tool/hoe.ron index 7a53519300..6036295c9e 100644 --- a/assets/common/items/npc_weapons/tool/hoe.ron +++ b/assets/common/items/npc_weapons/tool/hoe.ron @@ -6,7 +6,9 @@ ItemDef( kind: Farming, stats: ( equip_time_millis: 400, - power: 1.50), + power: 1.50, + speed: 1.0 + ), ) ), quality: Low, diff --git a/assets/common/items/npc_weapons/tool/pickaxe.ron b/assets/common/items/npc_weapons/tool/pickaxe.ron index 2c65c2e835..59c317df95 100644 --- a/assets/common/items/npc_weapons/tool/pickaxe.ron +++ b/assets/common/items/npc_weapons/tool/pickaxe.ron @@ -6,7 +6,9 @@ ItemDef( kind: Farming, stats: ( equip_time_millis: 400, - power: 1.50), + power: 1.50, + speed: 1.0 + ), ) ), quality: Low, diff --git a/assets/common/items/npc_weapons/tool/pitchfork.ron b/assets/common/items/npc_weapons/tool/pitchfork.ron index d49dee8808..2bfbe7ddb0 100644 --- a/assets/common/items/npc_weapons/tool/pitchfork.ron +++ b/assets/common/items/npc_weapons/tool/pitchfork.ron @@ -6,7 +6,9 @@ ItemDef( kind: Farming, stats: ( equip_time_millis: 400, - power: 1.50), + power: 1.50, + speed: 1.0 + ), ) ), quality: Low, diff --git a/assets/common/items/npc_weapons/tool/rake.ron b/assets/common/items/npc_weapons/tool/rake.ron index d0a42c9f0f..1ff77b9c4a 100644 --- a/assets/common/items/npc_weapons/tool/rake.ron +++ b/assets/common/items/npc_weapons/tool/rake.ron @@ -6,7 +6,9 @@ ItemDef( kind: Farming, stats: ( equip_time_millis: 400, - power: 1.50), + power: 1.50, + speed: 1.0 + ), ) ), quality: Low, diff --git a/assets/common/items/npc_weapons/tool/shovel-0.ron b/assets/common/items/npc_weapons/tool/shovel-0.ron index 445fad1634..be185121e4 100644 --- a/assets/common/items/npc_weapons/tool/shovel-0.ron +++ b/assets/common/items/npc_weapons/tool/shovel-0.ron @@ -6,7 +6,9 @@ ItemDef( kind: Farming, stats: ( equip_time_millis: 400, - power: 1.50), + power: 1.50, + speed: 1.0 + ), ) ), quality: Low, diff --git a/assets/common/items/npc_weapons/tool/shovel-1.ron b/assets/common/items/npc_weapons/tool/shovel-1.ron index 6a1c3ce931..0acb72575c 100644 --- a/assets/common/items/npc_weapons/tool/shovel-1.ron +++ b/assets/common/items/npc_weapons/tool/shovel-1.ron @@ -6,7 +6,9 @@ ItemDef( kind: Farming, stats: ( equip_time_millis: 400, - power: 1.50), + power: 1.50, + speed: 1.0 + ), ) ), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/beast_claws.ron b/assets/common/items/npc_weapons/unique/beast_claws.ron index d954d73b12..7f3c4590f5 100644 --- a/assets/common/items/npc_weapons/unique/beast_claws.ron +++ b/assets/common/items/npc_weapons/unique/beast_claws.ron @@ -6,7 +6,9 @@ ItemDef( kind: Unique(BeastClaws), stats: ( equip_time_millis: 500, - power: 1.00), + power: 1.00, + speed: 1.0 + ), ) ), quality: Low, 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 31d8afd39d..3e665d9b61 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,9 @@ ItemDef( kind: Unique(StoneGolemFist), stats: ( equip_time_millis: 500, - power: 1.00), + power: 1.00, + speed: 1.0 + ), ) ), quality: Low, diff --git a/assets/common/items/weapons/axe/bloodsteel_axe-0.ron b/assets/common/items/weapons/axe/bloodsteel_axe-0.ron index 9882fb4842..0be056e32f 100644 --- a/assets/common/items/weapons/axe/bloodsteel_axe-0.ron +++ b/assets/common/items/weapons/axe/bloodsteel_axe-0.ron @@ -6,8 +6,9 @@ ItemDef( kind: Axe, stats: ( equip_time_millis: 400, - power: 1.60, - ), + power: 1.60, + speed: 1.0 + ), ) ), quality: High, diff --git a/assets/common/items/weapons/axe/bloodsteel_axe-1.ron b/assets/common/items/weapons/axe/bloodsteel_axe-1.ron index 65e25e6cce..a8b1463cc7 100644 --- a/assets/common/items/weapons/axe/bloodsteel_axe-1.ron +++ b/assets/common/items/weapons/axe/bloodsteel_axe-1.ron @@ -6,7 +6,9 @@ ItemDef( kind: Axe, stats: ( equip_time_millis: 400, - power: 1.60), + power: 1.60, + speed: 1.0 + ), ) ), quality: High, diff --git a/assets/common/items/weapons/axe/bloodsteel_axe-2.ron b/assets/common/items/weapons/axe/bloodsteel_axe-2.ron index f7278edbc5..749baeabe1 100644 --- a/assets/common/items/weapons/axe/bloodsteel_axe-2.ron +++ b/assets/common/items/weapons/axe/bloodsteel_axe-2.ron @@ -6,7 +6,9 @@ ItemDef( kind: Axe, stats: ( equip_time_millis: 400, - power: 1.60), + power: 1.60, + speed: 1.0 + ), ) ), quality: High, diff --git a/assets/common/items/weapons/axe/bronze_axe-0.ron b/assets/common/items/weapons/axe/bronze_axe-0.ron index a8ce9896e4..831a96c31d 100644 --- a/assets/common/items/weapons/axe/bronze_axe-0.ron +++ b/assets/common/items/weapons/axe/bronze_axe-0.ron @@ -6,7 +6,8 @@ ItemDef( kind: Axe, stats: ( equip_time_millis: 400, - power: 1.00 + power: 1.00, + 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 f40182984a..2db56ad6af 100644 --- a/assets/common/items/weapons/axe/bronze_axe-1.ron +++ b/assets/common/items/weapons/axe/bronze_axe-1.ron @@ -6,7 +6,8 @@ ItemDef( kind: Axe, stats: ( equip_time_millis: 400, - power: 1.00 + power: 1.00, + 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 433c2c2ddb..6857a20150 100644 --- a/assets/common/items/weapons/axe/cobalt_axe-0.ron +++ b/assets/common/items/weapons/axe/cobalt_axe-0.ron @@ -6,7 +6,9 @@ ItemDef( kind: Axe, stats: ( equip_time_millis: 400, - power: 1.80), + power: 1.80, + speed: 1.0 + ), ) ), quality: High, diff --git a/assets/common/items/weapons/axe/iron_axe-0.ron b/assets/common/items/weapons/axe/iron_axe-0.ron index 4eec31e7b5..860558e075 100644 --- a/assets/common/items/weapons/axe/iron_axe-0.ron +++ b/assets/common/items/weapons/axe/iron_axe-0.ron @@ -6,7 +6,8 @@ ItemDef( kind: Axe, stats: ( equip_time_millis: 400, - power: 1.20 + power: 1.20, + 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 9b37b9274c..034de7040c 100644 --- a/assets/common/items/weapons/axe/iron_axe-1.ron +++ b/assets/common/items/weapons/axe/iron_axe-1.ron @@ -6,7 +6,8 @@ ItemDef( kind: Axe, stats: ( equip_time_millis: 400, - power: 1.20 + power: 1.20, + 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 bb81880ddd..4d504a54ef 100644 --- a/assets/common/items/weapons/axe/iron_axe-2.ron +++ b/assets/common/items/weapons/axe/iron_axe-2.ron @@ -6,7 +6,8 @@ ItemDef( kind: Axe, stats: ( equip_time_millis: 400, - power: 1.20 + power: 1.20, + 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 742b10995f..5f3bae741f 100644 --- a/assets/common/items/weapons/axe/iron_axe-3.ron +++ b/assets/common/items/weapons/axe/iron_axe-3.ron @@ -6,7 +6,8 @@ ItemDef( kind: Axe, stats: ( equip_time_millis: 400, - power: 1.20 + power: 1.20, + 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 a297fdeb90..3666abd029 100644 --- a/assets/common/items/weapons/axe/iron_axe-4.ron +++ b/assets/common/items/weapons/axe/iron_axe-4.ron @@ -6,7 +6,8 @@ ItemDef( kind: Axe, stats: ( equip_time_millis: 400, - power: 1.20 + power: 1.20, + 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 050a7c0694..f610d87614 100644 --- a/assets/common/items/weapons/axe/iron_axe-5.ron +++ b/assets/common/items/weapons/axe/iron_axe-5.ron @@ -6,7 +6,8 @@ ItemDef( kind: Axe, stats: ( equip_time_millis: 400, - power: 1.20 + power: 1.20, + 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 0e9bb4aff2..26de17601e 100644 --- a/assets/common/items/weapons/axe/iron_axe-6.ron +++ b/assets/common/items/weapons/axe/iron_axe-6.ron @@ -6,7 +6,8 @@ ItemDef( kind: Axe, stats: ( equip_time_millis: 400, - power: 1.20 + power: 1.20, + 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 0977a19d62..2dda4e512b 100644 --- a/assets/common/items/weapons/axe/iron_axe-7.ron +++ b/assets/common/items/weapons/axe/iron_axe-7.ron @@ -6,7 +6,8 @@ ItemDef( kind: Axe, stats: ( equip_time_millis: 400, - power: 1.20 + power: 1.20, + 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 22581213d0..96da8a3311 100644 --- a/assets/common/items/weapons/axe/iron_axe-8.ron +++ b/assets/common/items/weapons/axe/iron_axe-8.ron @@ -6,7 +6,8 @@ ItemDef( kind: Axe, stats: ( equip_time_millis: 400, - power: 1.20 + power: 1.20, + 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 da43a2941a..6fe9ac4c57 100644 --- a/assets/common/items/weapons/axe/iron_axe-9.ron +++ b/assets/common/items/weapons/axe/iron_axe-9.ron @@ -6,7 +6,8 @@ ItemDef( kind: Axe, stats: ( equip_time_millis: 400, - power: 1.20 + power: 1.20, + 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 06bd30142c..d53a11f47d 100644 --- a/assets/common/items/weapons/axe/malachite_axe-0.ron +++ b/assets/common/items/weapons/axe/malachite_axe-0.ron @@ -6,7 +6,9 @@ ItemDef( kind: Axe, stats: ( equip_time_millis: 400, - power: 2.00), + power: 2.00, + speed: 1.0 + ), ) ), quality: Epic, diff --git a/assets/common/items/weapons/axe/orc_axe-0.ron b/assets/common/items/weapons/axe/orc_axe-0.ron index 293e0b469a..f725de2891 100644 --- a/assets/common/items/weapons/axe/orc_axe-0.ron +++ b/assets/common/items/weapons/axe/orc_axe-0.ron @@ -6,7 +6,9 @@ ItemDef( kind: Axe, stats: ( equip_time_millis: 400, - power: 0.60), + power: 0.60, + speed: 1.0 + ), ) ), quality: Low, diff --git a/assets/common/items/weapons/axe/starter_axe.ron b/assets/common/items/weapons/axe/starter_axe.ron index fc69ede912..b867f649aa 100644 --- a/assets/common/items/weapons/axe/starter_axe.ron +++ b/assets/common/items/weapons/axe/starter_axe.ron @@ -6,7 +6,9 @@ ItemDef( kind: Axe, stats: ( equip_time_millis: 400, - power: 0.50), + power: 0.50, + speed: 1.0 + ), ) ), quality: Low, diff --git a/assets/common/items/weapons/axe/steel_axe-0.ron b/assets/common/items/weapons/axe/steel_axe-0.ron index 6db9da1292..a422646047 100644 --- a/assets/common/items/weapons/axe/steel_axe-0.ron +++ b/assets/common/items/weapons/axe/steel_axe-0.ron @@ -6,7 +6,8 @@ ItemDef( kind: Axe, stats: ( equip_time_millis: 400, - power: 1.40 + power: 1.40, + 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 a1de1ff0cb..b5e3365c24 100644 --- a/assets/common/items/weapons/axe/steel_axe-1.ron +++ b/assets/common/items/weapons/axe/steel_axe-1.ron @@ -6,7 +6,8 @@ ItemDef( kind: Axe, stats: ( equip_time_millis: 400, - power: 1.40 + power: 1.40, + 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 702b2c6c71..aeab3c660e 100644 --- a/assets/common/items/weapons/axe/steel_axe-2.ron +++ b/assets/common/items/weapons/axe/steel_axe-2.ron @@ -6,7 +6,8 @@ ItemDef( kind: Axe, stats: ( equip_time_millis: 400, - power: 1.40 + power: 1.40, + 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 66b52dbe56..279638b999 100644 --- a/assets/common/items/weapons/axe/steel_axe-3.ron +++ b/assets/common/items/weapons/axe/steel_axe-3.ron @@ -6,7 +6,8 @@ ItemDef( kind: Axe, stats: ( equip_time_millis: 400, - power: 1.40 + power: 1.40, + 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 375c670501..f79705a9a6 100644 --- a/assets/common/items/weapons/axe/steel_axe-4.ron +++ b/assets/common/items/weapons/axe/steel_axe-4.ron @@ -6,7 +6,8 @@ ItemDef( kind: Axe, stats: ( equip_time_millis: 400, - power: 1.40 + power: 1.40, + 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 2f0ce88b5e..f0e90d9539 100644 --- a/assets/common/items/weapons/axe/steel_axe-5.ron +++ b/assets/common/items/weapons/axe/steel_axe-5.ron @@ -6,7 +6,8 @@ ItemDef( kind: Axe, stats: ( equip_time_millis: 400, - power: 1.40 + power: 1.40, + 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 d624671644..70af8b071b 100644 --- a/assets/common/items/weapons/axe/steel_axe-6.ron +++ b/assets/common/items/weapons/axe/steel_axe-6.ron @@ -6,7 +6,8 @@ ItemDef( kind: Axe, stats: ( equip_time_millis: 400, - power: 1.40 + power: 1.40, + 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 6c3c3c2713..f28034eca3 100644 --- a/assets/common/items/weapons/axe/worn_iron_axe-0.ron +++ b/assets/common/items/weapons/axe/worn_iron_axe-0.ron @@ -6,7 +6,9 @@ ItemDef( kind: Axe, stats: ( equip_time_millis: 400, - power: 0.80), + power: 0.80, + speed: 1.0 + ), ) ), quality: Low, 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 7e46247bef..ea846a768c 100644 --- a/assets/common/items/weapons/axe/worn_iron_axe-1.ron +++ b/assets/common/items/weapons/axe/worn_iron_axe-1.ron @@ -6,7 +6,9 @@ ItemDef( kind: Axe, stats: ( equip_time_millis: 400, - power: 0.80), + power: 0.80, + speed: 1.0 + ), ) ), quality: Low, 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 40d5d5166d..11d8a79165 100644 --- a/assets/common/items/weapons/axe/worn_iron_axe-2.ron +++ b/assets/common/items/weapons/axe/worn_iron_axe-2.ron @@ -6,7 +6,9 @@ ItemDef( kind: Axe, stats: ( equip_time_millis: 400, - power: 0.80), + power: 0.80, + speed: 1.0 + ), ) ), quality: Low, 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 4e0bdf832e..a8de78ee0d 100644 --- a/assets/common/items/weapons/axe/worn_iron_axe-3.ron +++ b/assets/common/items/weapons/axe/worn_iron_axe-3.ron @@ -6,7 +6,9 @@ ItemDef( kind: Axe, stats: ( equip_time_millis: 400, - power: 0.80), + power: 0.80, + speed: 1.0 + ), ) ), quality: Low, 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 80f96a3e1b..891cbbc2d2 100644 --- a/assets/common/items/weapons/axe/worn_iron_axe-4.ron +++ b/assets/common/items/weapons/axe/worn_iron_axe-4.ron @@ -6,7 +6,9 @@ ItemDef( kind: Axe, stats: ( equip_time_millis: 400, - power: 0.80), + power: 0.80, + speed: 1.0 + ), ) ), quality: Low, diff --git a/assets/common/items/weapons/bow/horn_longbow-0.ron b/assets/common/items/weapons/bow/horn_longbow-0.ron index 857204e357..2cae3a5cb6 100644 --- a/assets/common/items/weapons/bow/horn_longbow-0.ron +++ b/assets/common/items/weapons/bow/horn_longbow-0.ron @@ -6,7 +6,8 @@ ItemDef( kind: Bow, stats: ( equip_time_millis: 400, - power: 1.50 + power: 1.50, + speed: 1.0 ), ) ), diff --git a/assets/common/items/weapons/bow/iron_longbow-0.ron b/assets/common/items/weapons/bow/iron_longbow-0.ron index c4d0b20c36..e762de291d 100644 --- a/assets/common/items/weapons/bow/iron_longbow-0.ron +++ b/assets/common/items/weapons/bow/iron_longbow-0.ron @@ -6,7 +6,8 @@ ItemDef( kind: Bow, stats: ( equip_time_millis: 400, - power: 1.75 + power: 1.75, + speed: 1.0 ), ) ), diff --git a/assets/common/items/weapons/bow/leafy_longbow-0.ron b/assets/common/items/weapons/bow/leafy_longbow-0.ron index 82cfd80900..2861d9ae72 100644 --- a/assets/common/items/weapons/bow/leafy_longbow-0.ron +++ b/assets/common/items/weapons/bow/leafy_longbow-0.ron @@ -6,7 +6,8 @@ ItemDef( kind: Bow, stats: ( equip_time_millis: 400, - power: 1.25 + power: 1.25, + speed: 1.0 ), ) ), diff --git a/assets/common/items/weapons/bow/leafy_shortbow-0.ron b/assets/common/items/weapons/bow/leafy_shortbow-0.ron index d9e3698aac..50037a7ac2 100644 --- a/assets/common/items/weapons/bow/leafy_shortbow-0.ron +++ b/assets/common/items/weapons/bow/leafy_shortbow-0.ron @@ -6,7 +6,9 @@ ItemDef( kind: Bow, stats: ( equip_time_millis: 400, - power: 1.00), + power: 1.00, + speed: 1.0 + ), ) ), quality: Common, diff --git a/assets/common/items/weapons/bow/nature_ore_longbow-0.ron b/assets/common/items/weapons/bow/nature_ore_longbow-0.ron index 754e46a8dd..8053a3785c 100644 --- a/assets/common/items/weapons/bow/nature_ore_longbow-0.ron +++ b/assets/common/items/weapons/bow/nature_ore_longbow-0.ron @@ -6,7 +6,9 @@ ItemDef( kind: Bow, stats: ( equip_time_millis: 400, - power: 2.00), + power: 2.00, + speed: 1.0 + ), ) ), quality: Epic, diff --git a/assets/common/items/weapons/bow/rare_longbow.ron b/assets/common/items/weapons/bow/rare_longbow.ron index c7dd7ab7c2..a1fb137a44 100644 --- a/assets/common/items/weapons/bow/rare_longbow.ron +++ b/assets/common/items/weapons/bow/rare_longbow.ron @@ -6,7 +6,9 @@ ItemDef( kind: Bow, stats: ( equip_time_millis: 400, - power: 2.00), + power: 2.00, + speed: 1.0 + ), ) ), quality: Epic, diff --git a/assets/common/items/weapons/bow/starter_bow.ron b/assets/common/items/weapons/bow/starter_bow.ron index 2da0e169ee..053d52ffec 100644 --- a/assets/common/items/weapons/bow/starter_bow.ron +++ b/assets/common/items/weapons/bow/starter_bow.ron @@ -6,7 +6,9 @@ ItemDef( kind: Bow, stats: ( equip_time_millis: 400, - power: 0.50), + power: 0.50, + speed: 1.0 + ), ) ), quality: Low, diff --git a/assets/common/items/weapons/bow/wood_longbow-0.ron b/assets/common/items/weapons/bow/wood_longbow-0.ron index 42ec0d8afc..52f2576f1d 100644 --- a/assets/common/items/weapons/bow/wood_longbow-0.ron +++ b/assets/common/items/weapons/bow/wood_longbow-0.ron @@ -6,7 +6,9 @@ ItemDef( kind: Bow, stats: ( equip_time_millis: 400, - power: 1.00), + power: 1.00, + speed: 1.0 + ), ) ), quality: Common, diff --git a/assets/common/items/weapons/bow/wood_longbow-1.ron b/assets/common/items/weapons/bow/wood_longbow-1.ron index c97b7549f1..16e3bf322a 100644 --- a/assets/common/items/weapons/bow/wood_longbow-1.ron +++ b/assets/common/items/weapons/bow/wood_longbow-1.ron @@ -6,7 +6,9 @@ ItemDef( kind: Bow, stats: ( equip_time_millis: 400, - power: 1.00), + power: 1.00, + speed: 1.0 + ), ) ), quality: Common, diff --git a/assets/common/items/weapons/bow/wood_shortbow-0.ron b/assets/common/items/weapons/bow/wood_shortbow-0.ron index bc41b2ed9b..75cc167f2f 100644 --- a/assets/common/items/weapons/bow/wood_shortbow-0.ron +++ b/assets/common/items/weapons/bow/wood_shortbow-0.ron @@ -6,7 +6,9 @@ ItemDef( kind: Bow, stats: ( equip_time_millis: 400, - power: 0.8), + power: 0.8, + speed: 1.0 + ), ) ), quality: Moderate, diff --git a/assets/common/items/weapons/bow/wood_shortbow-1.ron b/assets/common/items/weapons/bow/wood_shortbow-1.ron index 452e2d5b19..26dffba37b 100644 --- a/assets/common/items/weapons/bow/wood_shortbow-1.ron +++ b/assets/common/items/weapons/bow/wood_shortbow-1.ron @@ -6,7 +6,9 @@ ItemDef( kind: Bow, stats: ( equip_time_millis: 400, - power: 0.75), + power: 0.75, + speed: 1.0 + ), ) ), quality: Common, diff --git a/assets/common/items/weapons/dagger/starter_dagger.ron b/assets/common/items/weapons/dagger/starter_dagger.ron index 88e980ecb7..a0118d0aca 100644 --- a/assets/common/items/weapons/dagger/starter_dagger.ron +++ b/assets/common/items/weapons/dagger/starter_dagger.ron @@ -6,7 +6,8 @@ ItemDef( kind: Dagger, stats: ( equip_time_millis: 300, - power: 1.00 + power: 1.00, + speed: 1.0 ), ) ), diff --git a/assets/common/items/weapons/empty/empty.ron b/assets/common/items/weapons/empty/empty.ron index 1efe02ad2d..ca1672b393 100644 --- a/assets/common/items/weapons/empty/empty.ron +++ b/assets/common/items/weapons/empty/empty.ron @@ -6,7 +6,9 @@ ItemDef( kind: Empty, stats: ( equip_time_millis: 200, - power: 1.00), + power: 1.00, + speed: 1.0 + ), ) ), quality: Low, diff --git a/assets/common/items/weapons/hammer/bronze_hammer-0.ron b/assets/common/items/weapons/hammer/bronze_hammer-0.ron index 4b972801c4..a558558585 100644 --- a/assets/common/items/weapons/hammer/bronze_hammer-0.ron +++ b/assets/common/items/weapons/hammer/bronze_hammer-0.ron @@ -6,7 +6,9 @@ ItemDef( kind: Hammer, stats: ( equip_time_millis: 500, - power: 1.00), + power: 1.00, + speed: 1.0 + ), ) ), quality: Common, diff --git a/assets/common/items/weapons/hammer/bronze_hammer-1.ron b/assets/common/items/weapons/hammer/bronze_hammer-1.ron index b3c3a4ab69..3fbff62c53 100644 --- a/assets/common/items/weapons/hammer/bronze_hammer-1.ron +++ b/assets/common/items/weapons/hammer/bronze_hammer-1.ron @@ -6,7 +6,9 @@ ItemDef( kind: Hammer, stats: ( equip_time_millis: 500, - power: 1.00), + power: 1.00, + speed: 1.0 + ), ) ), quality: Common, diff --git a/assets/common/items/weapons/hammer/cobalt_hammer-0.ron b/assets/common/items/weapons/hammer/cobalt_hammer-0.ron index 009df1be87..726cb8c524 100644 --- a/assets/common/items/weapons/hammer/cobalt_hammer-0.ron +++ b/assets/common/items/weapons/hammer/cobalt_hammer-0.ron @@ -6,7 +6,8 @@ ItemDef( kind: Hammer, stats: ( equip_time_millis: 500, - power: 1.60 + power: 1.60, + 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 a5f6fbd269..02bb324bfb 100644 --- a/assets/common/items/weapons/hammer/cobalt_hammer-1.ron +++ b/assets/common/items/weapons/hammer/cobalt_hammer-1.ron @@ -6,7 +6,8 @@ ItemDef( kind: Hammer, stats: ( equip_time_millis: 500, - power: 1.60 + power: 1.60, + 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 d56ea6a368..942d2c86d4 100644 --- a/assets/common/items/weapons/hammer/cultist_purp_2h-0.ron +++ b/assets/common/items/weapons/hammer/cultist_purp_2h-0.ron @@ -6,7 +6,9 @@ ItemDef( kind: Hammer, stats: ( equip_time_millis: 500, - power: 2.00), + power: 2.00, + speed: 1.0 + ), ) ), quality: Epic, diff --git a/assets/common/items/weapons/hammer/flimsy_hammer.ron b/assets/common/items/weapons/hammer/flimsy_hammer.ron index 7af99e88b1..02b087a584 100644 --- a/assets/common/items/weapons/hammer/flimsy_hammer.ron +++ b/assets/common/items/weapons/hammer/flimsy_hammer.ron @@ -6,7 +6,9 @@ ItemDef( kind: Hammer, stats: ( equip_time_millis: 500, - power: 0.50), + power: 0.50, + speed: 1.0 + ), ) ), quality: Low, diff --git a/assets/common/items/weapons/hammer/hammer_1.ron b/assets/common/items/weapons/hammer/hammer_1.ron index 5032c1f445..47b01d509b 100644 --- a/assets/common/items/weapons/hammer/hammer_1.ron +++ b/assets/common/items/weapons/hammer/hammer_1.ron @@ -6,7 +6,9 @@ ItemDef( kind: Hammer, stats: ( equip_time_millis: 500, - power: 0.50), + power: 0.50, + speed: 1.0 + ), quality: Low, ) ) diff --git a/assets/common/items/weapons/hammer/iron_hammer-0.ron b/assets/common/items/weapons/hammer/iron_hammer-0.ron index 5daec4f635..226db9e7d3 100644 --- a/assets/common/items/weapons/hammer/iron_hammer-0.ron +++ b/assets/common/items/weapons/hammer/iron_hammer-0.ron @@ -6,7 +6,9 @@ ItemDef( kind: Hammer, stats: ( equip_time_millis: 500, - power: 1.20), + power: 1.20, + speed: 1.0 + ), ) ), quality: Common, diff --git a/assets/common/items/weapons/hammer/iron_hammer-1.ron b/assets/common/items/weapons/hammer/iron_hammer-1.ron index 132098de35..70fc39cda6 100644 --- a/assets/common/items/weapons/hammer/iron_hammer-1.ron +++ b/assets/common/items/weapons/hammer/iron_hammer-1.ron @@ -6,7 +6,9 @@ ItemDef( kind: Hammer, stats: ( equip_time_millis: 500, - power: 1.20), + power: 1.20, + speed: 1.0 + ), ) ), quality: Common, diff --git a/assets/common/items/weapons/hammer/iron_hammer-2.ron b/assets/common/items/weapons/hammer/iron_hammer-2.ron index 89e8e2a0c4..11f045abe7 100644 --- a/assets/common/items/weapons/hammer/iron_hammer-2.ron +++ b/assets/common/items/weapons/hammer/iron_hammer-2.ron @@ -6,7 +6,9 @@ ItemDef( kind: Hammer, stats: ( equip_time_millis: 500, - power: 1.20), + power: 1.20, + speed: 1.0 + ), ) ), quality: Common, diff --git a/assets/common/items/weapons/hammer/iron_hammer-3.ron b/assets/common/items/weapons/hammer/iron_hammer-3.ron index de109ee94f..7af920efb4 100644 --- a/assets/common/items/weapons/hammer/iron_hammer-3.ron +++ b/assets/common/items/weapons/hammer/iron_hammer-3.ron @@ -6,7 +6,9 @@ ItemDef( kind: Hammer, stats: ( equip_time_millis: 500, - power: 1.20), + power: 1.20, + speed: 1.0 + ), ) ), quality: Common, diff --git a/assets/common/items/weapons/hammer/iron_hammer-4.ron b/assets/common/items/weapons/hammer/iron_hammer-4.ron index 45687f17f7..e7e7b0d2cf 100644 --- a/assets/common/items/weapons/hammer/iron_hammer-4.ron +++ b/assets/common/items/weapons/hammer/iron_hammer-4.ron @@ -6,7 +6,9 @@ ItemDef( kind: Hammer, stats: ( equip_time_millis: 500, - power: 1.20), + power: 1.20, + speed: 1.0 + ), ) ), quality: Common, diff --git a/assets/common/items/weapons/hammer/iron_hammer-5.ron b/assets/common/items/weapons/hammer/iron_hammer-5.ron index 60e119ac64..63a1bd1b41 100644 --- a/assets/common/items/weapons/hammer/iron_hammer-5.ron +++ b/assets/common/items/weapons/hammer/iron_hammer-5.ron @@ -6,7 +6,9 @@ ItemDef( kind: Hammer, stats: ( equip_time_millis: 500, - power: 1.20), + power: 1.20, + speed: 1.0 + ), ) ), quality: Common, diff --git a/assets/common/items/weapons/hammer/iron_hammer-6.ron b/assets/common/items/weapons/hammer/iron_hammer-6.ron index f1861da769..f87de3f0e8 100644 --- a/assets/common/items/weapons/hammer/iron_hammer-6.ron +++ b/assets/common/items/weapons/hammer/iron_hammer-6.ron @@ -6,7 +6,9 @@ ItemDef( kind: Hammer, stats: ( equip_time_millis: 500, - power: 1.20), + power: 1.20, + speed: 1.0 + ), ) ), quality: Common, diff --git a/assets/common/items/weapons/hammer/iron_hammer-7.ron b/assets/common/items/weapons/hammer/iron_hammer-7.ron index 6f202c273b..bda62278e3 100644 --- a/assets/common/items/weapons/hammer/iron_hammer-7.ron +++ b/assets/common/items/weapons/hammer/iron_hammer-7.ron @@ -6,7 +6,9 @@ ItemDef( kind: Hammer, stats: ( equip_time_millis: 500, - power: 1.20), + power: 1.20, + speed: 1.0 + ), ) ), quality: Common, diff --git a/assets/common/items/weapons/hammer/iron_hammer-8.ron b/assets/common/items/weapons/hammer/iron_hammer-8.ron index cee115593e..9b2ae813ad 100644 --- a/assets/common/items/weapons/hammer/iron_hammer-8.ron +++ b/assets/common/items/weapons/hammer/iron_hammer-8.ron @@ -6,7 +6,9 @@ ItemDef( kind: Hammer, stats: ( equip_time_millis: 500, - power: 1.20), + power: 1.20, + speed: 1.0 + ), ) ), quality: Common, diff --git a/assets/common/items/weapons/hammer/mjolnir.ron b/assets/common/items/weapons/hammer/mjolnir.ron index 052cbeaa9d..1c52804473 100644 --- a/assets/common/items/weapons/hammer/mjolnir.ron +++ b/assets/common/items/weapons/hammer/mjolnir.ron @@ -6,7 +6,9 @@ ItemDef( kind: Hammer, stats: ( equip_time_millis: 500, - power: 2.00), + power: 2.00, + speed: 1.0 + ), ) ), quality: Legendary, diff --git a/assets/common/items/weapons/hammer/ramshead_hammer.ron b/assets/common/items/weapons/hammer/ramshead_hammer.ron index 87f4d13a31..0f1c2887a6 100644 --- a/assets/common/items/weapons/hammer/ramshead_hammer.ron +++ b/assets/common/items/weapons/hammer/ramshead_hammer.ron @@ -6,7 +6,9 @@ ItemDef( kind: Hammer, stats: ( equip_time_millis: 500, - power: 1.80), + power: 1.80, + speed: 1.0 + ), ) ), quality: High, diff --git a/assets/common/items/weapons/hammer/runic_hammer.ron b/assets/common/items/weapons/hammer/runic_hammer.ron index 14c0bb88f9..3b32590023 100644 --- a/assets/common/items/weapons/hammer/runic_hammer.ron +++ b/assets/common/items/weapons/hammer/runic_hammer.ron @@ -6,7 +6,9 @@ ItemDef( kind: Hammer, stats: ( equip_time_millis: 500, - power: 1.80), + power: 1.80, + speed: 1.0 + ), ) ), quality: High, diff --git a/assets/common/items/weapons/hammer/starter_hammer.ron b/assets/common/items/weapons/hammer/starter_hammer.ron index 1b8dfb9bd4..35d167e7a8 100644 --- a/assets/common/items/weapons/hammer/starter_hammer.ron +++ b/assets/common/items/weapons/hammer/starter_hammer.ron @@ -6,7 +6,9 @@ ItemDef( kind: Hammer, stats: ( equip_time_millis: 500, - power: 0.50), + power: 0.50, + speed: 1.0 + ), ) ), quality: Low, diff --git a/assets/common/items/weapons/hammer/steel_hammer-0.ron b/assets/common/items/weapons/hammer/steel_hammer-0.ron index dab68a08c6..a952a02129 100644 --- a/assets/common/items/weapons/hammer/steel_hammer-0.ron +++ b/assets/common/items/weapons/hammer/steel_hammer-0.ron @@ -6,7 +6,8 @@ ItemDef( kind: Hammer, stats: ( equip_time_millis: 500, - power: 1.40 + power: 1.40, + 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 d6a2303806..0550316424 100644 --- a/assets/common/items/weapons/hammer/steel_hammer-1.ron +++ b/assets/common/items/weapons/hammer/steel_hammer-1.ron @@ -6,7 +6,8 @@ ItemDef( kind: Hammer, stats: ( equip_time_millis: 500, - power: 1.40 + power: 1.40, + 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 af1aa428c1..9556767429 100644 --- a/assets/common/items/weapons/hammer/steel_hammer-2.ron +++ b/assets/common/items/weapons/hammer/steel_hammer-2.ron @@ -6,7 +6,8 @@ ItemDef( kind: Hammer, stats: ( equip_time_millis: 500, - power: 1.40 + power: 1.40, + 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 483ee406f6..aff74b45a8 100644 --- a/assets/common/items/weapons/hammer/steel_hammer-3.ron +++ b/assets/common/items/weapons/hammer/steel_hammer-3.ron @@ -6,7 +6,8 @@ ItemDef( kind: Hammer, stats: ( equip_time_millis: 500, - power: 1.40 + power: 1.40, + 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 990f99d6f9..b5a6c46b8a 100644 --- a/assets/common/items/weapons/hammer/steel_hammer-4.ron +++ b/assets/common/items/weapons/hammer/steel_hammer-4.ron @@ -6,7 +6,8 @@ ItemDef( kind: Hammer, stats: ( equip_time_millis: 500, - power: 1.40 + power: 1.40, + 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 cf21df87d7..9b2bc8b565 100644 --- a/assets/common/items/weapons/hammer/steel_hammer-5.ron +++ b/assets/common/items/weapons/hammer/steel_hammer-5.ron @@ -6,7 +6,8 @@ ItemDef( kind: Hammer, stats: ( equip_time_millis: 500, - power: 1.40 + power: 1.40, + 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 169f4a97c0..6b5c9141e2 100644 --- a/assets/common/items/weapons/hammer/stone_hammer-0.ron +++ b/assets/common/items/weapons/hammer/stone_hammer-0.ron @@ -6,7 +6,9 @@ ItemDef( kind: Hammer, stats: ( equip_time_millis: 500, - power: 0.70), + power: 0.70, + speed: 1.0 + ), ) ), quality: Low, diff --git a/assets/common/items/weapons/hammer/stone_hammer-1.ron b/assets/common/items/weapons/hammer/stone_hammer-1.ron index 8a784f8109..02fc44688a 100644 --- a/assets/common/items/weapons/hammer/stone_hammer-1.ron +++ b/assets/common/items/weapons/hammer/stone_hammer-1.ron @@ -6,7 +6,9 @@ ItemDef( kind: Hammer, stats: ( equip_time_millis: 500, - power: 0.70), + power: 0.70, + speed: 1.0 + ), ) ), quality: Low, diff --git a/assets/common/items/weapons/hammer/stone_hammer-2.ron b/assets/common/items/weapons/hammer/stone_hammer-2.ron index ec0e6e3a7a..ead1e3cdd9 100644 --- a/assets/common/items/weapons/hammer/stone_hammer-2.ron +++ b/assets/common/items/weapons/hammer/stone_hammer-2.ron @@ -6,7 +6,9 @@ ItemDef( kind: Hammer, stats: ( equip_time_millis: 500, - power: 0.70), + power: 0.70, + speed: 1.0 + ), ) ), quality: Low, diff --git a/assets/common/items/weapons/hammer/stone_hammer-3.ron b/assets/common/items/weapons/hammer/stone_hammer-3.ron index e9e1a6c537..8817aec322 100644 --- a/assets/common/items/weapons/hammer/stone_hammer-3.ron +++ b/assets/common/items/weapons/hammer/stone_hammer-3.ron @@ -6,7 +6,9 @@ ItemDef( kind: Hammer, stats: ( equip_time_millis: 500, - power: 0.70), + power: 0.70, + speed: 1.0 + ), ) ), quality: Low, diff --git a/assets/common/items/weapons/hammer/wood_hammer-0.ron b/assets/common/items/weapons/hammer/wood_hammer-0.ron index 187c7b45aa..9c9d66a659 100644 --- a/assets/common/items/weapons/hammer/wood_hammer-0.ron +++ b/assets/common/items/weapons/hammer/wood_hammer-0.ron @@ -6,7 +6,9 @@ ItemDef( kind: Hammer, stats: ( equip_time_millis: 500, - power: 0.60), + power: 0.60, + speed: 1.0 + ), ) ), quality: Low, 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 124c8f2cf8..e48ae526da 100644 --- a/assets/common/items/weapons/hammer/worn_iron_hammer-0.ron +++ b/assets/common/items/weapons/hammer/worn_iron_hammer-0.ron @@ -6,7 +6,9 @@ ItemDef( kind: Hammer, stats: ( equip_time_millis: 500, - power: 0.85), + power: 0.85, + speed: 1.0 + ), ) ), quality: Common, 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 72857525af..42aa2614f8 100644 --- a/assets/common/items/weapons/hammer/worn_iron_hammer-1.ron +++ b/assets/common/items/weapons/hammer/worn_iron_hammer-1.ron @@ -6,7 +6,9 @@ ItemDef( kind: Hammer, stats: ( equip_time_millis: 500, - power: 0.85), + power: 0.85, + speed: 1.0 + ), ) ), quality: Common, 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 e26d985336..e005ea5254 100644 --- a/assets/common/items/weapons/hammer/worn_iron_hammer-2.ron +++ b/assets/common/items/weapons/hammer/worn_iron_hammer-2.ron @@ -6,7 +6,9 @@ ItemDef( kind: Hammer, stats: ( equip_time_millis: 500, - power: 0.85), + power: 0.85, + speed: 1.0 + ), ) ), quality: Common, 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 b220a87aab..c5c42c6b31 100644 --- a/assets/common/items/weapons/hammer/worn_iron_hammer-3.ron +++ b/assets/common/items/weapons/hammer/worn_iron_hammer-3.ron @@ -6,7 +6,9 @@ ItemDef( kind: Hammer, stats: ( equip_time_millis: 500, - power: 0.85), + power: 0.85, + speed: 1.0 + ), ) ), quality: Common, diff --git a/assets/common/items/weapons/sceptre/sceptre_velorite_0.ron b/assets/common/items/weapons/sceptre/sceptre_velorite_0.ron index f6e4ce9203..e4e1844354 100644 --- a/assets/common/items/weapons/sceptre/sceptre_velorite_0.ron +++ b/assets/common/items/weapons/sceptre/sceptre_velorite_0.ron @@ -6,7 +6,9 @@ ItemDef( kind: Sceptre, stats: ( equip_time_millis: 400, - power: 2.0), + power: 2.0, + speed: 1.0 + ), ) ), quality: Epic, diff --git a/assets/common/items/weapons/sceptre/staff_nature.ron b/assets/common/items/weapons/sceptre/staff_nature.ron index fb6a4578ad..7ee310e02f 100644 --- a/assets/common/items/weapons/sceptre/staff_nature.ron +++ b/assets/common/items/weapons/sceptre/staff_nature.ron @@ -6,7 +6,8 @@ ItemDef( kind: Sceptre, stats: ( equip_time_millis: 400, - power: 1.00 + power: 1.00, + speed: 1.0 ), ) ), diff --git a/assets/common/items/weapons/sceptre/starter_sceptre.ron b/assets/common/items/weapons/sceptre/starter_sceptre.ron index 08c565d6c4..a0769a37e2 100644 --- a/assets/common/items/weapons/sceptre/starter_sceptre.ron +++ b/assets/common/items/weapons/sceptre/starter_sceptre.ron @@ -6,7 +6,9 @@ ItemDef( kind: Sceptre, stats: ( equip_time_millis: 400, - power: 0.50), + power: 0.50, + speed: 1.0 + ), ) ), quality: Low, diff --git a/assets/common/items/weapons/shield/shield_1.ron b/assets/common/items/weapons/shield/shield_1.ron index 8cce97f19d..a0afddac2a 100644 --- a/assets/common/items/weapons/shield/shield_1.ron +++ b/assets/common/items/weapons/shield/shield_1.ron @@ -6,7 +6,9 @@ ItemDef( kind: Shield, stats: ( equip_time_millis: 400, - power: 1.00), + power: 1.00, + speed: 1.0 + ), ) ), quality: Common, diff --git a/assets/common/items/weapons/staff/amethyst_staff.ron b/assets/common/items/weapons/staff/amethyst_staff.ron index ad6154eda3..f5cbf8dd5b 100644 --- a/assets/common/items/weapons/staff/amethyst_staff.ron +++ b/assets/common/items/weapons/staff/amethyst_staff.ron @@ -6,7 +6,8 @@ ItemDef( kind: Staff, stats: ( equip_time_millis: 300, - power: 1.50 + power: 1.50, + speed: 1.0 ), ) ), diff --git a/assets/common/items/weapons/staff/bone_staff.ron b/assets/common/items/weapons/staff/bone_staff.ron index 07ff390481..95c82f7687 100644 --- a/assets/common/items/weapons/staff/bone_staff.ron +++ b/assets/common/items/weapons/staff/bone_staff.ron @@ -6,7 +6,9 @@ ItemDef( kind: Staff, stats: ( equip_time_millis: 300, - power: 1.00), + power: 1.00, + speed: 1.0 + ), ) ), quality: Common, diff --git a/assets/common/items/weapons/staff/cultist_staff.ron b/assets/common/items/weapons/staff/cultist_staff.ron index 7c0b305a8e..c7c28d3ce6 100644 --- a/assets/common/items/weapons/staff/cultist_staff.ron +++ b/assets/common/items/weapons/staff/cultist_staff.ron @@ -6,7 +6,9 @@ ItemDef( kind: Staff, stats: ( equip_time_millis: 300, - power: 2.00), + power: 2.00, + speed: 1.0 + ), ) ), quality: Epic, diff --git a/assets/common/items/weapons/staff/staff_1.ron b/assets/common/items/weapons/staff/staff_1.ron index 2100624af6..8b3080ec0c 100644 --- a/assets/common/items/weapons/staff/staff_1.ron +++ b/assets/common/items/weapons/staff/staff_1.ron @@ -6,7 +6,9 @@ ItemDef( kind: Staff, stats: ( equip_time_millis: 200, - power: 0.50), + power: 0.50, + speed: 1.0 + ), ) ), quality: Low, diff --git a/assets/common/items/weapons/staff/starter_staff.ron b/assets/common/items/weapons/staff/starter_staff.ron index 9e5ba43552..8fc27aa382 100644 --- a/assets/common/items/weapons/staff/starter_staff.ron +++ b/assets/common/items/weapons/staff/starter_staff.ron @@ -6,7 +6,9 @@ ItemDef( kind: Staff, stats: ( equip_time_millis: 300, - power: 0.50), + power: 0.50, + speed: 1.0 + ), ) ), quality: Low, diff --git a/assets/common/items/weapons/sword/cultist_purp_2h-0.ron b/assets/common/items/weapons/sword/cultist_purp_2h-0.ron index cb3870c4ee..38cff1c841 100644 --- a/assets/common/items/weapons/sword/cultist_purp_2h-0.ron +++ b/assets/common/items/weapons/sword/cultist_purp_2h-0.ron @@ -6,7 +6,9 @@ ItemDef( kind: Sword, stats: ( equip_time_millis: 500, - power: 2.00), + power: 2.00, + speed: 1.0 + ), ) ), quality: Epic, diff --git a/assets/common/items/weapons/sword/greatsword_2h_dam-0.ron b/assets/common/items/weapons/sword/greatsword_2h_dam-0.ron index c106820b69..b154161895 100644 --- a/assets/common/items/weapons/sword/greatsword_2h_dam-0.ron +++ b/assets/common/items/weapons/sword/greatsword_2h_dam-0.ron @@ -6,7 +6,9 @@ ItemDef( kind: Sword, stats: ( equip_time_millis: 500, - power: 0.80), + power: 0.80, + speed: 1.0 + ), ) ), quality: Common, diff --git a/assets/common/items/weapons/sword/greatsword_2h_dam-1.ron b/assets/common/items/weapons/sword/greatsword_2h_dam-1.ron index c106820b69..b154161895 100644 --- a/assets/common/items/weapons/sword/greatsword_2h_dam-1.ron +++ b/assets/common/items/weapons/sword/greatsword_2h_dam-1.ron @@ -6,7 +6,9 @@ ItemDef( kind: Sword, stats: ( equip_time_millis: 500, - power: 0.80), + power: 0.80, + speed: 1.0 + ), ) ), quality: Common, diff --git a/assets/common/items/weapons/sword/greatsword_2h_dam-2.ron b/assets/common/items/weapons/sword/greatsword_2h_dam-2.ron index c106820b69..b154161895 100644 --- a/assets/common/items/weapons/sword/greatsword_2h_dam-2.ron +++ b/assets/common/items/weapons/sword/greatsword_2h_dam-2.ron @@ -6,7 +6,9 @@ ItemDef( kind: Sword, stats: ( equip_time_millis: 500, - power: 0.80), + power: 0.80, + speed: 1.0 + ), ) ), quality: Common, diff --git a/assets/common/items/weapons/sword/greatsword_2h_fine-0.ron b/assets/common/items/weapons/sword/greatsword_2h_fine-0.ron index dbf3540f99..e6628d0292 100644 --- a/assets/common/items/weapons/sword/greatsword_2h_fine-0.ron +++ b/assets/common/items/weapons/sword/greatsword_2h_fine-0.ron @@ -6,7 +6,8 @@ ItemDef( kind: Sword, stats: ( equip_time_millis: 500, - power: 1.40 + power: 1.40, + speed: 1.0 ), ) ), diff --git a/assets/common/items/weapons/sword/greatsword_2h_fine-1.ron b/assets/common/items/weapons/sword/greatsword_2h_fine-1.ron index dbf3540f99..e6628d0292 100644 --- a/assets/common/items/weapons/sword/greatsword_2h_fine-1.ron +++ b/assets/common/items/weapons/sword/greatsword_2h_fine-1.ron @@ -6,7 +6,8 @@ ItemDef( kind: Sword, stats: ( equip_time_millis: 500, - power: 1.40 + power: 1.40, + speed: 1.0 ), ) ), diff --git a/assets/common/items/weapons/sword/greatsword_2h_fine-2.ron b/assets/common/items/weapons/sword/greatsword_2h_fine-2.ron index dbf3540f99..e6628d0292 100644 --- a/assets/common/items/weapons/sword/greatsword_2h_fine-2.ron +++ b/assets/common/items/weapons/sword/greatsword_2h_fine-2.ron @@ -6,7 +6,8 @@ ItemDef( kind: Sword, stats: ( equip_time_millis: 500, - power: 1.40 + power: 1.40, + speed: 1.0 ), ) ), diff --git a/assets/common/items/weapons/sword/greatsword_2h_orn-0.ron b/assets/common/items/weapons/sword/greatsword_2h_orn-0.ron index 3429a7216e..9f30811969 100644 --- a/assets/common/items/weapons/sword/greatsword_2h_orn-0.ron +++ b/assets/common/items/weapons/sword/greatsword_2h_orn-0.ron @@ -6,7 +6,8 @@ ItemDef( kind: Sword, stats: ( equip_time_millis: 500, - power: 1.70 + power: 1.70, + speed: 1.0 ), ) ), diff --git a/assets/common/items/weapons/sword/greatsword_2h_orn-1.ron b/assets/common/items/weapons/sword/greatsword_2h_orn-1.ron index 3429a7216e..9f30811969 100644 --- a/assets/common/items/weapons/sword/greatsword_2h_orn-1.ron +++ b/assets/common/items/weapons/sword/greatsword_2h_orn-1.ron @@ -6,7 +6,8 @@ ItemDef( kind: Sword, stats: ( equip_time_millis: 500, - power: 1.70 + power: 1.70, + speed: 1.0 ), ) ), diff --git a/assets/common/items/weapons/sword/greatsword_2h_orn-2.ron b/assets/common/items/weapons/sword/greatsword_2h_orn-2.ron index 3429a7216e..9f30811969 100644 --- a/assets/common/items/weapons/sword/greatsword_2h_orn-2.ron +++ b/assets/common/items/weapons/sword/greatsword_2h_orn-2.ron @@ -6,7 +6,8 @@ ItemDef( kind: Sword, stats: ( equip_time_millis: 500, - power: 1.70 + power: 1.70, + speed: 1.0 ), ) ), diff --git a/assets/common/items/weapons/sword/greatsword_2h_simple-0.ron b/assets/common/items/weapons/sword/greatsword_2h_simple-0.ron index b2f8c404b3..1c23454b2e 100644 --- a/assets/common/items/weapons/sword/greatsword_2h_simple-0.ron +++ b/assets/common/items/weapons/sword/greatsword_2h_simple-0.ron @@ -6,7 +6,9 @@ ItemDef( kind: Sword, stats: ( equip_time_millis: 500, - power: 1.10), + power: 1.10, + speed: 1.0 + ), ) ), quality: Common, diff --git a/assets/common/items/weapons/sword/greatsword_2h_simple-1.ron b/assets/common/items/weapons/sword/greatsword_2h_simple-1.ron index b2f8c404b3..1c23454b2e 100644 --- a/assets/common/items/weapons/sword/greatsword_2h_simple-1.ron +++ b/assets/common/items/weapons/sword/greatsword_2h_simple-1.ron @@ -6,7 +6,9 @@ ItemDef( kind: Sword, stats: ( equip_time_millis: 500, - power: 1.10), + power: 1.10, + speed: 1.0 + ), ) ), quality: Common, diff --git a/assets/common/items/weapons/sword/greatsword_2h_simple-2.ron b/assets/common/items/weapons/sword/greatsword_2h_simple-2.ron index b2f8c404b3..1c23454b2e 100644 --- a/assets/common/items/weapons/sword/greatsword_2h_simple-2.ron +++ b/assets/common/items/weapons/sword/greatsword_2h_simple-2.ron @@ -6,7 +6,9 @@ ItemDef( kind: Sword, stats: ( equip_time_millis: 500, - power: 1.10), + power: 1.10, + speed: 1.0 + ), ) ), quality: Common, diff --git a/assets/common/items/weapons/sword/long_2h_dam-0.ron b/assets/common/items/weapons/sword/long_2h_dam-0.ron index c7cb292ceb..50617f1647 100644 --- a/assets/common/items/weapons/sword/long_2h_dam-0.ron +++ b/assets/common/items/weapons/sword/long_2h_dam-0.ron @@ -6,7 +6,9 @@ ItemDef( kind: Sword, stats: ( equip_time_millis: 500, - power: 0.60), + power: 0.60, + speed: 1.0 + ), ) ), quality: Low, diff --git a/assets/common/items/weapons/sword/long_2h_dam-1.ron b/assets/common/items/weapons/sword/long_2h_dam-1.ron index c7cb292ceb..50617f1647 100644 --- a/assets/common/items/weapons/sword/long_2h_dam-1.ron +++ b/assets/common/items/weapons/sword/long_2h_dam-1.ron @@ -6,7 +6,9 @@ ItemDef( kind: Sword, stats: ( equip_time_millis: 500, - power: 0.60), + power: 0.60, + speed: 1.0 + ), ) ), quality: Low, diff --git a/assets/common/items/weapons/sword/long_2h_dam-2.ron b/assets/common/items/weapons/sword/long_2h_dam-2.ron index c7cb292ceb..50617f1647 100644 --- a/assets/common/items/weapons/sword/long_2h_dam-2.ron +++ b/assets/common/items/weapons/sword/long_2h_dam-2.ron @@ -6,7 +6,9 @@ ItemDef( kind: Sword, stats: ( equip_time_millis: 500, - power: 0.60), + power: 0.60, + speed: 1.0 + ), ) ), quality: Low, diff --git a/assets/common/items/weapons/sword/long_2h_dam-3.ron b/assets/common/items/weapons/sword/long_2h_dam-3.ron index c7cb292ceb..50617f1647 100644 --- a/assets/common/items/weapons/sword/long_2h_dam-3.ron +++ b/assets/common/items/weapons/sword/long_2h_dam-3.ron @@ -6,7 +6,9 @@ ItemDef( kind: Sword, stats: ( equip_time_millis: 500, - power: 0.60), + power: 0.60, + speed: 1.0 + ), ) ), quality: Low, diff --git a/assets/common/items/weapons/sword/long_2h_dam-4.ron b/assets/common/items/weapons/sword/long_2h_dam-4.ron index c7cb292ceb..50617f1647 100644 --- a/assets/common/items/weapons/sword/long_2h_dam-4.ron +++ b/assets/common/items/weapons/sword/long_2h_dam-4.ron @@ -6,7 +6,9 @@ ItemDef( kind: Sword, stats: ( equip_time_millis: 500, - power: 0.60), + power: 0.60, + speed: 1.0 + ), ) ), quality: Low, diff --git a/assets/common/items/weapons/sword/long_2h_dam-5.ron b/assets/common/items/weapons/sword/long_2h_dam-5.ron index c7cb292ceb..50617f1647 100644 --- a/assets/common/items/weapons/sword/long_2h_dam-5.ron +++ b/assets/common/items/weapons/sword/long_2h_dam-5.ron @@ -6,7 +6,9 @@ ItemDef( kind: Sword, stats: ( equip_time_millis: 500, - power: 0.60), + power: 0.60, + speed: 1.0 + ), ) ), quality: Low, diff --git a/assets/common/items/weapons/sword/long_2h_fine-0.ron b/assets/common/items/weapons/sword/long_2h_fine-0.ron index 2dfab19680..ca339b1ea7 100644 --- a/assets/common/items/weapons/sword/long_2h_fine-0.ron +++ b/assets/common/items/weapons/sword/long_2h_fine-0.ron @@ -6,7 +6,8 @@ ItemDef( kind: Sword, stats: ( equip_time_millis: 500, - power: 1.20 + power: 1.20, + speed: 1.0 ), ) ), diff --git a/assets/common/items/weapons/sword/long_2h_fine-1.ron b/assets/common/items/weapons/sword/long_2h_fine-1.ron index 2dfab19680..ca339b1ea7 100644 --- a/assets/common/items/weapons/sword/long_2h_fine-1.ron +++ b/assets/common/items/weapons/sword/long_2h_fine-1.ron @@ -6,7 +6,8 @@ ItemDef( kind: Sword, stats: ( equip_time_millis: 500, - power: 1.20 + power: 1.20, + speed: 1.0 ), ) ), diff --git a/assets/common/items/weapons/sword/long_2h_fine-2.ron b/assets/common/items/weapons/sword/long_2h_fine-2.ron index 2dfab19680..ca339b1ea7 100644 --- a/assets/common/items/weapons/sword/long_2h_fine-2.ron +++ b/assets/common/items/weapons/sword/long_2h_fine-2.ron @@ -6,7 +6,8 @@ ItemDef( kind: Sword, stats: ( equip_time_millis: 500, - power: 1.20 + power: 1.20, + speed: 1.0 ), ) ), diff --git a/assets/common/items/weapons/sword/long_2h_fine-3.ron b/assets/common/items/weapons/sword/long_2h_fine-3.ron index 2dfab19680..ca339b1ea7 100644 --- a/assets/common/items/weapons/sword/long_2h_fine-3.ron +++ b/assets/common/items/weapons/sword/long_2h_fine-3.ron @@ -6,7 +6,8 @@ ItemDef( kind: Sword, stats: ( equip_time_millis: 500, - power: 1.20 + power: 1.20, + speed: 1.0 ), ) ), diff --git a/assets/common/items/weapons/sword/long_2h_fine-4.ron b/assets/common/items/weapons/sword/long_2h_fine-4.ron index 2dfab19680..ca339b1ea7 100644 --- a/assets/common/items/weapons/sword/long_2h_fine-4.ron +++ b/assets/common/items/weapons/sword/long_2h_fine-4.ron @@ -6,7 +6,8 @@ ItemDef( kind: Sword, stats: ( equip_time_millis: 500, - power: 1.20 + power: 1.20, + speed: 1.0 ), ) ), diff --git a/assets/common/items/weapons/sword/long_2h_fine-5.ron b/assets/common/items/weapons/sword/long_2h_fine-5.ron index 2dfab19680..ca339b1ea7 100644 --- a/assets/common/items/weapons/sword/long_2h_fine-5.ron +++ b/assets/common/items/weapons/sword/long_2h_fine-5.ron @@ -6,7 +6,8 @@ ItemDef( kind: Sword, stats: ( equip_time_millis: 500, - power: 1.20 + power: 1.20, + speed: 1.0 ), ) ), diff --git a/assets/common/items/weapons/sword/long_2h_orn-0.ron b/assets/common/items/weapons/sword/long_2h_orn-0.ron index 3c07aea767..30f9362ce5 100644 --- a/assets/common/items/weapons/sword/long_2h_orn-0.ron +++ b/assets/common/items/weapons/sword/long_2h_orn-0.ron @@ -6,7 +6,8 @@ ItemDef( kind: Sword, stats: ( equip_time_millis: 500, - power: 1.50 + power: 1.50, + speed: 1.0 ), ) ), diff --git a/assets/common/items/weapons/sword/long_2h_orn-1.ron b/assets/common/items/weapons/sword/long_2h_orn-1.ron index 3c07aea767..30f9362ce5 100644 --- a/assets/common/items/weapons/sword/long_2h_orn-1.ron +++ b/assets/common/items/weapons/sword/long_2h_orn-1.ron @@ -6,7 +6,8 @@ ItemDef( kind: Sword, stats: ( equip_time_millis: 500, - power: 1.50 + power: 1.50, + speed: 1.0 ), ) ), diff --git a/assets/common/items/weapons/sword/long_2h_orn-2.ron b/assets/common/items/weapons/sword/long_2h_orn-2.ron index 3c07aea767..30f9362ce5 100644 --- a/assets/common/items/weapons/sword/long_2h_orn-2.ron +++ b/assets/common/items/weapons/sword/long_2h_orn-2.ron @@ -6,7 +6,8 @@ ItemDef( kind: Sword, stats: ( equip_time_millis: 500, - power: 1.50 + power: 1.50, + speed: 1.0 ), ) ), diff --git a/assets/common/items/weapons/sword/long_2h_orn-3.ron b/assets/common/items/weapons/sword/long_2h_orn-3.ron index 3c07aea767..30f9362ce5 100644 --- a/assets/common/items/weapons/sword/long_2h_orn-3.ron +++ b/assets/common/items/weapons/sword/long_2h_orn-3.ron @@ -6,7 +6,8 @@ ItemDef( kind: Sword, stats: ( equip_time_millis: 500, - power: 1.50 + power: 1.50, + speed: 1.0 ), ) ), diff --git a/assets/common/items/weapons/sword/long_2h_orn-4.ron b/assets/common/items/weapons/sword/long_2h_orn-4.ron index 3c07aea767..30f9362ce5 100644 --- a/assets/common/items/weapons/sword/long_2h_orn-4.ron +++ b/assets/common/items/weapons/sword/long_2h_orn-4.ron @@ -6,7 +6,8 @@ ItemDef( kind: Sword, stats: ( equip_time_millis: 500, - power: 1.50 + power: 1.50, + speed: 1.0 ), ) ), diff --git a/assets/common/items/weapons/sword/long_2h_orn-5.ron b/assets/common/items/weapons/sword/long_2h_orn-5.ron index 3c07aea767..30f9362ce5 100644 --- a/assets/common/items/weapons/sword/long_2h_orn-5.ron +++ b/assets/common/items/weapons/sword/long_2h_orn-5.ron @@ -6,7 +6,8 @@ ItemDef( kind: Sword, stats: ( equip_time_millis: 500, - power: 1.50 + power: 1.50, + speed: 1.0 ), ) ), diff --git a/assets/common/items/weapons/sword/long_2h_simple-0.ron b/assets/common/items/weapons/sword/long_2h_simple-0.ron index 93fa46aba2..834db5e8f9 100644 --- a/assets/common/items/weapons/sword/long_2h_simple-0.ron +++ b/assets/common/items/weapons/sword/long_2h_simple-0.ron @@ -6,7 +6,9 @@ ItemDef( kind: Sword, stats: ( equip_time_millis: 500, - power: 0.90), + power: 0.90, + speed: 1.0 + ), ) ), quality: Common, diff --git a/assets/common/items/weapons/sword/long_2h_simple-1.ron b/assets/common/items/weapons/sword/long_2h_simple-1.ron index 93fa46aba2..834db5e8f9 100644 --- a/assets/common/items/weapons/sword/long_2h_simple-1.ron +++ b/assets/common/items/weapons/sword/long_2h_simple-1.ron @@ -6,7 +6,9 @@ ItemDef( kind: Sword, stats: ( equip_time_millis: 500, - power: 0.90), + power: 0.90, + speed: 1.0 + ), ) ), quality: Common, diff --git a/assets/common/items/weapons/sword/long_2h_simple-2.ron b/assets/common/items/weapons/sword/long_2h_simple-2.ron index 93fa46aba2..834db5e8f9 100644 --- a/assets/common/items/weapons/sword/long_2h_simple-2.ron +++ b/assets/common/items/weapons/sword/long_2h_simple-2.ron @@ -6,7 +6,9 @@ ItemDef( kind: Sword, stats: ( equip_time_millis: 500, - power: 0.90), + power: 0.90, + speed: 1.0 + ), ) ), quality: Common, diff --git a/assets/common/items/weapons/sword/long_2h_simple-3.ron b/assets/common/items/weapons/sword/long_2h_simple-3.ron index 93fa46aba2..834db5e8f9 100644 --- a/assets/common/items/weapons/sword/long_2h_simple-3.ron +++ b/assets/common/items/weapons/sword/long_2h_simple-3.ron @@ -6,7 +6,9 @@ ItemDef( kind: Sword, stats: ( equip_time_millis: 500, - power: 0.90), + power: 0.90, + speed: 1.0 + ), ) ), quality: Common, diff --git a/assets/common/items/weapons/sword/long_2h_simple-4.ron b/assets/common/items/weapons/sword/long_2h_simple-4.ron index 93fa46aba2..834db5e8f9 100644 --- a/assets/common/items/weapons/sword/long_2h_simple-4.ron +++ b/assets/common/items/weapons/sword/long_2h_simple-4.ron @@ -6,7 +6,9 @@ ItemDef( kind: Sword, stats: ( equip_time_millis: 500, - power: 0.90), + power: 0.90, + speed: 1.0 + ), ) ), quality: Common, diff --git a/assets/common/items/weapons/sword/long_2h_simple-5.ron b/assets/common/items/weapons/sword/long_2h_simple-5.ron index 93fa46aba2..834db5e8f9 100644 --- a/assets/common/items/weapons/sword/long_2h_simple-5.ron +++ b/assets/common/items/weapons/sword/long_2h_simple-5.ron @@ -6,7 +6,9 @@ ItemDef( kind: Sword, stats: ( equip_time_millis: 500, - power: 0.90), + power: 0.90, + speed: 1.0 + ), ) ), quality: Common, diff --git a/assets/common/items/weapons/sword/short_sword_0.ron b/assets/common/items/weapons/sword/short_sword_0.ron index caeb1a11a9..32322d16f6 100644 --- a/assets/common/items/weapons/sword/short_sword_0.ron +++ b/assets/common/items/weapons/sword/short_sword_0.ron @@ -6,7 +6,9 @@ ItemDef( kind: Sword, stats: ( equip_time_millis: 400, - power: 0.75), + power: 0.75, + speed: 1.0 + ), ) ), quality: Common, diff --git a/assets/common/items/weapons/sword/starter_sword.ron b/assets/common/items/weapons/sword/starter_sword.ron index 8e236bb9d0..0e4f7bed26 100644 --- a/assets/common/items/weapons/sword/starter_sword.ron +++ b/assets/common/items/weapons/sword/starter_sword.ron @@ -6,7 +6,9 @@ ItemDef( kind: Sword, stats: ( equip_time_millis: 300, - power: 0.50), + power: 0.50, + speed: 1.0 + ), ) ), quality: Low, diff --git a/assets/common/items/weapons/sword/wood_sword.ron b/assets/common/items/weapons/sword/wood_sword.ron index d8d7bbe855..c061ac0ecb 100644 --- a/assets/common/items/weapons/sword/wood_sword.ron +++ b/assets/common/items/weapons/sword/wood_sword.ron @@ -6,7 +6,9 @@ ItemDef( kind: Sword, stats: ( equip_time_millis: 400, - power: 0.8), + power: 0.8, + speed: 1.0 + ), ) ), quality: Moderate, diff --git a/assets/common/items/weapons/sword/zweihander_sword_0.ron b/assets/common/items/weapons/sword/zweihander_sword_0.ron index 36d04c0a2e..4570f5f508 100644 --- a/assets/common/items/weapons/sword/zweihander_sword_0.ron +++ b/assets/common/items/weapons/sword/zweihander_sword_0.ron @@ -6,7 +6,8 @@ ItemDef( kind: Sword, stats: ( equip_time_millis: 500, - power: 1.50 + power: 1.50, + speed: 1.0 ), ) ), diff --git a/assets/common/items/weapons/tool/broom.ron b/assets/common/items/weapons/tool/broom.ron index f4f93d1f2d..fce5d07407 100644 --- a/assets/common/items/weapons/tool/broom.ron +++ b/assets/common/items/weapons/tool/broom.ron @@ -6,7 +6,9 @@ ItemDef( kind: Farming, stats: ( equip_time_millis: 400, - power: 1.00), + power: 1.00, + speed: 1.0 + ), ) ), quality: Common, diff --git a/assets/common/items/weapons/tool/fishing_rod.ron b/assets/common/items/weapons/tool/fishing_rod.ron index 8d48c43265..da171bf0df 100644 --- a/assets/common/items/weapons/tool/fishing_rod.ron +++ b/assets/common/items/weapons/tool/fishing_rod.ron @@ -6,7 +6,9 @@ ItemDef( kind: Farming, stats: ( equip_time_millis: 400, - power: 1.00), + power: 1.00, + speed: 1.0 + ), ) ), quality: Common, diff --git a/assets/common/items/weapons/tool/hoe.ron b/assets/common/items/weapons/tool/hoe.ron index cabc0521bf..2d2af04949 100644 --- a/assets/common/items/weapons/tool/hoe.ron +++ b/assets/common/items/weapons/tool/hoe.ron @@ -6,7 +6,9 @@ ItemDef( kind: Farming, stats: ( equip_time_millis: 400, - power: 1.00), + power: 1.00, + speed: 1.0 + ), ) ), quality: Common, diff --git a/assets/common/items/weapons/tool/pickaxe.ron b/assets/common/items/weapons/tool/pickaxe.ron index f13c1047af..3215e311d1 100644 --- a/assets/common/items/weapons/tool/pickaxe.ron +++ b/assets/common/items/weapons/tool/pickaxe.ron @@ -6,7 +6,9 @@ ItemDef( kind: Farming, stats: ( equip_time_millis: 400, - power: 1.00), + power: 1.00, + speed: 1.0 + ), ) ), quality: Common, diff --git a/assets/common/items/weapons/tool/pitchfork.ron b/assets/common/items/weapons/tool/pitchfork.ron index 8e1f9d0666..8f9c33a851 100644 --- a/assets/common/items/weapons/tool/pitchfork.ron +++ b/assets/common/items/weapons/tool/pitchfork.ron @@ -6,7 +6,9 @@ ItemDef( kind: Farming, stats: ( equip_time_millis: 400, - power: 1.00), + power: 1.00, + speed: 1.0 + ), ) ), quality: Common, diff --git a/assets/common/items/weapons/tool/rake.ron b/assets/common/items/weapons/tool/rake.ron index ddeed160a0..12357d1d60 100644 --- a/assets/common/items/weapons/tool/rake.ron +++ b/assets/common/items/weapons/tool/rake.ron @@ -6,7 +6,9 @@ ItemDef( kind: Farming, stats: ( equip_time_millis: 400, - power: 1.00), + power: 1.00, + speed: 1.0 + ), ) ), quality: Common, diff --git a/assets/common/items/weapons/tool/shovel-0.ron b/assets/common/items/weapons/tool/shovel-0.ron index c32d3583fd..55c06b76b9 100644 --- a/assets/common/items/weapons/tool/shovel-0.ron +++ b/assets/common/items/weapons/tool/shovel-0.ron @@ -6,7 +6,9 @@ ItemDef( kind: Farming, stats: ( equip_time_millis: 400, - power: 1.00), + power: 1.00, + speed: 1.0 + ), ) ), quality: Common, diff --git a/assets/common/items/weapons/tool/shovel-1.ron b/assets/common/items/weapons/tool/shovel-1.ron index eeedd4eda2..a9b0a19c53 100644 --- a/assets/common/items/weapons/tool/shovel-1.ron +++ b/assets/common/items/weapons/tool/shovel-1.ron @@ -6,7 +6,9 @@ ItemDef( kind: Farming, stats: ( equip_time_millis: 400, - power: 1.00), + power: 1.00, + speed: 1.0 + ), ) ), quality: Common, diff --git a/common/src/comp/inventory/item/tool.rs b/common/src/comp/inventory/item/tool.rs index 967097e0db..b56032b2e6 100644 --- a/common/src/comp/inventory/item/tool.rs +++ b/common/src/comp/inventory/item/tool.rs @@ -59,6 +59,7 @@ pub enum Hands { pub struct Stats { equip_time_millis: u32, power: f32, + speed: f32, } #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] @@ -75,6 +76,7 @@ impl Tool { stats: Stats { equip_time_millis: 0, power: 1.00, + speed: 1.00, }, } } @@ -82,6 +84,8 @@ impl Tool { // Keep power between 0.5 and 2.00 pub fn base_power(&self) -> f32 { self.stats.power } + pub fn base_speed(&self) -> f32 { self.stats.speed } + pub fn equip_time(&self) -> Duration { Duration::from_millis(self.stats.equip_time_millis as u64) } @@ -103,9 +107,12 @@ impl Tool { knockback: 10.0, range: 4.0, angle: 30.0, - base_buildup_duration: Duration::from_millis(350), - base_swing_duration: Duration::from_millis(100), - base_recover_duration: Duration::from_millis(400), + base_buildup_duration: Duration::from_millis(350) + .div_f32(self.base_speed()), + base_swing_duration: Duration::from_millis(100) + .div_f32(self.base_speed()), + base_recover_duration: Duration::from_millis(400) + .div_f32(self.base_speed()), forward_movement: 0.5, }, combo_melee::Stage { @@ -116,9 +123,12 @@ impl Tool { knockback: 12.0, range: 3.5, angle: 180.0, - base_buildup_duration: Duration::from_millis(400), - base_swing_duration: Duration::from_millis(600), - base_recover_duration: Duration::from_millis(400), + base_buildup_duration: Duration::from_millis(400) + .div_f32(self.base_speed()), + base_swing_duration: Duration::from_millis(600) + .div_f32(self.base_speed()), + base_recover_duration: Duration::from_millis(400) + .div_f32(self.base_speed()), forward_movement: 0.0, }, combo_melee::Stage { @@ -129,9 +139,12 @@ impl Tool { knockback: 14.0, range: 6.0, angle: 10.0, - base_buildup_duration: Duration::from_millis(500), - base_swing_duration: Duration::from_millis(200), - base_recover_duration: Duration::from_millis(300), + base_buildup_duration: Duration::from_millis(500) + .div_f32(self.base_speed()), + base_swing_duration: Duration::from_millis(200) + .div_f32(self.base_speed()), + base_recover_duration: Duration::from_millis(300) + .div_f32(self.base_speed()), forward_movement: 1.2, }, ], @@ -152,17 +165,17 @@ impl Tool { angle: 45.0, energy_drain: 500, forward_speed: 4.0, - buildup_duration: Duration::from_millis(250), - charge_duration: Duration::from_millis(600), - swing_duration: Duration::from_millis(100), - recover_duration: Duration::from_millis(500), + buildup_duration: Duration::from_millis(250).div_f32(self.base_speed()), + charge_duration: Duration::from_millis(600).div_f32(self.base_speed()), + swing_duration: Duration::from_millis(100).div_f32(self.base_speed()), + recover_duration: Duration::from_millis(500).div_f32(self.base_speed()), infinite_charge: true, is_interruptible: true, }, SpinMelee { - buildup_duration: Duration::from_millis(750), - swing_duration: Duration::from_millis(500), - recover_duration: Duration::from_millis(500), + buildup_duration: Duration::from_millis(750).div_f32(self.base_speed()), + swing_duration: Duration::from_millis(500).div_f32(self.base_speed()), + recover_duration: Duration::from_millis(500).div_f32(self.base_speed()), base_damage: (140.0 * self.base_power()) as u32, knockback: 10.0, range: 3.5, @@ -185,9 +198,9 @@ impl Tool { knockback: 8.0, range: 3.5, angle: 50.0, - base_buildup_duration: Duration::from_millis(350), - base_swing_duration: Duration::from_millis(75), - base_recover_duration: Duration::from_millis(400), + base_buildup_duration: Duration::from_millis(350).div_f32(self.base_speed()), + base_swing_duration: Duration::from_millis(75).div_f32(self.base_speed()), + base_recover_duration: Duration::from_millis(400).div_f32(self.base_speed()), forward_movement: 0.5, }, combo_melee::Stage { @@ -198,9 +211,9 @@ impl Tool { knockback: 12.0, range: 3.5, angle: 30.0, - base_buildup_duration: Duration::from_millis(500), - base_swing_duration: Duration::from_millis(100), - base_recover_duration: Duration::from_millis(500), + base_buildup_duration: Duration::from_millis(500).div_f32(self.base_speed()), + base_swing_duration: Duration::from_millis(100).div_f32(self.base_speed()), + base_recover_duration: Duration::from_millis(500).div_f32(self.base_speed()), forward_movement: 0.25, }, ], @@ -212,9 +225,9 @@ impl Tool { is_interruptible: false, }, SpinMelee { - buildup_duration: Duration::from_millis(100), - swing_duration: Duration::from_millis(250), - recover_duration: Duration::from_millis(100), + buildup_duration: Duration::from_millis(100).div_f32(self.base_speed()), + swing_duration: Duration::from_millis(250).div_f32(self.base_speed()), + recover_duration: Duration::from_millis(100).div_f32(self.base_speed()), base_damage: (60.0 * self.base_power()) as u32, knockback: 0.0, range: 3.5, @@ -227,10 +240,10 @@ impl Tool { }, LeapMelee { energy_cost: 450, - buildup_duration: Duration::from_millis(200), - movement_duration: Duration::from_millis(200), - swing_duration: Duration::from_millis(200), - recover_duration: Duration::from_millis(200), + buildup_duration: Duration::from_millis(200).div_f32(self.base_speed()), + movement_duration: Duration::from_millis(200).div_f32(self.base_speed()), + swing_duration: Duration::from_millis(200).div_f32(self.base_speed()), + recover_duration: Duration::from_millis(200).div_f32(self.base_speed()), base_damage: (240.0 * self.base_power()) as u32, knockback: 12.0, range: 4.5, @@ -249,9 +262,9 @@ impl Tool { knockback: 0.0, range: 3.5, angle: 20.0, - base_buildup_duration: Duration::from_millis(600), - base_swing_duration: Duration::from_millis(60), - base_recover_duration: Duration::from_millis(300), + base_buildup_duration: Duration::from_millis(600).div_f32(self.base_speed()), + base_swing_duration: Duration::from_millis(60).div_f32(self.base_speed()), + base_recover_duration: Duration::from_millis(300).div_f32(self.base_speed()), forward_movement: 0.0, }], initial_energy_gain: 0, @@ -270,16 +283,16 @@ impl Tool { max_knockback: 60.0, range: 3.5, max_angle: 30.0, - charge_duration: Duration::from_millis(1200), - swing_duration: Duration::from_millis(200), - recover_duration: Duration::from_millis(300), + charge_duration: Duration::from_millis(1200).div_f32(self.base_speed()), + swing_duration: Duration::from_millis(200).div_f32(self.base_speed()), + recover_duration: Duration::from_millis(300).div_f32(self.base_speed()), }, LeapMelee { energy_cost: 700, - buildup_duration: Duration::from_millis(100), - movement_duration: Duration::from_millis(800), - swing_duration: Duration::from_millis(150), - recover_duration: Duration::from_millis(200), + buildup_duration: Duration::from_millis(100).div_f32(self.base_speed()), + movement_duration: Duration::from_millis(800).div_f32(self.base_speed()), + swing_duration: Duration::from_millis(150).div_f32(self.base_speed()), + recover_duration: Duration::from_millis(200).div_f32(self.base_speed()), base_damage: (240.0 * self.base_power()) as u32, knockback: 25.0, range: 4.5, @@ -290,9 +303,9 @@ impl Tool { ], Farming => vec![BasicMelee { energy_cost: 1, - buildup_duration: Duration::from_millis(600), - swing_duration: Duration::from_millis(100), - recover_duration: Duration::from_millis(150), + buildup_duration: Duration::from_millis(600).div_f32(self.base_speed()), + swing_duration: Duration::from_millis(100).div_f32(self.base_speed()), + recover_duration: Duration::from_millis(150).div_f32(self.base_speed()), base_damage: (50.0 * self.base_power()) as u32, knockback: 0.0, range: 3.5, @@ -301,8 +314,8 @@ impl Tool { Bow => vec![ BasicRanged { energy_cost: 0, - buildup_duration: Duration::from_millis(200), - recover_duration: Duration::from_millis(300), + buildup_duration: Duration::from_millis(200).div_f32(self.base_speed()), + recover_duration: Duration::from_millis(300).div_f32(self.base_speed()), projectile: Projectile { hit_solid: vec![projectile::Effect::Stick], hit_entity: vec![ @@ -343,9 +356,9 @@ impl Tool { max_damage: (200.0 * self.base_power()) as u32, initial_knockback: 10.0, max_knockback: 20.0, - buildup_duration: Duration::from_millis(100), - charge_duration: Duration::from_millis(1500), - recover_duration: Duration::from_millis(500), + buildup_duration: Duration::from_millis(100).div_f32(self.base_speed()), + charge_duration: Duration::from_millis(1500).div_f32(self.base_speed()), + recover_duration: Duration::from_millis(500).div_f32(self.base_speed()), projectile_body: Body::Object(object::Body::MultiArrow), projectile_light: None, projectile_gravity: Some(Gravity(0.2)), @@ -354,10 +367,10 @@ impl Tool { }, RepeaterRanged { energy_cost: 450, - movement_duration: Duration::from_millis(300), - buildup_duration: Duration::from_millis(200), - shoot_duration: Duration::from_millis(200), - recover_duration: Duration::from_millis(800), + movement_duration: Duration::from_millis(300).div_f32(self.base_speed()), + buildup_duration: Duration::from_millis(200).div_f32(self.base_speed()), + shoot_duration: Duration::from_millis(200).div_f32(self.base_speed()), + recover_duration: Duration::from_millis(800).div_f32(self.base_speed()), leap: Some(5.0), projectile: Projectile { hit_solid: vec![projectile::Effect::Stick], @@ -394,9 +407,9 @@ impl Tool { ], Dagger => vec![BasicMelee { energy_cost: 0, - buildup_duration: Duration::from_millis(100), - swing_duration: Duration::from_millis(100), - recover_duration: Duration::from_millis(300), + buildup_duration: Duration::from_millis(100).div_f32(self.base_speed()), + swing_duration: Duration::from_millis(100).div_f32(self.base_speed()), + recover_duration: Duration::from_millis(300).div_f32(self.base_speed()), base_damage: (50.0 * self.base_power()) as u32, knockback: 0.0, range: 3.5, @@ -404,8 +417,8 @@ impl Tool { }], Sceptre => vec![ BasicBeam { - buildup_duration: Duration::from_millis(250), - recover_duration: Duration::from_millis(250), + buildup_duration: Duration::from_millis(250).div_f32(self.base_speed()), + recover_duration: Duration::from_millis(250).div_f32(self.base_speed()), beam_duration: Duration::from_secs(1), base_hps: (60.0 * self.base_power()) as u32, base_dps: (60.0 * self.base_power()) as u32, @@ -419,8 +432,8 @@ impl Tool { }, BasicRanged { energy_cost: 800, - buildup_duration: Duration::from_millis(800), - recover_duration: Duration::from_millis(50), + buildup_duration: Duration::from_millis(800).div_f32(self.base_speed()), + recover_duration: Duration::from_millis(50).div_f32(self.base_speed()), projectile: Projectile { hit_solid: vec![ projectile::Effect::Explode(Explosion { @@ -485,8 +498,8 @@ impl Tool { Staff => vec![ BasicRanged { energy_cost: 0, - buildup_duration: Duration::from_millis(500), - recover_duration: Duration::from_millis(350), + buildup_duration: Duration::from_millis(500).div_f32(self.base_speed()), + recover_duration: Duration::from_millis(350).div_f32(self.base_speed()), projectile: Projectile { hit_solid: vec![ projectile::Effect::Explode(Explosion { @@ -530,9 +543,9 @@ impl Tool { can_continue: true, }, BasicBeam { - buildup_duration: Duration::from_millis(250), - recover_duration: Duration::from_millis(250), - beam_duration: Duration::from_millis(500), + buildup_duration: Duration::from_millis(250).div_f32(self.base_speed()), + recover_duration: Duration::from_millis(250).div_f32(self.base_speed()), + beam_duration: Duration::from_millis(500).div_f32(self.base_speed()), base_hps: 0, base_dps: (150.0 * self.base_power()) as u32, tick_rate: 3.0, @@ -545,9 +558,9 @@ impl Tool { }, Shockwave { energy_cost: 600, - buildup_duration: Duration::from_millis(700), - swing_duration: Duration::from_millis(100), - recover_duration: Duration::from_millis(300), + buildup_duration: Duration::from_millis(700).div_f32(self.base_speed()), + swing_duration: Duration::from_millis(100).div_f32(self.base_speed()), + recover_duration: Duration::from_millis(300).div_f32(self.base_speed()), damage: (200.0 * self.base_power()) as u32, knockback: Knockback::Away(25.0), shockwave_angle: 360.0, @@ -561,9 +574,9 @@ impl Tool { Shield => vec![ BasicMelee { energy_cost: 0, - buildup_duration: Duration::from_millis(100), - swing_duration: Duration::from_millis(100), - recover_duration: Duration::from_millis(300), + buildup_duration: Duration::from_millis(100).div_f32(self.base_speed()), + swing_duration: Duration::from_millis(100).div_f32(self.base_speed()), + recover_duration: Duration::from_millis(300).div_f32(self.base_speed()), base_damage: (40.0 * self.base_power()) as u32, knockback: 0.0, range: 3.0, @@ -574,9 +587,9 @@ impl Tool { Unique(StoneGolemFist) => vec![ BasicMelee { energy_cost: 0, - buildup_duration: Duration::from_millis(400), - swing_duration: Duration::from_millis(100), - recover_duration: Duration::from_millis(250), + buildup_duration: Duration::from_millis(400).div_f32(self.base_speed()), + swing_duration: Duration::from_millis(100).div_f32(self.base_speed()), + recover_duration: Duration::from_millis(250).div_f32(self.base_speed()), knockback: 25.0, base_damage: 200, range: 5.0, @@ -584,9 +597,9 @@ impl Tool { }, Shockwave { energy_cost: 0, - buildup_duration: Duration::from_millis(500), - swing_duration: Duration::from_millis(200), - recover_duration: Duration::from_millis(800), + buildup_duration: Duration::from_millis(500).div_f32(self.base_speed()), + swing_duration: Duration::from_millis(200).div_f32(self.base_speed()), + recover_duration: Duration::from_millis(800).div_f32(self.base_speed()), damage: 500, knockback: Knockback::TowardsUp(40.0), shockwave_angle: 90.0, @@ -599,9 +612,9 @@ impl Tool { ], Unique(BeastClaws) => vec![BasicMelee { energy_cost: 0, - buildup_duration: Duration::from_millis(250), - swing_duration: Duration::from_millis(250), - recover_duration: Duration::from_millis(250), + buildup_duration: Duration::from_millis(250).div_f32(self.base_speed(), + swing_duration: Duration::from_millis(250).div_f32(self.base_speed(), + recover_duration: Duration::from_millis(250).div_f32(self.base_speed(), knockback: 25.0, base_damage: 200, range: 5.0, @@ -609,17 +622,17 @@ impl Tool { }], Debug => vec![ CharacterAbility::Boost { - movement_duration: Duration::from_millis(50), + movement_duration: Duration::from_millis(50).div_f32(self.base_speed()), only_up: false, }, CharacterAbility::Boost { - movement_duration: Duration::from_millis(50), + movement_duration: Duration::from_millis(50).div_f32(self.base_speed()), only_up: true, }, BasicRanged { energy_cost: 0, buildup_duration: Duration::from_millis(0), - recover_duration: Duration::from_millis(10), + recover_duration: Duration::from_millis(10).div_f32(self.base_speed()), projectile: Projectile { hit_solid: vec![projectile::Effect::Stick], hit_entity: vec![projectile::Effect::Stick, projectile::Effect::Possess], @@ -640,8 +653,8 @@ impl Tool { Empty => vec![BasicMelee { energy_cost: 0, buildup_duration: Duration::from_millis(0), - swing_duration: Duration::from_millis(100), - recover_duration: Duration::from_millis(900), + swing_duration: Duration::from_millis(100).div_f32(self.base_speed()), + recover_duration: Duration::from_millis(900).div_f32(self.base_speed()), base_damage: 20, knockback: 0.0, range: 3.5, diff --git a/voxygen/src/hud/util.rs b/voxygen/src/hud/util.rs index f59a154fcd..aff752e1fc 100644 --- a/voxygen/src/hud/util.rs +++ b/voxygen/src/hud/util.rs @@ -98,19 +98,22 @@ fn tool_desc(tool: &Tool, desc: &str) -> String { ToolKind::Empty => "Empty", }; let power = tool.base_power(); + let speed = tool.base_speed(); if !desc.is_empty() { format!( - "{}\n\nPower: {:0.1}\n\n{}\n\n", + "{}\n\nPower: {:0.1}\n\nSpeed: {:0.1}\n\n{}\n\n", kind, power * 10.0, + speed * 10.0, desc ) } else { format!( - "{}\n\nPower: {:0.1}\n\n", + "{}\n\nPower: {:0.1}\n\nSpeed: {:0.1}\n\n", kind, - power * 10.0 + power * 10.0, + speed * 10.0 ) } }