From be8b12845a590e11d8e2f6e561540adea1485b86 Mon Sep 17 00:00:00 2001 From: Sam Date: Sat, 10 Jul 2021 11:04:12 -0500 Subject: [PATCH] Added buff strength stat to weapons. --- assets/common/abilities/axe/doublestrike.ron | 12 + assets/common/abilities/axe/leap.ron | 6 + assets/common/abilities/axe/spin.ron | 7 +- assets/common/abilities/axesimple/dash.ron | 6 + .../abilities/axesimple/doublestrike.ron | 12 + .../abilities/custom/beastclaws/basic.ron | 7 +- .../custom/birdlargebreathe/triplestrike.ron | 18 + .../custom/birdlargefire/triplestrike.ron | 18 + .../abilities/custom/harvester/scythe.ron | 7 +- .../abilities/custom/minotaur/charge.ron | 6 + .../abilities/custom/minotaur/cleave.ron | 6 + .../common/abilities/custom/tornado/spin.ron | 7 +- .../abilities/custom/yeti/icespikes.ron | 6 + assets/common/abilities/dagger/tempbasic.ron | 7 +- assets/common/abilities/pick/swing.ron | 7 +- assets/common/abilities/spear/dash.ron | 6 + .../common/abilities/spear/doublestrike.ron | 12 + assets/common/abilities/sword/dash.ron | 6 + assets/common/abilities/sword/spin.ron | 7 +- .../common/abilities/sword/triplestrike.ron | 18 + assets/common/abilities/swordsimple/dash.ron | 6 + .../abilities/swordsimple/doublestrike.ron | 12 + .../modular/damage/sword/metal_blade.ron | 1 + assets/common/items/debug/admin_stick.ron | 33 +- assets/common/items/debug/admin_sword.ron | 32 +- .../common/items/debug/velorite_bow_debug.ron | 18 +- .../items/npc_weapons/axe/minotaur_axe.ron | 1 + .../items/npc_weapons/axe/oni_blue_axe.ron | 1 + .../biped_small/adlet/adlet_bow.ron | 1 + .../biped_small/adlet/gnoll_staff.ron | 1 + .../biped_small/adlet/wooden_spear.ron | 1 + .../biped_small/gnarling/adlet_bow.ron | 1 + .../biped_small/gnarling/gnoll_staff.ron | 1 + .../biped_small/gnarling/wooden_spear.ron | 1 + .../biped_small/haniwa/adlet_bow.ron | 1 + .../biped_small/haniwa/gnoll_staff.ron | 1 + .../biped_small/haniwa/wooden_spear.ron | 1 + .../biped_small/myrmidon/adlet_bow.ron | 1 + .../biped_small/myrmidon/gnoll_staff.ron | 1 + .../biped_small/myrmidon/wooden_spear.ron | 1 + .../biped_small/sahagin/adlet_bow.ron | 1 + .../biped_small/sahagin/gnoll_staff.ron | 1 + .../biped_small/sahagin/wooden_spear.ron | 1 + .../npc_weapons/bow/bipedlarge-velorite.ron | 1 + .../items/npc_weapons/bow/saurok_bow.ron | 1 + .../npc_weapons/hammer/bipedlarge-cultist.ron | 1 + .../npc_weapons/hammer/cyclops_hammer.ron | 1 + .../npc_weapons/hammer/harvester_scythe.ron | 1 + .../items/npc_weapons/hammer/ogre_hammer.ron | 1 + .../npc_weapons/hammer/oni_red_hammer.ron | 1 + .../items/npc_weapons/hammer/troll_hammer.ron | 1 + .../npc_weapons/hammer/wendigo_hammer.ron | 1 + .../items/npc_weapons/hammer/yeti_hammer.ron | 1 + .../npc_weapons/staff/bipedlarge-cultist.ron | 1 + .../npc_weapons/staff/mindflayer_staff.ron | 1 + .../items/npc_weapons/staff/ogre_staff.ron | 1 + .../items/npc_weapons/staff/saurok_staff.ron | 1 + .../npc_weapons/sword/bipedlarge-cultist.ron | 1 + .../npc_weapons/sword/dullahan_sword.ron | 1 + .../items/npc_weapons/sword/saurok_sword.ron | 1 + .../common/items/npc_weapons/unique/asp.ron | 1 + .../items/npc_weapons/unique/basilisk.ron | 1 + .../items/npc_weapons/unique/beast_claws.ron | 1 + .../npc_weapons/unique/birdlargebasic.ron | 1 + .../npc_weapons/unique/birdlargebreathe.ron | 1 + .../npc_weapons/unique/birdlargefire.ron | 1 + .../npc_weapons/unique/clay_golem_fist.ron | 1 + .../npc_weapons/unique/haniwa_sentry.ron | 1 + .../common/items/npc_weapons/unique/husk.ron | 1 + .../items/npc_weapons/unique/husk_brute.ron | 1 + .../items/npc_weapons/unique/maneater.ron | 1 + .../items/npc_weapons/unique/quadlowbasic.ron | 1 + .../items/npc_weapons/unique/quadlowbeam.ron | 1 + .../npc_weapons/unique/quadlowbreathe.ron | 1 + .../items/npc_weapons/unique/quadlowquick.ron | 1 + .../items/npc_weapons/unique/quadlowtail.ron | 1 + .../items/npc_weapons/unique/quadmedbasic.ron | 1 + .../npc_weapons/unique/quadmedbasicgentle.ron | 1 + .../npc_weapons/unique/quadmedcharge.ron | 1 + .../items/npc_weapons/unique/quadmedhoof.ron | 1 + .../items/npc_weapons/unique/quadmedjump.ron | 1 + .../items/npc_weapons/unique/quadmedquick.ron | 1 + .../npc_weapons/unique/quadsmallbasic.ron | 1 + .../npc_weapons/unique/stone_golems_fist.ron | 1 + .../npc_weapons/unique/theropodbasic.ron | 1 + .../items/npc_weapons/unique/theropodbird.ron | 1 + .../npc_weapons/unique/theropodcharge.ron | 1 + .../items/npc_weapons/unique/tidal_claws.ron | 1 + .../items/npc_weapons/unique/tidal_totem.ron | 1 + .../items/npc_weapons/unique/tornado.ron | 1 + .../items/npc_weapons/unique/turret.ron | 1 + .../npc_weapons/unique/wendigo_magic.ron | 1 + assets/common/items/tool/craftsman_hammer.ron | 6 +- assets/common/items/tool/pickaxe_steel.ron | 8 +- assets/common/items/tool/pickaxe_stone.ron | 8 +- .../items/weapons/axe/bloodsteel_axe-0.ron | 1 + .../items/weapons/axe/bloodsteel_axe-1.ron | 1 + .../items/weapons/axe/bloodsteel_axe-2.ron | 1 + .../common/items/weapons/axe/bronze_axe-0.ron | 1 + .../common/items/weapons/axe/bronze_axe-1.ron | 1 + .../common/items/weapons/axe/bronze_axe-2.ron | 1 + .../common/items/weapons/axe/cobalt_axe-0.ron | 1 + .../common/items/weapons/axe/cobalt_axe-1.ron | 1 + .../common/items/weapons/axe/iron_axe-0.ron | 1 + .../common/items/weapons/axe/iron_axe-1.ron | 1 + .../common/items/weapons/axe/iron_axe-2.ron | 1 + .../common/items/weapons/axe/iron_axe-3.ron | 1 + .../common/items/weapons/axe/iron_axe-4.ron | 1 + .../common/items/weapons/axe/iron_axe-5.ron | 1 + .../common/items/weapons/axe/iron_axe-6.ron | 1 + .../common/items/weapons/axe/iron_axe-7.ron | 1 + .../common/items/weapons/axe/iron_axe-8.ron | 1 + .../common/items/weapons/axe/iron_axe-9.ron | 1 + .../items/weapons/axe/malachite_axe-0.ron | 1 + assets/common/items/weapons/axe/orc_axe-0.ron | 1 + assets/common/items/weapons/axe/parashu.ron | 1 + .../common/items/weapons/axe/starter_axe.ron | 1 + .../common/items/weapons/axe/steel_axe-0.ron | 1 + .../common/items/weapons/axe/steel_axe-1.ron | 1 + .../common/items/weapons/axe/steel_axe-2.ron | 1 + .../common/items/weapons/axe/steel_axe-3.ron | 1 + .../common/items/weapons/axe/steel_axe-4.ron | 1 + .../common/items/weapons/axe/steel_axe-5.ron | 1 + .../common/items/weapons/axe/steel_axe-6.ron | 1 + .../items/weapons/axe_1h/bloodsteel-0.ron | 1 + .../items/weapons/axe_1h/bloodsteel-1.ron | 1 + .../common/items/weapons/axe_1h/bronze-0.ron | 1 + .../common/items/weapons/axe_1h/bronze-1.ron | 1 + .../common/items/weapons/axe_1h/cobalt-0.ron | 1 + .../common/items/weapons/axe_1h/cobalt-1.ron | 1 + assets/common/items/weapons/axe_1h/iron-0.ron | 1 + assets/common/items/weapons/axe_1h/iron-1.ron | 1 + assets/common/items/weapons/axe_1h/iron-2.ron | 1 + assets/common/items/weapons/axe_1h/iron-3.ron | 1 + .../items/weapons/axe_1h/orichalcum-0.ron | 1 + .../common/items/weapons/axe_1h/steel-0.ron | 1 + .../common/items/weapons/axe_1h/steel-1.ron | 1 + .../common/items/weapons/axe_1h/steel-2.ron | 1 + .../common/items/weapons/axe_1h/stone-0.ron | 1 + .../common/items/weapons/axe_1h/stone-1.ron | 1 + assets/common/items/weapons/axe_1h/wood-0.ron | 1 + assets/common/items/weapons/axe_1h/wood-1.ron | 1 + assets/common/items/weapons/bow/bone-0.ron | 1 + assets/common/items/weapons/bow/bone-1.ron | 1 + assets/common/items/weapons/bow/bone-2.ron | 1 + assets/common/items/weapons/bow/bone-3.ron | 1 + assets/common/items/weapons/bow/eldwood-0.ron | 1 + assets/common/items/weapons/bow/eldwood-1.ron | 1 + assets/common/items/weapons/bow/eldwood-2.ron | 1 + .../common/items/weapons/bow/frostwood-0.ron | 1 + .../common/items/weapons/bow/frostwood-1.ron | 1 + .../common/items/weapons/bow/frostwood-2.ron | 1 + .../common/items/weapons/bow/hardwood-0.ron | 1 + .../common/items/weapons/bow/hardwood-1.ron | 1 + .../common/items/weapons/bow/hardwood-2.ron | 1 + .../common/items/weapons/bow/hardwood-3.ron | 1 + .../common/items/weapons/bow/hardwood-4.ron | 1 + .../common/items/weapons/bow/hardwood-5.ron | 1 + assets/common/items/weapons/bow/metal-0.ron | 1 + assets/common/items/weapons/bow/metal-1.ron | 1 + assets/common/items/weapons/bow/metal-2.ron | 1 + assets/common/items/weapons/bow/metal-3.ron | 1 + assets/common/items/weapons/bow/metal-4.ron | 1 + assets/common/items/weapons/bow/rawwood-0.ron | 1 + assets/common/items/weapons/bow/rawwood-1.ron | 1 + assets/common/items/weapons/bow/sagitta.ron | 1 + assets/common/items/weapons/bow/starter.ron | 1 + assets/common/items/weapons/bow/velorite.ron | 1 + assets/common/items/weapons/bow/wood-0.ron | 1 + assets/common/items/weapons/bow/wood-1.ron | 1 + assets/common/items/weapons/bow/wood-2.ron | 1 + assets/common/items/weapons/bow/wood-3.ron | 1 + assets/common/items/weapons/bow/wood-4.ron | 1 + .../common/items/weapons/dagger/basic_0.ron | 1 + .../common/items/weapons/dagger/cultist_0.ron | 1 + .../items/weapons/dagger/starter_dagger.ron | 1 + assets/common/items/weapons/empty/empty.ron | 1 + .../items/weapons/hammer/bronze_hammer-0.ron | 1 + .../items/weapons/hammer/bronze_hammer-1.ron | 1 + .../items/weapons/hammer/burnt_drumstick.ron | 1 + .../items/weapons/hammer/cobalt_hammer-0.ron | 1 + .../items/weapons/hammer/cobalt_hammer-1.ron | 1 + .../weapons/hammer/cultist_purp_2h-0.ron | 1 + .../items/weapons/hammer/flimsy_hammer.ron | 1 + .../common/items/weapons/hammer/hammer_1.ron | 1 + .../items/weapons/hammer/iron_hammer-0.ron | 1 + .../items/weapons/hammer/iron_hammer-1.ron | 1 + .../items/weapons/hammer/iron_hammer-2.ron | 1 + .../items/weapons/hammer/iron_hammer-3.ron | 1 + .../items/weapons/hammer/iron_hammer-4.ron | 1 + .../items/weapons/hammer/iron_hammer-5.ron | 1 + .../items/weapons/hammer/iron_hammer-6.ron | 1 + .../items/weapons/hammer/iron_hammer-7.ron | 1 + .../items/weapons/hammer/iron_hammer-8.ron | 1 + .../common/items/weapons/hammer/mjolnir.ron | 1 + .../items/weapons/hammer/ramshead_hammer.ron | 1 + .../items/weapons/hammer/runic_hammer.ron | 1 + .../items/weapons/hammer/starter_hammer.ron | 1 + .../items/weapons/hammer/steel_hammer-0.ron | 1 + .../items/weapons/hammer/steel_hammer-1.ron | 1 + .../items/weapons/hammer/steel_hammer-2.ron | 1 + .../items/weapons/hammer/steel_hammer-3.ron | 1 + .../items/weapons/hammer/steel_hammer-4.ron | 1 + .../items/weapons/hammer/steel_hammer-5.ron | 1 + .../items/weapons/hammer/stone_hammer-0.ron | 1 + .../items/weapons/hammer/stone_hammer-1.ron | 1 + .../items/weapons/hammer/stone_hammer-2.ron | 1 + .../items/weapons/hammer/stone_hammer-3.ron | 1 + .../items/weapons/hammer/wood_hammer-0.ron | 1 + .../items/weapons/hammer_1h/bloodsteel-0.ron | 1 + .../items/weapons/hammer_1h/bloodsteel-1.ron | 1 + .../items/weapons/hammer_1h/bronze-0.ron | 1 + .../items/weapons/hammer_1h/bronze-1.ron | 1 + .../items/weapons/hammer_1h/cobalt-0.ron | 1 + .../items/weapons/hammer_1h/cobalt-1.ron | 1 + .../common/items/weapons/hammer_1h/iron-0.ron | 1 + .../common/items/weapons/hammer_1h/iron-1.ron | 1 + .../common/items/weapons/hammer_1h/iron-2.ron | 1 + .../items/weapons/hammer_1h/orichalcum-0.ron | 1 + .../items/weapons/hammer_1h/steel-0.ron | 1 + .../items/weapons/hammer_1h/steel-1.ron | 1 + .../items/weapons/hammer_1h/steel-2.ron | 1 + .../items/weapons/hammer_1h/stone-0.ron | 1 + .../items/weapons/hammer_1h/stone-1.ron | 1 + .../common/items/weapons/hammer_1h/wood-0.ron | 1 + .../common/items/weapons/hammer_1h/wood-1.ron | 1 + .../common/items/weapons/sceptre/amethyst.ron | 1 + .../common/items/weapons/sceptre/caduceus.ron | 1 + .../items/weapons/sceptre/coralline_cane.ron | 1 + .../items/weapons/sceptre/divine_gohei.ron | 1 + .../items/weapons/sceptre/druids_arbor.ron | 1 + .../common/items/weapons/sceptre/emerald.ron | 1 + assets/common/items/weapons/sceptre/fork0.ron | 1 + .../common/items/weapons/sceptre/loops0.ron | 1 + assets/common/items/weapons/sceptre/moon0.ron | 1 + .../items/weapons/sceptre/root_evil.ron | 1 + .../items/weapons/sceptre/root_green0.ron | 1 + .../weapons/sceptre/sceptre_velorite_0.ron | 1 + .../items/weapons/sceptre/staff_nature.ron | 1 + .../items/weapons/sceptre/starter_sceptre.ron | 1 + .../items/weapons/sceptre/totem_green.ron | 1 + .../common/items/weapons/shield/shield_1.ron | 1 + assets/common/items/weapons/staff/aurora.ron | 1 + .../common/items/weapons/staff/bent_fuse.ron | 1 + .../common/items/weapons/staff/bone_staff.ron | 1 + .../items/weapons/staff/crimson_eye.ron | 1 + .../items/weapons/staff/cultist_staff.ron | 1 + .../items/weapons/staff/dragon_tongue.ron | 1 + .../items/weapons/staff/fiery_wishing_rod.ron | 1 + .../items/weapons/staff/flamethrower_0.ron | 1 + .../items/weapons/staff/frostwood_torch.ron | 1 + .../items/weapons/staff/golden_khakkara.ron | 1 + .../common/items/weapons/staff/heated_arm.ron | 1 + .../items/weapons/staff/infused_tower.ron | 1 + .../common/items/weapons/staff/laevateinn.ron | 1 + .../common/items/weapons/staff/lava_rod.ron | 1 + .../common/items/weapons/staff/ley_seeker.ron | 1 + .../common/items/weapons/staff/orc_iron.ron | 1 + assets/common/items/weapons/staff/phoenix.ron | 1 + .../common/items/weapons/staff/ruby_rod.ron | 1 + assets/common/items/weapons/staff/solar.ron | 1 + assets/common/items/weapons/staff/staff_1.ron | 1 + .../items/weapons/staff/starter_staff.ron | 1 + .../items/weapons/sword/bloodsteel-0.ron | 1 + .../items/weapons/sword/bloodsteel-1.ron | 1 + .../items/weapons/sword/bloodsteel-2.ron | 1 + .../common/items/weapons/sword/bronze-0.ron | 1 + .../common/items/weapons/sword/bronze-1.ron | 1 + .../common/items/weapons/sword/bronze-2.ron | 1 + .../common/items/weapons/sword/caladbolg.ron | 1 + .../common/items/weapons/sword/cobalt-0.ron | 1 + .../common/items/weapons/sword/cobalt-1.ron | 1 + .../common/items/weapons/sword/cobalt-2.ron | 1 + .../common/items/weapons/sword/cobalt-3.ron | 1 + assets/common/items/weapons/sword/cultist.ron | 1 + assets/common/items/weapons/sword/frost-0.ron | 1 + assets/common/items/weapons/sword/frost-1.ron | 1 + assets/common/items/weapons/sword/iron-0.ron | 1 + assets/common/items/weapons/sword/iron-1.ron | 1 + assets/common/items/weapons/sword/iron-10.ron | 1 + assets/common/items/weapons/sword/iron-2.ron | 1 + assets/common/items/weapons/sword/iron-3.ron | 1 + assets/common/items/weapons/sword/iron-4.ron | 1 + assets/common/items/weapons/sword/iron-5.ron | 1 + assets/common/items/weapons/sword/iron-6.ron | 1 + assets/common/items/weapons/sword/iron-7.ron | 1 + assets/common/items/weapons/sword/iron-8.ron | 1 + assets/common/items/weapons/sword/iron-9.ron | 1 + assets/common/items/weapons/sword/starter.ron | 1 + assets/common/items/weapons/sword/steel-0.ron | 1 + assets/common/items/weapons/sword/steel-1.ron | 1 + assets/common/items/weapons/sword/steel-2.ron | 1 + assets/common/items/weapons/sword/steel-3.ron | 1 + assets/common/items/weapons/sword/steel-4.ron | 1 + assets/common/items/weapons/sword/steel-5.ron | 1 + assets/common/items/weapons/sword/steel-6.ron | 1 + assets/common/items/weapons/sword/steel-7.ron | 1 + assets/common/items/weapons/sword/steel-8.ron | 1 + assets/common/items/weapons/sword/stone-0.ron | 1 + assets/common/items/weapons/sword/stone-1.ron | 1 + assets/common/items/weapons/sword/stone-2.ron | 1 + assets/common/items/weapons/sword/wood-0.ron | 1 + assets/common/items/weapons/sword/wood-1.ron | 1 + assets/common/items/weapons/sword/wood-2.ron | 1 + .../items/weapons/sword_1h/bloodsteel-0.ron | 1 + .../items/weapons/sword_1h/bloodsteel-1.ron | 1 + .../items/weapons/sword_1h/bloodsteel-2.ron | 1 + .../items/weapons/sword_1h/bronze-0.ron | 1 + .../items/weapons/sword_1h/bronze-1.ron | 1 + .../items/weapons/sword_1h/bronze-2.ron | 1 + .../items/weapons/sword_1h/cobalt-0.ron | 1 + .../items/weapons/sword_1h/cobalt-1.ron | 1 + .../items/weapons/sword_1h/cobalt-2.ron | 1 + .../items/weapons/sword_1h/cobalt-3.ron | 1 + .../common/items/weapons/sword_1h/iron-0.ron | 1 + .../common/items/weapons/sword_1h/iron-1.ron | 1 + .../common/items/weapons/sword_1h/iron-2.ron | 1 + .../common/items/weapons/sword_1h/iron-3.ron | 1 + .../common/items/weapons/sword_1h/iron-4.ron | 1 + .../items/weapons/sword_1h/obsidian-0.ron | 1 + .../items/weapons/sword_1h/orichalcum-0.ron | 1 + .../items/weapons/sword_1h/orichalcum-1.ron | 1 + .../common/items/weapons/sword_1h/steel-0.ron | 1 + .../common/items/weapons/sword_1h/steel-1.ron | 1 + .../common/items/weapons/sword_1h/steel-2.ron | 1 + .../common/items/weapons/sword_1h/steel-3.ron | 1 + assets/common/items/weapons/tool/broom.ron | 1 + .../common/items/weapons/tool/fishing_rod.ron | 1 + assets/common/items/weapons/tool/hoe.ron | 1 + assets/common/items/weapons/tool/pickaxe.ron | 1 + .../common/items/weapons/tool/pitchfork.ron | 1 + assets/common/items/weapons/tool/rake.ron | 1 + assets/common/items/weapons/tool/shovel-0.ron | 1 + assets/common/items/weapons/tool/shovel-1.ron | 1 + assets/common/material_stats_manifest.ron | 7 + common/src/bin/csv_export/main.rs | 64 ++-- common/src/bin/csv_import/main.rs | 326 +++++++++--------- common/src/combat.rs | 21 +- common/src/comp/ability.rs | 89 ++++- common/src/comp/inventory/item/modular.rs | 1 + common/src/comp/inventory/item/tool.rs | 34 +- common/src/comp/projectile.rs | 10 +- common/src/states/basic_melee.rs | 12 +- common/src/states/basic_ranged.rs | 2 + common/src/states/charged_melee.rs | 13 +- common/src/states/charged_ranged.rs | 9 +- common/src/states/combo_melee.rs | 25 +- common/src/states/dash_melee.rs | 22 +- common/src/states/leap_melee.rs | 13 +- common/src/states/repeater_ranged.rs | 2 + common/src/states/shockwave.rs | 7 +- common/src/states/spin_melee.rs | 12 +- common/src/states/utils.rs | 18 + server/src/sys/wiring/dispatch_actions.rs | 2 +- .../audio/sfx/event_mapper/combat/tests.rs | 2 + 355 files changed, 972 insertions(+), 329 deletions(-) diff --git a/assets/common/abilities/axe/doublestrike.ron b/assets/common/abilities/axe/doublestrike.ron index 80de5e37e0..932a87780e 100644 --- a/assets/common/abilities/axe/doublestrike.ron +++ b/assets/common/abilities/axe/doublestrike.ron @@ -15,6 +15,12 @@ ComboMelee( base_recover_duration: 0.35, forward_movement: 0.5, damage_kind: Slashing, + damage_effect: Some(Buff(( + kind: Bleeding, + dur_secs: 10.0, + strength: DamageFraction(0.1), + chance: 0.1, + ))), ), ( stage: 2, @@ -31,6 +37,12 @@ ComboMelee( base_recover_duration: 0.35, forward_movement: 0.25, damage_kind: Slashing, + damage_effect: Some(Buff(( + kind: Bleeding, + dur_secs: 10.0, + strength: DamageFraction(0.1), + chance: 0.1, + ))), ), ], initial_energy_gain: 25, diff --git a/assets/common/abilities/axe/leap.ron b/assets/common/abilities/axe/leap.ron index 156d6cc98f..2d06e6ff3d 100644 --- a/assets/common/abilities/axe/leap.ron +++ b/assets/common/abilities/axe/leap.ron @@ -12,4 +12,10 @@ LeapMelee( forward_leap_strength: 20.0, vertical_leap_strength: 8.0, damage_kind: Slashing, + damage_effect: Some(Buff(( + kind: Bleeding, + dur_secs: 10.0, + strength: DamageFraction(0.1), + chance: 0.1, + ))), ) diff --git a/assets/common/abilities/axe/spin.ron b/assets/common/abilities/axe/spin.ron index df0320d9c2..c6ead7a592 100644 --- a/assets/common/abilities/axe/spin.ron +++ b/assets/common/abilities/axe/spin.ron @@ -6,7 +6,12 @@ SpinMelee( base_poise_damage: 25, knockback: ( strength: 0.0, direction: Away), range: 3.5, - damage_effect: None, + damage_effect: Some(Buff(( + kind: Bleeding, + dur_secs: 10.0, + strength: DamageFraction(0.1), + chance: 0.1, + ))), energy_cost: 100, is_infinite: true, movement_behavior: AxeHover, diff --git a/assets/common/abilities/axesimple/dash.ron b/assets/common/abilities/axesimple/dash.ron index 6a646ae020..aaf5e8876f 100644 --- a/assets/common/abilities/axesimple/dash.ron +++ b/assets/common/abilities/axesimple/dash.ron @@ -17,4 +17,10 @@ DashMelee( charge_through: true, is_interruptible: true, damage_kind: Slashing, + damage_effect: Some(Buff(( + kind: Bleeding, + dur_secs: 10.0, + strength: DamageFraction(0.1), + chance: 0.1, + ))), ) diff --git a/assets/common/abilities/axesimple/doublestrike.ron b/assets/common/abilities/axesimple/doublestrike.ron index d97b3dbcce..bc8a30cd1e 100644 --- a/assets/common/abilities/axesimple/doublestrike.ron +++ b/assets/common/abilities/axesimple/doublestrike.ron @@ -15,6 +15,12 @@ ComboMelee( base_recover_duration: 0.6, forward_movement: 3.5, damage_kind: Slashing, + damage_effect: Some(Buff(( + kind: Bleeding, + dur_secs: 10.0, + strength: DamageFraction(0.1), + chance: 0.1, + ))), ), ( stage: 2, @@ -31,6 +37,12 @@ ComboMelee( base_recover_duration: 1.2, forward_movement: 4.5, damage_kind: Slashing, + damage_effect: Some(Buff(( + kind: Bleeding, + dur_secs: 10.0, + strength: DamageFraction(0.1), + chance: 0.1, + ))), ), ], initial_energy_gain: 0, diff --git a/assets/common/abilities/custom/beastclaws/basic.ron b/assets/common/abilities/custom/beastclaws/basic.ron index 52caa48f41..6246489fb3 100644 --- a/assets/common/abilities/custom/beastclaws/basic.ron +++ b/assets/common/abilities/custom/beastclaws/basic.ron @@ -8,6 +8,11 @@ BasicMelee( base_poise_damage: 40, range: 5.0, max_angle: 120.0, - damage_effect: None, + damage_effect: Some(Buff(( + kind: Bleeding, + dur_secs: 10.0, + strength: DamageFraction(0.1), + chance: 0.1, + ))), damage_kind: Slashing, ) diff --git a/assets/common/abilities/custom/birdlargebreathe/triplestrike.ron b/assets/common/abilities/custom/birdlargebreathe/triplestrike.ron index b0a727e645..ed38a425c9 100644 --- a/assets/common/abilities/custom/birdlargebreathe/triplestrike.ron +++ b/assets/common/abilities/custom/birdlargebreathe/triplestrike.ron @@ -15,6 +15,12 @@ ComboMelee( base_recover_duration: 0.3, forward_movement: 2.0, damage_kind: Slashing, + damage_effect: Some(Buff(( + kind: Bleeding, + dur_secs: 10.0, + strength: DamageFraction(0.1), + chance: 0.1, + ))), ), ( stage: 2, @@ -31,6 +37,12 @@ ComboMelee( base_recover_duration: 0.3, forward_movement: 1.5, damage_kind: Slashing, + damage_effect: Some(Buff(( + kind: Bleeding, + dur_secs: 10.0, + strength: DamageFraction(0.1), + chance: 0.1, + ))), ), ( stage: 3, @@ -47,6 +59,12 @@ ComboMelee( base_recover_duration: 0.3, forward_movement: 1.5, damage_kind: Slashing, + damage_effect: Some(Buff(( + kind: Bleeding, + dur_secs: 10.0, + strength: DamageFraction(0.1), + chance: 0.1, + ))), ), ], initial_energy_gain: 0, diff --git a/assets/common/abilities/custom/birdlargefire/triplestrike.ron b/assets/common/abilities/custom/birdlargefire/triplestrike.ron index b0a727e645..ed38a425c9 100644 --- a/assets/common/abilities/custom/birdlargefire/triplestrike.ron +++ b/assets/common/abilities/custom/birdlargefire/triplestrike.ron @@ -15,6 +15,12 @@ ComboMelee( base_recover_duration: 0.3, forward_movement: 2.0, damage_kind: Slashing, + damage_effect: Some(Buff(( + kind: Bleeding, + dur_secs: 10.0, + strength: DamageFraction(0.1), + chance: 0.1, + ))), ), ( stage: 2, @@ -31,6 +37,12 @@ ComboMelee( base_recover_duration: 0.3, forward_movement: 1.5, damage_kind: Slashing, + damage_effect: Some(Buff(( + kind: Bleeding, + dur_secs: 10.0, + strength: DamageFraction(0.1), + chance: 0.1, + ))), ), ( stage: 3, @@ -47,6 +59,12 @@ ComboMelee( base_recover_duration: 0.3, forward_movement: 1.5, damage_kind: Slashing, + damage_effect: Some(Buff(( + kind: Bleeding, + dur_secs: 10.0, + strength: DamageFraction(0.1), + chance: 0.1, + ))), ), ], initial_energy_gain: 0, diff --git a/assets/common/abilities/custom/harvester/scythe.ron b/assets/common/abilities/custom/harvester/scythe.ron index f299ddaf66..1c05eedf5f 100644 --- a/assets/common/abilities/custom/harvester/scythe.ron +++ b/assets/common/abilities/custom/harvester/scythe.ron @@ -8,6 +8,11 @@ BasicMelee( knockback: ( strength: 10.0, direction: Away), range: 4.0, max_angle: 60.0, - damage_effect: None, + damage_effect: Some(Buff(( + kind: Bleeding, + dur_secs: 2.0, + strength: DamageFraction(0.5), + chance: 0.1, + ))), damage_kind: Slashing, ) diff --git a/assets/common/abilities/custom/minotaur/charge.ron b/assets/common/abilities/custom/minotaur/charge.ron index d84e388687..e313f18a92 100644 --- a/assets/common/abilities/custom/minotaur/charge.ron +++ b/assets/common/abilities/custom/minotaur/charge.ron @@ -17,4 +17,10 @@ DashMelee( charge_through: false, is_interruptible: false, damage_kind: Piercing, + damage_effect: Some(Buff(( + kind: Bleeding, + dur_secs: 10.0, + strength: DamageFraction(0.1), + chance: 0.1, + ))), ) diff --git a/assets/common/abilities/custom/minotaur/cleave.ron b/assets/common/abilities/custom/minotaur/cleave.ron index 8627f80ea0..c656f6201d 100644 --- a/assets/common/abilities/custom/minotaur/cleave.ron +++ b/assets/common/abilities/custom/minotaur/cleave.ron @@ -15,4 +15,10 @@ ChargedMelee( recover_duration: 0.5, specifier: Some(GroundCleave), damage_kind: Slashing, + damage_effect: Some(Buff(( + kind: Bleeding, + dur_secs: 10.0, + strength: DamageFraction(0.1), + chance: 0.1, + ))), ) diff --git a/assets/common/abilities/custom/tornado/spin.ron b/assets/common/abilities/custom/tornado/spin.ron index f5108fad61..d5051d6495 100644 --- a/assets/common/abilities/custom/tornado/spin.ron +++ b/assets/common/abilities/custom/tornado/spin.ron @@ -6,7 +6,12 @@ SpinMelee( base_poise_damage: 0, knockback: ( strength: 50.0, direction: Away), range: 3.5, - damage_effect: None, + damage_effect: Some(Buff(( + kind: Bleeding, + dur_secs: 10.0, + strength: DamageFraction(0.1), + chance: 0.1, + ))), energy_cost: 0, is_infinite: true, movement_behavior: ForwardGround, diff --git a/assets/common/abilities/custom/yeti/icespikes.ron b/assets/common/abilities/custom/yeti/icespikes.ron index ad3d0c87c5..38e9130bd5 100644 --- a/assets/common/abilities/custom/yeti/icespikes.ron +++ b/assets/common/abilities/custom/yeti/icespikes.ron @@ -14,4 +14,10 @@ Shockwave( move_efficiency: 0.2, damage_kind: Piercing, specifier: IceSpikes, + damage_effect: Some(Buff(( + kind: Bleeding, + dur_secs: 10.0, + strength: DamageFraction(0.1), + chance: 0.1, + ))), ) diff --git a/assets/common/abilities/dagger/tempbasic.ron b/assets/common/abilities/dagger/tempbasic.ron index ff5600ae76..a818caa352 100644 --- a/assets/common/abilities/dagger/tempbasic.ron +++ b/assets/common/abilities/dagger/tempbasic.ron @@ -8,6 +8,11 @@ BasicMelee( knockback: ( strength: 0.0, direction: Away), range: 3.5, max_angle: 20.0, - damage_effect: None, + damage_effect: Some(Buff(( + kind: Bleeding, + dur_secs: 10.0, + strength: DamageFraction(0.1), + chance: 0.1, + ))), damage_kind: Piercing, ) diff --git a/assets/common/abilities/pick/swing.ron b/assets/common/abilities/pick/swing.ron index 55a6fbe4ec..06cf310e2d 100644 --- a/assets/common/abilities/pick/swing.ron +++ b/assets/common/abilities/pick/swing.ron @@ -8,6 +8,11 @@ BasicMelee( knockback: ( strength: 0.0, direction: Away), range: 4.5, max_angle: 20.0, - damage_effect: None, + damage_effect: Some(Buff(( + kind: Bleeding, + dur_secs: 10.0, + strength: DamageFraction(0.1), + chance: 0.1, + ))), damage_kind: Piercing, ) diff --git a/assets/common/abilities/spear/dash.ron b/assets/common/abilities/spear/dash.ron index 6dc288fd3e..04b4ea7920 100644 --- a/assets/common/abilities/spear/dash.ron +++ b/assets/common/abilities/spear/dash.ron @@ -17,4 +17,10 @@ DashMelee( charge_through: true, is_interruptible: true, damage_kind: Piercing, + damage_effect: Some(Buff(( + kind: Bleeding, + dur_secs: 10.0, + strength: DamageFraction(0.1), + chance: 0.1, + ))), ) diff --git a/assets/common/abilities/spear/doublestrike.ron b/assets/common/abilities/spear/doublestrike.ron index 075850a90c..c97d3e0eba 100644 --- a/assets/common/abilities/spear/doublestrike.ron +++ b/assets/common/abilities/spear/doublestrike.ron @@ -15,6 +15,12 @@ ComboMelee( base_recover_duration: 0.4, forward_movement: 0.7, damage_kind: Piercing, + damage_effect: Some(Buff(( + kind: Bleeding, + dur_secs: 10.0, + strength: DamageFraction(0.1), + chance: 0.1, + ))), ), ( stage: 2, @@ -31,6 +37,12 @@ ComboMelee( base_recover_duration: 0.5, forward_movement: 0.7, damage_kind: Piercing, + damage_effect: Some(Buff(( + kind: Bleeding, + dur_secs: 10.0, + strength: DamageFraction(0.1), + chance: 0.1, + ))), ), ], initial_energy_gain: 0, diff --git a/assets/common/abilities/sword/dash.ron b/assets/common/abilities/sword/dash.ron index 90e4ae76eb..5c932b85aa 100644 --- a/assets/common/abilities/sword/dash.ron +++ b/assets/common/abilities/sword/dash.ron @@ -17,4 +17,10 @@ DashMelee( charge_through: true, is_interruptible: true, damage_kind: Piercing, + damage_effect: Some(Buff(( + kind: Bleeding, + dur_secs: 10.0, + strength: DamageFraction(0.1), + chance: 0.1, + ))), ) diff --git a/assets/common/abilities/sword/spin.ron b/assets/common/abilities/sword/spin.ron index faf3361b1c..8c656130c1 100644 --- a/assets/common/abilities/sword/spin.ron +++ b/assets/common/abilities/sword/spin.ron @@ -6,7 +6,12 @@ SpinMelee( base_poise_damage: 13, knockback: ( strength: 10.0, direction: Away), range: 3.5, - damage_effect: None, + damage_effect: Some(Buff(( + kind: Bleeding, + dur_secs: 10.0, + strength: DamageFraction(0.1), + chance: 0.1, + ))), energy_cost: 150, is_infinite: false, movement_behavior: ForwardGround, diff --git a/assets/common/abilities/sword/triplestrike.ron b/assets/common/abilities/sword/triplestrike.ron index 93ae1ffd07..6f4660b543 100644 --- a/assets/common/abilities/sword/triplestrike.ron +++ b/assets/common/abilities/sword/triplestrike.ron @@ -15,6 +15,12 @@ ComboMelee( base_recover_duration: 0.15, forward_movement: 0.5, damage_kind: Slashing, + damage_effect: Some(Buff(( + kind: Bleeding, + dur_secs: 10.0, + strength: DamageFraction(0.1), + chance: 0.1, + ))), ), ( stage: 2, @@ -31,6 +37,12 @@ ComboMelee( base_recover_duration: 0.3, forward_movement: 0.0, damage_kind: Slashing, + damage_effect: Some(Buff(( + kind: Bleeding, + dur_secs: 10.0, + strength: DamageFraction(0.1), + chance: 0.1, + ))), ), ( stage: 3, @@ -47,6 +59,12 @@ ComboMelee( base_recover_duration: 0.35, forward_movement: 1.2, damage_kind: Piercing, + damage_effect: Some(Buff(( + kind: Bleeding, + dur_secs: 10.0, + strength: DamageFraction(0.1), + chance: 0.1, + ))), ), ], initial_energy_gain: 0, diff --git a/assets/common/abilities/swordsimple/dash.ron b/assets/common/abilities/swordsimple/dash.ron index 7a4e478edb..eec4d7e583 100644 --- a/assets/common/abilities/swordsimple/dash.ron +++ b/assets/common/abilities/swordsimple/dash.ron @@ -17,4 +17,10 @@ DashMelee( charge_through: true, is_interruptible: true, damage_kind: Piercing, + damage_effect: Some(Buff(( + kind: Bleeding, + dur_secs: 10.0, + strength: DamageFraction(0.1), + chance: 0.1, + ))), ) diff --git a/assets/common/abilities/swordsimple/doublestrike.ron b/assets/common/abilities/swordsimple/doublestrike.ron index f8a9b3860e..39eb48d54a 100644 --- a/assets/common/abilities/swordsimple/doublestrike.ron +++ b/assets/common/abilities/swordsimple/doublestrike.ron @@ -15,6 +15,12 @@ ComboMelee( base_recover_duration: 0.5, forward_movement: 2.5, damage_kind: Slashing, + damage_effect: Some(Buff(( + kind: Bleeding, + dur_secs: 10.0, + strength: DamageFraction(0.1), + chance: 0.1, + ))), ), ( stage: 2, @@ -31,6 +37,12 @@ ComboMelee( base_recover_duration: 0.7, forward_movement: 2.0, damage_kind: Slashing, + damage_effect: Some(Buff(( + kind: Bleeding, + dur_secs: 10.0, + strength: DamageFraction(0.1), + chance: 0.1, + ))), ), ], initial_energy_gain: 0, 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 0427058b9f..45b78c1fd8 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 @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.1, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, ), )), quality: Common, diff --git a/assets/common/items/debug/admin_stick.ron b/assets/common/items/debug/admin_stick.ron index 46d08717b5..428a9f96a3 100644 --- a/assets/common/items/debug/admin_stick.ron +++ b/assets/common/items/debug/admin_stick.ron @@ -1,22 +1,21 @@ ItemDef( name: "Belzeshrub the Broom-God", description: "You can hear him giggle whenever\nyou hit the ground a bit too hard...", - kind: Tool( - ( - kind: Debug, - hands: Two, - stats: Direct(( - equip_time_secs: 0.0, - power: 1.00, - effect_power: 1.00, - speed: 1.0, - crit_chance: 0.0, - range: 1.0, - energy_efficiency: 1.0, - )), - ) - ), + kind: Tool(( + kind: Debug, + hands: Two, + stats: Direct(( + equip_time_secs: 0.0, + power: 1.0, + effect_power: 1.0, + speed: 1.0, + crit_chance: 0.0, + range: 1.0, + energy_efficiency: 1.0, + buff_strength: 1.0, + )), + )), quality: Debug, tags: [], -) -// And the ground is pretty hard at maximum velocity... + ability_spec: None, +) \ No newline at end of file diff --git a/assets/common/items/debug/admin_sword.ron b/assets/common/items/debug/admin_sword.ron index 6d5f343a60..7c89995ec6 100644 --- a/assets/common/items/debug/admin_sword.ron +++ b/assets/common/items/debug/admin_sword.ron @@ -1,21 +1,21 @@ ItemDef( name: "Admin Greatsword", description: "Shouldn't this be a hammer?", - kind: Tool( - ( - kind: Sword, - hands: Two, - stats: Direct(( - equip_time_secs: 0.0, - power: 999.9, - effect_power: 999.9, - speed: 1.0, - crit_chance: 0.5, - range: 1.0, - energy_efficiency: 1.0, - )), - ) - ), + kind: Tool(( + kind: Sword, + hands: Two, + stats: Direct(( + equip_time_secs: 0.0, + power: 999.9, + effect_power: 999.9, + speed: 1.0, + crit_chance: 0.5, + range: 1.0, + energy_efficiency: 1.0, + buff_strength: 1.0, + )), + )), quality: Debug, tags: [], -) + ability_spec: None, +) \ No newline at end of file diff --git a/assets/common/items/debug/velorite_bow_debug.ron b/assets/common/items/debug/velorite_bow_debug.ron index e9e53cee94..d16fea1d65 100644 --- a/assets/common/items/debug/velorite_bow_debug.ron +++ b/assets/common/items/debug/velorite_bow_debug.ron @@ -5,15 +5,17 @@ ItemDef( kind: Bow, hands: Two, stats: Direct(( - equip_time_secs: 0.0, - power: 999.9, - effect_power: 999.9, - speed: 100.0, - crit_chance: 0.5, - range: 1.0, - energy_efficiency: 1.0, - )), + equip_time_secs: 0.0, + power: 999.9, + effect_power: 999.9, + speed: 100.0, + crit_chance: 0.5, + range: 1.0, + energy_efficiency: 1.0, + buff_strength: 1.0, + )), )), quality: Debug, tags: [], + ability_spec: None, ) \ No newline at end of file diff --git a/assets/common/items/npc_weapons/axe/minotaur_axe.ron b/assets/common/items/npc_weapons/axe/minotaur_axe.ron index cf641034c5..f0dd5e4607 100644 --- a/assets/common/items/npc_weapons/axe/minotaur_axe.ron +++ b/assets/common/items/npc_weapons/axe/minotaur_axe.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.1, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Legendary, diff --git a/assets/common/items/npc_weapons/axe/oni_blue_axe.ron b/assets/common/items/npc_weapons/axe/oni_blue_axe.ron index 9e2f507213..38aafa359f 100644 --- a/assets/common/items/npc_weapons/axe/oni_blue_axe.ron +++ b/assets/common/items/npc_weapons/axe/oni_blue_axe.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.18, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Low, 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 f4725e0714..0973eedb9f 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 @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.08406594, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, 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 fe37be87af..5fe99814c8 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 @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.05059524, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Low, 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 1a047e8119..7ea0f637f2 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 @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.07589286, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Low, 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 79bd4e33a8..401083b24a 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 @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.26764706, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, 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 daf45c344c..7b58d6d483 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 @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.12037037, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Low, 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 10776f2531..8aa201d533 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 @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.13541667, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Low, 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 33b1592308..0f1754a5e8 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 @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.05625, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, 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 700621bda2..836fc43a00 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 @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.036458332, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Low, 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 9b43c15e61..8f786d5c69 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 @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.05357143, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Low, 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 74c16074e7..ac233dde25 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 @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.095454544, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, 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 830a27de1e..6ccef52257 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 @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.040873703, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Low, 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 bcbbdc7a3e..4aa6e8482a 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 @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.04963235, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Low, 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 ab91cbc69c..296946a0f6 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 @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.066083916, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, 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 7a2d57c6fc..74b42dd235 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 @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.053030305, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Low, 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 1734113c28..1de6a21ae2 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 @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.05965909, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Low, diff --git a/assets/common/items/npc_weapons/bow/bipedlarge-velorite.ron b/assets/common/items/npc_weapons/bow/bipedlarge-velorite.ron index b8a589bb2e..a21c91e260 100644 --- a/assets/common/items/npc_weapons/bow/bipedlarge-velorite.ron +++ b/assets/common/items/npc_weapons/bow/bipedlarge-velorite.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.140625, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Epic, diff --git a/assets/common/items/npc_weapons/bow/saurok_bow.ron b/assets/common/items/npc_weapons/bow/saurok_bow.ron index 9ef0fe58cb..a29a32b41c 100644 --- a/assets/common/items/npc_weapons/bow/saurok_bow.ron +++ b/assets/common/items/npc_weapons/bow/saurok_bow.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.0625, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Low, diff --git a/assets/common/items/npc_weapons/hammer/bipedlarge-cultist.ron b/assets/common/items/npc_weapons/hammer/bipedlarge-cultist.ron index a76ca17a7f..367c4d5d94 100644 --- a/assets/common/items/npc_weapons/hammer/bipedlarge-cultist.ron +++ b/assets/common/items/npc_weapons/hammer/bipedlarge-cultist.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.140625, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Epic, diff --git a/assets/common/items/npc_weapons/hammer/cyclops_hammer.ron b/assets/common/items/npc_weapons/hammer/cyclops_hammer.ron index 07c96c1236..d769c40adb 100644 --- a/assets/common/items/npc_weapons/hammer/cyclops_hammer.ron +++ b/assets/common/items/npc_weapons/hammer/cyclops_hammer.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.0625, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Low, diff --git a/assets/common/items/npc_weapons/hammer/harvester_scythe.ron b/assets/common/items/npc_weapons/hammer/harvester_scythe.ron index 6a76c59604..0e75a422bd 100644 --- a/assets/common/items/npc_weapons/hammer/harvester_scythe.ron +++ b/assets/common/items/npc_weapons/hammer/harvester_scythe.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.05078125, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Low, diff --git a/assets/common/items/npc_weapons/hammer/ogre_hammer.ron b/assets/common/items/npc_weapons/hammer/ogre_hammer.ron index d16ccbefa6..412e9d811e 100644 --- a/assets/common/items/npc_weapons/hammer/ogre_hammer.ron +++ b/assets/common/items/npc_weapons/hammer/ogre_hammer.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.0625, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Low, diff --git a/assets/common/items/npc_weapons/hammer/oni_red_hammer.ron b/assets/common/items/npc_weapons/hammer/oni_red_hammer.ron index e8c420ee45..c09de44568 100644 --- a/assets/common/items/npc_weapons/hammer/oni_red_hammer.ron +++ b/assets/common/items/npc_weapons/hammer/oni_red_hammer.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.1, range: 1.0, energy_efficiency: 1.0, + buff_strength: 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 568b678de3..eae1c62325 100644 --- a/assets/common/items/npc_weapons/hammer/troll_hammer.ron +++ b/assets/common/items/npc_weapons/hammer/troll_hammer.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.0625, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Low, diff --git a/assets/common/items/npc_weapons/hammer/wendigo_hammer.ron b/assets/common/items/npc_weapons/hammer/wendigo_hammer.ron index ce76a74104..717a4da2d0 100644 --- a/assets/common/items/npc_weapons/hammer/wendigo_hammer.ron +++ b/assets/common/items/npc_weapons/hammer/wendigo_hammer.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.0625, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Low, diff --git a/assets/common/items/npc_weapons/hammer/yeti_hammer.ron b/assets/common/items/npc_weapons/hammer/yeti_hammer.ron index d0e6a9e1a5..ff565733d3 100644 --- a/assets/common/items/npc_weapons/hammer/yeti_hammer.ron +++ b/assets/common/items/npc_weapons/hammer/yeti_hammer.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.046875, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Low, diff --git a/assets/common/items/npc_weapons/staff/bipedlarge-cultist.ron b/assets/common/items/npc_weapons/staff/bipedlarge-cultist.ron index 4ca4859d54..6ed3acd344 100644 --- a/assets/common/items/npc_weapons/staff/bipedlarge-cultist.ron +++ b/assets/common/items/npc_weapons/staff/bipedlarge-cultist.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.140625, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Epic, diff --git a/assets/common/items/npc_weapons/staff/mindflayer_staff.ron b/assets/common/items/npc_weapons/staff/mindflayer_staff.ron index 4226f6d795..e8c5bbfb6a 100644 --- a/assets/common/items/npc_weapons/staff/mindflayer_staff.ron +++ b/assets/common/items/npc_weapons/staff/mindflayer_staff.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.0, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Legendary, diff --git a/assets/common/items/npc_weapons/staff/ogre_staff.ron b/assets/common/items/npc_weapons/staff/ogre_staff.ron index 1f2aed7f02..7c4f5ba16e 100644 --- a/assets/common/items/npc_weapons/staff/ogre_staff.ron +++ b/assets/common/items/npc_weapons/staff/ogre_staff.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.0625, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Low, diff --git a/assets/common/items/npc_weapons/staff/saurok_staff.ron b/assets/common/items/npc_weapons/staff/saurok_staff.ron index 5fac1e10c3..9b6003e2f2 100644 --- a/assets/common/items/npc_weapons/staff/saurok_staff.ron +++ b/assets/common/items/npc_weapons/staff/saurok_staff.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.0625, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Low, diff --git a/assets/common/items/npc_weapons/sword/bipedlarge-cultist.ron b/assets/common/items/npc_weapons/sword/bipedlarge-cultist.ron index 3c52499428..5a2a866429 100644 --- a/assets/common/items/npc_weapons/sword/bipedlarge-cultist.ron +++ b/assets/common/items/npc_weapons/sword/bipedlarge-cultist.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.140625, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Epic, diff --git a/assets/common/items/npc_weapons/sword/dullahan_sword.ron b/assets/common/items/npc_weapons/sword/dullahan_sword.ron index 8a4c7f5a99..d46ec59046 100644 --- a/assets/common/items/npc_weapons/sword/dullahan_sword.ron +++ b/assets/common/items/npc_weapons/sword/dullahan_sword.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.0625, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Low, diff --git a/assets/common/items/npc_weapons/sword/saurok_sword.ron b/assets/common/items/npc_weapons/sword/saurok_sword.ron index 742456cf38..f88c146e71 100644 --- a/assets/common/items/npc_weapons/sword/saurok_sword.ron +++ b/assets/common/items/npc_weapons/sword/saurok_sword.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.0625, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/asp.ron b/assets/common/items/npc_weapons/unique/asp.ron index b5782c1b98..6a8630c61e 100644 --- a/assets/common/items/npc_weapons/unique/asp.ron +++ b/assets/common/items/npc_weapons/unique/asp.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.0625, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/basilisk.ron b/assets/common/items/npc_weapons/unique/basilisk.ron index 193de48987..7242fe6c9a 100644 --- a/assets/common/items/npc_weapons/unique/basilisk.ron +++ b/assets/common/items/npc_weapons/unique/basilisk.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.0625, range: 1.0, energy_efficiency: 1.0, + buff_strength: 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 067e69f807..ac2cf503b1 100644 --- a/assets/common/items/npc_weapons/unique/beast_claws.ron +++ b/assets/common/items/npc_weapons/unique/beast_claws.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.0625, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/birdlargebasic.ron b/assets/common/items/npc_weapons/unique/birdlargebasic.ron index 959641b575..bcea09e2ab 100644 --- a/assets/common/items/npc_weapons/unique/birdlargebasic.ron +++ b/assets/common/items/npc_weapons/unique/birdlargebasic.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.0625, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/birdlargebreathe.ron b/assets/common/items/npc_weapons/unique/birdlargebreathe.ron index 4aedd04fe9..09c3b2409e 100644 --- a/assets/common/items/npc_weapons/unique/birdlargebreathe.ron +++ b/assets/common/items/npc_weapons/unique/birdlargebreathe.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.0625, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/birdlargefire.ron b/assets/common/items/npc_weapons/unique/birdlargefire.ron index c57f482919..e553300c0b 100644 --- a/assets/common/items/npc_weapons/unique/birdlargefire.ron +++ b/assets/common/items/npc_weapons/unique/birdlargefire.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.0625, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/clay_golem_fist.ron b/assets/common/items/npc_weapons/unique/clay_golem_fist.ron index 47292e5930..7d80dd1564 100644 --- a/assets/common/items/npc_weapons/unique/clay_golem_fist.ron +++ b/assets/common/items/npc_weapons/unique/clay_golem_fist.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.1, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/haniwa_sentry.ron b/assets/common/items/npc_weapons/unique/haniwa_sentry.ron index 7f5b410774..1f4193f2e0 100644 --- a/assets/common/items/npc_weapons/unique/haniwa_sentry.ron +++ b/assets/common/items/npc_weapons/unique/haniwa_sentry.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.0625, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/husk.ron b/assets/common/items/npc_weapons/unique/husk.ron index 6f588593d5..8422e8a31e 100644 --- a/assets/common/items/npc_weapons/unique/husk.ron +++ b/assets/common/items/npc_weapons/unique/husk.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.0625, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/husk_brute.ron b/assets/common/items/npc_weapons/unique/husk_brute.ron index fcc552fad7..19cc4a43ac 100644 --- a/assets/common/items/npc_weapons/unique/husk_brute.ron +++ b/assets/common/items/npc_weapons/unique/husk_brute.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.0625, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/maneater.ron b/assets/common/items/npc_weapons/unique/maneater.ron index f365f03d20..6980223ace 100644 --- a/assets/common/items/npc_weapons/unique/maneater.ron +++ b/assets/common/items/npc_weapons/unique/maneater.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.0625, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/quadlowbasic.ron b/assets/common/items/npc_weapons/unique/quadlowbasic.ron index a6ed59234a..4252476464 100644 --- a/assets/common/items/npc_weapons/unique/quadlowbasic.ron +++ b/assets/common/items/npc_weapons/unique/quadlowbasic.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.0625, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/quadlowbeam.ron b/assets/common/items/npc_weapons/unique/quadlowbeam.ron index 8ad079d5c7..4ad1b672d1 100644 --- a/assets/common/items/npc_weapons/unique/quadlowbeam.ron +++ b/assets/common/items/npc_weapons/unique/quadlowbeam.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.0625, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/quadlowbreathe.ron b/assets/common/items/npc_weapons/unique/quadlowbreathe.ron index b93d304a87..da56ac0b0b 100644 --- a/assets/common/items/npc_weapons/unique/quadlowbreathe.ron +++ b/assets/common/items/npc_weapons/unique/quadlowbreathe.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.0625, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/quadlowquick.ron b/assets/common/items/npc_weapons/unique/quadlowquick.ron index 7a1d582b17..3cb1286745 100644 --- a/assets/common/items/npc_weapons/unique/quadlowquick.ron +++ b/assets/common/items/npc_weapons/unique/quadlowquick.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.0625, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/quadlowtail.ron b/assets/common/items/npc_weapons/unique/quadlowtail.ron index 0f6e059c42..aad9d719c1 100644 --- a/assets/common/items/npc_weapons/unique/quadlowtail.ron +++ b/assets/common/items/npc_weapons/unique/quadlowtail.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.0625, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/quadmedbasic.ron b/assets/common/items/npc_weapons/unique/quadmedbasic.ron index 71124fd0e0..ef43a88ece 100644 --- a/assets/common/items/npc_weapons/unique/quadmedbasic.ron +++ b/assets/common/items/npc_weapons/unique/quadmedbasic.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.0625, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/quadmedbasicgentle.ron b/assets/common/items/npc_weapons/unique/quadmedbasicgentle.ron index cd135af614..db9c4e4553 100644 --- a/assets/common/items/npc_weapons/unique/quadmedbasicgentle.ron +++ b/assets/common/items/npc_weapons/unique/quadmedbasicgentle.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.09375, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/quadmedcharge.ron b/assets/common/items/npc_weapons/unique/quadmedcharge.ron index 3ef3e7f37a..fde0d957ec 100644 --- a/assets/common/items/npc_weapons/unique/quadmedcharge.ron +++ b/assets/common/items/npc_weapons/unique/quadmedcharge.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.0625, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/quadmedhoof.ron b/assets/common/items/npc_weapons/unique/quadmedhoof.ron index b983318077..a43e5aed17 100644 --- a/assets/common/items/npc_weapons/unique/quadmedhoof.ron +++ b/assets/common/items/npc_weapons/unique/quadmedhoof.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.0625, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/quadmedjump.ron b/assets/common/items/npc_weapons/unique/quadmedjump.ron index a0dae04065..a1abd09380 100644 --- a/assets/common/items/npc_weapons/unique/quadmedjump.ron +++ b/assets/common/items/npc_weapons/unique/quadmedjump.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.0625, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/quadmedquick.ron b/assets/common/items/npc_weapons/unique/quadmedquick.ron index 13673a434a..adf915c4e3 100644 --- a/assets/common/items/npc_weapons/unique/quadmedquick.ron +++ b/assets/common/items/npc_weapons/unique/quadmedquick.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.0625, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/quadsmallbasic.ron b/assets/common/items/npc_weapons/unique/quadsmallbasic.ron index b11883c318..928acd0580 100644 --- a/assets/common/items/npc_weapons/unique/quadsmallbasic.ron +++ b/assets/common/items/npc_weapons/unique/quadsmallbasic.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.0625, range: 1.0, energy_efficiency: 1.0, + buff_strength: 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 cd62ba0b10..5fe154cdae 100644 --- a/assets/common/items/npc_weapons/unique/stone_golems_fist.ron +++ b/assets/common/items/npc_weapons/unique/stone_golems_fist.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.0625, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/theropodbasic.ron b/assets/common/items/npc_weapons/unique/theropodbasic.ron index 785de16ce8..61cda71cd9 100644 --- a/assets/common/items/npc_weapons/unique/theropodbasic.ron +++ b/assets/common/items/npc_weapons/unique/theropodbasic.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.0625, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/theropodbird.ron b/assets/common/items/npc_weapons/unique/theropodbird.ron index 7b4f8bd0af..31d66c6bc1 100644 --- a/assets/common/items/npc_weapons/unique/theropodbird.ron +++ b/assets/common/items/npc_weapons/unique/theropodbird.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.0625, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/theropodcharge.ron b/assets/common/items/npc_weapons/unique/theropodcharge.ron index 9919f7fea8..d4617bd00a 100644 --- a/assets/common/items/npc_weapons/unique/theropodcharge.ron +++ b/assets/common/items/npc_weapons/unique/theropodcharge.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.1, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/tidal_claws.ron b/assets/common/items/npc_weapons/unique/tidal_claws.ron index ee74d31477..192518a6b5 100644 --- a/assets/common/items/npc_weapons/unique/tidal_claws.ron +++ b/assets/common/items/npc_weapons/unique/tidal_claws.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.0625, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/tidal_totem.ron b/assets/common/items/npc_weapons/unique/tidal_totem.ron index 7e35260927..d86bde56d7 100644 --- a/assets/common/items/npc_weapons/unique/tidal_totem.ron +++ b/assets/common/items/npc_weapons/unique/tidal_totem.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.0625, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/tornado.ron b/assets/common/items/npc_weapons/unique/tornado.ron index a4b4565f7f..4fd1d5e106 100644 --- a/assets/common/items/npc_weapons/unique/tornado.ron +++ b/assets/common/items/npc_weapons/unique/tornado.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.0, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/turret.ron b/assets/common/items/npc_weapons/unique/turret.ron index a224eeb6df..15cafd26ef 100644 --- a/assets/common/items/npc_weapons/unique/turret.ron +++ b/assets/common/items/npc_weapons/unique/turret.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.0625, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/wendigo_magic.ron b/assets/common/items/npc_weapons/unique/wendigo_magic.ron index b5833c988b..def4c8a519 100644 --- a/assets/common/items/npc_weapons/unique/wendigo_magic.ron +++ b/assets/common/items/npc_weapons/unique/wendigo_magic.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.0625, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Low, diff --git a/assets/common/items/tool/craftsman_hammer.ron b/assets/common/items/tool/craftsman_hammer.ron index 1d6f1a87c6..a4cd1e1c46 100644 --- a/assets/common/items/tool/craftsman_hammer.ron +++ b/assets/common/items/tool/craftsman_hammer.ron @@ -12,8 +12,12 @@ ItemDef( crit_chance: 0.0, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Common, - tags: [CraftingTool], + tags: [ + CraftingTool, + ], + ability_spec: None, ) \ No newline at end of file diff --git a/assets/common/items/tool/pickaxe_steel.ron b/assets/common/items/tool/pickaxe_steel.ron index 6d93dca065..ae2da427c4 100644 --- a/assets/common/items/tool/pickaxe_steel.ron +++ b/assets/common/items/tool/pickaxe_steel.ron @@ -12,8 +12,12 @@ ItemDef( crit_chance: 0.0, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, - tags: [CraftingTool], -) + tags: [ + CraftingTool, + ], + ability_spec: None, +) \ No newline at end of file diff --git a/assets/common/items/tool/pickaxe_stone.ron b/assets/common/items/tool/pickaxe_stone.ron index 218a1cf1d5..ff3909dbcc 100644 --- a/assets/common/items/tool/pickaxe_stone.ron +++ b/assets/common/items/tool/pickaxe_stone.ron @@ -12,8 +12,12 @@ ItemDef( crit_chance: 0.0, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Low, - tags: [CraftingTool], -) + tags: [ + CraftingTool, + ], + ability_spec: None, +) \ No newline at end of file diff --git a/assets/common/items/weapons/axe/bloodsteel_axe-0.ron b/assets/common/items/weapons/axe/bloodsteel_axe-0.ron index 77404b3988..1234647ddf 100644 --- a/assets/common/items/weapons/axe/bloodsteel_axe-0.ron +++ b/assets/common/items/weapons/axe/bloodsteel_axe-0.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.1421875, range: 1.0, energy_efficiency: 1.0, + buff_strength: 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 96f98ad9b7..b02ecea234 100644 --- a/assets/common/items/weapons/axe/bloodsteel_axe-1.ron +++ b/assets/common/items/weapons/axe/bloodsteel_axe-1.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.1421875, range: 1.0, energy_efficiency: 1.0, + buff_strength: 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 bb23163ebc..4e421d9c20 100644 --- a/assets/common/items/weapons/axe/bloodsteel_axe-2.ron +++ b/assets/common/items/weapons/axe/bloodsteel_axe-2.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.1421875, range: 1.0, energy_efficiency: 1.0, + buff_strength: 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 c66316161f..a505f9cfea 100644 --- a/assets/common/items/weapons/axe/bronze_axe-0.ron +++ b/assets/common/items/weapons/axe/bronze_axe-0.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.15, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/axe/bronze_axe-1.ron b/assets/common/items/weapons/axe/bronze_axe-1.ron index c0cd1599c4..0cfdd2a4f3 100644 --- a/assets/common/items/weapons/axe/bronze_axe-1.ron +++ b/assets/common/items/weapons/axe/bronze_axe-1.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.15, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/axe/bronze_axe-2.ron b/assets/common/items/weapons/axe/bronze_axe-2.ron index 74f0e11a87..f80088227a 100644 --- a/assets/common/items/weapons/axe/bronze_axe-2.ron +++ b/assets/common/items/weapons/axe/bronze_axe-2.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.15, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/axe/cobalt_axe-0.ron b/assets/common/items/weapons/axe/cobalt_axe-0.ron index 05404646d2..0a07bfa70f 100644 --- a/assets/common/items/weapons/axe/cobalt_axe-0.ron +++ b/assets/common/items/weapons/axe/cobalt_axe-0.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.13611111, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: High, diff --git a/assets/common/items/weapons/axe/cobalt_axe-1.ron b/assets/common/items/weapons/axe/cobalt_axe-1.ron index d3b2492bd1..51aba83388 100644 --- a/assets/common/items/weapons/axe/cobalt_axe-1.ron +++ b/assets/common/items/weapons/axe/cobalt_axe-1.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.13611111, range: 1.0, energy_efficiency: 1.0, + buff_strength: 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 64f6d0ee78..3336223d82 100644 --- a/assets/common/items/weapons/axe/iron_axe-0.ron +++ b/assets/common/items/weapons/axe/iron_axe-0.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.1375, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/axe/iron_axe-1.ron b/assets/common/items/weapons/axe/iron_axe-1.ron index 0bcfc640b6..7c52660016 100644 --- a/assets/common/items/weapons/axe/iron_axe-1.ron +++ b/assets/common/items/weapons/axe/iron_axe-1.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.1375, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/axe/iron_axe-2.ron b/assets/common/items/weapons/axe/iron_axe-2.ron index dd031661c9..5589f7b05d 100644 --- a/assets/common/items/weapons/axe/iron_axe-2.ron +++ b/assets/common/items/weapons/axe/iron_axe-2.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.1375, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/axe/iron_axe-3.ron b/assets/common/items/weapons/axe/iron_axe-3.ron index 563b229d3f..d7c2ab079e 100644 --- a/assets/common/items/weapons/axe/iron_axe-3.ron +++ b/assets/common/items/weapons/axe/iron_axe-3.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.1375, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/axe/iron_axe-4.ron b/assets/common/items/weapons/axe/iron_axe-4.ron index ffb3e48779..95ac87ed05 100644 --- a/assets/common/items/weapons/axe/iron_axe-4.ron +++ b/assets/common/items/weapons/axe/iron_axe-4.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.1375, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/axe/iron_axe-5.ron b/assets/common/items/weapons/axe/iron_axe-5.ron index b75cc13013..003bc9a00e 100644 --- a/assets/common/items/weapons/axe/iron_axe-5.ron +++ b/assets/common/items/weapons/axe/iron_axe-5.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.1375, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/axe/iron_axe-6.ron b/assets/common/items/weapons/axe/iron_axe-6.ron index 8a4f96f98d..d0b1ef7683 100644 --- a/assets/common/items/weapons/axe/iron_axe-6.ron +++ b/assets/common/items/weapons/axe/iron_axe-6.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.1375, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/axe/iron_axe-7.ron b/assets/common/items/weapons/axe/iron_axe-7.ron index 6169f0efb3..f7a93d6f41 100644 --- a/assets/common/items/weapons/axe/iron_axe-7.ron +++ b/assets/common/items/weapons/axe/iron_axe-7.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.1375, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/axe/iron_axe-8.ron b/assets/common/items/weapons/axe/iron_axe-8.ron index e927122360..655651286c 100644 --- a/assets/common/items/weapons/axe/iron_axe-8.ron +++ b/assets/common/items/weapons/axe/iron_axe-8.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.1375, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/axe/iron_axe-9.ron b/assets/common/items/weapons/axe/iron_axe-9.ron index 7c594f1d67..fb3fb24efe 100644 --- a/assets/common/items/weapons/axe/iron_axe-9.ron +++ b/assets/common/items/weapons/axe/iron_axe-9.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.1375, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/axe/malachite_axe-0.ron b/assets/common/items/weapons/axe/malachite_axe-0.ron index 941dd215e2..6825fd53e4 100644 --- a/assets/common/items/weapons/axe/malachite_axe-0.ron +++ b/assets/common/items/weapons/axe/malachite_axe-0.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.140625, range: 1.0, energy_efficiency: 1.0, + buff_strength: 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 2ecfafd096..03824da752 100644 --- a/assets/common/items/weapons/axe/orc_axe-0.ron +++ b/assets/common/items/weapons/axe/orc_axe-0.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.083333336, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Low, diff --git a/assets/common/items/weapons/axe/parashu.ron b/assets/common/items/weapons/axe/parashu.ron index 56229cd4f4..ca75e5b455 100644 --- a/assets/common/items/weapons/axe/parashu.ron +++ b/assets/common/items/weapons/axe/parashu.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.11666667, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Legendary, diff --git a/assets/common/items/weapons/axe/starter_axe.ron b/assets/common/items/weapons/axe/starter_axe.ron index 334f9a9469..12d9d8950d 100644 --- a/assets/common/items/weapons/axe/starter_axe.ron +++ b/assets/common/items/weapons/axe/starter_axe.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.09375, range: 1.0, energy_efficiency: 1.0, + buff_strength: 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 5f29d50341..0eb2e0891a 100644 --- a/assets/common/items/weapons/axe/steel_axe-0.ron +++ b/assets/common/items/weapons/axe/steel_axe-0.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.12857144, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/axe/steel_axe-1.ron b/assets/common/items/weapons/axe/steel_axe-1.ron index 04f3e96a62..2a15d0e9f2 100644 --- a/assets/common/items/weapons/axe/steel_axe-1.ron +++ b/assets/common/items/weapons/axe/steel_axe-1.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.12857144, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/axe/steel_axe-2.ron b/assets/common/items/weapons/axe/steel_axe-2.ron index aca52c8f21..62c21dcd2a 100644 --- a/assets/common/items/weapons/axe/steel_axe-2.ron +++ b/assets/common/items/weapons/axe/steel_axe-2.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.12857144, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/axe/steel_axe-3.ron b/assets/common/items/weapons/axe/steel_axe-3.ron index c1ca997b1a..880675e6b7 100644 --- a/assets/common/items/weapons/axe/steel_axe-3.ron +++ b/assets/common/items/weapons/axe/steel_axe-3.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.12857144, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/axe/steel_axe-4.ron b/assets/common/items/weapons/axe/steel_axe-4.ron index 6d5877f324..fc49882b94 100644 --- a/assets/common/items/weapons/axe/steel_axe-4.ron +++ b/assets/common/items/weapons/axe/steel_axe-4.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.12857144, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/axe/steel_axe-5.ron b/assets/common/items/weapons/axe/steel_axe-5.ron index f2b64d4bb3..1f1919c632 100644 --- a/assets/common/items/weapons/axe/steel_axe-5.ron +++ b/assets/common/items/weapons/axe/steel_axe-5.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.12857144, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/axe/steel_axe-6.ron b/assets/common/items/weapons/axe/steel_axe-6.ron index 31a5fe8f1d..9ff3d5c053 100644 --- a/assets/common/items/weapons/axe/steel_axe-6.ron +++ b/assets/common/items/weapons/axe/steel_axe-6.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.12857144, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/axe_1h/bloodsteel-0.ron b/assets/common/items/weapons/axe_1h/bloodsteel-0.ron index e7f873f212..62ce97cc27 100644 --- a/assets/common/items/weapons/axe_1h/bloodsteel-0.ron +++ b/assets/common/items/weapons/axe_1h/bloodsteel-0.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.16485508, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: High, diff --git a/assets/common/items/weapons/axe_1h/bloodsteel-1.ron b/assets/common/items/weapons/axe_1h/bloodsteel-1.ron index 9c33a8fd10..5ffa81170b 100644 --- a/assets/common/items/weapons/axe_1h/bloodsteel-1.ron +++ b/assets/common/items/weapons/axe_1h/bloodsteel-1.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.11666667, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: High, diff --git a/assets/common/items/weapons/axe_1h/bronze-0.ron b/assets/common/items/weapons/axe_1h/bronze-0.ron index 567d56e335..5f4433e39b 100644 --- a/assets/common/items/weapons/axe_1h/bronze-0.ron +++ b/assets/common/items/weapons/axe_1h/bronze-0.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.15714286, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/axe_1h/bronze-1.ron b/assets/common/items/weapons/axe_1h/bronze-1.ron index 1501bd04b4..755e3fedda 100644 --- a/assets/common/items/weapons/axe_1h/bronze-1.ron +++ b/assets/common/items/weapons/axe_1h/bronze-1.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.14318182, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/axe_1h/cobalt-0.ron b/assets/common/items/weapons/axe_1h/cobalt-0.ron index 46a0116116..3d001aaf77 100644 --- a/assets/common/items/weapons/axe_1h/cobalt-0.ron +++ b/assets/common/items/weapons/axe_1h/cobalt-0.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.1421875, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: High, diff --git a/assets/common/items/weapons/axe_1h/cobalt-1.ron b/assets/common/items/weapons/axe_1h/cobalt-1.ron index 5ab17bf671..db938fb386 100644 --- a/assets/common/items/weapons/axe_1h/cobalt-1.ron +++ b/assets/common/items/weapons/axe_1h/cobalt-1.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.12635136, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: High, diff --git a/assets/common/items/weapons/axe_1h/iron-0.ron b/assets/common/items/weapons/axe_1h/iron-0.ron index 8326780789..b07ac72c00 100644 --- a/assets/common/items/weapons/axe_1h/iron-0.ron +++ b/assets/common/items/weapons/axe_1h/iron-0.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.15, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/axe_1h/iron-1.ron b/assets/common/items/weapons/axe_1h/iron-1.ron index 332c68dac4..011e6b54f5 100644 --- a/assets/common/items/weapons/axe_1h/iron-1.ron +++ b/assets/common/items/weapons/axe_1h/iron-1.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.1257085, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/axe_1h/iron-2.ron b/assets/common/items/weapons/axe_1h/iron-2.ron index ab0f53744a..9fa9d1f752 100644 --- a/assets/common/items/weapons/axe_1h/iron-2.ron +++ b/assets/common/items/weapons/axe_1h/iron-2.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.16363636, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/axe_1h/iron-3.ron b/assets/common/items/weapons/axe_1h/iron-3.ron index 536faccad0..da27762047 100644 --- a/assets/common/items/weapons/axe_1h/iron-3.ron +++ b/assets/common/items/weapons/axe_1h/iron-3.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.1375, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/axe_1h/orichalcum-0.ron b/assets/common/items/weapons/axe_1h/orichalcum-0.ron index e0efa51258..8b4503db85 100644 --- a/assets/common/items/weapons/axe_1h/orichalcum-0.ron +++ b/assets/common/items/weapons/axe_1h/orichalcum-0.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.140625, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Epic, diff --git a/assets/common/items/weapons/axe_1h/steel-0.ron b/assets/common/items/weapons/axe_1h/steel-0.ron index 680f7ba8a6..350a966725 100644 --- a/assets/common/items/weapons/axe_1h/steel-0.ron +++ b/assets/common/items/weapons/axe_1h/steel-0.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.118421055, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/axe_1h/steel-1.ron b/assets/common/items/weapons/axe_1h/steel-1.ron index cbf802c19e..d18b887ff1 100644 --- a/assets/common/items/weapons/axe_1h/steel-1.ron +++ b/assets/common/items/weapons/axe_1h/steel-1.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.12857144, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/axe_1h/steel-2.ron b/assets/common/items/weapons/axe_1h/steel-2.ron index 70cf736e34..fcd49d5071 100644 --- a/assets/common/items/weapons/axe_1h/steel-2.ron +++ b/assets/common/items/weapons/axe_1h/steel-2.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.139011, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/axe_1h/stone-0.ron b/assets/common/items/weapons/axe_1h/stone-0.ron index b7277f75b5..7b3f2b16d0 100644 --- a/assets/common/items/weapons/axe_1h/stone-0.ron +++ b/assets/common/items/weapons/axe_1h/stone-0.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.1265625, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Common, diff --git a/assets/common/items/weapons/axe_1h/stone-1.ron b/assets/common/items/weapons/axe_1h/stone-1.ron index 68ee4aa9e0..165a790979 100644 --- a/assets/common/items/weapons/axe_1h/stone-1.ron +++ b/assets/common/items/weapons/axe_1h/stone-1.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.14311224, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Common, diff --git a/assets/common/items/weapons/axe_1h/wood-0.ron b/assets/common/items/weapons/axe_1h/wood-0.ron index ad67935987..4c1a4dd631 100644 --- a/assets/common/items/weapons/axe_1h/wood-0.ron +++ b/assets/common/items/weapons/axe_1h/wood-0.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.0625, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Low, diff --git a/assets/common/items/weapons/axe_1h/wood-1.ron b/assets/common/items/weapons/axe_1h/wood-1.ron index 6c2300da3c..e952cfea88 100644 --- a/assets/common/items/weapons/axe_1h/wood-1.ron +++ b/assets/common/items/weapons/axe_1h/wood-1.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.09821428, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Low, diff --git a/assets/common/items/weapons/bow/bone-0.ron b/assets/common/items/weapons/bow/bone-0.ron index 1c7af14dc5..a098e98393 100644 --- a/assets/common/items/weapons/bow/bone-0.ron +++ b/assets/common/items/weapons/bow/bone-0.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.16587302, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/bow/bone-1.ron b/assets/common/items/weapons/bow/bone-1.ron index 3424372a03..c427d2aaa8 100644 --- a/assets/common/items/weapons/bow/bone-1.ron +++ b/assets/common/items/weapons/bow/bone-1.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.12222222, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/bow/bone-2.ron b/assets/common/items/weapons/bow/bone-2.ron index be71797cf2..f149dac143 100644 --- a/assets/common/items/weapons/bow/bone-2.ron +++ b/assets/common/items/weapons/bow/bone-2.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.15, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/bow/bone-3.ron b/assets/common/items/weapons/bow/bone-3.ron index 19987fc4d9..344575fa27 100644 --- a/assets/common/items/weapons/bow/bone-3.ron +++ b/assets/common/items/weapons/bow/bone-3.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.13564593, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/bow/eldwood-0.ron b/assets/common/items/weapons/bow/eldwood-0.ron index 25435a478d..57209f7f42 100644 --- a/assets/common/items/weapons/bow/eldwood-0.ron +++ b/assets/common/items/weapons/bow/eldwood-0.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.13611111, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: High, diff --git a/assets/common/items/weapons/bow/eldwood-1.ron b/assets/common/items/weapons/bow/eldwood-1.ron index 0c31f96b9e..54bcd20f7e 100644 --- a/assets/common/items/weapons/bow/eldwood-1.ron +++ b/assets/common/items/weapons/bow/eldwood-1.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.15511364, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: High, diff --git a/assets/common/items/weapons/bow/eldwood-2.ron b/assets/common/items/weapons/bow/eldwood-2.ron index f0a8056cf1..d1a3b869b6 100644 --- a/assets/common/items/weapons/bow/eldwood-2.ron +++ b/assets/common/items/weapons/bow/eldwood-2.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.11666667, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: High, diff --git a/assets/common/items/weapons/bow/frostwood-0.ron b/assets/common/items/weapons/bow/frostwood-0.ron index d67e26d69e..a1b2722d04 100644 --- a/assets/common/items/weapons/bow/frostwood-0.ron +++ b/assets/common/items/weapons/bow/frostwood-0.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.16363636, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: High, diff --git a/assets/common/items/weapons/bow/frostwood-1.ron b/assets/common/items/weapons/bow/frostwood-1.ron index 302e26d351..1fed9856a3 100644 --- a/assets/common/items/weapons/bow/frostwood-1.ron +++ b/assets/common/items/weapons/bow/frostwood-1.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.1421875, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: High, diff --git a/assets/common/items/weapons/bow/frostwood-2.ron b/assets/common/items/weapons/bow/frostwood-2.ron index 2bd0e96eed..f6b5c2c134 100644 --- a/assets/common/items/weapons/bow/frostwood-2.ron +++ b/assets/common/items/weapons/bow/frostwood-2.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.13165635, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: High, diff --git a/assets/common/items/weapons/bow/hardwood-0.ron b/assets/common/items/weapons/bow/hardwood-0.ron index de893ce3a6..373a82aad4 100644 --- a/assets/common/items/weapons/bow/hardwood-0.ron +++ b/assets/common/items/weapons/bow/hardwood-0.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.1375, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/bow/hardwood-1.ron b/assets/common/items/weapons/bow/hardwood-1.ron index 5d2e90d491..2fc9db0ff3 100644 --- a/assets/common/items/weapons/bow/hardwood-1.ron +++ b/assets/common/items/weapons/bow/hardwood-1.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.114285715, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/bow/hardwood-2.ron b/assets/common/items/weapons/bow/hardwood-2.ron index 3f78a36a89..a4829a5df7 100644 --- a/assets/common/items/weapons/bow/hardwood-2.ron +++ b/assets/common/items/weapons/bow/hardwood-2.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.15, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/bow/hardwood-3.ron b/assets/common/items/weapons/bow/hardwood-3.ron index bf5b2b9a1f..9f53ebee4b 100644 --- a/assets/common/items/weapons/bow/hardwood-3.ron +++ b/assets/common/items/weapons/bow/hardwood-3.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.1789855, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/bow/hardwood-4.ron b/assets/common/items/weapons/bow/hardwood-4.ron index a2d124dd9b..2df1ec4828 100644 --- a/assets/common/items/weapons/bow/hardwood-4.ron +++ b/assets/common/items/weapons/bow/hardwood-4.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.16363636, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/bow/hardwood-5.ron b/assets/common/items/weapons/bow/hardwood-5.ron index 5a814124c3..678394079d 100644 --- a/assets/common/items/weapons/bow/hardwood-5.ron +++ b/assets/common/items/weapons/bow/hardwood-5.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.1257085, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/bow/metal-0.ron b/assets/common/items/weapons/bow/metal-0.ron index 0696588298..43caab6afe 100644 --- a/assets/common/items/weapons/bow/metal-0.ron +++ b/assets/common/items/weapons/bow/metal-0.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.12857144, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/bow/metal-1.ron b/assets/common/items/weapons/bow/metal-1.ron index 0cc1937732..7fc942f238 100644 --- a/assets/common/items/weapons/bow/metal-1.ron +++ b/assets/common/items/weapons/bow/metal-1.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.15, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/bow/metal-2.ron b/assets/common/items/weapons/bow/metal-2.ron index 8916df0541..63fffbd87f 100644 --- a/assets/common/items/weapons/bow/metal-2.ron +++ b/assets/common/items/weapons/bow/metal-2.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.139011, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/bow/metal-3.ron b/assets/common/items/weapons/bow/metal-3.ron index 4fad83c624..0bf7f71ef9 100644 --- a/assets/common/items/weapons/bow/metal-3.ron +++ b/assets/common/items/weapons/bow/metal-3.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.118421055, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/bow/metal-4.ron b/assets/common/items/weapons/bow/metal-4.ron index 874ca51949..636f900ac8 100644 --- a/assets/common/items/weapons/bow/metal-4.ron +++ b/assets/common/items/weapons/bow/metal-4.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.108333334, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/bow/rawwood-0.ron b/assets/common/items/weapons/bow/rawwood-0.ron index 496900e759..f7409ffe61 100644 --- a/assets/common/items/weapons/bow/rawwood-0.ron +++ b/assets/common/items/weapons/bow/rawwood-0.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.0718985, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Low, diff --git a/assets/common/items/weapons/bow/rawwood-1.ron b/assets/common/items/weapons/bow/rawwood-1.ron index 27772d6c6a..b4d4ee73e2 100644 --- a/assets/common/items/weapons/bow/rawwood-1.ron +++ b/assets/common/items/weapons/bow/rawwood-1.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.083333336, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Low, diff --git a/assets/common/items/weapons/bow/sagitta.ron b/assets/common/items/weapons/bow/sagitta.ron index 604feb1dcc..9a51e7115c 100644 --- a/assets/common/items/weapons/bow/sagitta.ron +++ b/assets/common/items/weapons/bow/sagitta.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.11666667, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Legendary, diff --git a/assets/common/items/weapons/bow/starter.ron b/assets/common/items/weapons/bow/starter.ron index beae2fea8b..ee006a4df9 100644 --- a/assets/common/items/weapons/bow/starter.ron +++ b/assets/common/items/weapons/bow/starter.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.09375, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Low, diff --git a/assets/common/items/weapons/bow/velorite.ron b/assets/common/items/weapons/bow/velorite.ron index fb9cd66aa2..f5e1508611 100644 --- a/assets/common/items/weapons/bow/velorite.ron +++ b/assets/common/items/weapons/bow/velorite.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.140625, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Epic, diff --git a/assets/common/items/weapons/bow/wood-0.ron b/assets/common/items/weapons/bow/wood-0.ron index d2ce70af97..ef4dc87dda 100644 --- a/assets/common/items/weapons/bow/wood-0.ron +++ b/assets/common/items/weapons/bow/wood-0.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.0625, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Low, diff --git a/assets/common/items/weapons/bow/wood-1.ron b/assets/common/items/weapons/bow/wood-1.ron index 8748f63c78..469a357839 100644 --- a/assets/common/items/weapons/bow/wood-1.ron +++ b/assets/common/items/weapons/bow/wood-1.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.0795068, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Low, diff --git a/assets/common/items/weapons/bow/wood-2.ron b/assets/common/items/weapons/bow/wood-2.ron index a01f93815a..2c47cee7c1 100644 --- a/assets/common/items/weapons/bow/wood-2.ron +++ b/assets/common/items/weapons/bow/wood-2.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.0703125, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Low, diff --git a/assets/common/items/weapons/bow/wood-3.ron b/assets/common/items/weapons/bow/wood-3.ron index 40ccd2a57f..e84786c33b 100644 --- a/assets/common/items/weapons/bow/wood-3.ron +++ b/assets/common/items/weapons/bow/wood-3.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.055555556, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Low, diff --git a/assets/common/items/weapons/bow/wood-4.ron b/assets/common/items/weapons/bow/wood-4.ron index b096526bc1..3492e806e1 100644 --- a/assets/common/items/weapons/bow/wood-4.ron +++ b/assets/common/items/weapons/bow/wood-4.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.09090909, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Low, diff --git a/assets/common/items/weapons/dagger/basic_0.ron b/assets/common/items/weapons/dagger/basic_0.ron index f671f2b236..dbd6ff0fd4 100644 --- a/assets/common/items/weapons/dagger/basic_0.ron +++ b/assets/common/items/weapons/dagger/basic_0.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.13611111, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: High, diff --git a/assets/common/items/weapons/dagger/cultist_0.ron b/assets/common/items/weapons/dagger/cultist_0.ron index 302d50b2e1..600202f889 100644 --- a/assets/common/items/weapons/dagger/cultist_0.ron +++ b/assets/common/items/weapons/dagger/cultist_0.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.140625, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Epic, diff --git a/assets/common/items/weapons/dagger/starter_dagger.ron b/assets/common/items/weapons/dagger/starter_dagger.ron index 63cb606da2..c0aed604c2 100644 --- a/assets/common/items/weapons/dagger/starter_dagger.ron +++ b/assets/common/items/weapons/dagger/starter_dagger.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.15, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/empty/empty.ron b/assets/common/items/weapons/empty/empty.ron index 420b93436e..cdf38904ec 100644 --- a/assets/common/items/weapons/empty/empty.ron +++ b/assets/common/items/weapons/empty/empty.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.0625, range: 1.0, energy_efficiency: 1.0, + buff_strength: 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 d46a6c99b8..322241ce55 100644 --- a/assets/common/items/weapons/hammer/bronze_hammer-0.ron +++ b/assets/common/items/weapons/hammer/bronze_hammer-0.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.1125, range: 1.0, energy_efficiency: 1.0, + buff_strength: 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 819620065c..93b0ab60ac 100644 --- a/assets/common/items/weapons/hammer/bronze_hammer-1.ron +++ b/assets/common/items/weapons/hammer/bronze_hammer-1.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.1125, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Common, diff --git a/assets/common/items/weapons/hammer/burnt_drumstick.ron b/assets/common/items/weapons/hammer/burnt_drumstick.ron index 4295dd101d..2373f5dfb4 100644 --- a/assets/common/items/weapons/hammer/burnt_drumstick.ron +++ b/assets/common/items/weapons/hammer/burnt_drumstick.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.09375, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Low, diff --git a/assets/common/items/weapons/hammer/cobalt_hammer-0.ron b/assets/common/items/weapons/hammer/cobalt_hammer-0.ron index 867208a97e..3862fd15bb 100644 --- a/assets/common/items/weapons/hammer/cobalt_hammer-0.ron +++ b/assets/common/items/weapons/hammer/cobalt_hammer-0.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.121875, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/hammer/cobalt_hammer-1.ron b/assets/common/items/weapons/hammer/cobalt_hammer-1.ron index ead09ae050..8d192f91c3 100644 --- a/assets/common/items/weapons/hammer/cobalt_hammer-1.ron +++ b/assets/common/items/weapons/hammer/cobalt_hammer-1.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.121875, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, 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 5d353fbd6a..aa02c68b59 100644 --- a/assets/common/items/weapons/hammer/cultist_purp_2h-0.ron +++ b/assets/common/items/weapons/hammer/cultist_purp_2h-0.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.140625, range: 1.0, energy_efficiency: 1.0, + buff_strength: 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 2ddb252a38..24992bcfa9 100644 --- a/assets/common/items/weapons/hammer/flimsy_hammer.ron +++ b/assets/common/items/weapons/hammer/flimsy_hammer.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.09375, range: 1.0, energy_efficiency: 1.0, + buff_strength: 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 2b19de3491..2dad4bbb88 100644 --- a/assets/common/items/weapons/hammer/hammer_1.ron +++ b/assets/common/items/weapons/hammer/hammer_1.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.09375, range: 1.0, energy_efficiency: 1.0, + buff_strength: 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 4c3b15d8c4..f4c258c558 100644 --- a/assets/common/items/weapons/hammer/iron_hammer-0.ron +++ b/assets/common/items/weapons/hammer/iron_hammer-0.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.103125, range: 1.0, energy_efficiency: 1.0, + buff_strength: 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 5836e358b0..3436a072bc 100644 --- a/assets/common/items/weapons/hammer/iron_hammer-1.ron +++ b/assets/common/items/weapons/hammer/iron_hammer-1.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.103125, range: 1.0, energy_efficiency: 1.0, + buff_strength: 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 43cb6abe7a..04e4e8269b 100644 --- a/assets/common/items/weapons/hammer/iron_hammer-2.ron +++ b/assets/common/items/weapons/hammer/iron_hammer-2.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.103125, range: 1.0, energy_efficiency: 1.0, + buff_strength: 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 a3addb1821..4dc171b2a9 100644 --- a/assets/common/items/weapons/hammer/iron_hammer-3.ron +++ b/assets/common/items/weapons/hammer/iron_hammer-3.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.103125, range: 1.0, energy_efficiency: 1.0, + buff_strength: 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 53d684c2cd..b1df589d24 100644 --- a/assets/common/items/weapons/hammer/iron_hammer-4.ron +++ b/assets/common/items/weapons/hammer/iron_hammer-4.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.103125, range: 1.0, energy_efficiency: 1.0, + buff_strength: 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 76b9e60fea..f851ba6265 100644 --- a/assets/common/items/weapons/hammer/iron_hammer-5.ron +++ b/assets/common/items/weapons/hammer/iron_hammer-5.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.103125, range: 1.0, energy_efficiency: 1.0, + buff_strength: 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 f59d57b36d..3c7577a8a6 100644 --- a/assets/common/items/weapons/hammer/iron_hammer-6.ron +++ b/assets/common/items/weapons/hammer/iron_hammer-6.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.103125, range: 1.0, energy_efficiency: 1.0, + buff_strength: 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 5a46380beb..01b7479c0f 100644 --- a/assets/common/items/weapons/hammer/iron_hammer-7.ron +++ b/assets/common/items/weapons/hammer/iron_hammer-7.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.103125, range: 1.0, energy_efficiency: 1.0, + buff_strength: 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 d702aff15b..cfc58443ad 100644 --- a/assets/common/items/weapons/hammer/iron_hammer-8.ron +++ b/assets/common/items/weapons/hammer/iron_hammer-8.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.103125, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Common, diff --git a/assets/common/items/weapons/hammer/mjolnir.ron b/assets/common/items/weapons/hammer/mjolnir.ron index 31d45488c0..d304a1909d 100644 --- a/assets/common/items/weapons/hammer/mjolnir.ron +++ b/assets/common/items/weapons/hammer/mjolnir.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.078125, range: 1.0, energy_efficiency: 1.0, + buff_strength: 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 a7866537d6..fc1a984f0c 100644 --- a/assets/common/items/weapons/hammer/ramshead_hammer.ron +++ b/assets/common/items/weapons/hammer/ramshead_hammer.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.13611111, range: 1.0, energy_efficiency: 1.0, + buff_strength: 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 6971418aa4..fe0da9bda4 100644 --- a/assets/common/items/weapons/hammer/runic_hammer.ron +++ b/assets/common/items/weapons/hammer/runic_hammer.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.13611111, range: 1.0, energy_efficiency: 1.0, + buff_strength: 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 cf9122fd4e..877d3bfa0e 100644 --- a/assets/common/items/weapons/hammer/starter_hammer.ron +++ b/assets/common/items/weapons/hammer/starter_hammer.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.09375, range: 1.0, energy_efficiency: 1.0, + buff_strength: 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 67bf346a74..5afb149591 100644 --- a/assets/common/items/weapons/hammer/steel_hammer-0.ron +++ b/assets/common/items/weapons/hammer/steel_hammer-0.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.12857144, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/hammer/steel_hammer-1.ron b/assets/common/items/weapons/hammer/steel_hammer-1.ron index 72f6158e94..f5371668e5 100644 --- a/assets/common/items/weapons/hammer/steel_hammer-1.ron +++ b/assets/common/items/weapons/hammer/steel_hammer-1.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.12857144, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/hammer/steel_hammer-2.ron b/assets/common/items/weapons/hammer/steel_hammer-2.ron index 56463a7e2d..aab3bcdd76 100644 --- a/assets/common/items/weapons/hammer/steel_hammer-2.ron +++ b/assets/common/items/weapons/hammer/steel_hammer-2.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.12857144, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/hammer/steel_hammer-3.ron b/assets/common/items/weapons/hammer/steel_hammer-3.ron index 662b53abc5..b74c9c62b4 100644 --- a/assets/common/items/weapons/hammer/steel_hammer-3.ron +++ b/assets/common/items/weapons/hammer/steel_hammer-3.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.12857144, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/hammer/steel_hammer-4.ron b/assets/common/items/weapons/hammer/steel_hammer-4.ron index 3509fcde47..9cc699e849 100644 --- a/assets/common/items/weapons/hammer/steel_hammer-4.ron +++ b/assets/common/items/weapons/hammer/steel_hammer-4.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.12857144, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/hammer/steel_hammer-5.ron b/assets/common/items/weapons/hammer/steel_hammer-5.ron index 3b70105d7e..fcf9ad23c7 100644 --- a/assets/common/items/weapons/hammer/steel_hammer-5.ron +++ b/assets/common/items/weapons/hammer/steel_hammer-5.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.12857144, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/hammer/stone_hammer-0.ron b/assets/common/items/weapons/hammer/stone_hammer-0.ron index fc0913845c..7978d451c1 100644 --- a/assets/common/items/weapons/hammer/stone_hammer-0.ron +++ b/assets/common/items/weapons/hammer/stone_hammer-0.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.07589286, range: 1.0, energy_efficiency: 1.0, + buff_strength: 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 4277371bd5..59d7512f2b 100644 --- a/assets/common/items/weapons/hammer/stone_hammer-1.ron +++ b/assets/common/items/weapons/hammer/stone_hammer-1.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.07589286, range: 1.0, energy_efficiency: 1.0, + buff_strength: 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 a8b1fd5851..457b14b2ef 100644 --- a/assets/common/items/weapons/hammer/stone_hammer-2.ron +++ b/assets/common/items/weapons/hammer/stone_hammer-2.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.07589286, range: 1.0, energy_efficiency: 1.0, + buff_strength: 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 5738a5d5a8..a098d06560 100644 --- a/assets/common/items/weapons/hammer/stone_hammer-3.ron +++ b/assets/common/items/weapons/hammer/stone_hammer-3.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.07589286, range: 1.0, energy_efficiency: 1.0, + buff_strength: 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 6b6768fb1f..c8bd565b39 100644 --- a/assets/common/items/weapons/hammer/wood_hammer-0.ron +++ b/assets/common/items/weapons/hammer/wood_hammer-0.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.083333336, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Low, diff --git a/assets/common/items/weapons/hammer_1h/bloodsteel-0.ron b/assets/common/items/weapons/hammer_1h/bloodsteel-0.ron index 1be87d1a02..8d859b80ba 100644 --- a/assets/common/items/weapons/hammer_1h/bloodsteel-0.ron +++ b/assets/common/items/weapons/hammer_1h/bloodsteel-0.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.15511364, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: High, diff --git a/assets/common/items/weapons/hammer_1h/bloodsteel-1.ron b/assets/common/items/weapons/hammer_1h/bloodsteel-1.ron index 0caab7c279..d00a36f38b 100644 --- a/assets/common/items/weapons/hammer_1h/bloodsteel-1.ron +++ b/assets/common/items/weapons/hammer_1h/bloodsteel-1.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.13611111, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: High, diff --git a/assets/common/items/weapons/hammer_1h/bronze-0.ron b/assets/common/items/weapons/hammer_1h/bronze-0.ron index 8f24652b63..09a896067c 100644 --- a/assets/common/items/weapons/hammer_1h/bronze-0.ron +++ b/assets/common/items/weapons/hammer_1h/bronze-0.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.12222222, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/hammer_1h/bronze-1.ron b/assets/common/items/weapons/hammer_1h/bronze-1.ron index 3ab5bea207..4aae1c247b 100644 --- a/assets/common/items/weapons/hammer_1h/bronze-1.ron +++ b/assets/common/items/weapons/hammer_1h/bronze-1.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.15, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/hammer_1h/cobalt-0.ron b/assets/common/items/weapons/hammer_1h/cobalt-0.ron index 3625d80398..e0afcb76d8 100644 --- a/assets/common/items/weapons/hammer_1h/cobalt-0.ron +++ b/assets/common/items/weapons/hammer_1h/cobalt-0.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.1421875, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: High, diff --git a/assets/common/items/weapons/hammer_1h/cobalt-1.ron b/assets/common/items/weapons/hammer_1h/cobalt-1.ron index b72b7b0435..9ec5636729 100644 --- a/assets/common/items/weapons/hammer_1h/cobalt-1.ron +++ b/assets/common/items/weapons/hammer_1h/cobalt-1.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.15277778, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: High, diff --git a/assets/common/items/weapons/hammer_1h/iron-0.ron b/assets/common/items/weapons/hammer_1h/iron-0.ron index b5961ad86e..96d7fba5be 100644 --- a/assets/common/items/weapons/hammer_1h/iron-0.ron +++ b/assets/common/items/weapons/hammer_1h/iron-0.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.114285715, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/hammer_1h/iron-1.ron b/assets/common/items/weapons/hammer_1h/iron-1.ron index 08e219cc0a..efb1b08e90 100644 --- a/assets/common/items/weapons/hammer_1h/iron-1.ron +++ b/assets/common/items/weapons/hammer_1h/iron-1.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.1257085, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/hammer_1h/iron-2.ron b/assets/common/items/weapons/hammer_1h/iron-2.ron index 652dc28e2d..bed337ac3d 100644 --- a/assets/common/items/weapons/hammer_1h/iron-2.ron +++ b/assets/common/items/weapons/hammer_1h/iron-2.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.15, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/hammer_1h/orichalcum-0.ron b/assets/common/items/weapons/hammer_1h/orichalcum-0.ron index cd40d71f44..3245ba2de5 100644 --- a/assets/common/items/weapons/hammer_1h/orichalcum-0.ron +++ b/assets/common/items/weapons/hammer_1h/orichalcum-0.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.140625, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Epic, diff --git a/assets/common/items/weapons/hammer_1h/steel-0.ron b/assets/common/items/weapons/hammer_1h/steel-0.ron index 8dea0d7925..6a6af9f557 100644 --- a/assets/common/items/weapons/hammer_1h/steel-0.ron +++ b/assets/common/items/weapons/hammer_1h/steel-0.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.118421055, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/hammer_1h/steel-1.ron b/assets/common/items/weapons/hammer_1h/steel-1.ron index e95631c135..24218019cd 100644 --- a/assets/common/items/weapons/hammer_1h/steel-1.ron +++ b/assets/common/items/weapons/hammer_1h/steel-1.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.12857144, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/hammer_1h/steel-2.ron b/assets/common/items/weapons/hammer_1h/steel-2.ron index b11baa4143..3560ae80a7 100644 --- a/assets/common/items/weapons/hammer_1h/steel-2.ron +++ b/assets/common/items/weapons/hammer_1h/steel-2.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.15, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/hammer_1h/stone-0.ron b/assets/common/items/weapons/hammer_1h/stone-0.ron index b1e2141d2b..36354f9f0b 100644 --- a/assets/common/items/weapons/hammer_1h/stone-0.ron +++ b/assets/common/items/weapons/hammer_1h/stone-0.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.14311224, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Common, diff --git a/assets/common/items/weapons/hammer_1h/stone-1.ron b/assets/common/items/weapons/hammer_1h/stone-1.ron index e7d79d262f..05c1bd0be0 100644 --- a/assets/common/items/weapons/hammer_1h/stone-1.ron +++ b/assets/common/items/weapons/hammer_1h/stone-1.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.1, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Common, diff --git a/assets/common/items/weapons/hammer_1h/wood-0.ron b/assets/common/items/weapons/hammer_1h/wood-0.ron index 84414576e2..d22e8a5dc1 100644 --- a/assets/common/items/weapons/hammer_1h/wood-0.ron +++ b/assets/common/items/weapons/hammer_1h/wood-0.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.0625, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Low, diff --git a/assets/common/items/weapons/hammer_1h/wood-1.ron b/assets/common/items/weapons/hammer_1h/wood-1.ron index df8b7cf735..e6ba8ea922 100644 --- a/assets/common/items/weapons/hammer_1h/wood-1.ron +++ b/assets/common/items/weapons/hammer_1h/wood-1.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.09821428, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Low, diff --git a/assets/common/items/weapons/sceptre/amethyst.ron b/assets/common/items/weapons/sceptre/amethyst.ron index 7c0eb8a383..9b37b9cb66 100644 --- a/assets/common/items/weapons/sceptre/amethyst.ron +++ b/assets/common/items/weapons/sceptre/amethyst.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.088125, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Epic, diff --git a/assets/common/items/weapons/sceptre/caduceus.ron b/assets/common/items/weapons/sceptre/caduceus.ron index c19a55cedf..140e08e7c8 100644 --- a/assets/common/items/weapons/sceptre/caduceus.ron +++ b/assets/common/items/weapons/sceptre/caduceus.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.078125, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Legendary, diff --git a/assets/common/items/weapons/sceptre/coralline_cane.ron b/assets/common/items/weapons/sceptre/coralline_cane.ron index 63f0308aee..83760b9dbb 100644 --- a/assets/common/items/weapons/sceptre/coralline_cane.ron +++ b/assets/common/items/weapons/sceptre/coralline_cane.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.14666668, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: High, diff --git a/assets/common/items/weapons/sceptre/divine_gohei.ron b/assets/common/items/weapons/sceptre/divine_gohei.ron index 15c32bac0b..d4bd367b01 100644 --- a/assets/common/items/weapons/sceptre/divine_gohei.ron +++ b/assets/common/items/weapons/sceptre/divine_gohei.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.0809375, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Common, diff --git a/assets/common/items/weapons/sceptre/druids_arbor.ron b/assets/common/items/weapons/sceptre/druids_arbor.ron index a0f0ccf80e..b5dcbad131 100644 --- a/assets/common/items/weapons/sceptre/druids_arbor.ron +++ b/assets/common/items/weapons/sceptre/druids_arbor.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.055102043, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/sceptre/emerald.ron b/assets/common/items/weapons/sceptre/emerald.ron index ba8fdd7a2c..e73f53d225 100644 --- a/assets/common/items/weapons/sceptre/emerald.ron +++ b/assets/common/items/weapons/sceptre/emerald.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.140625, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Epic, diff --git a/assets/common/items/weapons/sceptre/fork0.ron b/assets/common/items/weapons/sceptre/fork0.ron index 9d61a08f11..1894439515 100644 --- a/assets/common/items/weapons/sceptre/fork0.ron +++ b/assets/common/items/weapons/sceptre/fork0.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.11666667, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: High, diff --git a/assets/common/items/weapons/sceptre/loops0.ron b/assets/common/items/weapons/sceptre/loops0.ron index 3c7fe60484..149b2acf82 100644 --- a/assets/common/items/weapons/sceptre/loops0.ron +++ b/assets/common/items/weapons/sceptre/loops0.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.1925, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: High, diff --git a/assets/common/items/weapons/sceptre/moon0.ron b/assets/common/items/weapons/sceptre/moon0.ron index 7f29f58dfa..f18da6a96e 100644 --- a/assets/common/items/weapons/sceptre/moon0.ron +++ b/assets/common/items/weapons/sceptre/moon0.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.0609375, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/sceptre/root_evil.ron b/assets/common/items/weapons/sceptre/root_evil.ron index 1f095b601b..4e49b8b06d 100644 --- a/assets/common/items/weapons/sceptre/root_evil.ron +++ b/assets/common/items/weapons/sceptre/root_evil.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.078125, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Legendary, diff --git a/assets/common/items/weapons/sceptre/root_green0.ron b/assets/common/items/weapons/sceptre/root_green0.ron index 3fefc62202..9867a6e5e7 100644 --- a/assets/common/items/weapons/sceptre/root_green0.ron +++ b/assets/common/items/weapons/sceptre/root_green0.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.055102043, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Low, diff --git a/assets/common/items/weapons/sceptre/sceptre_velorite_0.ron b/assets/common/items/weapons/sceptre/sceptre_velorite_0.ron index 06f1086245..b2df1eb8fc 100644 --- a/assets/common/items/weapons/sceptre/sceptre_velorite_0.ron +++ b/assets/common/items/weapons/sceptre/sceptre_velorite_0.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.21153846, range: 1.0, energy_efficiency: 1.0, + buff_strength: 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 94d383dc61..e9075b4d22 100644 --- a/assets/common/items/weapons/sceptre/staff_nature.ron +++ b/assets/common/items/weapons/sceptre/staff_nature.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.16491365, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/sceptre/starter_sceptre.ron b/assets/common/items/weapons/sceptre/starter_sceptre.ron index 7faabc5f98..b34799c3f4 100644 --- a/assets/common/items/weapons/sceptre/starter_sceptre.ron +++ b/assets/common/items/weapons/sceptre/starter_sceptre.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.09375, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Low, diff --git a/assets/common/items/weapons/sceptre/totem_green.ron b/assets/common/items/weapons/sceptre/totem_green.ron index 4901babc23..5aa3edda28 100644 --- a/assets/common/items/weapons/sceptre/totem_green.ron +++ b/assets/common/items/weapons/sceptre/totem_green.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.16363636, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/shield/shield_1.ron b/assets/common/items/weapons/shield/shield_1.ron index fafaceb6c2..ef3be5fc51 100644 --- a/assets/common/items/weapons/shield/shield_1.ron +++ b/assets/common/items/weapons/shield/shield_1.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.1125, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Common, diff --git a/assets/common/items/weapons/staff/aurora.ron b/assets/common/items/weapons/staff/aurora.ron index 799d0c6ecd..547c3dc51a 100644 --- a/assets/common/items/weapons/staff/aurora.ron +++ b/assets/common/items/weapons/staff/aurora.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.2625, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: High, diff --git a/assets/common/items/weapons/staff/bent_fuse.ron b/assets/common/items/weapons/staff/bent_fuse.ron index f13f9c9743..96aa112d66 100644 --- a/assets/common/items/weapons/staff/bent_fuse.ron +++ b/assets/common/items/weapons/staff/bent_fuse.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.17045455, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Low, diff --git a/assets/common/items/weapons/staff/bone_staff.ron b/assets/common/items/weapons/staff/bone_staff.ron index bae3f8751a..245785d2d5 100644 --- a/assets/common/items/weapons/staff/bone_staff.ron +++ b/assets/common/items/weapons/staff/bone_staff.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.1125, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Low, diff --git a/assets/common/items/weapons/staff/crimson_eye.ron b/assets/common/items/weapons/staff/crimson_eye.ron index 611667fd71..894123736e 100644 --- a/assets/common/items/weapons/staff/crimson_eye.ron +++ b/assets/common/items/weapons/staff/crimson_eye.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.125, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Low, diff --git a/assets/common/items/weapons/staff/cultist_staff.ron b/assets/common/items/weapons/staff/cultist_staff.ron index 4388d23569..423081c14e 100644 --- a/assets/common/items/weapons/staff/cultist_staff.ron +++ b/assets/common/items/weapons/staff/cultist_staff.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.140625, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Epic, diff --git a/assets/common/items/weapons/staff/dragon_tongue.ron b/assets/common/items/weapons/staff/dragon_tongue.ron index d23d166945..f04ba52f70 100644 --- a/assets/common/items/weapons/staff/dragon_tongue.ron +++ b/assets/common/items/weapons/staff/dragon_tongue.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.2625, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Epic, diff --git a/assets/common/items/weapons/staff/fiery_wishing_rod.ron b/assets/common/items/weapons/staff/fiery_wishing_rod.ron index 5dab5a9653..da0b7ae5cb 100644 --- a/assets/common/items/weapons/staff/fiery_wishing_rod.ron +++ b/assets/common/items/weapons/staff/fiery_wishing_rod.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.11111111, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Common, diff --git a/assets/common/items/weapons/staff/flamethrower_0.ron b/assets/common/items/weapons/staff/flamethrower_0.ron index e79b06400a..9f3482fe94 100644 --- a/assets/common/items/weapons/staff/flamethrower_0.ron +++ b/assets/common/items/weapons/staff/flamethrower_0.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.113131315, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/staff/frostwood_torch.ron b/assets/common/items/weapons/staff/frostwood_torch.ron index 53aa17da99..2881c528c4 100644 --- a/assets/common/items/weapons/staff/frostwood_torch.ron +++ b/assets/common/items/weapons/staff/frostwood_torch.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.13437909, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: High, diff --git a/assets/common/items/weapons/staff/golden_khakkara.ron b/assets/common/items/weapons/staff/golden_khakkara.ron index 2c0480f605..72298c1042 100644 --- a/assets/common/items/weapons/staff/golden_khakkara.ron +++ b/assets/common/items/weapons/staff/golden_khakkara.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.115, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/staff/heated_arm.ron b/assets/common/items/weapons/staff/heated_arm.ron index 28d1e73c56..b7ffba5f52 100644 --- a/assets/common/items/weapons/staff/heated_arm.ron +++ b/assets/common/items/weapons/staff/heated_arm.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.15, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/staff/infused_tower.ron b/assets/common/items/weapons/staff/infused_tower.ron index d8a17cb716..620113d4d6 100644 --- a/assets/common/items/weapons/staff/infused_tower.ron +++ b/assets/common/items/weapons/staff/infused_tower.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.18715277, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/staff/laevateinn.ron b/assets/common/items/weapons/staff/laevateinn.ron index cab27ff4d9..cfb7ec3675 100644 --- a/assets/common/items/weapons/staff/laevateinn.ron +++ b/assets/common/items/weapons/staff/laevateinn.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.2002994, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Legendary, diff --git a/assets/common/items/weapons/staff/lava_rod.ron b/assets/common/items/weapons/staff/lava_rod.ron index 72f6f919e6..3521264c5e 100644 --- a/assets/common/items/weapons/staff/lava_rod.ron +++ b/assets/common/items/weapons/staff/lava_rod.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.114379086, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/staff/ley_seeker.ron b/assets/common/items/weapons/staff/ley_seeker.ron index 1aa930cc4d..11c0734081 100644 --- a/assets/common/items/weapons/staff/ley_seeker.ron +++ b/assets/common/items/weapons/staff/ley_seeker.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.1125, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Common, diff --git a/assets/common/items/weapons/staff/orc_iron.ron b/assets/common/items/weapons/staff/orc_iron.ron index 189b87b5b1..71de0916b5 100644 --- a/assets/common/items/weapons/staff/orc_iron.ron +++ b/assets/common/items/weapons/staff/orc_iron.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.2638889, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/staff/phoenix.ron b/assets/common/items/weapons/staff/phoenix.ron index c3d5765152..c6e3fd711a 100644 --- a/assets/common/items/weapons/staff/phoenix.ron +++ b/assets/common/items/weapons/staff/phoenix.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.1002994, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Legendary, diff --git a/assets/common/items/weapons/staff/ruby_rod.ron b/assets/common/items/weapons/staff/ruby_rod.ron index d1f3806ff6..1144ff7864 100644 --- a/assets/common/items/weapons/staff/ruby_rod.ron +++ b/assets/common/items/weapons/staff/ruby_rod.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.2625, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: High, diff --git a/assets/common/items/weapons/staff/solar.ron b/assets/common/items/weapons/staff/solar.ron index e0f50051be..80d4199fba 100644 --- a/assets/common/items/weapons/staff/solar.ron +++ b/assets/common/items/weapons/staff/solar.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.125, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/staff/staff_1.ron b/assets/common/items/weapons/staff/staff_1.ron index 3c2993f8e4..b6ebb2e4b2 100644 --- a/assets/common/items/weapons/staff/staff_1.ron +++ b/assets/common/items/weapons/staff/staff_1.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.09375, range: 1.0, energy_efficiency: 1.0, + buff_strength: 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 2710815df6..c099b18efd 100644 --- a/assets/common/items/weapons/staff/starter_staff.ron +++ b/assets/common/items/weapons/staff/starter_staff.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.09375, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Low, diff --git a/assets/common/items/weapons/sword/bloodsteel-0.ron b/assets/common/items/weapons/sword/bloodsteel-0.ron index 042b812187..30b00abbe7 100644 --- a/assets/common/items/weapons/sword/bloodsteel-0.ron +++ b/assets/common/items/weapons/sword/bloodsteel-0.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.13611111, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: High, diff --git a/assets/common/items/weapons/sword/bloodsteel-1.ron b/assets/common/items/weapons/sword/bloodsteel-1.ron index c40299bfbc..c1851194b6 100644 --- a/assets/common/items/weapons/sword/bloodsteel-1.ron +++ b/assets/common/items/weapons/sword/bloodsteel-1.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.15511364, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: High, diff --git a/assets/common/items/weapons/sword/bloodsteel-2.ron b/assets/common/items/weapons/sword/bloodsteel-2.ron index f2f82cda5e..a211ff4a0f 100644 --- a/assets/common/items/weapons/sword/bloodsteel-2.ron +++ b/assets/common/items/weapons/sword/bloodsteel-2.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.11666667, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: High, diff --git a/assets/common/items/weapons/sword/bronze-0.ron b/assets/common/items/weapons/sword/bronze-0.ron index f0156a3a47..ce7faeec50 100644 --- a/assets/common/items/weapons/sword/bronze-0.ron +++ b/assets/common/items/weapons/sword/bronze-0.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.13564593, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/sword/bronze-1.ron b/assets/common/items/weapons/sword/bronze-1.ron index 8cd7ac673f..f0e22034f3 100644 --- a/assets/common/items/weapons/sword/bronze-1.ron +++ b/assets/common/items/weapons/sword/bronze-1.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.16587302, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/sword/bronze-2.ron b/assets/common/items/weapons/sword/bronze-2.ron index d9d0433730..e4a635ba27 100644 --- a/assets/common/items/weapons/sword/bronze-2.ron +++ b/assets/common/items/weapons/sword/bronze-2.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.15, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/sword/caladbolg.ron b/assets/common/items/weapons/sword/caladbolg.ron index 222ff834c0..2705db45f0 100644 --- a/assets/common/items/weapons/sword/caladbolg.ron +++ b/assets/common/items/weapons/sword/caladbolg.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.11666667, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Legendary, diff --git a/assets/common/items/weapons/sword/cobalt-0.ron b/assets/common/items/weapons/sword/cobalt-0.ron index 4b4507638b..327504bf51 100644 --- a/assets/common/items/weapons/sword/cobalt-0.ron +++ b/assets/common/items/weapons/sword/cobalt-0.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.15277778, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: High, diff --git a/assets/common/items/weapons/sword/cobalt-1.ron b/assets/common/items/weapons/sword/cobalt-1.ron index 99471a5a1d..ae0cd3e249 100644 --- a/assets/common/items/weapons/sword/cobalt-1.ron +++ b/assets/common/items/weapons/sword/cobalt-1.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.120987654, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: High, diff --git a/assets/common/items/weapons/sword/cobalt-2.ron b/assets/common/items/weapons/sword/cobalt-2.ron index 550a22f875..2adefc27bd 100644 --- a/assets/common/items/weapons/sword/cobalt-2.ron +++ b/assets/common/items/weapons/sword/cobalt-2.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.1421875, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: High, diff --git a/assets/common/items/weapons/sword/cobalt-3.ron b/assets/common/items/weapons/sword/cobalt-3.ron index 785720c1f9..1857a0477d 100644 --- a/assets/common/items/weapons/sword/cobalt-3.ron +++ b/assets/common/items/weapons/sword/cobalt-3.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.13165635, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: High, diff --git a/assets/common/items/weapons/sword/cultist.ron b/assets/common/items/weapons/sword/cultist.ron index 5a381f6a99..ed718b3950 100644 --- a/assets/common/items/weapons/sword/cultist.ron +++ b/assets/common/items/weapons/sword/cultist.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.140625, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Epic, diff --git a/assets/common/items/weapons/sword/frost-0.ron b/assets/common/items/weapons/sword/frost-0.ron index 77df25a9a0..1c738a52bc 100644 --- a/assets/common/items/weapons/sword/frost-0.ron +++ b/assets/common/items/weapons/sword/frost-0.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.13897058, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: High, diff --git a/assets/common/items/weapons/sword/frost-1.ron b/assets/common/items/weapons/sword/frost-1.ron index aad6042005..10a0529e00 100644 --- a/assets/common/items/weapons/sword/frost-1.ron +++ b/assets/common/items/weapons/sword/frost-1.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.14182693, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Epic, diff --git a/assets/common/items/weapons/sword/iron-0.ron b/assets/common/items/weapons/sword/iron-0.ron index b6bcec4515..291f63d219 100644 --- a/assets/common/items/weapons/sword/iron-0.ron +++ b/assets/common/items/weapons/sword/iron-0.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.13153847, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/sword/iron-1.ron b/assets/common/items/weapons/sword/iron-1.ron index 25eec086ee..0b61f6e87f 100644 --- a/assets/common/items/weapons/sword/iron-1.ron +++ b/assets/common/items/weapons/sword/iron-1.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.10862069, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/sword/iron-10.ron b/assets/common/items/weapons/sword/iron-10.ron index c81e83f6d1..5b94017b70 100644 --- a/assets/common/items/weapons/sword/iron-10.ron +++ b/assets/common/items/weapons/sword/iron-10.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.11996997, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/sword/iron-2.ron b/assets/common/items/weapons/sword/iron-2.ron index 96cf45bc8f..8b58d33b3a 100644 --- a/assets/common/items/weapons/sword/iron-2.ron +++ b/assets/common/items/weapons/sword/iron-2.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.15, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/sword/iron-3.ron b/assets/common/items/weapons/sword/iron-3.ron index a70948ed82..0b0e71ee44 100644 --- a/assets/common/items/weapons/sword/iron-3.ron +++ b/assets/common/items/weapons/sword/iron-3.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.14363733, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/sword/iron-4.ron b/assets/common/items/weapons/sword/iron-4.ron index c5ce6a2a0f..f522ac5de7 100644 --- a/assets/common/items/weapons/sword/iron-4.ron +++ b/assets/common/items/weapons/sword/iron-4.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.1257085, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/sword/iron-5.ron b/assets/common/items/weapons/sword/iron-5.ron index 155c9ad17c..0cc9a8bd9d 100644 --- a/assets/common/items/weapons/sword/iron-5.ron +++ b/assets/common/items/weapons/sword/iron-5.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.15664452, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/sword/iron-6.ron b/assets/common/items/weapons/sword/iron-6.ron index f0044ae283..44d4393cc3 100644 --- a/assets/common/items/weapons/sword/iron-6.ron +++ b/assets/common/items/weapons/sword/iron-6.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.1375, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/sword/iron-7.ron b/assets/common/items/weapons/sword/iron-7.ron index 21ebd06880..f8aee3d7eb 100644 --- a/assets/common/items/weapons/sword/iron-7.ron +++ b/assets/common/items/weapons/sword/iron-7.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.114285715, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/sword/iron-8.ron b/assets/common/items/weapons/sword/iron-8.ron index 410fb7b386..a35a0a257e 100644 --- a/assets/common/items/weapons/sword/iron-8.ron +++ b/assets/common/items/weapons/sword/iron-8.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.16363636, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/sword/iron-9.ron b/assets/common/items/weapons/sword/iron-9.ron index ffbbe6e0b3..5d94b7cda6 100644 --- a/assets/common/items/weapons/sword/iron-9.ron +++ b/assets/common/items/weapons/sword/iron-9.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.17105263, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/sword/starter.ron b/assets/common/items/weapons/sword/starter.ron index de54fa860a..8350bf0f91 100644 --- a/assets/common/items/weapons/sword/starter.ron +++ b/assets/common/items/weapons/sword/starter.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.09375, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Low, diff --git a/assets/common/items/weapons/sword/steel-0.ron b/assets/common/items/weapons/sword/steel-0.ron index 17cc10fd50..64b5d56a73 100644 --- a/assets/common/items/weapons/sword/steel-0.ron +++ b/assets/common/items/weapons/sword/steel-0.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.12857144, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/sword/steel-1.ron b/assets/common/items/weapons/sword/steel-1.ron index 901330cd87..58f32ee999 100644 --- a/assets/common/items/weapons/sword/steel-1.ron +++ b/assets/common/items/weapons/sword/steel-1.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.1234748, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/sword/steel-2.ron b/assets/common/items/weapons/sword/steel-2.ron index 74526489f9..80e6e900c9 100644 --- a/assets/common/items/weapons/sword/steel-2.ron +++ b/assets/common/items/weapons/sword/steel-2.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.14441861, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/sword/steel-3.ron b/assets/common/items/weapons/sword/steel-3.ron index cdebe8a3ae..a8c50fa6da 100644 --- a/assets/common/items/weapons/sword/steel-3.ron +++ b/assets/common/items/weapons/sword/steel-3.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.118421055, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/sword/steel-4.ron b/assets/common/items/weapons/sword/steel-4.ron index 78c4320948..6bd7d5917f 100644 --- a/assets/common/items/weapons/sword/steel-4.ron +++ b/assets/common/items/weapons/sword/steel-4.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.113382734, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/sword/steel-5.ron b/assets/common/items/weapons/sword/steel-5.ron index 245df91e81..4f66f924f0 100644 --- a/assets/common/items/weapons/sword/steel-5.ron +++ b/assets/common/items/weapons/sword/steel-5.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.15, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/sword/steel-6.ron b/assets/common/items/weapons/sword/steel-6.ron index b6d1976f92..be3d39431c 100644 --- a/assets/common/items/weapons/sword/steel-6.ron +++ b/assets/common/items/weapons/sword/steel-6.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.139011, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/sword/steel-7.ron b/assets/common/items/weapons/sword/steel-7.ron index dc0d4669d7..7194e1309b 100644 --- a/assets/common/items/weapons/sword/steel-7.ron +++ b/assets/common/items/weapons/sword/steel-7.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.108333334, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/sword/steel-8.ron b/assets/common/items/weapons/sword/steel-8.ron index d3536a94e1..efcb9f3b5f 100644 --- a/assets/common/items/weapons/sword/steel-8.ron +++ b/assets/common/items/weapons/sword/steel-8.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.13373984, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/sword/stone-0.ron b/assets/common/items/weapons/sword/stone-0.ron index ba3bd23aa6..0acac17d3d 100644 --- a/assets/common/items/weapons/sword/stone-0.ron +++ b/assets/common/items/weapons/sword/stone-0.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.055555556, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Low, diff --git a/assets/common/items/weapons/sword/stone-1.ron b/assets/common/items/weapons/sword/stone-1.ron index 2229cb26c4..6e87324322 100644 --- a/assets/common/items/weapons/sword/stone-1.ron +++ b/assets/common/items/weapons/sword/stone-1.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.0703125, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Low, diff --git a/assets/common/items/weapons/sword/stone-2.ron b/assets/common/items/weapons/sword/stone-2.ron index a29af4ec86..18579de35a 100644 --- a/assets/common/items/weapons/sword/stone-2.ron +++ b/assets/common/items/weapons/sword/stone-2.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.0625, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Low, diff --git a/assets/common/items/weapons/sword/wood-0.ron b/assets/common/items/weapons/sword/wood-0.ron index 6f2a3ddec8..aadf349da3 100644 --- a/assets/common/items/weapons/sword/wood-0.ron +++ b/assets/common/items/weapons/sword/wood-0.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.083333336, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Low, diff --git a/assets/common/items/weapons/sword/wood-1.ron b/assets/common/items/weapons/sword/wood-1.ron index 323431a57a..7ef37d79de 100644 --- a/assets/common/items/weapons/sword/wood-1.ron +++ b/assets/common/items/weapons/sword/wood-1.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.0625, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Low, diff --git a/assets/common/items/weapons/sword/wood-2.ron b/assets/common/items/weapons/sword/wood-2.ron index c8c730eddb..695e4b9457 100644 --- a/assets/common/items/weapons/sword/wood-2.ron +++ b/assets/common/items/weapons/sword/wood-2.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.09821428, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Low, diff --git a/assets/common/items/weapons/sword_1h/bloodsteel-0.ron b/assets/common/items/weapons/sword_1h/bloodsteel-0.ron index 7d5510a0ef..2cf2f1aa8c 100644 --- a/assets/common/items/weapons/sword_1h/bloodsteel-0.ron +++ b/assets/common/items/weapons/sword_1h/bloodsteel-0.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.16712894, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: High, diff --git a/assets/common/items/weapons/sword_1h/bloodsteel-1.ron b/assets/common/items/weapons/sword_1h/bloodsteel-1.ron index 1750b717d8..4bc30540c8 100644 --- a/assets/common/items/weapons/sword_1h/bloodsteel-1.ron +++ b/assets/common/items/weapons/sword_1h/bloodsteel-1.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.1125, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: High, diff --git a/assets/common/items/weapons/sword_1h/bloodsteel-2.ron b/assets/common/items/weapons/sword_1h/bloodsteel-2.ron index f03c62c0b9..9c8157654e 100644 --- a/assets/common/items/weapons/sword_1h/bloodsteel-2.ron +++ b/assets/common/items/weapons/sword_1h/bloodsteel-2.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.1375, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: High, diff --git a/assets/common/items/weapons/sword_1h/bronze-0.ron b/assets/common/items/weapons/sword_1h/bronze-0.ron index 4244dbed62..a46893234e 100644 --- a/assets/common/items/weapons/sword_1h/bronze-0.ron +++ b/assets/common/items/weapons/sword_1h/bronze-0.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.14958791, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Common, diff --git a/assets/common/items/weapons/sword_1h/bronze-1.ron b/assets/common/items/weapons/sword_1h/bronze-1.ron index a01563be9e..bc09df6def 100644 --- a/assets/common/items/weapons/sword_1h/bronze-1.ron +++ b/assets/common/items/weapons/sword_1h/bronze-1.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.13125, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Common, diff --git a/assets/common/items/weapons/sword_1h/bronze-2.ron b/assets/common/items/weapons/sword_1h/bronze-2.ron index 6b193bc6b5..aba86de79e 100644 --- a/assets/common/items/weapons/sword_1h/bronze-2.ron +++ b/assets/common/items/weapons/sword_1h/bronze-2.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.11598297, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Common, diff --git a/assets/common/items/weapons/sword_1h/cobalt-0.ron b/assets/common/items/weapons/sword_1h/cobalt-0.ron index 8e2a550ff9..0cdc5e7a30 100644 --- a/assets/common/items/weapons/sword_1h/cobalt-0.ron +++ b/assets/common/items/weapons/sword_1h/cobalt-0.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.14475524, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/sword_1h/cobalt-1.ron b/assets/common/items/weapons/sword_1h/cobalt-1.ron index b60c47cb66..1f49fa089a 100644 --- a/assets/common/items/weapons/sword_1h/cobalt-1.ron +++ b/assets/common/items/weapons/sword_1h/cobalt-1.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.105882354, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/sword_1h/cobalt-2.ron b/assets/common/items/weapons/sword_1h/cobalt-2.ron index 25d0187fad..520a7328c0 100644 --- a/assets/common/items/weapons/sword_1h/cobalt-2.ron +++ b/assets/common/items/weapons/sword_1h/cobalt-2.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.13469388, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/sword_1h/cobalt-3.ron b/assets/common/items/weapons/sword_1h/cobalt-3.ron index 294a6ead99..2932e500e7 100644 --- a/assets/common/items/weapons/sword_1h/cobalt-3.ron +++ b/assets/common/items/weapons/sword_1h/cobalt-3.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.11546052, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/sword_1h/iron-0.ron b/assets/common/items/weapons/sword_1h/iron-0.ron index 761e4561d9..1db773f0d8 100644 --- a/assets/common/items/weapons/sword_1h/iron-0.ron +++ b/assets/common/items/weapons/sword_1h/iron-0.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.1125, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Common, diff --git a/assets/common/items/weapons/sword_1h/iron-1.ron b/assets/common/items/weapons/sword_1h/iron-1.ron index 8ad329fbec..7fb13fc469 100644 --- a/assets/common/items/weapons/sword_1h/iron-1.ron +++ b/assets/common/items/weapons/sword_1h/iron-1.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.124404766, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Common, diff --git a/assets/common/items/weapons/sword_1h/iron-2.ron b/assets/common/items/weapons/sword_1h/iron-2.ron index b82aaba59a..bef6341caf 100644 --- a/assets/common/items/weapons/sword_1h/iron-2.ron +++ b/assets/common/items/weapons/sword_1h/iron-2.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.09166667, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Common, diff --git a/assets/common/items/weapons/sword_1h/iron-3.ron b/assets/common/items/weapons/sword_1h/iron-3.ron index f52382d58f..ab372db06c 100644 --- a/assets/common/items/weapons/sword_1h/iron-3.ron +++ b/assets/common/items/weapons/sword_1h/iron-3.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.13806818, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Common, diff --git a/assets/common/items/weapons/sword_1h/iron-4.ron b/assets/common/items/weapons/sword_1h/iron-4.ron index beed4c0e52..a4d4fe2580 100644 --- a/assets/common/items/weapons/sword_1h/iron-4.ron +++ b/assets/common/items/weapons/sword_1h/iron-4.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.10173445, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Common, diff --git a/assets/common/items/weapons/sword_1h/obsidian-0.ron b/assets/common/items/weapons/sword_1h/obsidian-0.ron index a78ad76167..23dd50a938 100644 --- a/assets/common/items/weapons/sword_1h/obsidian-0.ron +++ b/assets/common/items/weapons/sword_1h/obsidian-0.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.117663816, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: High, diff --git a/assets/common/items/weapons/sword_1h/orichalcum-0.ron b/assets/common/items/weapons/sword_1h/orichalcum-0.ron index 14da7b7004..478de886ab 100644 --- a/assets/common/items/weapons/sword_1h/orichalcum-0.ron +++ b/assets/common/items/weapons/sword_1h/orichalcum-0.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.13110903, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Epic, diff --git a/assets/common/items/weapons/sword_1h/orichalcum-1.ron b/assets/common/items/weapons/sword_1h/orichalcum-1.ron index 5045377e0f..9f84b2286b 100644 --- a/assets/common/items/weapons/sword_1h/orichalcum-1.ron +++ b/assets/common/items/weapons/sword_1h/orichalcum-1.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.14990601, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Epic, diff --git a/assets/common/items/weapons/sword_1h/steel-0.ron b/assets/common/items/weapons/sword_1h/steel-0.ron index 77401efce9..fe6496cb9f 100644 --- a/assets/common/items/weapons/sword_1h/steel-0.ron +++ b/assets/common/items/weapons/sword_1h/steel-0.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.10714286, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/sword_1h/steel-1.ron b/assets/common/items/weapons/sword_1h/steel-1.ron index ab8c55a325..55cbddfd31 100644 --- a/assets/common/items/weapons/sword_1h/steel-1.ron +++ b/assets/common/items/weapons/sword_1h/steel-1.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.12928994, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/sword_1h/steel-2.ron b/assets/common/items/weapons/sword_1h/steel-2.ron index d7431a67e4..c27cd28984 100644 --- a/assets/common/items/weapons/sword_1h/steel-2.ron +++ b/assets/common/items/weapons/sword_1h/steel-2.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.15974025, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/sword_1h/steel-3.ron b/assets/common/items/weapons/sword_1h/steel-3.ron index be0e827410..3549207585 100644 --- a/assets/common/items/weapons/sword_1h/steel-3.ron +++ b/assets/common/items/weapons/sword_1h/steel-3.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.14085366, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/tool/broom.ron b/assets/common/items/weapons/tool/broom.ron index d0b8dfb3e3..d2825173a9 100644 --- a/assets/common/items/weapons/tool/broom.ron +++ b/assets/common/items/weapons/tool/broom.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.1125, range: 1.0, energy_efficiency: 1.0, + buff_strength: 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 992b82f7ad..467ccbe468 100644 --- a/assets/common/items/weapons/tool/fishing_rod.ron +++ b/assets/common/items/weapons/tool/fishing_rod.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.1125, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Common, diff --git a/assets/common/items/weapons/tool/hoe.ron b/assets/common/items/weapons/tool/hoe.ron index daf7c46153..19da48545b 100644 --- a/assets/common/items/weapons/tool/hoe.ron +++ b/assets/common/items/weapons/tool/hoe.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.1125, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Common, diff --git a/assets/common/items/weapons/tool/pickaxe.ron b/assets/common/items/weapons/tool/pickaxe.ron index 22ce0c283b..dc49cf9556 100644 --- a/assets/common/items/weapons/tool/pickaxe.ron +++ b/assets/common/items/weapons/tool/pickaxe.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.1125, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Common, diff --git a/assets/common/items/weapons/tool/pitchfork.ron b/assets/common/items/weapons/tool/pitchfork.ron index 4d8cb9b483..fa35b03cf0 100644 --- a/assets/common/items/weapons/tool/pitchfork.ron +++ b/assets/common/items/weapons/tool/pitchfork.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.1125, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Common, diff --git a/assets/common/items/weapons/tool/rake.ron b/assets/common/items/weapons/tool/rake.ron index ca2e7c7365..859ac44fa5 100644 --- a/assets/common/items/weapons/tool/rake.ron +++ b/assets/common/items/weapons/tool/rake.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.1125, range: 1.0, energy_efficiency: 1.0, + buff_strength: 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 919d26ea64..e05c6efce2 100644 --- a/assets/common/items/weapons/tool/shovel-0.ron +++ b/assets/common/items/weapons/tool/shovel-0.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.1125, range: 1.0, energy_efficiency: 1.0, + buff_strength: 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 185e6acf7e..b9bddbbaae 100644 --- a/assets/common/items/weapons/tool/shovel-1.ron +++ b/assets/common/items/weapons/tool/shovel-1.ron @@ -12,6 +12,7 @@ ItemDef( crit_chance: 0.1125, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, )), )), quality: Common, diff --git a/assets/common/material_stats_manifest.ron b/assets/common/material_stats_manifest.ron index f700e76303..66ca732282 100644 --- a/assets/common/material_stats_manifest.ron +++ b/assets/common/material_stats_manifest.ron @@ -8,6 +8,7 @@ crit_chance: 1.75, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, ), "common.items.mineral.ingot.bronze": ( equip_time_secs: 1.0, @@ -17,6 +18,7 @@ crit_chance: 0.75, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, ), "common.items.mineral.ingot.cobalt": ( equip_time_secs: 1.0, @@ -26,6 +28,7 @@ crit_chance: 1.5, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, ), "common.items.mineral.ingot.copper": ( equip_time_secs: 1.0, @@ -35,6 +38,7 @@ crit_chance: 0.4, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, ), "common.items.mineral.ingot.iron": ( equip_time_secs: 1.0, @@ -44,6 +48,7 @@ crit_chance: 1.0, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, ), "common.items.mineral.ingot.steel": ( equip_time_secs: 1.0, @@ -53,6 +58,7 @@ crit_chance: 1.25, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, ), "common.items.mineral.ingot.tin": ( equip_time_secs: 1.0, @@ -62,5 +68,6 @@ crit_chance: 0.25, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, ), }) diff --git a/common/src/bin/csv_export/main.rs b/common/src/bin/csv_export/main.rs index c1db5e2fca..a71c31438b 100644 --- a/common/src/bin/csv_export/main.rs +++ b/common/src/bin/csv_export/main.rs @@ -102,49 +102,47 @@ fn weapon_stats() -> Result<(), Box> { "Crit Chance", "Range", "Energy Efficiency", + "Buff Strength", "Equip Time (s)", "Description", ])?; let msm = MaterialStatManifest::default(); - let mut items: Vec = comp::Item::new_from_asset_glob("common.items.weapons.*") + // Does all items even outside weapon folder since we check if itemkind was a + // tool anyways + let items: Vec = comp::Item::new_from_asset_glob("common.items.*") .expect("Failed to iterate over item folders!"); - items.extend( - comp::Item::new_from_asset_glob("common.items.npc_weapons.*") - .expect("Failed to iterate over npc weapons!"), - ); for item in items.iter() { - match item.kind() { - comp::item::ItemKind::Tool(tool) => { - let power = tool.base_power(&msm, &[]).to_string(); - let effect_power = tool.base_effect_power(&msm, &[]).to_string(); - let speed = tool.base_speed(&msm, &[]).to_string(); - let crit_chance = tool.base_crit_chance(&msm, &[]).to_string(); - let range = tool.base_range(&msm, &[]).to_string(); - let energy_efficiency = tool.base_energy_efficiency(&msm, &[]).to_string(); - let equip_time = tool.equip_time(&msm, &[]).as_secs_f32().to_string(); - let kind = get_tool_kind(&tool.kind); - let hands = get_tool_hands(&tool); + if let comp::item::ItemKind::Tool(tool) = item.kind() { + let power = tool.base_power(&msm, &[]).to_string(); + let effect_power = tool.base_effect_power(&msm, &[]).to_string(); + let speed = tool.base_speed(&msm, &[]).to_string(); + let crit_chance = tool.base_crit_chance(&msm, &[]).to_string(); + let range = tool.base_range(&msm, &[]).to_string(); + let energy_efficiency = tool.base_energy_efficiency(&msm, &[]).to_string(); + let buff_strength = tool.base_buff_strength(&msm, &[]).to_string(); + let equip_time = tool.equip_time(&msm, &[]).as_secs_f32().to_string(); + let kind = get_tool_kind(&tool.kind); + let hands = get_tool_hands(&tool); - wtr.write_record(&[ - item.item_definition_id(), - &kind, - item.name(), - &hands, - &format!("{:?}", item.quality()), - &power, - &effect_power, - &speed, - &crit_chance, - &range, - &energy_efficiency, - &equip_time, - item.description(), - ])?; - }, - _ => println!("Skipping non-weapon item: {:?}\n", item), + wtr.write_record(&[ + item.item_definition_id(), + &kind, + item.name(), + &hands, + &format!("{:?}", item.quality()), + &power, + &effect_power, + &speed, + &crit_chance, + &range, + &energy_efficiency, + &buff_strength, + &equip_time, + item.description(), + ])?; } } diff --git a/common/src/bin/csv_import/main.rs b/common/src/bin/csv_import/main.rs index 5880123567..3d09ba9269 100644 --- a/common/src/bin/csv_import/main.rs +++ b/common/src/bin/csv_import/main.rs @@ -13,7 +13,7 @@ use veloren_common::{ self, item::{ armor::{ArmorKind, Protection}, - tool::AbilitySpec, + tool::{AbilitySpec, Stats}, ItemDesc, ItemKind, ItemTag, Quality, }, }, @@ -255,177 +255,177 @@ fn weapon_stats() -> Result<(), Box> { .collect(); for record in rdr.records() { - let mut items: Vec = comp::Item::new_from_asset_glob("common.items.weapons.*") + // Does all items even outside weapons since we check if itemkind was a tool + // anyways + let items: Vec = comp::Item::new_from_asset_glob("common.items.*") .expect("Failed to iterate over item folders!"); - items.extend( - comp::Item::new_from_asset_glob("common.items.npc_weapons.*") - .expect("Failed to iterate over npc weapons!"), - ); + for item in items.iter() { - match item.kind() { - comp::item::ItemKind::Tool(tool) => { - if let Ok(ref record) = record { - if item.item_definition_id() - == record.get(headers["Path"]).expect("No file path in csv?") - { - let kind = tool.kind; - let equip_time_secs: f32 = record - .get(headers["Equip Time (s)"]) - .expect(&format!( - "Error unwrapping equip time for {:?}", - item.item_definition_id() - )) - .parse() - .expect(&format!("Not a u32? {:?}", item.item_definition_id())); - let power: f32 = record - .get(headers["Power"]) - .expect(&format!( - "Error unwrapping power for {:?}", - item.item_definition_id() - )) - .parse() - .expect(&format!("Not a f32? {:?}", item.item_definition_id())); - let effect_power: f32 = record - .get(headers["Effect Power"]) - .expect(&format!( - "Error unwrapping effect power for {:?}", - item.item_definition_id() - )) - .parse() - .expect(&format!("Not a f32? {:?}", item.item_definition_id())); - - let speed: f32 = record - .get(headers["Speed"]) - .expect(&format!( - "Error unwrapping speed for {:?}", - item.item_definition_id() - )) - .parse() - .expect(&format!("Not a f32? {:?}", item.item_definition_id())); - - let hands = if let Some(hands_raw) = record.get(headers["Hands"]) { - match hands_raw { - "One" | "1" | "1h" => comp::item::tool::Hands::One, - "Two" | "2" | "2h" => comp::item::tool::Hands::Two, - _ => { - eprintln!( - "Unknown hand variant for {:?}", - item.item_definition_id() - ); - comp::item::tool::Hands::Two - }, - } - } else { - eprintln!( - "Could not unwrap hand for {:?}", - item.item_definition_id() - ); - comp::item::tool::Hands::Two - }; - - let crit_chance: f32 = record - .get(headers["Crit Chance"]) - .expect(&format!( - "Error unwrapping crit_chance for {:?}", - item.item_definition_id() - )) - .parse() - .expect(&format!("Not a f32? {:?}", item.item_definition_id())); - - let range: f32 = record - .get(headers["Range"]) - .expect(&format!( - "Error unwrapping range for {:?}", - item.item_definition_id() - )) - .parse() - .expect(&format!("Not a f32? {:?}", item.item_definition_id())); - - let energy_efficiency: f32 = record - .get(headers["Energy Efficiency"]) - .expect(&format!( - "Error unwrapping energy efficiency for {:?}", - item.item_definition_id() - )) - .parse() - .expect(&format!("Not a f32? {:?}", item.item_definition_id())); - - let tool = comp::item::tool::Tool::new( - kind, - hands, - equip_time_secs, - power, - effect_power, - speed, - crit_chance, - range, - energy_efficiency, - ); - - let quality = if let Some(quality_raw) = record.get(headers["Quality"]) - { - match quality_raw { - "Low" => comp::item::Quality::Low, - "Common" => comp::item::Quality::Common, - "Moderate" => comp::item::Quality::Moderate, - "High" => comp::item::Quality::High, - "Epic" => comp::item::Quality::Epic, - "Legendary" => comp::item::Quality::Legendary, - "Artifact" => comp::item::Quality::Artifact, - "Debug" => comp::item::Quality::Debug, - _ => { - eprintln!( - "Unknown quality variant for {:?}", - item.item_definition_id() - ); - comp::item::Quality::Debug - }, - } - } else { - eprintln!( - "Could not unwrap quality for {:?}", - item.item_definition_id() - ); - comp::item::Quality::Debug - }; - - let description = record.get(headers["Description"]).expect(&format!( - "Error unwrapping description for {:?}", + if let comp::item::ItemKind::Tool(tool) = item.kind() { + if let Ok(ref record) = record { + if item.item_definition_id() + == record.get(headers["Path"]).expect("No file path in csv?") + { + let kind = tool.kind; + let equip_time_secs: f32 = record + .get(headers["Equip Time (s)"]) + .expect(&format!( + "Error unwrapping equip time for {:?}", item.item_definition_id() - )); + )) + .parse() + .expect(&format!("Not a u32? {:?}", item.item_definition_id())); + let power: f32 = record + .get(headers["Power"]) + .expect(&format!( + "Error unwrapping power for {:?}", + item.item_definition_id() + )) + .parse() + .expect(&format!("Not a f32? {:?}", item.item_definition_id())); + let effect_power: f32 = record + .get(headers["Effect Power"]) + .expect(&format!( + "Error unwrapping effect power for {:?}", + item.item_definition_id() + )) + .parse() + .expect(&format!("Not a f32? {:?}", item.item_definition_id())); - let fake_item = FakeItemDef::new( - item.name().to_string(), - description.to_string(), - ItemKind::Tool(tool), - quality, - item.tags().to_vec(), - item.ability_spec.clone(), - ); + let speed: f32 = record + .get(headers["Speed"]) + .expect(&format!( + "Error unwrapping speed for {:?}", + item.item_definition_id() + )) + .parse() + .expect(&format!("Not a f32? {:?}", item.item_definition_id())); - let pretty_config = PrettyConfig::new() - .with_depth_limit(4) - .with_separate_tuple_members(true) - .with_decimal_floats(true) - .with_enumerate_arrays(true); - - let mut path = ASSETS_PATH.clone(); - for part in item.item_definition_id().split('.') { - path.push(part); + let hands = if let Some(hands_raw) = record.get(headers["Hands"]) { + match hands_raw { + "One" | "1" | "1h" => comp::item::tool::Hands::One, + "Two" | "2" | "2h" => comp::item::tool::Hands::Two, + _ => { + eprintln!( + "Unknown hand variant for {:?}", + item.item_definition_id() + ); + comp::item::tool::Hands::Two + }, } - path.set_extension("ron"); + } else { + eprintln!("Could not unwrap hand for {:?}", item.item_definition_id()); + comp::item::tool::Hands::Two + }; - let path_str = path.to_str().expect("File path not unicode?!"); - let mut writer = File::create(path_str)?; - write!( - writer, - "ItemDef{}", - to_string_pretty(&fake_item, pretty_config)?.replace("\\'", "'") - )?; + let crit_chance: f32 = record + .get(headers["Crit Chance"]) + .expect(&format!( + "Error unwrapping crit_chance for {:?}", + item.item_definition_id() + )) + .parse() + .expect(&format!("Not a f32? {:?}", item.item_definition_id())); + + let range: f32 = record + .get(headers["Range"]) + .expect(&format!( + "Error unwrapping range for {:?}", + item.item_definition_id() + )) + .parse() + .expect(&format!("Not a f32? {:?}", item.item_definition_id())); + + let energy_efficiency: f32 = record + .get(headers["Energy Efficiency"]) + .expect(&format!( + "Error unwrapping energy efficiency for {:?}", + item.item_definition_id() + )) + .parse() + .expect(&format!("Not a f32? {:?}", item.item_definition_id())); + + let buff_strength: f32 = record + .get(headers["Buff Strength"]) + .expect(&format!( + "Error unwrapping buff strength for {:?}", + item.item_definition_id() + )) + .parse() + .expect(&format!("Not a f32? {:?}", item.item_definition_id())); + + let tool = comp::item::tool::Tool::new(kind, hands, Stats { + equip_time_secs, + power, + effect_power, + speed, + crit_chance, + range, + energy_efficiency, + buff_strength, + }); + + let quality = if let Some(quality_raw) = record.get(headers["Quality"]) { + match quality_raw { + "Low" => comp::item::Quality::Low, + "Common" => comp::item::Quality::Common, + "Moderate" => comp::item::Quality::Moderate, + "High" => comp::item::Quality::High, + "Epic" => comp::item::Quality::Epic, + "Legendary" => comp::item::Quality::Legendary, + "Artifact" => comp::item::Quality::Artifact, + "Debug" => comp::item::Quality::Debug, + _ => { + eprintln!( + "Unknown quality variant for {:?}", + item.item_definition_id() + ); + comp::item::Quality::Debug + }, + } + } else { + eprintln!( + "Could not unwrap quality for {:?}", + item.item_definition_id() + ); + comp::item::Quality::Debug + }; + + let description = record.get(headers["Description"]).expect(&format!( + "Error unwrapping description for {:?}", + item.item_definition_id() + )); + + let fake_item = FakeItemDef::new( + item.name().to_string(), + description.to_string(), + ItemKind::Tool(tool), + quality, + item.tags().to_vec(), + item.ability_spec.clone(), + ); + + let pretty_config = PrettyConfig::new() + .with_depth_limit(4) + .with_separate_tuple_members(true) + .with_decimal_floats(true) + .with_enumerate_arrays(true); + + let mut path = ASSETS_PATH.clone(); + for part in item.item_definition_id().split('.') { + path.push(part); } + path.set_extension("ron"); + + let path_str = path.to_str().expect("File path not unicode?!"); + let mut writer = File::create(path_str)?; + write!( + writer, + "ItemDef{}", + to_string_pretty(&fake_item, pretty_config)?.replace("\\'", "'") + )?; } - }, - _ => println!("Skipping non-weapon item: {:?}\n", item), + } } } } diff --git a/common/src/combat.rs b/common/src/combat.rs index 0bdd184fb5..1bd42c2389 100644 --- a/common/src/combat.rs +++ b/common/src/combat.rs @@ -30,7 +30,7 @@ use serde::{Deserialize, Serialize}; #[cfg(not(target_arch = "wasm32"))] use specs::Entity as EcsEntity; #[cfg(not(target_arch = "wasm32"))] -use std::time::Duration; +use std::{ops::MulAssign, time::Duration}; #[cfg(not(target_arch = "wasm32"))] use vek::*; #[cfg(not(target_arch = "wasm32"))] @@ -705,6 +705,16 @@ impl CombatBuffStrength { } } +impl MulAssign for CombatBuffStrength { + fn mul_assign(&mut self, mul: f32) { + match self { + Self::DamageFraction(ref mut val) | Self::Value(ref mut val) => { + *val *= mul; + }, + } + } +} + #[cfg(not(target_arch = "wasm32"))] impl CombatBuff { fn to_buff(self, uid: Option, damage: f32) -> Buff { @@ -724,15 +734,6 @@ impl CombatBuff { source, ) } - - pub fn default_physical() -> Self { - Self { - kind: BuffKind::Bleeding, - dur_secs: 10.0, - strength: CombatBuffStrength::DamageFraction(0.1), - chance: 0.1, - } - } } #[cfg(not(target_arch = "wasm32"))] diff --git a/common/src/comp/ability.rs b/common/src/comp/ability.rs index c1ac7f1d1b..60293bf8d6 100644 --- a/common/src/comp/ability.rs +++ b/common/src/comp/ability.rs @@ -122,6 +122,7 @@ pub enum CharacterAbility { charge_through: bool, is_interruptible: bool, damage_kind: DamageKind, + damage_effect: Option, }, BasicBlock { buildup_duration: f32, @@ -163,6 +164,7 @@ pub enum CharacterAbility { forward_leap_strength: f32, vertical_leap_strength: f32, damage_kind: DamageKind, + damage_effect: Option, }, SpinMelee { buildup_duration: f32, @@ -200,6 +202,7 @@ pub enum CharacterAbility { recover_duration: f32, specifier: Option, damage_kind: DamageKind, + damage_effect: Option, }, ChargedRanged { energy_cost: f32, @@ -235,6 +238,7 @@ pub enum CharacterAbility { move_efficiency: f32, damage_kind: DamageKind, specifier: comp::shockwave::FrontendSpecifier, + damage_effect: Option, }, BasicBeam { buildup_duration: f32, @@ -413,7 +417,7 @@ impl CharacterAbility { knockback: _, ref mut range, max_angle: _, - damage_effect: _, + ref mut damage_effect, damage_kind: _, } => { *buildup_duration /= stats.speed; @@ -423,6 +427,15 @@ impl CharacterAbility { *base_poise_damage *= stats.effect_power; *range *= stats.range; *energy_cost /= stats.energy_efficiency; + if let Some(CombatEffect::Buff(combat::CombatBuff { + kind: _, + dur_secs: _, + strength, + chance: _, + })) = damage_effect + { + *strength *= stats.buff_strength; + } }, BasicRanged { ref mut energy_cost, @@ -488,6 +501,7 @@ impl CharacterAbility { charge_through: _, is_interruptible: _, damage_kind: _, + ref mut damage_effect, } => { *base_damage *= stats.power; *scaled_damage *= stats.power; @@ -499,6 +513,15 @@ impl CharacterAbility { *range *= stats.range; *energy_cost /= stats.energy_efficiency; *energy_drain /= stats.energy_efficiency; + if let Some(CombatEffect::Buff(combat::CombatBuff { + kind: _, + dur_secs: _, + strength, + chance: _, + })) = damage_effect + { + *strength *= stats.buff_strength; + } }, BasicBlock { ref mut buildup_duration, @@ -556,6 +579,7 @@ impl CharacterAbility { forward_leap_strength: _, vertical_leap_strength: _, damage_kind: _, + ref mut damage_effect, } => { *buildup_duration /= stats.speed; *swing_duration /= stats.speed; @@ -564,6 +588,15 @@ impl CharacterAbility { *base_poise_damage *= stats.effect_power; *range *= stats.range; *energy_cost /= stats.energy_efficiency; + if let Some(CombatEffect::Buff(combat::CombatBuff { + kind: _, + dur_secs: _, + strength, + chance: _, + })) = damage_effect + { + *strength *= stats.buff_strength; + } }, SpinMelee { ref mut buildup_duration, @@ -573,7 +606,7 @@ impl CharacterAbility { ref mut base_poise_damage, knockback: _, ref mut range, - damage_effect: _, + ref mut damage_effect, ref mut energy_cost, is_infinite: _, movement_behavior: _, @@ -591,6 +624,15 @@ impl CharacterAbility { *base_poise_damage *= stats.effect_power; *range *= stats.range; *energy_cost /= stats.energy_efficiency; + if let Some(CombatEffect::Buff(combat::CombatBuff { + kind: _, + dur_secs: _, + strength, + chance: _, + })) = damage_effect + { + *strength *= stats.buff_strength; + } }, ChargedMelee { ref mut energy_cost, @@ -609,6 +651,7 @@ impl CharacterAbility { ref mut recover_duration, specifier: _, damage_kind: _, + ref mut damage_effect, } => { *initial_damage *= stats.power; *scaled_damage *= stats.power; @@ -619,6 +662,15 @@ impl CharacterAbility { *range *= stats.range; *energy_cost /= stats.energy_efficiency; *energy_drain /= stats.energy_efficiency; + if let Some(CombatEffect::Buff(combat::CombatBuff { + kind: _, + dur_secs: _, + strength, + chance: _, + })) = damage_effect + { + *strength *= stats.buff_strength; + } }, ChargedRanged { ref mut energy_cost, @@ -663,6 +715,7 @@ impl CharacterAbility { move_efficiency: _, damage_kind: _, specifier: _, + ref mut damage_effect, } => { *buildup_duration /= stats.speed; *swing_duration /= stats.speed; @@ -671,6 +724,15 @@ impl CharacterAbility { *poise_damage *= stats.effect_power; *shockwave_duration *= stats.range; *energy_cost /= stats.energy_efficiency; + if let Some(CombatEffect::Buff(combat::CombatBuff { + kind: _, + dur_secs: _, + strength, + chance: _, + })) = damage_effect + { + *strength *= stats.buff_strength; + } }, BasicBeam { ref mut buildup_duration, @@ -680,7 +742,7 @@ impl CharacterAbility { ref mut tick_rate, ref mut range, max_angle: _, - damage_effect: _, + ref mut damage_effect, energy_regen: _, ref mut energy_drain, orientation_behavior: _, @@ -695,6 +757,15 @@ impl CharacterAbility { // Duration modified to keep velocity constant *beam_duration *= stats.range; *energy_drain /= stats.energy_efficiency; + if let Some(CombatEffect::Buff(combat::CombatBuff { + kind: _, + dur_secs: _, + strength, + chance: _, + })) = damage_effect + { + *strength *= stats.buff_strength; + } }, BasicAura { ref mut buildup_duration, @@ -715,6 +786,8 @@ impl CharacterAbility { *buildup_duration /= stats.speed; *cast_duration /= stats.speed; *recover_duration /= stats.speed; + // Do we want to make buff_strength affect this instead of power? + // Look into during modular weapon transition *strength *= stats.power; *range *= stats.range; *energy_cost /= stats.energy_efficiency; @@ -773,6 +846,8 @@ impl CharacterAbility { buff_duration: _, ref mut energy_cost, } => { + // Do we want to make buff_strength affect this instead of power? + // Look into during modular weapon transition *buff_strength *= stats.power; *buildup_duration /= stats.speed; *cast_duration /= stats.speed; @@ -1486,6 +1561,7 @@ impl From<(&CharacterAbility, AbilityInfo)> for CharacterState { charge_through, is_interruptible, damage_kind, + damage_effect, } => CharacterState::DashMelee(dash_melee::Data { static_data: dash_melee::StaticData { base_damage: *base_damage, @@ -1504,6 +1580,7 @@ impl From<(&CharacterAbility, AbilityInfo)> for CharacterState { swing_duration: Duration::from_secs_f32(*swing_duration), recover_duration: Duration::from_secs_f32(*recover_duration), is_interruptible: *is_interruptible, + damage_effect: *damage_effect, ability_info, damage_kind: *damage_kind, }, @@ -1595,6 +1672,7 @@ impl From<(&CharacterAbility, AbilityInfo)> for CharacterState { forward_leap_strength, vertical_leap_strength, damage_kind, + damage_effect, } => CharacterState::LeapMelee(leap_melee::Data { static_data: leap_melee::StaticData { buildup_duration: Duration::from_secs_f32(*buildup_duration), @@ -1608,6 +1686,7 @@ impl From<(&CharacterAbility, AbilityInfo)> for CharacterState { max_angle: *max_angle, forward_leap_strength: *forward_leap_strength, vertical_leap_strength: *vertical_leap_strength, + damage_effect: *damage_effect, ability_info, damage_kind: *damage_kind, }, @@ -1676,6 +1755,7 @@ impl From<(&CharacterAbility, AbilityInfo)> for CharacterState { max_angle, specifier, damage_kind, + damage_effect, } => CharacterState::ChargedMelee(charged_melee::Data { static_data: charged_melee::StaticData { energy_cost: *energy_cost, @@ -1692,6 +1772,7 @@ impl From<(&CharacterAbility, AbilityInfo)> for CharacterState { swing_duration: Duration::from_secs_f32(*swing_duration), hit_timing: *hit_timing, recover_duration: Duration::from_secs_f32(*recover_duration), + damage_effect: *damage_effect, ability_info, specifier: *specifier, damage_kind: *damage_kind, @@ -1788,6 +1869,7 @@ impl From<(&CharacterAbility, AbilityInfo)> for CharacterState { move_efficiency, damage_kind, specifier, + damage_effect, } => CharacterState::Shockwave(shockwave::Data { static_data: shockwave::StaticData { buildup_duration: Duration::from_secs_f32(*buildup_duration), @@ -1802,6 +1884,7 @@ impl From<(&CharacterAbility, AbilityInfo)> for CharacterState { shockwave_duration: Duration::from_secs_f32(*shockwave_duration), requires_ground: *requires_ground, move_efficiency: *move_efficiency, + damage_effect: *damage_effect, ability_info, damage_kind: *damage_kind, specifier: *specifier, diff --git a/common/src/comp/inventory/item/modular.rs b/common/src/comp/inventory/item/modular.rs index 3626b653f6..e5d0710732 100644 --- a/common/src/comp/inventory/item/modular.rs +++ b/common/src/comp/inventory/item/modular.rs @@ -177,6 +177,7 @@ fn make_component_def( }, range: 0.5, energy_efficiency: 0.0, + buff_strength: 0.0, }, }; let kind = ItemKind::ModularComponent(mc); diff --git a/common/src/comp/inventory/item/tool.rs b/common/src/comp/inventory/item/tool.rs index 2eea44dfaf..9ba0312772 100644 --- a/common/src/comp/inventory/item/tool.rs +++ b/common/src/comp/inventory/item/tool.rs @@ -82,6 +82,7 @@ pub struct Stats { pub crit_chance: f32, pub range: f32, pub energy_efficiency: f32, + pub buff_strength: f32, } impl Stats { @@ -94,6 +95,7 @@ impl Stats { crit_chance: 0.0, range: 0.0, energy_efficiency: 0.0, + buff_strength: 0.0, } } @@ -119,6 +121,7 @@ impl AddAssign for Stats { self.speed += other.speed; self.crit_chance += other.crit_chance; self.range += other.range; + self.buff_strength += other.buff_strength; } } impl MulAssign for Stats { @@ -129,6 +132,7 @@ impl MulAssign for Stats { self.speed *= other.speed; self.crit_chance *= other.crit_chance; self.range *= other.range; + self.buff_strength *= other.buff_strength; } } impl DivAssign for Stats { @@ -142,6 +146,7 @@ impl DivAssign for Stats { self.speed /= scalar as f32; self.crit_chance /= scalar as f32; self.range /= scalar as f32; + self.buff_strength /= scalar as f32; } } @@ -157,6 +162,7 @@ impl Sub for Stats { crit_chance: self.crit_chance - other.crit_chance, range: self.range - other.range, energy_efficiency: self.range - other.energy_efficiency, + buff_strength: self.buff_strength - other.buff_strength, } } } @@ -236,6 +242,7 @@ impl From<(&MaterialStatManifest, &[Item], &Tool)> for Stats { crit_chance: raw_stats.crit_chance, range: raw_stats.range, energy_efficiency: raw_stats.energy_efficiency, + buff_strength: raw_stats.buff_strength, } } } @@ -252,29 +259,11 @@ impl Tool { // DO NOT USE UNLESS YOU KNOW WHAT YOU ARE DOING // Added for CSV import of stats #[allow(clippy::too_many_arguments)] - pub fn new( - kind: ToolKind, - hands: Hands, - equip_time_secs: f32, - power: f32, - effect_power: f32, - speed: f32, - crit_chance: f32, - range: f32, - energy_efficiency: f32, - ) -> Self { + pub fn new(kind: ToolKind, hands: Hands, stats: Stats) -> Self { Self { kind, hands, - stats: StatKind::Direct(Stats { - equip_time_secs, - power, - effect_power, - speed, - crit_chance, - range, - energy_efficiency, - }), + stats: StatKind::Direct(stats), } } @@ -290,6 +279,7 @@ impl Tool { crit_chance: 0.1, range: 1.0, energy_efficiency: 1.0, + buff_strength: 1.0, }), } } @@ -322,6 +312,10 @@ impl Tool { self.stats.resolve_stats(msm, components).energy_efficiency } + pub fn base_buff_strength(&self, msm: &MaterialStatManifest, components: &[Item]) -> f32 { + self.stats.resolve_stats(msm, components).buff_strength + } + pub fn equip_time(&self, msm: &MaterialStatManifest, components: &[Item]) -> Duration { Duration::from_secs_f32(self.stats.resolve_stats(msm, components).equip_time_secs) } diff --git a/common/src/comp/projectile.rs b/common/src/comp/projectile.rs index 68ccee18a6..27b5ce719b 100644 --- a/common/src/comp/projectile.rs +++ b/common/src/comp/projectile.rs @@ -85,6 +85,7 @@ impl ProjectileConstructor { owner: Option, crit_chance: f32, crit_mult: f32, + buff_strength: f32, ) -> Projectile { use ProjectileConstructor::*; match self { @@ -103,7 +104,12 @@ impl ProjectileConstructor { .with_requirement(CombatRequirement::AnyDamage); let energy = AttackEffect::new(None, CombatEffect::EnergyReward(energy_regen)) .with_requirement(CombatRequirement::AnyDamage); - let buff = CombatEffect::Buff(CombatBuff::default_physical()); + let buff = CombatEffect::Buff(CombatBuff { + kind: BuffKind::Bleeding, + dur_secs: 10.0, + strength: CombatBuffStrength::DamageFraction(0.1 * buff_strength), + chance: 0.1, + }); let damage = AttackDamage::new( Damage { source: DamageSource::Projectile, @@ -321,7 +327,7 @@ impl ProjectileConstructor { CombatEffect::Buff(CombatBuff { kind: BuffKind::Burning, dur_secs: 5.0, - strength: CombatBuffStrength::DamageFraction(0.2), + strength: CombatBuffStrength::DamageFraction(0.2 * buff_strength), chance: 1.0, }), ) diff --git a/common/src/states/basic_melee.rs b/common/src/states/basic_melee.rs index fefffb3948..35460a510d 100644 --- a/common/src/states/basic_melee.rs +++ b/common/src/states/basic_melee.rs @@ -1,7 +1,7 @@ use crate::{ combat::{ - Attack, AttackDamage, AttackEffect, CombatBuff, CombatEffect, CombatRequirement, Damage, - DamageKind, DamageSource, GroupTarget, Knockback, + Attack, AttackDamage, AttackEffect, CombatEffect, CombatRequirement, Damage, DamageKind, + DamageSource, GroupTarget, Knockback, }, comp::{tool::ToolKind, CharacterState, Melee, StateUpdate}, states::{ @@ -106,12 +106,8 @@ impl CharacterBehavior for Data { }, Some(GroupTarget::OutOfGroup), ); - match self.static_data.damage_effect { - Some(effect) => damage = damage.with_effect(effect), - None => { - let buff = CombatEffect::Buff(CombatBuff::default_physical()); - damage = damage.with_effect(buff); - }, + if let Some(effect) = self.static_data.damage_effect { + damage = damage.with_effect(effect); } let (crit_chance, crit_mult) = get_crit_data(data, self.static_data.ability_info); diff --git a/common/src/states/basic_ranged.rs b/common/src/states/basic_ranged.rs index ea67b45da9..7ca246f7c4 100644 --- a/common/src/states/basic_ranged.rs +++ b/common/src/states/basic_ranged.rs @@ -74,10 +74,12 @@ impl CharacterBehavior for Data { // Fire let (crit_chance, crit_mult) = get_crit_data(data, self.static_data.ability_info); + let buff_strength = get_buff_strength(data, self.static_data.ability_info); let projectile = self.static_data.projectile.create_projectile( Some(*data.uid), crit_chance, crit_mult, + buff_strength, ); // Shoots all projectiles simultaneously for i in 0..self.static_data.num_projectiles { diff --git a/common/src/states/charged_melee.rs b/common/src/states/charged_melee.rs index be4e083dd7..7ace902d81 100644 --- a/common/src/states/charged_melee.rs +++ b/common/src/states/charged_melee.rs @@ -1,5 +1,5 @@ use crate::{ - combat::{Attack, AttackDamage, AttackEffect, CombatBuff, CombatEffect, CombatRequirement}, + combat::{Attack, AttackDamage, AttackEffect, CombatEffect, CombatRequirement}, comp::{tool::ToolKind, CharacterState, EnergyChange, EnergySource, Melee, StateUpdate}, event::LocalEvent, outcome::Outcome, @@ -43,6 +43,8 @@ pub struct StaticData { pub hit_timing: f32, /// How long the state has until exiting pub recover_duration: Duration, + /// Adds an effect onto the main damage of the attack + pub damage_effect: Option, /// What key is used to press ability pub ability_info: AbilityInfo, /// Used to specify the melee attack to the frontend @@ -148,8 +150,7 @@ impl CharacterBehavior for Data { }), ) .with_requirement(CombatRequirement::AnyDamage); - let buff = CombatEffect::Buff(CombatBuff::default_physical()); - let damage = AttackDamage::new( + let mut damage = AttackDamage::new( Damage { source: DamageSource::Melee, kind: self.static_data.damage_kind, @@ -157,8 +158,10 @@ impl CharacterBehavior for Data { + self.charge_amount * self.static_data.scaled_damage as f32, }, Some(GroupTarget::OutOfGroup), - ) - .with_effect(buff); + ); + if let Some(effect) = self.static_data.damage_effect { + damage = damage.with_effect(effect); + } let (crit_chance, crit_mult) = get_crit_data(data, self.static_data.ability_info); let attack = Attack::default() diff --git a/common/src/states/charged_ranged.rs b/common/src/states/charged_ranged.rs index 42098239ed..bd9aabd054 100644 --- a/common/src/states/charged_ranged.rs +++ b/common/src/states/charged_ranged.rs @@ -109,8 +109,13 @@ impl CharacterBehavior for Data { // Fire let (crit_chance, crit_mult) = get_crit_data(data, self.static_data.ability_info); - let projectile = - arrow.create_projectile(Some(*data.uid), crit_chance, crit_mult); + let buff_strength = get_buff_strength(data, self.static_data.ability_info); + let projectile = arrow.create_projectile( + Some(*data.uid), + crit_chance, + crit_mult, + buff_strength, + ); update.server_events.push_front(ServerEvent::Shoot { entity: data.entity, dir: data.inputs.look_dir, diff --git a/common/src/states/combo_melee.rs b/common/src/states/combo_melee.rs index 9859b90be0..fb97e4bb56 100644 --- a/common/src/states/combo_melee.rs +++ b/common/src/states/combo_melee.rs @@ -44,6 +44,8 @@ pub struct Stage { pub forward_movement: f32, /// What kind of damage this stage of the attack does pub damage_kind: DamageKind, + /// Adds an effect onto the main damage of the attack + pub damage_effect: Option, } impl Stage { @@ -63,10 +65,20 @@ impl Stage { base_recover_duration: Duration::from_secs_f32(self.base_recover_duration), forward_movement: self.forward_movement, damage_kind: self.damage_kind, + damage_effect: self.damage_effect, } } - pub fn adjusted_by_stats(self, stats: Stats) -> Self { + pub fn adjusted_by_stats(mut self, stats: Stats) -> Self { + if let Some(CombatEffect::Buff(CombatBuff { + kind: _, + dur_secs: _, + ref mut strength, + chance: _, + })) = self.damage_effect + { + *strength *= stats.buff_strength; + } Self { stage: self.stage, base_damage: self.base_damage * stats.power, @@ -82,6 +94,7 @@ impl Stage { base_recover_duration: self.base_recover_duration / stats.speed, forward_movement: self.forward_movement, damage_kind: self.damage_kind, + damage_effect: self.damage_effect, } } @@ -234,17 +247,17 @@ impl CharacterBehavior for Data { let energy = AttackEffect::new(None, CombatEffect::EnergyReward(energy)) .with_requirement(CombatRequirement::AnyDamage); - let buff = CombatEffect::Buff(CombatBuff::default_physical()); - - let damage = AttackDamage::new( + let mut damage = AttackDamage::new( Damage { source: DamageSource::Melee, kind: self.static_data.stage_data[stage_index].damage_kind, value: damage as f32, }, Some(GroupTarget::OutOfGroup), - ) - .with_effect(buff); + ); + if let Some(effect) = self.static_data.stage_data[stage_index].damage_effect { + damage = damage.with_effect(effect); + } let (crit_chance, crit_mult) = get_crit_data(data, self.static_data.ability_info); diff --git a/common/src/states/dash_melee.rs b/common/src/states/dash_melee.rs index bb916ce4f4..33012b8aa7 100644 --- a/common/src/states/dash_melee.rs +++ b/common/src/states/dash_melee.rs @@ -1,5 +1,5 @@ use crate::{ - combat::{Attack, AttackDamage, AttackEffect, CombatBuff, CombatEffect, CombatRequirement}, + combat::{Attack, AttackDamage, AttackEffect, CombatEffect, CombatRequirement}, comp::{tool::ToolKind, CharacterState, EnergyChange, EnergySource, Melee, StateUpdate}, states::{ behavior::{CharacterBehavior, JoinData}, @@ -45,6 +45,8 @@ pub struct StaticData { pub recover_duration: Duration, /// Whether the state can be interrupted by other abilities pub is_interruptible: bool, + /// Adds an effect onto the main damage of the attack + pub damage_effect: Option, /// What key is used to press ability pub ability_info: AbilityInfo, /// What kind of damage the attack does @@ -131,8 +133,7 @@ impl CharacterBehavior for Data { }), ) .with_requirement(CombatRequirement::AnyDamage); - let buff = CombatEffect::Buff(CombatBuff::default_physical()); - let damage = AttackDamage::new( + let mut damage = AttackDamage::new( Damage { source: DamageSource::Melee, kind: self.static_data.damage_kind, @@ -140,8 +141,10 @@ impl CharacterBehavior for Data { + charge_frac * self.static_data.scaled_damage as f32, }, Some(GroupTarget::OutOfGroup), - ) - .with_effect(buff); + ); + if let Some(effect) = self.static_data.damage_effect { + damage = damage.with_effect(effect); + } let (crit_chance, crit_mult) = get_crit_data(data, self.static_data.ability_info); let attack = Attack::default() @@ -267,8 +270,7 @@ impl CharacterBehavior for Data { }), ) .with_requirement(CombatRequirement::AnyDamage); - let buff = CombatEffect::Buff(CombatBuff::default_physical()); - let damage = AttackDamage::new( + let mut damage = AttackDamage::new( Damage { source: DamageSource::Melee, kind: self.static_data.damage_kind, @@ -276,8 +278,10 @@ impl CharacterBehavior for Data { + charge_frac * self.static_data.scaled_damage as f32, }, Some(GroupTarget::OutOfGroup), - ) - .with_effect(buff); + ); + if let Some(effect) = self.static_data.damage_effect { + damage = damage.with_effect(effect); + } let (crit_chance, crit_mult) = get_crit_data(data, self.static_data.ability_info); let attack = Attack::default() diff --git a/common/src/states/leap_melee.rs b/common/src/states/leap_melee.rs index 4768d7c726..72124f1772 100644 --- a/common/src/states/leap_melee.rs +++ b/common/src/states/leap_melee.rs @@ -1,5 +1,5 @@ use crate::{ - combat::{Attack, AttackDamage, AttackEffect, CombatBuff, CombatEffect, CombatRequirement}, + combat::{Attack, AttackDamage, AttackEffect, CombatEffect, CombatRequirement}, comp::{tool::ToolKind, CharacterState, Melee, StateUpdate}, states::{ behavior::{CharacterBehavior, JoinData}, @@ -35,6 +35,8 @@ pub struct StaticData { pub forward_leap_strength: f32, /// Affects how high the player leaps pub vertical_leap_strength: f32, + /// Adds an effect onto the main damage of the attack + pub damage_effect: Option, /// What key is used to press ability pub ability_info: AbilityInfo, /// What kind of damage the attack does @@ -141,16 +143,17 @@ impl CharacterBehavior for Data { }), ) .with_requirement(CombatRequirement::AnyDamage); - let buff = CombatEffect::Buff(CombatBuff::default_physical()); - let damage = AttackDamage::new( + let mut damage = AttackDamage::new( Damage { source: DamageSource::Melee, kind: self.static_data.damage_kind, value: self.static_data.base_damage as f32, }, Some(GroupTarget::OutOfGroup), - ) - .with_effect(buff); + ); + if let Some(effect) = self.static_data.damage_effect { + damage = damage.with_effect(effect); + } let (crit_chance, crit_mult) = get_crit_data(data, self.static_data.ability_info); let attack = Attack::default() diff --git a/common/src/states/repeater_ranged.rs b/common/src/states/repeater_ranged.rs index beaedc70a5..206963b5af 100644 --- a/common/src/states/repeater_ranged.rs +++ b/common/src/states/repeater_ranged.rs @@ -90,10 +90,12 @@ impl CharacterBehavior for Data { // Fire if input is pressed still let (crit_chance, crit_mult) = get_crit_data(data, self.static_data.ability_info); + let buff_strength = get_buff_strength(data, self.static_data.ability_info); let projectile = self.static_data.projectile.create_projectile( Some(*data.uid), crit_chance, crit_mult, + buff_strength, ); update.server_events.push_front(ServerEvent::Shoot { entity: data.entity, diff --git a/common/src/states/shockwave.rs b/common/src/states/shockwave.rs index 09278a3698..c45805efe8 100644 --- a/common/src/states/shockwave.rs +++ b/common/src/states/shockwave.rs @@ -42,6 +42,8 @@ pub struct StaticData { pub move_efficiency: f32, /// What key is used to press ability pub ability_info: AbilityInfo, + /// Adds an effect onto the main damage of the attack + pub damage_effect: Option, /// What kind of damage the attack does pub damage_kind: DamageKind, /// Used to specify the shockwave to the frontend @@ -86,7 +88,7 @@ impl CharacterBehavior for Data { CombatEffect::Knockback(self.static_data.knockback), ) .with_requirement(CombatRequirement::AnyDamage); - let damage = AttackDamage::new( + let mut damage = AttackDamage::new( Damage { source: DamageSource::Shockwave, kind: self.static_data.damage_kind, @@ -94,6 +96,9 @@ impl CharacterBehavior for Data { }, Some(GroupTarget::OutOfGroup), ); + if let Some(effect) = self.static_data.damage_effect { + damage = damage.with_effect(effect); + } let (crit_chance, crit_mult) = get_crit_data(data, self.static_data.ability_info); let attack = Attack::default() diff --git a/common/src/states/spin_melee.rs b/common/src/states/spin_melee.rs index 2caf344353..f955cc3263 100644 --- a/common/src/states/spin_melee.rs +++ b/common/src/states/spin_melee.rs @@ -1,7 +1,7 @@ use crate::{ combat::{ - Attack, AttackDamage, AttackEffect, CombatBuff, CombatEffect, CombatRequirement, Damage, - DamageKind, DamageSource, GroupTarget, Knockback, + Attack, AttackDamage, AttackEffect, CombatEffect, CombatRequirement, Damage, DamageKind, + DamageSource, GroupTarget, Knockback, }, comp::{tool::ToolKind, CharacterState, EnergyChange, EnergySource, Melee, StateUpdate}, consts::GRAVITY, @@ -128,12 +128,8 @@ impl CharacterBehavior for Data { }, self.static_data.target, ); - match self.static_data.damage_effect { - Some(effect) => damage = damage.with_effect(effect), - None => { - let buff = CombatEffect::Buff(CombatBuff::default_physical()); - damage = damage.with_effect(buff); - }, + if let Some(effect) = self.static_data.damage_effect { + damage = damage.with_effect(effect); } let (crit_chance, crit_mult) = get_crit_data(data, self.static_data.ability_info); diff --git a/common/src/states/utils.rs b/common/src/states/utils.rs index 095e1e92c0..19ad469f29 100644 --- a/common/src/states/utils.rs +++ b/common/src/states/utils.rs @@ -836,6 +836,24 @@ pub fn get_crit_data(data: &JoinData, ai: AbilityInfo) -> (f32, f32) { (crit_chance, crit_mult) } +/// Returns buff strength from the weapon used in the ability +pub fn get_buff_strength(data: &JoinData, ai: AbilityInfo) -> f32 { + ai.hand + .map(|hand| match hand { + HandInfo::TwoHanded | HandInfo::MainHand => EquipSlot::ActiveMainhand, + HandInfo::OffHand => EquipSlot::ActiveOffhand, + }) + .and_then(|slot| data.inventory.equipped(slot)) + .and_then(|item| { + if let ItemKind::Tool(tool) = item.kind() { + Some(tool.base_buff_strength(data.msm, item.components())) + } else { + None + } + }) + .unwrap_or(1.0) +} + pub fn handle_state_interrupt(data: &JoinData, update: &mut StateUpdate, attacks_interrupt: bool) { if attacks_interrupt { handle_ability_input(data, update); diff --git a/server/src/sys/wiring/dispatch_actions.rs b/server/src/sys/wiring/dispatch_actions.rs index 641275a006..28730134b6 100644 --- a/server/src/sys/wiring/dispatch_actions.rs +++ b/server/src/sys/wiring/dispatch_actions.rs @@ -110,7 +110,7 @@ fn dispatch_action_spawn_projectile( entity, dir: Dir::forward(), body: Body::Object(object::Body::Arrow), - projectile: constr.create_projectile(None, 1.0, 1.0), + projectile: constr.create_projectile(None, 0.0, 1.0, 1.0), light: None, speed: 5.0, object: None, diff --git a/voxygen/src/audio/sfx/event_mapper/combat/tests.rs b/voxygen/src/audio/sfx/event_mapper/combat/tests.rs index 73df919023..29f6315894 100644 --- a/voxygen/src/audio/sfx/event_mapper/combat/tests.rs +++ b/voxygen/src/audio/sfx/event_mapper/combat/tests.rs @@ -132,6 +132,7 @@ fn matches_ability_stage() { base_recover_duration: Duration::from_millis(400), forward_movement: 0.5, damage_kind: DamageKind::Slashing, + damage_effect: None, }], initial_energy_gain: 0.0, max_energy_gain: 100.0, @@ -193,6 +194,7 @@ fn ignores_different_ability_stage() { base_recover_duration: Duration::from_millis(400), forward_movement: 0.5, damage_kind: DamageKind::Slashing, + damage_effect: None, }], initial_energy_gain: 0.0, max_energy_gain: 100.0,