From 49f496e2905716abcfcf6903fbf9f31e89fa2be8 Mon Sep 17 00:00:00 2001 From: jshipsey Date: Fri, 12 Mar 2021 00:38:41 -0500 Subject: [PATCH] intitial values --- assets/common/abilities/axe/doublestrike.ron | 8 +- assets/common/abilities/axe/leap.ron | 4 +- assets/common/abilities/axe/spin.ron | 2 +- assets/common/abilities/hammer/charged.ron | 4 +- assets/common/abilities/hammer/leap.ron | 4 +- .../common/abilities/hammer/singlestrike.ron | 6 +- .../abilities/hammersimple/doublestrike.ron | 4 +- assets/common/abilities/spear/dash.ron | 6 +- .../common/abilities/spear/doublestrike.ron | 22 +-- assets/common/abilities/sword/dash.ron | 2 +- assets/common/abilities/sword/spin.ron | 2 +- .../common/abilities/sword/triplestrike.ron | 6 +- assets/common/abilities/swordsimple/dash.ron | 2 +- .../abilities/swordsimple/doublestrike.ron | 4 +- .../abilities/unique/beastclaws/basic.ron | 4 +- .../unique/quadlowbasic/singlestrike.ron | 8 +- .../unique/quadlowbasic/triplestrike.ron | 24 +-- .../abilities/unique/quadlowbreathe/dash.ron | 4 +- .../unique/quadlowbreathe/triplestrike.ron | 6 +- .../abilities/unique/quadlowquick/dash.ron | 4 +- .../unique/quadlowquick/quadstrike.ron | 16 +- .../unique/quadlowranged/singlestrike.ron | 8 +- .../abilities/unique/quadlowtail/charged.ron | 6 +- .../unique/quadlowtail/triplestrike.ron | 8 +- .../unique/quadmedbasic/singlestrike.ron | 6 +- .../unique/quadmedbasic/triplestrike.ron | 24 +-- .../abilities/unique/quadmedcharge/dash.ron | 4 +- .../unique/quadmedcharge/doublestrike.ron | 8 +- .../abilities/unique/quadmedhoof/basic.ron | 4 +- .../unique/quadmedjump/doublestrike.ron | 12 +- .../abilities/unique/quadmedjump/leap.ron | 4 +- .../unique/quadmedjump/quickleap.ron | 4 +- .../abilities/unique/quadmedquick/dash.ron | 6 +- .../unique/quadmedquick/triplestrike.ron | 12 +- .../unique/quadsmallbasic/singlestrike.ron | 4 +- .../unique/stonegolemfist/shockwave.ron | 2 +- .../unique/stonegolemfist/singlestrike.ron | 4 +- .../abilities/unique/stonegolemfist/spin.ron | 2 +- .../unique/theropodbasic/singlestrike.ron | 4 +- .../unique/theropodbasic/triplestrike.ron | 12 +- .../unique/theropodbird/singlestrike.ron | 6 +- .../unique/theropodbird/triplestrike.ron | 16 +- .../unique/wendigomagic/singlestrike.ron | 4 +- assets/common/items/armor/agile/chest.ron | 2 +- assets/common/items/armor/agile/hand.ron | 2 +- assets/common/items/armor/agile/pants.ron | 2 +- assets/common/items/armor/agile/shoulder.ron | 2 +- assets/common/items/armor/assassin/chest.ron | 2 +- assets/common/items/armor/assassin/foot.ron | 2 +- assets/common/items/armor/assassin/hand.ron | 2 +- assets/common/items/armor/assassin/pants.ron | 2 +- .../common/items/armor/assassin/shoulder.ron | 2 +- .../common/items/armor/bonerattler/belt.ron | 2 +- .../common/items/armor/bonerattler/chest.ron | 2 +- .../common/items/armor/bonerattler/foot.ron | 2 +- .../common/items/armor/bonerattler/hand.ron | 2 +- .../common/items/armor/bonerattler/pants.ron | 2 +- .../items/armor/bonerattler/shoulder.ron | 2 +- assets/common/items/armor/cultist/belt.ron | 2 +- assets/common/items/armor/cultist/chest.ron | 2 +- assets/common/items/armor/cultist/foot.ron | 2 +- assets/common/items/armor/cultist/pants.ron | 2 +- .../common/items/armor/cultist/shoulder.ron | 2 +- assets/common/items/armor/druid/belt.ron | 2 +- assets/common/items/armor/druid/chest.ron | 2 +- assets/common/items/armor/druid/pants.ron | 2 +- .../common/items/armor/leather_plate/belt.ron | 2 +- .../items/armor/leather_plate/chest.ron | 2 +- .../common/items/armor/leather_plate/foot.ron | 2 +- .../common/items/armor/leather_plate/hand.ron | 2 +- .../items/armor/leather_plate/pants.ron | 2 +- .../items/armor/leather_plate/shoulder.ron | 2 +- .../armor/misc/foot/jackalope_slippers.ron | 2 +- .../common/items/armor/misc/foot/sandals.ron | 2 +- .../common/items/armor/misc/neck/plain_0.ron | 2 +- .../common/items/armor/misc/neck/plain_1.ron | 2 +- assets/common/items/armor/misc/neck/shell.ron | 2 +- .../common/items/armor/misc/pants/hunting.ron | 2 +- assets/common/items/armor/misc/ring/skull.ron | 2 +- .../items/armor/misc/shoulder/iron_spikes.ron | 2 +- .../armor/misc/shoulder/leather_iron_0.ron | 2 +- .../armor/misc/shoulder/leather_iron_1.ron | 2 +- .../armor/misc/shoulder/leather_iron_2.ron | 2 +- .../armor/misc/shoulder/leather_iron_3.ron | 2 +- assets/common/items/armor/plate/belt.ron | 2 +- assets/common/items/armor/plate/chest.ron | 2 +- assets/common/items/armor/plate/foot.ron | 2 +- assets/common/items/armor/plate/hand.ron | 2 +- assets/common/items/armor/plate/pants.ron | 2 +- assets/common/items/armor/plate/shoulder.ron | 2 +- assets/common/items/armor/rugged/chest.ron | 4 +- assets/common/items/armor/steel/belt.ron | 2 +- assets/common/items/armor/steel/chest.ron | 2 +- assets/common/items/armor/steel/foot.ron | 2 +- assets/common/items/armor/steel/hand.ron | 2 +- assets/common/items/armor/steel/pants.ron | 2 +- assets/common/items/armor/steel/shoulder.ron | 2 +- assets/common/items/armor/swift/chest.ron | 2 +- assets/common/items/armor/swift/foot.ron | 2 +- assets/common/items/armor/swift/hand.ron | 2 +- assets/common/items/armor/swift/pants.ron | 2 +- assets/common/items/armor/swift/shoulder.ron | 2 +- assets/common/items/armor/tarasque/belt.ron | 4 +- assets/common/items/armor/tarasque/chest.ron | 2 +- assets/common/items/armor/tarasque/foot.ron | 4 +- assets/common/items/armor/tarasque/hand.ron | 4 +- assets/common/items/armor/tarasque/pants.ron | 2 +- .../common/items/armor/tarasque/shoulder.ron | 4 +- assets/common/items/armor/twigs/chest.ron | 2 +- assets/common/items/armor/twigs/foot.ron | 2 +- assets/common/items/armor/twigs/hand.ron | 2 +- assets/common/items/armor/twigs/pants.ron | 2 +- assets/common/items/armor/twigs/shoulder.ron | 2 +- .../common/items/armor/twigsflowers/chest.ron | 2 +- .../common/items/armor/twigsflowers/foot.ron | 2 +- .../common/items/armor/twigsflowers/hand.ron | 2 +- .../common/items/armor/twigsflowers/pants.ron | 2 +- .../items/armor/twigsflowers/shoulder.ron | 2 +- .../common/items/armor/twigsleaves/belt.ron | 2 +- .../common/items/armor/twigsleaves/chest.ron | 2 +- .../common/items/armor/twigsleaves/foot.ron | 2 +- .../common/items/armor/twigsleaves/hand.ron | 2 +- .../common/items/armor/twigsleaves/pants.ron | 2 +- .../items/armor/twigsleaves/shoulder.ron | 2 +- .../common/items/armor/velorite_mage/back.ron | 2 +- .../common/items/armor/velorite_mage/belt.ron | 2 +- .../items/armor/velorite_mage/chest.ron | 2 +- .../common/items/armor/velorite_mage/foot.ron | 2 +- .../common/items/armor/velorite_mage/hand.ron | 2 +- .../items/armor/velorite_mage/pants.ron | 2 +- .../items/armor/velorite_mage/shoulder.ron | 2 +- assets/common/items/armor/warlock/back.ron | 2 +- assets/common/items/armor/warlock/belt.ron | 2 +- assets/common/items/armor/warlock/chest.ron | 2 +- assets/common/items/armor/warlock/foot.ron | 2 +- assets/common/items/armor/warlock/hand.ron | 2 +- assets/common/items/armor/warlock/head.ron | 2 +- assets/common/items/armor/warlock/pants.ron | 2 +- .../common/items/armor/warlock/shoulder.ron | 2 +- assets/common/items/armor/warlord/back.ron | 2 +- assets/common/items/armor/warlord/belt.ron | 2 +- assets/common/items/armor/warlord/chest.ron | 2 +- assets/common/items/armor/warlord/foot.ron | 2 +- assets/common/items/armor/warlord/hand.ron | 2 +- assets/common/items/armor/warlord/head.ron | 2 +- assets/common/items/armor/warlord/pants.ron | 2 +- .../common/items/armor/warlord/shoulder.ron | 2 +- .../biped_small/adlet/wooden_spear.ron | 2 +- .../biped_small/gnarling/wooden_spear.ron | 2 +- .../biped_small/haniwa/wooden_spear.ron | 2 +- .../biped_small/myrmidon/wooden_spear.ron | 2 +- .../biped_small/sahagin/wooden_spear.ron | 2 +- .../npc_weapons/unique/quadmedbasicgentle.ron | 18 ++ .../items/weapons/hammer/bronze_hammer-0.ron | 2 +- .../items/weapons/hammer/cobalt_hammer-0.ron | 2 +- .../items/weapons/hammer/cobalt_hammer-1.ron | 2 +- .../items/weapons/hammer/flimsy_hammer.ron | 2 +- .../common/items/weapons/hammer/hammer_1.ron | 2 +- .../items/weapons/hammer/iron_hammer-0.ron | 2 +- .../items/weapons/hammer/iron_hammer-1.ron | 2 +- .../items/weapons/hammer/iron_hammer-2.ron | 2 +- .../items/weapons/hammer/iron_hammer-5.ron | 2 +- .../items/weapons/hammer/iron_hammer-6.ron | 2 +- .../items/weapons/hammer/iron_hammer-7.ron | 2 +- .../items/weapons/hammer/iron_hammer-8.ron | 2 +- .../common/items/weapons/hammer/mjolnir.ron | 2 +- .../items/weapons/hammer/ramshead_hammer.ron | 2 +- .../items/weapons/hammer/runic_hammer.ron | 2 +- .../items/weapons/hammer/starter_hammer.ron | 2 +- .../items/weapons/hammer/steel_hammer-0.ron | 2 +- .../items/weapons/hammer/steel_hammer-1.ron | 2 +- .../items/weapons/hammer/steel_hammer-3.ron | 2 +- .../items/weapons/hammer/steel_hammer-4.ron | 2 +- .../items/weapons/hammer/steel_hammer-5.ron | 2 +- .../items/weapons/hammer/stone_hammer-0.ron | 2 +- .../items/weapons/hammer/stone_hammer-1.ron | 2 +- .../items/weapons/hammer/stone_hammer-3.ron | 2 +- .../items/weapons/hammer/wood_hammer-0.ron | 2 +- .../weapons/hammer/worn_iron_hammer-1.ron | 2 +- .../weapons/hammer/worn_iron_hammer-2.ron | 2 +- .../weapons/hammer/worn_iron_hammer-3.ron | 2 +- .../items/weapons/sword/bloodsteel-0.ron | 2 +- .../items/weapons/sword/bloodsteel-1.ron | 2 +- .../items/weapons/sword/bloodsteel-2.ron | 2 +- .../common/items/weapons/sword/bronze-0.ron | 2 +- .../common/items/weapons/sword/bronze-1.ron | 2 +- .../common/items/weapons/sword/bronze-2.ron | 2 +- .../common/items/weapons/sword/caladbolg.ron | 2 +- .../common/items/weapons/sword/cobalt-0.ron | 2 +- .../common/items/weapons/sword/cobalt-1.ron | 2 +- .../common/items/weapons/sword/cobalt-2.ron | 2 +- .../common/items/weapons/sword/cobalt-3.ron | 2 +- assets/common/items/weapons/sword/cultist.ron | 2 +- assets/common/items/weapons/sword/frost-0.ron | 2 +- assets/common/items/weapons/sword/frost-1.ron | 2 +- assets/common/items/weapons/sword/iron-0.ron | 2 +- assets/common/items/weapons/sword/iron-1.ron | 2 +- assets/common/items/weapons/sword/iron-10.ron | 2 +- assets/common/items/weapons/sword/iron-2.ron | 2 +- assets/common/items/weapons/sword/iron-3.ron | 2 +- assets/common/items/weapons/sword/iron-4.ron | 2 +- assets/common/items/weapons/sword/iron-5.ron | 2 +- assets/common/items/weapons/sword/iron-6.ron | 2 +- assets/common/items/weapons/sword/iron-7.ron | 2 +- assets/common/items/weapons/sword/iron-8.ron | 2 +- assets/common/items/weapons/sword/iron-9.ron | 2 +- assets/common/items/weapons/sword/starter.ron | 2 +- assets/common/items/weapons/sword/steel-0.ron | 2 +- assets/common/items/weapons/sword/steel-1.ron | 2 +- assets/common/items/weapons/sword/steel-2.ron | 2 +- assets/common/items/weapons/sword/steel-3.ron | 2 +- assets/common/items/weapons/sword/steel-4.ron | 2 +- assets/common/items/weapons/sword/steel-5.ron | 2 +- assets/common/items/weapons/sword/steel-6.ron | 2 +- assets/common/items/weapons/sword/steel-7.ron | 2 +- assets/common/items/weapons/sword/steel-8.ron | 2 +- assets/common/items/weapons/sword/stone-0.ron | 2 +- assets/common/items/weapons/sword/stone-1.ron | 2 +- assets/common/items/weapons/sword/stone-2.ron | 2 +- assets/common/items/weapons/sword/wood-0.ron | 2 +- assets/common/items/weapons/sword/wood-1.ron | 2 +- assets/common/items/weapons/sword/wood-2.ron | 2 +- .../humanoid_armor_shoulder_manifest.ron | 4 +- common/src/comp/body.rs | 11 +- common/src/comp/inventory/loadout_builder.rs | 16 +- common/src/comp/poise.rs | 6 +- voxygen/anim/src/biped_small/alpha.rs | 2 +- voxygen/anim/src/biped_small/mod.rs | 3 +- voxygen/anim/src/biped_small/stunned.rs | 177 ++++++++++++++++++ voxygen/anim/src/character/mod.rs | 2 +- voxygen/anim/src/quadruped_medium/alpha.rs | 2 +- voxygen/anim/src/quadruped_medium/stunned.rs | 6 +- voxygen/src/scene/figure/mod.rs | 57 ++++-- 233 files changed, 599 insertions(+), 373 deletions(-) create mode 100644 assets/common/items/npc_weapons/unique/quadmedbasicgentle.ron create mode 100644 voxygen/anim/src/biped_small/stunned.rs diff --git a/assets/common/abilities/axe/doublestrike.ron b/assets/common/abilities/axe/doublestrike.ron index 09f55a7eb4..570ef6dfdf 100644 --- a/assets/common/abilities/axe/doublestrike.ron +++ b/assets/common/abilities/axe/doublestrike.ron @@ -3,21 +3,21 @@ ComboMelee( ( stage: 1, base_damage: 90, - base_poise_damage: 0, + base_poise_damage: 30, damage_increase: 10, poise_damage_increase: 0, knockback: 8.0, range: 3.5, angle: 50.0, - base_buildup_duration: 0.2, + base_buildup_duration: 0.3, base_swing_duration: 0.075, - base_recover_duration: 0.15, + base_recover_duration: 0.2, forward_movement: 0.5, ), ( stage: 2, base_damage: 130, - base_poise_damage: 0, + base_poise_damage: 45, damage_increase: 15, poise_damage_increase: 0, knockback: 12.0, diff --git a/assets/common/abilities/axe/leap.ron b/assets/common/abilities/axe/leap.ron index 21717ff934..c59b733465 100644 --- a/assets/common/abilities/axe/leap.ron +++ b/assets/common/abilities/axe/leap.ron @@ -4,8 +4,8 @@ LeapMelee( movement_duration: 0.2, swing_duration: 0.2, recover_duration: 0.2, - base_damage: 240, - base_poise_damage: 0, + base_damage: 150, + base_poise_damage: 70, knockback: 12.0, range: 4.5, max_angle: 30.0, diff --git a/assets/common/abilities/axe/spin.ron b/assets/common/abilities/axe/spin.ron index 3d89fdb173..4d80f6055c 100644 --- a/assets/common/abilities/axe/spin.ron +++ b/assets/common/abilities/axe/spin.ron @@ -3,7 +3,7 @@ SpinMelee( swing_duration: 0.4, recover_duration: 0.2, base_damage: 60, - base_poise_damage: 0, + base_poise_damage: 70, knockback: 0.0, range: 3.5, energy_cost: 100, diff --git a/assets/common/abilities/hammer/charged.ron b/assets/common/abilities/hammer/charged.ron index dce676d2f2..978143195e 100644 --- a/assets/common/abilities/hammer/charged.ron +++ b/assets/common/abilities/hammer/charged.ron @@ -3,8 +3,8 @@ ChargedMelee( energy_drain: 300, initial_damage: 10, scaled_damage: 160, - initial_poise_damage: 0, - scaled_poise_damage: 0, + initial_poise_damage: 60, + scaled_poise_damage: 130, initial_knockback: 10.0, scaled_knockback: 50.0, range: 3.5, diff --git a/assets/common/abilities/hammer/leap.ron b/assets/common/abilities/hammer/leap.ron index c0a0a12f99..47f90adb77 100644 --- a/assets/common/abilities/hammer/leap.ron +++ b/assets/common/abilities/hammer/leap.ron @@ -4,8 +4,8 @@ LeapMelee( movement_duration: 0.8, swing_duration: 0.15, recover_duration: 0.2, - base_damage: 240, - base_poise_damage: 0, + base_damage: 160, + base_poise_damage: 80, knockback: 25.0, range: 4.5, max_angle: 360.0, diff --git a/assets/common/abilities/hammer/singlestrike.ron b/assets/common/abilities/hammer/singlestrike.ron index 6462b08599..7c4ce65e6d 100644 --- a/assets/common/abilities/hammer/singlestrike.ron +++ b/assets/common/abilities/hammer/singlestrike.ron @@ -3,14 +3,14 @@ ComboMelee( stage: 1, base_damage: 150, damage_increase: 10, - base_poise_damage: 0, + base_poise_damage: 40, poise_damage_increase: 0, knockback: 10.0, range: 4.5, angle: 50.0, - base_buildup_duration: 0.3, + base_buildup_duration: 0.4, base_swing_duration: 0.1, - base_recover_duration: 0.2, + base_recover_duration: 0.25, forward_movement: 0.0, )], initial_energy_gain: 50, diff --git a/assets/common/abilities/hammersimple/doublestrike.ron b/assets/common/abilities/hammersimple/doublestrike.ron index e0d62fa150..7dfe46f9fe 100644 --- a/assets/common/abilities/hammersimple/doublestrike.ron +++ b/assets/common/abilities/hammersimple/doublestrike.ron @@ -4,7 +4,7 @@ ComboMelee( stage: 1, base_damage: 90, damage_increase: 10, - base_poise_damage: 0, + base_poise_damage: 45, poise_damage_increase: 0, knockback: 4.0, range: 3.5, @@ -18,7 +18,7 @@ ComboMelee( stage: 2, base_damage: 130, damage_increase: 15, - base_poise_damage: 0, + base_poise_damage: 45, poise_damage_increase: 0, knockback: 16.0, range: 1.5, diff --git a/assets/common/abilities/spear/dash.ron b/assets/common/abilities/spear/dash.ron index 39999a70b1..b15f47e7de 100644 --- a/assets/common/abilities/spear/dash.ron +++ b/assets/common/abilities/spear/dash.ron @@ -2,12 +2,12 @@ DashMelee( energy_cost: 100, base_damage: 80, scaled_damage: 160, - base_poise_damage: 0, + base_poise_damage: 60, scaled_poise_damage: 0, base_knockback: 8.0, scaled_knockback: 7.0, - range: 5.0, - angle: 45.0, + range: 3.0, + angle: 20.0, energy_drain: 0, forward_speed: 2.0, buildup_duration: 0.5, diff --git a/assets/common/abilities/spear/doublestrike.ron b/assets/common/abilities/spear/doublestrike.ron index 17516e0fc7..dcbd38ac54 100644 --- a/assets/common/abilities/spear/doublestrike.ron +++ b/assets/common/abilities/spear/doublestrike.ron @@ -4,29 +4,29 @@ ComboMelee( stage: 1, base_damage: 90, damage_increase: 10, - base_poise_damage: 0, + base_poise_damage: 30, poise_damage_increase: 0, - knockback: 8.0, - range: 3.5, - angle: 50.0, + knockback: 4.0, + range: 2.5, + angle: 15.0, base_buildup_duration: 0.35, base_swing_duration: 0.075, base_recover_duration: 0.4, - forward_movement: 1.0, + forward_movement: 0.7, ), ( stage: 2, base_damage: 130, - damage_increase: 15, - base_poise_damage: 0, + damage_increase: 20, + base_poise_damage: 30, poise_damage_increase: 0, - knockback: 12.0, - range: 3.5, - angle: 30.0, + knockback: 7.0, + range: 2.5, + angle: 15.0, base_buildup_duration: 0.5, base_swing_duration: 0.1, base_recover_duration: 0.5, - forward_movement: 1.0, + forward_movement: 0.7, ), ], initial_energy_gain: 0, diff --git a/assets/common/abilities/sword/dash.ron b/assets/common/abilities/sword/dash.ron index 4af6873b5f..72ba6f4451 100644 --- a/assets/common/abilities/sword/dash.ron +++ b/assets/common/abilities/sword/dash.ron @@ -2,7 +2,7 @@ DashMelee( energy_cost: 100, base_damage: 80, scaled_damage: 160, - base_poise_damage: 0, + base_poise_damage: 60, scaled_poise_damage: 0, base_knockback: 8.0, scaled_knockback: 7.0, diff --git a/assets/common/abilities/sword/spin.ron b/assets/common/abilities/sword/spin.ron index 9e628e5253..b8ff65f93e 100644 --- a/assets/common/abilities/sword/spin.ron +++ b/assets/common/abilities/sword/spin.ron @@ -3,7 +3,7 @@ SpinMelee( swing_duration: 0.4, recover_duration: 0.5, base_damage: 160, - base_poise_damage: 0, + base_poise_damage: 25, knockback: 10.0, range: 3.5, energy_cost: 150, diff --git a/assets/common/abilities/sword/triplestrike.ron b/assets/common/abilities/sword/triplestrike.ron index ba9a689c71..904cf1f750 100644 --- a/assets/common/abilities/sword/triplestrike.ron +++ b/assets/common/abilities/sword/triplestrike.ron @@ -4,7 +4,7 @@ ComboMelee( stage: 1, base_damage: 100, damage_increase: 10, - base_poise_damage: 0, + base_poise_damage: 15, poise_damage_increase: 0, knockback: 10.0, range: 4.0, @@ -18,7 +18,7 @@ ComboMelee( stage: 2, base_damage: 80, damage_increase: 15, - base_poise_damage: 0, + base_poise_damage: 17, poise_damage_increase: 0, knockback: 12.0, range: 3.5, @@ -32,7 +32,7 @@ ComboMelee( stage: 3, base_damage: 130, damage_increase: 20, - base_poise_damage: 0, + base_poise_damage: 20, poise_damage_increase: 0, knockback: 14.0, range: 6.0, diff --git a/assets/common/abilities/swordsimple/dash.ron b/assets/common/abilities/swordsimple/dash.ron index 0da7356930..1a97e27d8c 100644 --- a/assets/common/abilities/swordsimple/dash.ron +++ b/assets/common/abilities/swordsimple/dash.ron @@ -2,7 +2,7 @@ DashMelee( energy_cost: 100, base_damage: 80, scaled_damage: 160, - base_poise_damage: 0, + base_poise_damage: 40, scaled_poise_damage: 0, base_knockback: 8.0, scaled_knockback: 7.0, diff --git a/assets/common/abilities/swordsimple/doublestrike.ron b/assets/common/abilities/swordsimple/doublestrike.ron index 5d5b94f3d7..bc5178debc 100644 --- a/assets/common/abilities/swordsimple/doublestrike.ron +++ b/assets/common/abilities/swordsimple/doublestrike.ron @@ -4,7 +4,7 @@ ComboMelee( stage: 1, base_damage: 90, damage_increase: 10, - base_poise_damage: 0, + base_poise_damage: 15, poise_damage_increase: 0, knockback: 8.0, range: 3.5, @@ -18,7 +18,7 @@ ComboMelee( stage: 2, base_damage: 130, damage_increase: 15, - base_poise_damage: 0, + base_poise_damage: 20, poise_damage_increase: 0, knockback: 12.0, range: 3.5, diff --git a/assets/common/abilities/unique/beastclaws/basic.ron b/assets/common/abilities/unique/beastclaws/basic.ron index bba42ea1cb..6104f35b8b 100644 --- a/assets/common/abilities/unique/beastclaws/basic.ron +++ b/assets/common/abilities/unique/beastclaws/basic.ron @@ -1,11 +1,11 @@ BasicMelee( energy_cost: 0, buildup_duration: 0.25, - swing_duration: 0.25, + swing_duration: 0.1, recover_duration: 0.25, knockback: 25.0, base_damage: 200, - base_poise_damage: 0, + base_poise_damage: 40, range: 5.0, max_angle: 120.0, ) diff --git a/assets/common/abilities/unique/quadlowbasic/singlestrike.ron b/assets/common/abilities/unique/quadlowbasic/singlestrike.ron index 81394686c5..fcfd98953d 100644 --- a/assets/common/abilities/unique/quadlowbasic/singlestrike.ron +++ b/assets/common/abilities/unique/quadlowbasic/singlestrike.ron @@ -4,13 +4,13 @@ ComboMelee( stage: 1, base_damage: 100, damage_increase: 0, - base_poise_damage: 0, + base_poise_damage: 40, poise_damage_increase: 0, - knockback: 5.0, + knockback: 3.0, range: 3.5, angle: 60.0, - base_buildup_duration: 0.5, - base_swing_duration: 0.15, + base_buildup_duration: 0.4, + base_swing_duration: 0.07, base_recover_duration: 0.4, forward_movement: 3.0, ), diff --git a/assets/common/abilities/unique/quadlowbasic/triplestrike.ron b/assets/common/abilities/unique/quadlowbasic/triplestrike.ron index 894f7e7dc3..cde38787d3 100644 --- a/assets/common/abilities/unique/quadlowbasic/triplestrike.ron +++ b/assets/common/abilities/unique/quadlowbasic/triplestrike.ron @@ -4,13 +4,13 @@ ComboMelee( stage: 1, base_damage: 120, damage_increase: 0, - base_poise_damage: 0, + base_poise_damage: 30, poise_damage_increase: 0, - knockback: 10.0, + knockback: 7.0, range: 3.5, angle: 30.0, - base_buildup_duration: 0.9, - base_swing_duration: 0.1, + base_buildup_duration: 0.65, + base_swing_duration: 0.07, base_recover_duration: 0.3, forward_movement: 2.0, ), @@ -18,13 +18,13 @@ ComboMelee( stage: 2, base_damage: 80, damage_increase: 0, - base_poise_damage: 0, + base_poise_damage: 30, poise_damage_increase: 0, - knockback: 10.0, + knockback: 7.0, range: 3.5, angle: 30.0, - base_buildup_duration: 0.5, - base_swing_duration: 0.1, + base_buildup_duration: 0.4, + base_swing_duration: 0.07, base_recover_duration: 0.3, forward_movement: 1.5, ), @@ -32,13 +32,13 @@ ComboMelee( stage: 3, base_damage: 130, damage_increase: 0, - base_poise_damage: 0, + base_poise_damage: 30, poise_damage_increase: 0, - knockback: 10.0, + knockback: 7.0, range: 3.5, angle: 30.0, - base_buildup_duration: 0.5, - base_swing_duration: 0.1, + base_buildup_duration: 0.4, + base_swing_duration: 0.07, base_recover_duration: 0.3, forward_movement: 1.5, ), diff --git a/assets/common/abilities/unique/quadlowbreathe/dash.ron b/assets/common/abilities/unique/quadlowbreathe/dash.ron index 75bc98c21e..d3e1effddb 100644 --- a/assets/common/abilities/unique/quadlowbreathe/dash.ron +++ b/assets/common/abilities/unique/quadlowbreathe/dash.ron @@ -2,9 +2,9 @@ DashMelee( energy_cost: 0, base_damage: 150, scaled_damage: 110, - base_poise_damage: 0, + base_poise_damage: 40, scaled_poise_damage: 0, - base_knockback: 8.0, + base_knockback: 4.0, scaled_knockback: 17.0, range: 5.0, angle: 45.0, diff --git a/assets/common/abilities/unique/quadlowbreathe/triplestrike.ron b/assets/common/abilities/unique/quadlowbreathe/triplestrike.ron index 19002fa7e5..48f2cac272 100644 --- a/assets/common/abilities/unique/quadlowbreathe/triplestrike.ron +++ b/assets/common/abilities/unique/quadlowbreathe/triplestrike.ron @@ -9,7 +9,7 @@ ComboMelee( knockback: 10.0, range: 4.5, angle: 30.0, - base_buildup_duration: 0.9, + base_buildup_duration: 0.65, base_swing_duration: 0.1, base_recover_duration: 0.3, forward_movement: 2.0, @@ -23,7 +23,7 @@ ComboMelee( knockback: 10.0, range: 3.5, angle: 30.0, - base_buildup_duration: 0.5, + base_buildup_duration: 0.4, base_swing_duration: 0.1, base_recover_duration: 0.3, forward_movement: 1.5, @@ -37,7 +37,7 @@ ComboMelee( knockback: 10.0, range: 3.5, angle: 30.0, - base_buildup_duration: 0.5, + base_buildup_duration: 0.4, base_swing_duration: 0.1, base_recover_duration: 0.3, forward_movement: 1.5, diff --git a/assets/common/abilities/unique/quadlowquick/dash.ron b/assets/common/abilities/unique/quadlowquick/dash.ron index 5309a610da..fee777ea0b 100644 --- a/assets/common/abilities/unique/quadlowquick/dash.ron +++ b/assets/common/abilities/unique/quadlowquick/dash.ron @@ -2,9 +2,9 @@ DashMelee( energy_cost: 0, base_damage: 30, scaled_damage: 10, - base_poise_damage: 0, + base_poise_damage: 40, scaled_poise_damage: 0, - base_knockback: 8.0, + base_knockback: 2.0, scaled_knockback: 7.0, range: 2.0, angle: 45.0, diff --git a/assets/common/abilities/unique/quadlowquick/quadstrike.ron b/assets/common/abilities/unique/quadlowquick/quadstrike.ron index 8547f9ad20..12e4cebca5 100644 --- a/assets/common/abilities/unique/quadlowquick/quadstrike.ron +++ b/assets/common/abilities/unique/quadlowquick/quadstrike.ron @@ -5,7 +5,7 @@ ComboMelee( base_damage: 100, damage_increase: 0, base_poise_damage: 0, - poise_damage_increase: 0, + poise_damage_increase: 30, knockback: 2.0, range: 3.5, angle: 30.0, @@ -19,12 +19,12 @@ ComboMelee( base_damage: 130, damage_increase: 0, base_poise_damage: 0, - poise_damage_increase: 0, + poise_damage_increase: 30, knockback: 2.0, range: 3.5, angle: 30.0, - base_buildup_duration: 0.2, - base_swing_duration: 0.1, + base_buildup_duration: 0.15, + base_swing_duration: 0.07, base_recover_duration: 0.1, forward_movement: 0.8, ), @@ -32,13 +32,13 @@ ComboMelee( stage: 3, base_damage: 130, damage_increase: 0, - base_poise_damage: 0, + base_poise_damage: 30, poise_damage_increase: 0, knockback: 2.0, range: 3.5, angle: 30.0, base_buildup_duration: 0.2, - base_swing_duration: 0.1, + base_swing_duration: 0.07, base_recover_duration: 0.1, forward_movement: 0.8, ), @@ -47,12 +47,12 @@ ComboMelee( base_damage: 130, damage_increase: 0, base_poise_damage: 0, - poise_damage_increase: 0, + poise_damage_increase: 30, knockback: 8.0, range: 3.5, angle: 30.0, base_buildup_duration: 0.2, - base_swing_duration: 0.1, + base_swing_duration: 0.07, base_recover_duration: 0.1, forward_movement: 0.8, ), diff --git a/assets/common/abilities/unique/quadlowranged/singlestrike.ron b/assets/common/abilities/unique/quadlowranged/singlestrike.ron index d33d76a794..8601c08693 100644 --- a/assets/common/abilities/unique/quadlowranged/singlestrike.ron +++ b/assets/common/abilities/unique/quadlowranged/singlestrike.ron @@ -4,13 +4,13 @@ ComboMelee( stage: 1, base_damage: 60, damage_increase: 0, - base_poise_damage: 0, + base_poise_damage: 40, poise_damage_increase: 0, - knockback: 5.0, + knockback: 3.0, range: 3.5, angle: 60.0, - base_buildup_duration: 0.5, - base_swing_duration: 0.15, + base_buildup_duration: 0.4, + base_swing_duration: 0.1, base_recover_duration: 0.4, forward_movement: 3.0, ), diff --git a/assets/common/abilities/unique/quadlowtail/charged.ron b/assets/common/abilities/unique/quadlowtail/charged.ron index 0c03daed43..03d15c4aed 100644 --- a/assets/common/abilities/unique/quadlowtail/charged.ron +++ b/assets/common/abilities/unique/quadlowtail/charged.ron @@ -3,14 +3,14 @@ ChargedMelee( energy_drain: 0, initial_damage: 160, scaled_damage: 40, - initial_poise_damage: 0, - scaled_poise_damage: 0, + initial_poise_damage: 30, + scaled_poise_damage: 80, initial_knockback: 10.0, scaled_knockback: 20.0, range: 6.0, max_angle: 90.0, speed: 1.0, - charge_duration: 1.2, + charge_duration: 0.8, swing_duration: 0.7, hit_timing: 0.9, recover_duration: 1.2, diff --git a/assets/common/abilities/unique/quadlowtail/triplestrike.ron b/assets/common/abilities/unique/quadlowtail/triplestrike.ron index df16e28ff4..cd47b9f65e 100644 --- a/assets/common/abilities/unique/quadlowtail/triplestrike.ron +++ b/assets/common/abilities/unique/quadlowtail/triplestrike.ron @@ -5,11 +5,11 @@ ComboMelee( base_damage: 100, damage_increase: 0, base_poise_damage: 0, - poise_damage_increase: 0, + poise_damage_increase: 30, knockback: 10.0, range: 3.5, angle: 30.0, - base_buildup_duration: 0.9, + base_buildup_duration: 0.65, base_swing_duration: 0.1, base_recover_duration: 0.2, forward_movement: 2.0, @@ -18,7 +18,7 @@ ComboMelee( stage: 2, base_damage: 120, damage_increase: 0, - base_poise_damage: 0, + base_poise_damage: 30, poise_damage_increase: 0, knockback: 10.0, range: 3.5, @@ -32,7 +32,7 @@ ComboMelee( stage: 3, base_damage: 130, damage_increase: 0, - base_poise_damage: 0, + base_poise_damage: 30, poise_damage_increase: 0, knockback: 10.0, range: 3.5, diff --git a/assets/common/abilities/unique/quadmedbasic/singlestrike.ron b/assets/common/abilities/unique/quadmedbasic/singlestrike.ron index 7646178bb5..5818357edf 100644 --- a/assets/common/abilities/unique/quadmedbasic/singlestrike.ron +++ b/assets/common/abilities/unique/quadmedbasic/singlestrike.ron @@ -4,13 +4,13 @@ ComboMelee( stage: 1, base_damage: 120, damage_increase: 0, - base_poise_damage: 0, + base_poise_damage: 30, poise_damage_increase: 0, knockback: 5.0, range: 3.5, angle: 60.0, - base_buildup_duration: 0.65, - base_swing_duration: 0.15, + base_buildup_duration: 0.4, + base_swing_duration: 0.1, base_recover_duration: 0.4, forward_movement: 1.0, ), diff --git a/assets/common/abilities/unique/quadmedbasic/triplestrike.ron b/assets/common/abilities/unique/quadmedbasic/triplestrike.ron index 622ec06793..25d6eb42be 100644 --- a/assets/common/abilities/unique/quadmedbasic/triplestrike.ron +++ b/assets/common/abilities/unique/quadmedbasic/triplestrike.ron @@ -4,13 +4,13 @@ ComboMelee( stage: 1, base_damage: 120, damage_increase: 0, - base_poise_damage: 0, + base_poise_damage: 35, poise_damage_increase: 0, - knockback: 10.0, + knockback: 5.0, range: 3.5, angle: 30.0, - base_buildup_duration: 0.9, - base_swing_duration: 0.1, + base_buildup_duration: 0.4, + base_swing_duration: 0.07, base_recover_duration: 0.4, forward_movement: 1.0, ), @@ -18,13 +18,13 @@ ComboMelee( stage: 2, base_damage: 120, damage_increase: 0, - base_poise_damage: 0, + base_poise_damage: 35, poise_damage_increase: 0, - knockback: 10.0, + knockback: 5.0, range: 3.5, angle: 30.0, - base_buildup_duration: 0.3, - base_swing_duration: 0.1, + base_buildup_duration: 0.25, + base_swing_duration: 0.07, base_recover_duration: 0.2, forward_movement: 0.0, ), @@ -32,13 +32,13 @@ ComboMelee( stage: 3, base_damage: 120, damage_increase: 0, - base_poise_damage: 0, + base_poise_damage: 35, poise_damage_increase: 0, - knockback: 10.0, + knockback: 5.0, range: 3.5, angle: 30.0, - base_buildup_duration: 0.3, - base_swing_duration: 0.1, + base_buildup_duration: 0.25, + base_swing_duration: 0.07, base_recover_duration: 0.2, forward_movement: 1.0, ), diff --git a/assets/common/abilities/unique/quadmedcharge/dash.ron b/assets/common/abilities/unique/quadmedcharge/dash.ron index 485f073dcf..592890d1c7 100644 --- a/assets/common/abilities/unique/quadmedcharge/dash.ron +++ b/assets/common/abilities/unique/quadmedcharge/dash.ron @@ -2,8 +2,8 @@ DashMelee( energy_cost: 0, base_damage: 150, scaled_damage: 40, - base_poise_damage: 0, - scaled_poise_damage: 0, + base_poise_damage: 40, + scaled_poise_damage: 40, base_knockback: 8.0, scaled_knockback: 17.0, range: 4.0, diff --git a/assets/common/abilities/unique/quadmedcharge/doublestrike.ron b/assets/common/abilities/unique/quadmedcharge/doublestrike.ron index e1361313bd..1a720d49bd 100644 --- a/assets/common/abilities/unique/quadmedcharge/doublestrike.ron +++ b/assets/common/abilities/unique/quadmedcharge/doublestrike.ron @@ -4,12 +4,12 @@ ComboMelee( stage: 1, base_damage: 100, damage_increase: 0, - base_poise_damage: 0, + base_poise_damage: 40, poise_damage_increase: 0, knockback: 10.0, range: 3.5, angle: 30.0, - base_buildup_duration: 0.9, + base_buildup_duration: 0.65, base_swing_duration: 0.1, base_recover_duration: 0.3, forward_movement: 1.0, @@ -19,11 +19,11 @@ ComboMelee( base_damage: 80, damage_increase: 0, base_poise_damage: 0, - poise_damage_increase: 0, + poise_damage_increase: 40, knockback: 10.0, range: 3.5, angle: 30.0, - base_buildup_duration: 0.5, + base_buildup_duration: 0.4, base_swing_duration: 0.1, base_recover_duration: 0.3, forward_movement: 0.5, diff --git a/assets/common/abilities/unique/quadmedhoof/basic.ron b/assets/common/abilities/unique/quadmedhoof/basic.ron index 6d23313014..5417249f76 100644 --- a/assets/common/abilities/unique/quadmedhoof/basic.ron +++ b/assets/common/abilities/unique/quadmedhoof/basic.ron @@ -1,10 +1,10 @@ BasicMelee( energy_cost: 0, - buildup_duration: 0.6, + buildup_duration: 0.45, swing_duration: 0.5, recover_duration: 0.35, base_damage: 130, - base_poise_damage: 0, + base_poise_damage: 30, knockback: 25.0, range: 3.0, max_angle: 120.0, diff --git a/assets/common/abilities/unique/quadmedjump/doublestrike.ron b/assets/common/abilities/unique/quadmedjump/doublestrike.ron index eab589270c..b7461fc10b 100644 --- a/assets/common/abilities/unique/quadmedjump/doublestrike.ron +++ b/assets/common/abilities/unique/quadmedjump/doublestrike.ron @@ -4,12 +4,12 @@ ComboMelee( stage: 1, base_damage: 100, damage_increase: 0, - base_poise_damage: 0, + base_poise_damage: 30, poise_damage_increase: 0, - knockback: 8.0, + knockback: 4.0, range: 3.5, angle: 30.0, - base_buildup_duration: 0.9, + base_buildup_duration: 0.65, base_swing_duration: 0.1, base_recover_duration: 0.3, forward_movement: 1.0, @@ -18,12 +18,12 @@ ComboMelee( stage: 2, base_damage: 80, damage_increase: 0, - base_poise_damage: 0, + base_poise_damage: 30, poise_damage_increase: 0, - knockback: 8.0, + knockback: 4.0, range: 3.5, angle: 30.0, - base_buildup_duration: 0.5, + base_buildup_duration: 0.4, base_swing_duration: 0.1, base_recover_duration: 0.3, forward_movement: 1.5, diff --git a/assets/common/abilities/unique/quadmedjump/leap.ron b/assets/common/abilities/unique/quadmedjump/leap.ron index b66583eb2c..cecfe5b597 100644 --- a/assets/common/abilities/unique/quadmedjump/leap.ron +++ b/assets/common/abilities/unique/quadmedjump/leap.ron @@ -5,8 +5,8 @@ LeapMelee( swing_duration: 0.075, recover_duration: 0.2, base_damage: 240, - base_poise_damage: 0, - knockback: 12.0, + base_poise_damage: 60, + knockback: 4.0, range: 4.5, max_angle: 180.0, forward_leap_strength: 40.0, diff --git a/assets/common/abilities/unique/quadmedjump/quickleap.ron b/assets/common/abilities/unique/quadmedjump/quickleap.ron index b4963c1150..57ed67d56c 100644 --- a/assets/common/abilities/unique/quadmedjump/quickleap.ron +++ b/assets/common/abilities/unique/quadmedjump/quickleap.ron @@ -5,8 +5,8 @@ LeapMelee( swing_duration: 0.075, recover_duration: 0.125, base_damage: 120, - base_poise_damage: 0, - knockback: 7.0, + base_poise_damage: 30, + knockback: 2.0, range: 4.5, max_angle: 180.0, forward_leap_strength: 20.0, diff --git a/assets/common/abilities/unique/quadmedquick/dash.ron b/assets/common/abilities/unique/quadmedquick/dash.ron index 83d195e0df..8ee8f527a6 100644 --- a/assets/common/abilities/unique/quadmedquick/dash.ron +++ b/assets/common/abilities/unique/quadmedquick/dash.ron @@ -2,9 +2,9 @@ DashMelee( energy_cost: 0, base_damage: 130, scaled_damage: 20, - base_poise_damage: 0, - scaled_poise_damage: 0, - base_knockback: 8.0, + base_poise_damage: 40, + scaled_poise_damage: 60, + base_knockback: 3.0, scaled_knockback: 7.0, range: 2.0, angle: 45.0, diff --git a/assets/common/abilities/unique/quadmedquick/triplestrike.ron b/assets/common/abilities/unique/quadmedquick/triplestrike.ron index 001aa3d68b..6db2921db3 100644 --- a/assets/common/abilities/unique/quadmedquick/triplestrike.ron +++ b/assets/common/abilities/unique/quadmedquick/triplestrike.ron @@ -4,12 +4,12 @@ ComboMelee( stage: 1, base_damage: 150, damage_increase: 0, - base_poise_damage: 0, + base_poise_damage: 30, poise_damage_increase: 0, knockback: 5.0, range: 3.5, angle: 60.0, - base_buildup_duration: 0.8, + base_buildup_duration: 0.6, base_swing_duration: 0.15, base_recover_duration: 0.4, forward_movement: 0.3, @@ -18,12 +18,12 @@ ComboMelee( stage: 2, base_damage: 150, damage_increase: 0, - base_poise_damage: 0, + base_poise_damage: 30, poise_damage_increase: 0, knockback: 5.0, range: 3.5, angle: 60.0, - base_buildup_duration: 0.6, + base_buildup_duration: 0.4, base_swing_duration: 0.15, base_recover_duration: 0.3, forward_movement: 0.5, @@ -32,12 +32,12 @@ ComboMelee( stage: 3, base_damage: 150, damage_increase: 0, - base_poise_damage: 0, + base_poise_damage: 30, poise_damage_increase: 0, knockback: 5.0, range: 3.5, angle: 60.0, - base_buildup_duration: 0.6, + base_buildup_duration: 0.4, base_swing_duration: 0.15, base_recover_duration: 0.3, forward_movement: 0.5, diff --git a/assets/common/abilities/unique/quadsmallbasic/singlestrike.ron b/assets/common/abilities/unique/quadsmallbasic/singlestrike.ron index eeef8f01ea..999909eb44 100644 --- a/assets/common/abilities/unique/quadsmallbasic/singlestrike.ron +++ b/assets/common/abilities/unique/quadsmallbasic/singlestrike.ron @@ -4,9 +4,9 @@ ComboMelee( stage: 1, base_damage: 30, damage_increase: 0, - base_poise_damage: 0, + base_poise_damage: 10, poise_damage_increase: 0, - knockback: 5.0, + knockback: 3.0, range: 3.5, angle: 60.0, base_buildup_duration: 0.3, diff --git a/assets/common/abilities/unique/stonegolemfist/shockwave.ron b/assets/common/abilities/unique/stonegolemfist/shockwave.ron index d6f315fdab..1099d9aaf0 100644 --- a/assets/common/abilities/unique/stonegolemfist/shockwave.ron +++ b/assets/common/abilities/unique/stonegolemfist/shockwave.ron @@ -4,7 +4,7 @@ Shockwave( swing_duration: 0.15, recover_duration: 1.8, damage: 500, - poise_damage: 0, + poise_damage: 50, knockback: (strength: 40.0, direction: TowardsUp), shockwave_angle: 100.0, shockwave_vertical_angle: 90.0, diff --git a/assets/common/abilities/unique/stonegolemfist/singlestrike.ron b/assets/common/abilities/unique/stonegolemfist/singlestrike.ron index 07c68c1aea..b090c2d514 100644 --- a/assets/common/abilities/unique/stonegolemfist/singlestrike.ron +++ b/assets/common/abilities/unique/stonegolemfist/singlestrike.ron @@ -4,9 +4,9 @@ ComboMelee( stage: 1, base_damage: 300, damage_increase: 0, - base_poise_damage: 0, + base_poise_damage: 40, poise_damage_increase: 0, - knockback: 5.0, + knockback: 3.0, range: 3.5, angle: 60.0, base_buildup_duration: 0.9, diff --git a/assets/common/abilities/unique/stonegolemfist/spin.ron b/assets/common/abilities/unique/stonegolemfist/spin.ron index d33628d464..33d821f51f 100644 --- a/assets/common/abilities/unique/stonegolemfist/spin.ron +++ b/assets/common/abilities/unique/stonegolemfist/spin.ron @@ -3,7 +3,7 @@ SpinMelee( swing_duration: 0.3, recover_duration: 0.1, base_damage: 500, - base_poise_damage: 0, + base_poise_damage: 30, knockback: 0.0, range: 7.5, energy_cost: 0, diff --git a/assets/common/abilities/unique/theropodbasic/singlestrike.ron b/assets/common/abilities/unique/theropodbasic/singlestrike.ron index 09f9bbd86b..428e07b482 100644 --- a/assets/common/abilities/unique/theropodbasic/singlestrike.ron +++ b/assets/common/abilities/unique/theropodbasic/singlestrike.ron @@ -4,9 +4,9 @@ ComboMelee( stage: 1, base_damage: 150, damage_increase: 0, - base_poise_damage: 0, + base_poise_damage: 40, poise_damage_increase: 0, - knockback: 5.0, + knockback: 4.0, range: 7.5, angle: 60.0, base_buildup_duration: 0.5, diff --git a/assets/common/abilities/unique/theropodbasic/triplestrike.ron b/assets/common/abilities/unique/theropodbasic/triplestrike.ron index 43c3c68909..653f154098 100644 --- a/assets/common/abilities/unique/theropodbasic/triplestrike.ron +++ b/assets/common/abilities/unique/theropodbasic/triplestrike.ron @@ -4,9 +4,9 @@ ComboMelee( stage: 1, base_damage: 170, damage_increase: 0, - base_poise_damage: 0, + base_poise_damage: 35, poise_damage_increase: 0, - knockback: 10.0, + knockback: 5.0, range: 7.5, angle: 30.0, base_buildup_duration: 0.9, @@ -18,9 +18,9 @@ ComboMelee( stage: 2, base_damage: 190, damage_increase: 0, - base_poise_damage: 0, + base_poise_damage: 35, poise_damage_increase: 0, - knockback: 10.0, + knockback: 5.0, range: 5.5, angle: 30.0, base_buildup_duration: 0.5, @@ -32,9 +32,9 @@ ComboMelee( stage: 3, base_damage: 230, damage_increase: 0, - base_poise_damage: 0, + base_poise_damage: 35, poise_damage_increase: 0, - knockback: 10.0, + knockback: 5.0, range: 5.5, angle: 30.0, base_buildup_duration: 0.35, diff --git a/assets/common/abilities/unique/theropodbird/singlestrike.ron b/assets/common/abilities/unique/theropodbird/singlestrike.ron index 3bb472cda9..9c97b320bb 100644 --- a/assets/common/abilities/unique/theropodbird/singlestrike.ron +++ b/assets/common/abilities/unique/theropodbird/singlestrike.ron @@ -4,12 +4,12 @@ ComboMelee( stage: 1, base_damage: 150, damage_increase: 0, - base_poise_damage: 0, + base_poise_damage: 40, poise_damage_increase: 0, - knockback: 5.0, + knockback: 2.0, range: 5.5, angle: 5.0, - base_buildup_duration: 0.5, + base_buildup_duration: 0.4, base_swing_duration: 0.15, base_recover_duration: 0.4, forward_movement: 3.0, diff --git a/assets/common/abilities/unique/theropodbird/triplestrike.ron b/assets/common/abilities/unique/theropodbird/triplestrike.ron index 6fd4e976c5..6dcb11f250 100644 --- a/assets/common/abilities/unique/theropodbird/triplestrike.ron +++ b/assets/common/abilities/unique/theropodbird/triplestrike.ron @@ -4,12 +4,12 @@ ComboMelee( stage: 1, base_damage: 170, damage_increase: 0, - base_poise_damage: 0, + base_poise_damage: 20, poise_damage_increase: 0, - knockback: 10.0, + knockback: 3.0, range: 4.5, angle: 5.0, - base_buildup_duration: 0.9, + base_buildup_duration: 0.65, base_swing_duration: 0.15, base_recover_duration: 0.3, forward_movement: 1.0, @@ -18,12 +18,12 @@ ComboMelee( stage: 2, base_damage: 190, damage_increase: 0, - base_poise_damage: 0, + base_poise_damage: 20, poise_damage_increase: 0, - knockback: 10.0, + knockback: 3.0, range: 4.0, angle: 10.0, - base_buildup_duration: 0.5, + base_buildup_duration: 0.4, base_swing_duration: 0.15, base_recover_duration: 0.15, forward_movement: 1.0, @@ -32,9 +32,9 @@ ComboMelee( stage: 3, base_damage: 230, damage_increase: 0, - base_poise_damage: 0, + base_poise_damage: 20, poise_damage_increase: 0, - knockback: 10.0, + knockback: 3.0, range: 4.0, angle: 10.0, base_buildup_duration: 0.35, diff --git a/assets/common/abilities/unique/wendigomagic/singlestrike.ron b/assets/common/abilities/unique/wendigomagic/singlestrike.ron index 98007d86c9..e9a5f6ca4d 100644 --- a/assets/common/abilities/unique/wendigomagic/singlestrike.ron +++ b/assets/common/abilities/unique/wendigomagic/singlestrike.ron @@ -4,9 +4,9 @@ ComboMelee( stage: 1, base_damage: 100, damage_increase: 0, - base_poise_damage: 0, + base_poise_damage: 40, poise_damage_increase: 0, - knockback: 5.0, + knockback: 3.0, range: 3.5, angle: 30.0, base_buildup_duration: 0.5, diff --git a/assets/common/items/armor/agile/chest.ron b/assets/common/items/armor/agile/chest.ron index 825e4fc5fc..57510e6896 100644 --- a/assets/common/items/armor/agile/chest.ron +++ b/assets/common/items/armor/agile/chest.ron @@ -5,7 +5,7 @@ ItemDef( kind: Chest("Agile"), stats: ( protection: Normal(8.0), - poise_resilience: Normal(3.0), + poise_resilience: Normal(1.0), ), )), quality: Moderate, diff --git a/assets/common/items/armor/agile/hand.ron b/assets/common/items/armor/agile/hand.ron index f26a394bdb..3b4c6f2391 100644 --- a/assets/common/items/armor/agile/hand.ron +++ b/assets/common/items/armor/agile/hand.ron @@ -5,7 +5,7 @@ ItemDef( kind: Hand("Agile"), stats: ( protection: Normal(4.0), - poise_resilience: Normal(4.0), + poise_resilience: Normal(1.0), ), )), quality: Moderate, diff --git a/assets/common/items/armor/agile/pants.ron b/assets/common/items/armor/agile/pants.ron index 7244899d6a..e51159afb5 100644 --- a/assets/common/items/armor/agile/pants.ron +++ b/assets/common/items/armor/agile/pants.ron @@ -5,7 +5,7 @@ ItemDef( kind: Pants("Agile"), stats: ( protection: Normal(6.0), - poise_resilience: Normal(3.0), + poise_resilience: Normal(1.0), ), )), quality: Moderate, diff --git a/assets/common/items/armor/agile/shoulder.ron b/assets/common/items/armor/agile/shoulder.ron index 8cf36a908e..005e3495fb 100644 --- a/assets/common/items/armor/agile/shoulder.ron +++ b/assets/common/items/armor/agile/shoulder.ron @@ -5,7 +5,7 @@ ItemDef( kind: Shoulder("Agile"), stats: ( protection: Normal(8.0), - poise_resilience: Normal(4.0), + poise_resilience: Normal(1.0), ), )), quality: Moderate, diff --git a/assets/common/items/armor/assassin/chest.ron b/assets/common/items/armor/assassin/chest.ron index 045f734b24..25c95c4661 100644 --- a/assets/common/items/armor/assassin/chest.ron +++ b/assets/common/items/armor/assassin/chest.ron @@ -5,7 +5,7 @@ ItemDef( kind: Chest("Assassin"), stats: ( protection: Normal(15.0), - poise_resilience: Normal(10.0), + poise_resilience: Normal(1.0), ), )), quality: Moderate, diff --git a/assets/common/items/armor/assassin/foot.ron b/assets/common/items/armor/assassin/foot.ron index d4236ca206..0dd80a1cf2 100644 --- a/assets/common/items/armor/assassin/foot.ron +++ b/assets/common/items/armor/assassin/foot.ron @@ -5,7 +5,7 @@ ItemDef( kind: Foot("Assassin"), stats: ( protection: Normal(4.0), - poise_resilience: Normal(2.0), + poise_resilience: Normal(1.0), ), )), quality: Moderate, diff --git a/assets/common/items/armor/assassin/hand.ron b/assets/common/items/armor/assassin/hand.ron index b0f5f026ee..7512d45b5d 100644 --- a/assets/common/items/armor/assassin/hand.ron +++ b/assets/common/items/armor/assassin/hand.ron @@ -5,7 +5,7 @@ ItemDef( kind: Hand("Assassin"), stats: ( protection: Normal(6.0), - poise_resilience: Normal(3.0), + poise_resilience: Normal(1.0), ), )), quality: Moderate, diff --git a/assets/common/items/armor/assassin/pants.ron b/assets/common/items/armor/assassin/pants.ron index 65d247fe76..1d19d67ca9 100644 --- a/assets/common/items/armor/assassin/pants.ron +++ b/assets/common/items/armor/assassin/pants.ron @@ -5,7 +5,7 @@ ItemDef( kind: Pants("Assassin"), stats: ( protection: Normal(10.0), - poise_resilience: Normal(3.0), + poise_resilience: Normal(1.0), ), )), quality: Moderate, diff --git a/assets/common/items/armor/assassin/shoulder.ron b/assets/common/items/armor/assassin/shoulder.ron index 5dd0fca5ca..7a580f0bd3 100644 --- a/assets/common/items/armor/assassin/shoulder.ron +++ b/assets/common/items/armor/assassin/shoulder.ron @@ -5,7 +5,7 @@ ItemDef( kind: Shoulder("Assassin"), stats: ( protection: Normal(8.0), - poise_resilience: Normal(7.0), + poise_resilience: Normal(1.0), ), )), quality: Moderate, diff --git a/assets/common/items/armor/bonerattler/belt.ron b/assets/common/items/armor/bonerattler/belt.ron index 0e92fb84e2..1e341a5520 100644 --- a/assets/common/items/armor/bonerattler/belt.ron +++ b/assets/common/items/armor/bonerattler/belt.ron @@ -5,7 +5,7 @@ ItemDef( kind: Belt("Bonerattler"), stats: ( protection: Normal(3.0), - poise_resilience: Normal(5.0), + poise_resilience: Normal(1.0), ), )), quality: High, diff --git a/assets/common/items/armor/bonerattler/chest.ron b/assets/common/items/armor/bonerattler/chest.ron index 628f7d2c2c..5b4d2e63ad 100644 --- a/assets/common/items/armor/bonerattler/chest.ron +++ b/assets/common/items/armor/bonerattler/chest.ron @@ -5,7 +5,7 @@ ItemDef( kind: Chest("Bonerattler"), stats: ( protection: Normal(25.0), - poise_resilience: Normal(35.0), + poise_resilience: Normal(1.0), ), )), quality: High, diff --git a/assets/common/items/armor/bonerattler/foot.ron b/assets/common/items/armor/bonerattler/foot.ron index d83a6dde27..ed36219c54 100644 --- a/assets/common/items/armor/bonerattler/foot.ron +++ b/assets/common/items/armor/bonerattler/foot.ron @@ -5,7 +5,7 @@ ItemDef( kind: Foot("Bonerattler"), stats: ( protection: Normal(5.0), - poise_resilience: Normal(10.0), + poise_resilience: Normal(1.0), ), )), quality: High, diff --git a/assets/common/items/armor/bonerattler/hand.ron b/assets/common/items/armor/bonerattler/hand.ron index 4c5c316efc..8c1632288b 100644 --- a/assets/common/items/armor/bonerattler/hand.ron +++ b/assets/common/items/armor/bonerattler/hand.ron @@ -5,7 +5,7 @@ ItemDef( kind: Hand("Bonerattler"), stats: ( protection: Normal(10.0), - poise_resilience: Normal(12.0), + poise_resilience: Normal(1.0), ), )), quality: High, diff --git a/assets/common/items/armor/bonerattler/pants.ron b/assets/common/items/armor/bonerattler/pants.ron index 85575b8570..f56d23c742 100644 --- a/assets/common/items/armor/bonerattler/pants.ron +++ b/assets/common/items/armor/bonerattler/pants.ron @@ -5,7 +5,7 @@ ItemDef( kind: Pants("Bonerattler"), stats: ( protection: Normal(20.0), - poise_resilience: Normal(24.0), + poise_resilience: Normal(1.0), ), )), quality: High, diff --git a/assets/common/items/armor/bonerattler/shoulder.ron b/assets/common/items/armor/bonerattler/shoulder.ron index 7ffc6bdff6..93f7a7c550 100644 --- a/assets/common/items/armor/bonerattler/shoulder.ron +++ b/assets/common/items/armor/bonerattler/shoulder.ron @@ -5,7 +5,7 @@ ItemDef( kind: Shoulder("Bonerattler"), stats: ( protection: Normal(15.0), - poise_resilience: Normal(17.0), + poise_resilience: Normal(1.0), ), )), quality: High, diff --git a/assets/common/items/armor/cultist/belt.ron b/assets/common/items/armor/cultist/belt.ron index fee30d35a7..c5fdaef53f 100644 --- a/assets/common/items/armor/cultist/belt.ron +++ b/assets/common/items/armor/cultist/belt.ron @@ -5,7 +5,7 @@ ItemDef( kind: Belt("Cultist"), stats: ( protection: Normal(6.0), - poise_resilience: Normal(5.0), + poise_resilience: Normal(1.0), ), )), quality: Epic, diff --git a/assets/common/items/armor/cultist/chest.ron b/assets/common/items/armor/cultist/chest.ron index fb311475a5..5cf89b6108 100644 --- a/assets/common/items/armor/cultist/chest.ron +++ b/assets/common/items/armor/cultist/chest.ron @@ -5,7 +5,7 @@ ItemDef( kind: Chest("Cultist"), stats: ( protection: Normal(30.0), - poise_resilience: Normal(15.0), + poise_resilience: Normal(1.0), ), )), quality: Epic, diff --git a/assets/common/items/armor/cultist/foot.ron b/assets/common/items/armor/cultist/foot.ron index da720e40b4..c95f4ed6cc 100644 --- a/assets/common/items/armor/cultist/foot.ron +++ b/assets/common/items/armor/cultist/foot.ron @@ -5,7 +5,7 @@ ItemDef( kind: Foot("Cultist"), stats: ( protection: Normal(6.0), - poise_resilience: Normal(3.0), + poise_resilience: Normal(1.0), ), )), quality: Epic, diff --git a/assets/common/items/armor/cultist/pants.ron b/assets/common/items/armor/cultist/pants.ron index e50ab01fc8..df7ecd9303 100644 --- a/assets/common/items/armor/cultist/pants.ron +++ b/assets/common/items/armor/cultist/pants.ron @@ -5,7 +5,7 @@ ItemDef( kind: Pants("Cultist"), stats: ( protection: Normal(24.0), - poise_resilience: Normal(14.0), + poise_resilience: Normal(1.0), ), )), quality: Epic, diff --git a/assets/common/items/armor/cultist/shoulder.ron b/assets/common/items/armor/cultist/shoulder.ron index e6e742acca..ebbf339023 100644 --- a/assets/common/items/armor/cultist/shoulder.ron +++ b/assets/common/items/armor/cultist/shoulder.ron @@ -5,7 +5,7 @@ ItemDef( kind: Shoulder("Cultist"), stats: ( protection: Normal(18.0), - poise_resilience: Normal(10.0), + poise_resilience: Normal(1.0), ), )), quality: Epic, diff --git a/assets/common/items/armor/druid/belt.ron b/assets/common/items/armor/druid/belt.ron index 1778016f46..98f9893097 100644 --- a/assets/common/items/armor/druid/belt.ron +++ b/assets/common/items/armor/druid/belt.ron @@ -5,7 +5,7 @@ ItemDef( kind: Belt("Druid"), stats: ( protection: Normal(2.0), - poise_resilience: Normal(2.0), + poise_resilience: Normal(1.0), ), )), quality: Moderate, diff --git a/assets/common/items/armor/druid/chest.ron b/assets/common/items/armor/druid/chest.ron index a478f480d9..346e0e31aa 100644 --- a/assets/common/items/armor/druid/chest.ron +++ b/assets/common/items/armor/druid/chest.ron @@ -5,7 +5,7 @@ ItemDef( kind: Chest("Druid"), stats: ( protection: Normal(6.0), - poise_resilience: Normal(4.0), + poise_resilience: Normal(1.0), ), )), quality: Moderate, diff --git a/assets/common/items/armor/druid/pants.ron b/assets/common/items/armor/druid/pants.ron index 051eb6acb1..ce3a392812 100644 --- a/assets/common/items/armor/druid/pants.ron +++ b/assets/common/items/armor/druid/pants.ron @@ -5,7 +5,7 @@ ItemDef( kind: Pants("Druid"), stats: ( protection: Normal(4.0), - poise_resilience: Normal(2.0), + poise_resilience: Normal(1.0), ), )), quality: Moderate, diff --git a/assets/common/items/armor/leather_plate/belt.ron b/assets/common/items/armor/leather_plate/belt.ron index 8a1adb2638..b12866f6d7 100644 --- a/assets/common/items/armor/leather_plate/belt.ron +++ b/assets/common/items/armor/leather_plate/belt.ron @@ -5,7 +5,7 @@ ItemDef( kind: Belt("LeatherPlate"), stats: ( protection: Normal(4.0), - poise_resilience: Normal(8.0), + poise_resilience: Normal(1.0), ), )), quality: Moderate, diff --git a/assets/common/items/armor/leather_plate/chest.ron b/assets/common/items/armor/leather_plate/chest.ron index 57b651fe5b..cabc5893b9 100644 --- a/assets/common/items/armor/leather_plate/chest.ron +++ b/assets/common/items/armor/leather_plate/chest.ron @@ -5,7 +5,7 @@ ItemDef( kind: Chest("LeatherPlate"), stats: ( protection: Normal(25.0), - poise_resilience: Normal(40.0), + poise_resilience: Normal(1.0), ), )), quality: High, diff --git a/assets/common/items/armor/leather_plate/foot.ron b/assets/common/items/armor/leather_plate/foot.ron index ea45f479eb..77cda34ff7 100644 --- a/assets/common/items/armor/leather_plate/foot.ron +++ b/assets/common/items/armor/leather_plate/foot.ron @@ -5,7 +5,7 @@ ItemDef( kind: Foot("LeatherPlate"), stats: ( protection: Normal(5.0), - poise_resilience: Normal(10.0), + poise_resilience: Normal(1.0), ), )), quality: High, diff --git a/assets/common/items/armor/leather_plate/hand.ron b/assets/common/items/armor/leather_plate/hand.ron index a7382c206a..b6db1b6e81 100644 --- a/assets/common/items/armor/leather_plate/hand.ron +++ b/assets/common/items/armor/leather_plate/hand.ron @@ -5,7 +5,7 @@ ItemDef( kind: Hand("LeatherPlate"), stats: ( protection: Normal(10.0), - poise_resilience: Normal(15.0), + poise_resilience: Normal(1.0), ), )), quality: Moderate, diff --git a/assets/common/items/armor/leather_plate/pants.ron b/assets/common/items/armor/leather_plate/pants.ron index 9d5b30b25a..93a245d686 100644 --- a/assets/common/items/armor/leather_plate/pants.ron +++ b/assets/common/items/armor/leather_plate/pants.ron @@ -5,7 +5,7 @@ ItemDef( kind: Pants("LeatherPlate"), stats: ( protection: Normal(20.0), - poise_resilience: Normal(26.0), + poise_resilience: Normal(1.0), ), )), quality: Moderate, diff --git a/assets/common/items/armor/leather_plate/shoulder.ron b/assets/common/items/armor/leather_plate/shoulder.ron index e7161f708f..a2a194c5f7 100644 --- a/assets/common/items/armor/leather_plate/shoulder.ron +++ b/assets/common/items/armor/leather_plate/shoulder.ron @@ -5,7 +5,7 @@ ItemDef( kind: Shoulder("LeatherPlate"), stats: ( protection: Normal(15.0), - poise_resilience: Normal(20.0), + poise_resilience: Normal(1.0), ), )), quality: Moderate, diff --git a/assets/common/items/armor/misc/foot/jackalope_slippers.ron b/assets/common/items/armor/misc/foot/jackalope_slippers.ron index fab40c9ac9..eafb03b174 100644 --- a/assets/common/items/armor/misc/foot/jackalope_slippers.ron +++ b/assets/common/items/armor/misc/foot/jackalope_slippers.ron @@ -5,7 +5,7 @@ ItemDef( kind: Foot("Jackalope"), stats: ( protection: Normal(0.0), - poise_resilience: Normal(10.0), + poise_resilience: Normal(1.0), ), )), quality: High, diff --git a/assets/common/items/armor/misc/foot/sandals.ron b/assets/common/items/armor/misc/foot/sandals.ron index 7c3aee3513..065daef9db 100644 --- a/assets/common/items/armor/misc/foot/sandals.ron +++ b/assets/common/items/armor/misc/foot/sandals.ron @@ -5,7 +5,7 @@ ItemDef( kind: Foot("Sandal"), stats: ( protection: Normal(0.0), - poise_resilience: Normal(0.0), + poise_resilience: Normal(1.0), ), )), quality: Low, diff --git a/assets/common/items/armor/misc/neck/plain_0.ron b/assets/common/items/armor/misc/neck/plain_0.ron index 8c1a5df87d..48c00bce48 100644 --- a/assets/common/items/armor/misc/neck/plain_0.ron +++ b/assets/common/items/armor/misc/neck/plain_0.ron @@ -5,7 +5,7 @@ ItemDef( kind: Neck("Plain0"), stats: ( protection: Normal(1.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), ), )), quality: Common, diff --git a/assets/common/items/armor/misc/neck/plain_1.ron b/assets/common/items/armor/misc/neck/plain_1.ron index 60e9a98cf1..dacfa55d06 100644 --- a/assets/common/items/armor/misc/neck/plain_1.ron +++ b/assets/common/items/armor/misc/neck/plain_1.ron @@ -5,7 +5,7 @@ ItemDef( kind: Neck("Plain1"), stats: ( protection: Normal(2.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), ), )), quality: Moderate, diff --git a/assets/common/items/armor/misc/neck/shell.ron b/assets/common/items/armor/misc/neck/shell.ron index 4bba778bd7..423cbe3520 100644 --- a/assets/common/items/armor/misc/neck/shell.ron +++ b/assets/common/items/armor/misc/neck/shell.ron @@ -5,7 +5,7 @@ ItemDef( kind: Neck("Shell"), stats: ( protection: Normal(2.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), ), )), quality: Moderate, diff --git a/assets/common/items/armor/misc/pants/hunting.ron b/assets/common/items/armor/misc/pants/hunting.ron index 75bc8ed1a4..4103ccf476 100644 --- a/assets/common/items/armor/misc/pants/hunting.ron +++ b/assets/common/items/armor/misc/pants/hunting.ron @@ -5,7 +5,7 @@ ItemDef( kind: Pants("Hunting"), stats: ( protection: Normal(8.0), - poise_resilience: Normal(3.0), + poise_resilience: Normal(1.0), ), )), quality: Moderate, diff --git a/assets/common/items/armor/misc/ring/skull.ron b/assets/common/items/armor/misc/ring/skull.ron index edfa8639e7..b8fef3c40a 100644 --- a/assets/common/items/armor/misc/ring/skull.ron +++ b/assets/common/items/armor/misc/ring/skull.ron @@ -5,7 +5,7 @@ ItemDef( kind: Ring("Skull"), stats: ( protection: Normal(3.0), - poise_resilience: Normal(1.0), + poise_resilience: Normal(0.0), ), )), quality: High, diff --git a/assets/common/items/armor/misc/shoulder/iron_spikes.ron b/assets/common/items/armor/misc/shoulder/iron_spikes.ron index b016c82ba1..559303a8f5 100644 --- a/assets/common/items/armor/misc/shoulder/iron_spikes.ron +++ b/assets/common/items/armor/misc/shoulder/iron_spikes.ron @@ -5,7 +5,7 @@ ItemDef( kind: Shoulder("IronSpikes"), stats: ( protection: Normal(12.0), - poise_resilience: Normal(15.0), + poise_resilience: Normal(1.0), ), )), quality: Moderate, diff --git a/assets/common/items/armor/misc/shoulder/leather_iron_0.ron b/assets/common/items/armor/misc/shoulder/leather_iron_0.ron index d1705fbfa0..cd6d05e18d 100644 --- a/assets/common/items/armor/misc/shoulder/leather_iron_0.ron +++ b/assets/common/items/armor/misc/shoulder/leather_iron_0.ron @@ -5,7 +5,7 @@ ItemDef( kind: Shoulder("IronLeather0"), stats: ( protection: Normal(9.0), - poise_resilience: Normal(5.0), + poise_resilience: Normal(1.0), ), )), quality: Common, diff --git a/assets/common/items/armor/misc/shoulder/leather_iron_1.ron b/assets/common/items/armor/misc/shoulder/leather_iron_1.ron index 980c26a06b..752c3886f5 100644 --- a/assets/common/items/armor/misc/shoulder/leather_iron_1.ron +++ b/assets/common/items/armor/misc/shoulder/leather_iron_1.ron @@ -5,7 +5,7 @@ ItemDef( kind: Shoulder("IronLeather1"), stats: ( protection: Normal(9.0), - poise_resilience: Normal(10.0), + poise_resilience: Normal(1.0), ), )), quality: Common, diff --git a/assets/common/items/armor/misc/shoulder/leather_iron_2.ron b/assets/common/items/armor/misc/shoulder/leather_iron_2.ron index 4c5005c49f..fb4dd1c7a0 100644 --- a/assets/common/items/armor/misc/shoulder/leather_iron_2.ron +++ b/assets/common/items/armor/misc/shoulder/leather_iron_2.ron @@ -5,7 +5,7 @@ ItemDef( kind: Shoulder("IronLeather2"), stats: ( protection: Normal(9.0), - poise_resilience: Normal(8.0), + poise_resilience: Normal(1.0), ), )), quality: Common, diff --git a/assets/common/items/armor/misc/shoulder/leather_iron_3.ron b/assets/common/items/armor/misc/shoulder/leather_iron_3.ron index e749bb15d2..94e747cc09 100644 --- a/assets/common/items/armor/misc/shoulder/leather_iron_3.ron +++ b/assets/common/items/armor/misc/shoulder/leather_iron_3.ron @@ -5,7 +5,7 @@ ItemDef( kind: Shoulder("IronLeather3"), stats: ( protection: Normal(9.0), - poise_resilience: Normal(5.0), + poise_resilience: Normal(1.0), ), )), quality: Common, diff --git a/assets/common/items/armor/plate/belt.ron b/assets/common/items/armor/plate/belt.ron index 6156ebc5a5..5b9c4372df 100644 --- a/assets/common/items/armor/plate/belt.ron +++ b/assets/common/items/armor/plate/belt.ron @@ -5,7 +5,7 @@ ItemDef( kind: Belt("Plate"), stats: ( protection: Normal(3.0), - poise_resilience: Normal(4.0), + poise_resilience: Normal(1.0), ), )), quality: Moderate, diff --git a/assets/common/items/armor/plate/chest.ron b/assets/common/items/armor/plate/chest.ron index 42d10380e8..41007c6815 100644 --- a/assets/common/items/armor/plate/chest.ron +++ b/assets/common/items/armor/plate/chest.ron @@ -5,7 +5,7 @@ ItemDef( kind: Chest("Plate"), stats: ( protection: Normal(20.0), - poise_resilience: Normal(18.0), + poise_resilience: Normal(1.0), ), )), quality: Moderate, diff --git a/assets/common/items/armor/plate/foot.ron b/assets/common/items/armor/plate/foot.ron index ee345d2b1a..0ac2599e95 100644 --- a/assets/common/items/armor/plate/foot.ron +++ b/assets/common/items/armor/plate/foot.ron @@ -5,7 +5,7 @@ ItemDef( kind: Foot("Plate"), stats: ( protection: Normal(4.0), - poise_resilience: Normal(8.0), + poise_resilience: Normal(1.0), ), )), quality: Moderate, diff --git a/assets/common/items/armor/plate/hand.ron b/assets/common/items/armor/plate/hand.ron index dee9f57b94..aaf1ec66ef 100644 --- a/assets/common/items/armor/plate/hand.ron +++ b/assets/common/items/armor/plate/hand.ron @@ -5,7 +5,7 @@ ItemDef( kind: Hand("Plate"), stats: ( protection: Normal(8.0), - poise_resilience: Normal(11.0), + poise_resilience: Normal(1.0), ), )), quality: Moderate, diff --git a/assets/common/items/armor/plate/pants.ron b/assets/common/items/armor/plate/pants.ron index 2ce11fd3cd..906543ec56 100644 --- a/assets/common/items/armor/plate/pants.ron +++ b/assets/common/items/armor/plate/pants.ron @@ -5,7 +5,7 @@ ItemDef( kind: Pants("Plate"), stats: ( protection: Normal(16.0), - poise_resilience: Normal(14.0), + poise_resilience: Normal(1.0), ), )), quality: Moderate, diff --git a/assets/common/items/armor/plate/shoulder.ron b/assets/common/items/armor/plate/shoulder.ron index f0565c8c7b..c7657ca136 100644 --- a/assets/common/items/armor/plate/shoulder.ron +++ b/assets/common/items/armor/plate/shoulder.ron @@ -5,7 +5,7 @@ ItemDef( kind: Shoulder("Plate"), stats: ( protection: Normal(12.0), - poise_resilience: Normal(16.0), + poise_resilience: Normal(1.0), ), )), quality: Moderate, diff --git a/assets/common/items/armor/rugged/chest.ron b/assets/common/items/armor/rugged/chest.ron index 82a93eaa8d..4a1a30fc49 100644 --- a/assets/common/items/armor/rugged/chest.ron +++ b/assets/common/items/armor/rugged/chest.ron @@ -4,8 +4,8 @@ ItemDef( kind: Armor(( kind: Chest("Rugged"), stats: ( - protection: Normal(1.0), - poise_resilience: Normal(1.0), + protection: Normal(3.0), + poise_resilience: Normal(4.0), ), )), quality: Low, diff --git a/assets/common/items/armor/steel/belt.ron b/assets/common/items/armor/steel/belt.ron index 44e377a5df..dd7e11190a 100644 --- a/assets/common/items/armor/steel/belt.ron +++ b/assets/common/items/armor/steel/belt.ron @@ -5,7 +5,7 @@ ItemDef( kind: Belt("Steel"), stats: ( protection: Normal(4.0), - poise_resilience: Normal(8.0), + poise_resilience: Normal(1.0), ), )), quality: Moderate, diff --git a/assets/common/items/armor/steel/chest.ron b/assets/common/items/armor/steel/chest.ron index 137f6fa6ab..1dd633855b 100644 --- a/assets/common/items/armor/steel/chest.ron +++ b/assets/common/items/armor/steel/chest.ron @@ -5,7 +5,7 @@ ItemDef( kind: Chest("Steel"), stats: ( protection: Normal(25.0), - poise_resilience: Normal(40.0), + poise_resilience: Normal(1.0), ), )), quality: High, diff --git a/assets/common/items/armor/steel/foot.ron b/assets/common/items/armor/steel/foot.ron index c34a4f01a4..e623f939ce 100644 --- a/assets/common/items/armor/steel/foot.ron +++ b/assets/common/items/armor/steel/foot.ron @@ -5,7 +5,7 @@ ItemDef( kind: Foot("Steel"), stats: ( protection: Normal(5.0), - poise_resilience: Normal(10.0), + poise_resilience: Normal(1.0), ), )), quality: High, diff --git a/assets/common/items/armor/steel/hand.ron b/assets/common/items/armor/steel/hand.ron index 8fee785e9b..8d10229c5b 100644 --- a/assets/common/items/armor/steel/hand.ron +++ b/assets/common/items/armor/steel/hand.ron @@ -5,7 +5,7 @@ ItemDef( kind: Hand("Steel"), stats: ( protection: Normal(10.0), - poise_resilience: Normal(15.0), + poise_resilience: Normal(1.0), ), )), quality: Moderate, diff --git a/assets/common/items/armor/steel/pants.ron b/assets/common/items/armor/steel/pants.ron index da749c30f4..ed7e917509 100644 --- a/assets/common/items/armor/steel/pants.ron +++ b/assets/common/items/armor/steel/pants.ron @@ -5,7 +5,7 @@ ItemDef( kind: Pants("Steel"), stats: ( protection: Normal(20.0), - poise_resilience: Normal(26.0), + poise_resilience: Normal(1.0), ), )), quality: Moderate, diff --git a/assets/common/items/armor/steel/shoulder.ron b/assets/common/items/armor/steel/shoulder.ron index ce7af493fb..09eb152149 100644 --- a/assets/common/items/armor/steel/shoulder.ron +++ b/assets/common/items/armor/steel/shoulder.ron @@ -5,7 +5,7 @@ ItemDef( kind: Shoulder("Steel"), stats: ( protection: Normal(15.0), - poise_resilience: Normal(20.0), + poise_resilience: Normal(1.0), ), )), quality: Moderate, diff --git a/assets/common/items/armor/swift/chest.ron b/assets/common/items/armor/swift/chest.ron index 41acaa1db1..ae94cb41e3 100644 --- a/assets/common/items/armor/swift/chest.ron +++ b/assets/common/items/armor/swift/chest.ron @@ -5,7 +5,7 @@ ItemDef( kind: Chest("Swift"), stats: ( protection: Normal(10.0), - poise_resilience: Normal(7.0), + poise_resilience: Normal(1.0), ), )), quality: Moderate, diff --git a/assets/common/items/armor/swift/foot.ron b/assets/common/items/armor/swift/foot.ron index b2f8392de9..c1007df921 100644 --- a/assets/common/items/armor/swift/foot.ron +++ b/assets/common/items/armor/swift/foot.ron @@ -5,7 +5,7 @@ ItemDef( kind: Foot("Swift"), stats: ( protection: Normal(2.0), - poise_resilience: Normal(2.0), + poise_resilience: Normal(1.0), ), )), quality: Common, diff --git a/assets/common/items/armor/swift/hand.ron b/assets/common/items/armor/swift/hand.ron index d916cd40f1..92d348fc6f 100644 --- a/assets/common/items/armor/swift/hand.ron +++ b/assets/common/items/armor/swift/hand.ron @@ -5,7 +5,7 @@ ItemDef( kind: Hand("Swift"), stats: ( protection: Normal(4.0), - poise_resilience: Normal(3.0), + poise_resilience: Normal(1.0), ), )), quality: Common, diff --git a/assets/common/items/armor/swift/pants.ron b/assets/common/items/armor/swift/pants.ron index 2310dbb5b2..4464e8607e 100644 --- a/assets/common/items/armor/swift/pants.ron +++ b/assets/common/items/armor/swift/pants.ron @@ -5,7 +5,7 @@ ItemDef( kind: Pants("Swift"), stats: ( protection: Normal(8.0), - poise_resilience: Normal(4.0), + poise_resilience: Normal(1.0), ), )), quality: Common, diff --git a/assets/common/items/armor/swift/shoulder.ron b/assets/common/items/armor/swift/shoulder.ron index 78dbf14989..f227b7bb4c 100644 --- a/assets/common/items/armor/swift/shoulder.ron +++ b/assets/common/items/armor/swift/shoulder.ron @@ -5,7 +5,7 @@ ItemDef( kind: Shoulder("Swift"), stats: ( protection: Normal(6.0), - poise_resilience: Normal(5.0), + poise_resilience: Normal(1.0), ), )), quality: Common, diff --git a/assets/common/items/armor/tarasque/belt.ron b/assets/common/items/armor/tarasque/belt.ron index 567779bb4b..f965815af7 100644 --- a/assets/common/items/armor/tarasque/belt.ron +++ b/assets/common/items/armor/tarasque/belt.ron @@ -4,8 +4,8 @@ ItemDef( kind: Armor(( kind: Belt("Tarasque"), stats: ( - protection: Normal(3.0), - poise_resilience: Normal(5.0), + protection: Normal(8.0), + poise_resilience: Normal(1.0), ), )), quality: High, diff --git a/assets/common/items/armor/tarasque/chest.ron b/assets/common/items/armor/tarasque/chest.ron index 7239fcf622..5bceb6b86a 100644 --- a/assets/common/items/armor/tarasque/chest.ron +++ b/assets/common/items/armor/tarasque/chest.ron @@ -5,7 +5,7 @@ ItemDef( kind: Chest("Tarasque"), stats: ( protection: Normal(25.0), - poise_resilience: Normal(30.0), + poise_resilience: Normal(1.0), ), )), quality: High, diff --git a/assets/common/items/armor/tarasque/foot.ron b/assets/common/items/armor/tarasque/foot.ron index b8026139fc..c4f696faf9 100644 --- a/assets/common/items/armor/tarasque/foot.ron +++ b/assets/common/items/armor/tarasque/foot.ron @@ -4,8 +4,8 @@ ItemDef( kind: Armor(( kind: Foot("Tarasque"), stats: ( - protection: Normal(5.0), - poise_resilience: Normal(9.0), + protection: Normal(8.0), + poise_resilience: Normal(1.0), ), )), quality: High, diff --git a/assets/common/items/armor/tarasque/hand.ron b/assets/common/items/armor/tarasque/hand.ron index 00d0d2a523..38475cb546 100644 --- a/assets/common/items/armor/tarasque/hand.ron +++ b/assets/common/items/armor/tarasque/hand.ron @@ -4,8 +4,8 @@ ItemDef( kind: Armor(( kind: Hand("Tarasque"), stats: ( - protection: Normal(10.0), - poise_resilience: Normal(12.0), + protection: Normal(6.0), + poise_resilience: Normal(1.0), ), )), quality: High, diff --git a/assets/common/items/armor/tarasque/pants.ron b/assets/common/items/armor/tarasque/pants.ron index f19a7eac38..c73ba0b3c7 100644 --- a/assets/common/items/armor/tarasque/pants.ron +++ b/assets/common/items/armor/tarasque/pants.ron @@ -5,7 +5,7 @@ ItemDef( kind: Pants("Tarasque"), stats: ( protection: Normal(20.0), - poise_resilience: Normal(13.0), + poise_resilience: Normal(1.0), ), )), quality: High, diff --git a/assets/common/items/armor/tarasque/shoulder.ron b/assets/common/items/armor/tarasque/shoulder.ron index 5a5639846c..f95305f0b5 100644 --- a/assets/common/items/armor/tarasque/shoulder.ron +++ b/assets/common/items/armor/tarasque/shoulder.ron @@ -4,8 +4,8 @@ ItemDef( kind: Armor(( kind: Shoulder("Tarasque"), stats: ( - protection: Normal(15.0), - poise_resilience: Normal(18.0), + protection: Normal(16.0), + poise_resilience: Normal(1.0), ), )), quality: High, diff --git a/assets/common/items/armor/twigs/chest.ron b/assets/common/items/armor/twigs/chest.ron index a87010b7b3..f1e3031611 100644 --- a/assets/common/items/armor/twigs/chest.ron +++ b/assets/common/items/armor/twigs/chest.ron @@ -5,7 +5,7 @@ ItemDef( kind: Chest("Twigs"), stats: ( protection: Normal(15.0), - poise_resilience: Normal(10.0), + poise_resilience: Normal(1.0), ), )), quality: Moderate, diff --git a/assets/common/items/armor/twigs/foot.ron b/assets/common/items/armor/twigs/foot.ron index 7be3596542..e3e8d814bd 100644 --- a/assets/common/items/armor/twigs/foot.ron +++ b/assets/common/items/armor/twigs/foot.ron @@ -5,7 +5,7 @@ ItemDef( kind: Foot("Twigs"), stats: ( protection: Normal(3.0), - poise_resilience: Normal(2.0), + poise_resilience: Normal(1.0), ), )), quality: Moderate, diff --git a/assets/common/items/armor/twigs/hand.ron b/assets/common/items/armor/twigs/hand.ron index cb7d01f5b8..75d178e928 100644 --- a/assets/common/items/armor/twigs/hand.ron +++ b/assets/common/items/armor/twigs/hand.ron @@ -5,7 +5,7 @@ ItemDef( kind: Hand("Twigs"), stats: ( protection: Normal(6.0), - poise_resilience: Normal(6.0), + poise_resilience: Normal(1.0), ), )), quality: Moderate, diff --git a/assets/common/items/armor/twigs/pants.ron b/assets/common/items/armor/twigs/pants.ron index 48e4adb233..a91d51cc8a 100644 --- a/assets/common/items/armor/twigs/pants.ron +++ b/assets/common/items/armor/twigs/pants.ron @@ -5,7 +5,7 @@ ItemDef( kind: Pants("Twigs"), stats: ( protection: Normal(12.0), - poise_resilience: Normal(9.0), + poise_resilience: Normal(1.0), ), )), quality: Moderate, diff --git a/assets/common/items/armor/twigs/shoulder.ron b/assets/common/items/armor/twigs/shoulder.ron index 4170468403..f2e009647f 100644 --- a/assets/common/items/armor/twigs/shoulder.ron +++ b/assets/common/items/armor/twigs/shoulder.ron @@ -5,7 +5,7 @@ ItemDef( kind: Shoulder("Twigs"), stats: ( protection: Normal(9.0), - poise_resilience: Normal(14.0), + poise_resilience: Normal(1.0), ), )), quality: Common, diff --git a/assets/common/items/armor/twigsflowers/chest.ron b/assets/common/items/armor/twigsflowers/chest.ron index 2cb32230da..353c728fe2 100644 --- a/assets/common/items/armor/twigsflowers/chest.ron +++ b/assets/common/items/armor/twigsflowers/chest.ron @@ -5,7 +5,7 @@ ItemDef( kind: Chest("TwigsFlowers"), stats: ( protection: Normal(15.0), - poise_resilience: Normal(8.0), + poise_resilience: Normal(1.0), ), )), quality: Moderate, diff --git a/assets/common/items/armor/twigsflowers/foot.ron b/assets/common/items/armor/twigsflowers/foot.ron index 268e6d594c..72c15a29ce 100644 --- a/assets/common/items/armor/twigsflowers/foot.ron +++ b/assets/common/items/armor/twigsflowers/foot.ron @@ -5,7 +5,7 @@ ItemDef( kind: Foot("TwigsFlowers"), stats: ( protection: Normal(3.0), - poise_resilience: Normal(2.0), + poise_resilience: Normal(1.0), ), )), quality: Moderate, diff --git a/assets/common/items/armor/twigsflowers/hand.ron b/assets/common/items/armor/twigsflowers/hand.ron index 7abaa4029a..a3e4e3e4ee 100644 --- a/assets/common/items/armor/twigsflowers/hand.ron +++ b/assets/common/items/armor/twigsflowers/hand.ron @@ -5,7 +5,7 @@ ItemDef( kind: Hand("TwigsFlowers"), stats: ( protection: Normal(6.0), - poise_resilience: Normal(4.0), + poise_resilience: Normal(1.0), ), )), quality: Moderate, diff --git a/assets/common/items/armor/twigsflowers/pants.ron b/assets/common/items/armor/twigsflowers/pants.ron index 8c8897c30e..4466db33c8 100644 --- a/assets/common/items/armor/twigsflowers/pants.ron +++ b/assets/common/items/armor/twigsflowers/pants.ron @@ -5,7 +5,7 @@ ItemDef( kind: Pants("TwigsFlowers"), stats: ( protection: Normal(12.0), - poise_resilience: Normal(4.0), + poise_resilience: Normal(1.0), ), )), quality: Moderate, diff --git a/assets/common/items/armor/twigsflowers/shoulder.ron b/assets/common/items/armor/twigsflowers/shoulder.ron index 848850f6b7..7da48e689d 100644 --- a/assets/common/items/armor/twigsflowers/shoulder.ron +++ b/assets/common/items/armor/twigsflowers/shoulder.ron @@ -5,7 +5,7 @@ ItemDef( kind: Shoulder("TwigsFlowers"), stats: ( protection: Normal(9.0), - poise_resilience: Normal(3.0), + poise_resilience: Normal(1.0), ), )), quality: Common, diff --git a/assets/common/items/armor/twigsleaves/belt.ron b/assets/common/items/armor/twigsleaves/belt.ron index fefd67422b..ad6c15161d 100644 --- a/assets/common/items/armor/twigsleaves/belt.ron +++ b/assets/common/items/armor/twigsleaves/belt.ron @@ -5,7 +5,7 @@ ItemDef( kind: Belt("TwigsLeaves"), stats: ( protection: Normal(2.0), - poise_resilience: Normal(3.0), + poise_resilience: Normal(1.0), ), )), quality: Moderate, diff --git a/assets/common/items/armor/twigsleaves/chest.ron b/assets/common/items/armor/twigsleaves/chest.ron index 03b005b64f..587c4bb46a 100644 --- a/assets/common/items/armor/twigsleaves/chest.ron +++ b/assets/common/items/armor/twigsleaves/chest.ron @@ -5,7 +5,7 @@ ItemDef( kind: Chest("TwigsLeaves"), stats: ( protection: Normal(15.0), - poise_resilience: Normal(10.0), + poise_resilience: Normal(1.0), ), )), quality: Moderate, diff --git a/assets/common/items/armor/twigsleaves/foot.ron b/assets/common/items/armor/twigsleaves/foot.ron index ae77fa5366..8e1ca3c682 100644 --- a/assets/common/items/armor/twigsleaves/foot.ron +++ b/assets/common/items/armor/twigsleaves/foot.ron @@ -5,7 +5,7 @@ ItemDef( kind: Foot("TwigsLeaves"), stats: ( protection: Normal(3.0), - poise_resilience: Normal(2.0), + poise_resilience: Normal(1.0), ), )), quality: Moderate, diff --git a/assets/common/items/armor/twigsleaves/hand.ron b/assets/common/items/armor/twigsleaves/hand.ron index acea0a22fe..aff4f77101 100644 --- a/assets/common/items/armor/twigsleaves/hand.ron +++ b/assets/common/items/armor/twigsleaves/hand.ron @@ -5,7 +5,7 @@ ItemDef( kind: Hand("TwigsLeaves"), stats: ( protection: Normal(6.0), - poise_resilience: Normal(7.0), + poise_resilience: Normal(1.0), ), )), quality: Moderate, diff --git a/assets/common/items/armor/twigsleaves/pants.ron b/assets/common/items/armor/twigsleaves/pants.ron index 63825a46e2..10660afefa 100644 --- a/assets/common/items/armor/twigsleaves/pants.ron +++ b/assets/common/items/armor/twigsleaves/pants.ron @@ -5,7 +5,7 @@ ItemDef( kind: Pants("TwigsLeaves"), stats: ( protection: Normal(12.0), - poise_resilience: Normal(8.0), + poise_resilience: Normal(1.0), ), )), quality: Moderate, diff --git a/assets/common/items/armor/twigsleaves/shoulder.ron b/assets/common/items/armor/twigsleaves/shoulder.ron index 815a58203a..ad1e8e2a32 100644 --- a/assets/common/items/armor/twigsleaves/shoulder.ron +++ b/assets/common/items/armor/twigsleaves/shoulder.ron @@ -5,7 +5,7 @@ ItemDef( kind: Shoulder("TwigsLeaves"), stats: ( protection: Normal(9.0), - poise_resilience: Normal(2.0), + poise_resilience: Normal(1.0), ), )), quality: Common, diff --git a/assets/common/items/armor/velorite_mage/back.ron b/assets/common/items/armor/velorite_mage/back.ron index bcdea7d8fb..0851567820 100644 --- a/assets/common/items/armor/velorite_mage/back.ron +++ b/assets/common/items/armor/velorite_mage/back.ron @@ -5,7 +5,7 @@ ItemDef( kind: Back("VeloriteMage"), stats: ( protection: Normal(2.8), - poise_resilience: Normal(2.0), + poise_resilience: Normal(0.5), ), )), quality: High, diff --git a/assets/common/items/armor/velorite_mage/belt.ron b/assets/common/items/armor/velorite_mage/belt.ron index 9617a3f25e..1363ece7bb 100644 --- a/assets/common/items/armor/velorite_mage/belt.ron +++ b/assets/common/items/armor/velorite_mage/belt.ron @@ -5,7 +5,7 @@ ItemDef( kind: Belt("VeloriteMage"), stats: ( protection: Normal(5.8), - poise_resilience: Normal(5.0), + poise_resilience: Normal(1.0), ), )), quality: High, diff --git a/assets/common/items/armor/velorite_mage/chest.ron b/assets/common/items/armor/velorite_mage/chest.ron index d1b97f6b1e..a487eaac83 100644 --- a/assets/common/items/armor/velorite_mage/chest.ron +++ b/assets/common/items/armor/velorite_mage/chest.ron @@ -5,7 +5,7 @@ ItemDef( kind: Chest("VeloriteMage"), stats: ( protection: Normal(28.0), - poise_resilience: Normal(20.0), + poise_resilience: Normal(1.0), ), )), quality: High, diff --git a/assets/common/items/armor/velorite_mage/foot.ron b/assets/common/items/armor/velorite_mage/foot.ron index 388fa8fb16..b02d3ca62c 100644 --- a/assets/common/items/armor/velorite_mage/foot.ron +++ b/assets/common/items/armor/velorite_mage/foot.ron @@ -5,7 +5,7 @@ ItemDef( kind: Foot("VeloriteMage"), stats: ( protection: Normal(5.9), - poise_resilience: Normal(5.0), + poise_resilience: Normal(1.0), ), )), quality: High, diff --git a/assets/common/items/armor/velorite_mage/hand.ron b/assets/common/items/armor/velorite_mage/hand.ron index 4ce489f50b..08f83f358d 100644 --- a/assets/common/items/armor/velorite_mage/hand.ron +++ b/assets/common/items/armor/velorite_mage/hand.ron @@ -5,7 +5,7 @@ ItemDef( kind: Hand("VeloriteMage"), stats: ( protection: Normal(11.5), - poise_resilience: Normal(13.0), + poise_resilience: Normal(1.0), ), )), quality: High, diff --git a/assets/common/items/armor/velorite_mage/pants.ron b/assets/common/items/armor/velorite_mage/pants.ron index 8661cf605f..9dbf71b02a 100644 --- a/assets/common/items/armor/velorite_mage/pants.ron +++ b/assets/common/items/armor/velorite_mage/pants.ron @@ -5,7 +5,7 @@ ItemDef( kind: Pants("VeloriteMage"), stats: ( protection: Normal(23.0), - poise_resilience: Normal(23.0), + poise_resilience: Normal(1.0), ), )), quality: High, diff --git a/assets/common/items/armor/velorite_mage/shoulder.ron b/assets/common/items/armor/velorite_mage/shoulder.ron index deb330f2b9..da41eb6f2c 100644 --- a/assets/common/items/armor/velorite_mage/shoulder.ron +++ b/assets/common/items/armor/velorite_mage/shoulder.ron @@ -5,7 +5,7 @@ ItemDef( kind: Shoulder("VeloriteMage"), stats: ( protection: Normal(17.0), - poise_resilience: Normal(17.0), + poise_resilience: Normal(1.0), ), )), quality: High, diff --git a/assets/common/items/armor/warlock/back.ron b/assets/common/items/armor/warlock/back.ron index 6b5a529c0e..868bd9c57b 100644 --- a/assets/common/items/armor/warlock/back.ron +++ b/assets/common/items/armor/warlock/back.ron @@ -5,7 +5,7 @@ ItemDef( kind: Back("Warlock"), stats: ( protection: Normal(4.0), - poise_resilience: Normal(3.0), + poise_resilience: Normal(0.2), ), )), quality: Moderate, diff --git a/assets/common/items/armor/warlock/belt.ron b/assets/common/items/armor/warlock/belt.ron index 8d9ddd0614..0a773cead4 100644 --- a/assets/common/items/armor/warlock/belt.ron +++ b/assets/common/items/armor/warlock/belt.ron @@ -5,7 +5,7 @@ ItemDef( kind: Belt("Warlock"), stats: ( protection: Normal(8.0), - poise_resilience: Normal(7.0), + poise_resilience: Normal(1.0), ), )), quality: Moderate, diff --git a/assets/common/items/armor/warlock/chest.ron b/assets/common/items/armor/warlock/chest.ron index 8ccc069e30..3b297b8070 100644 --- a/assets/common/items/armor/warlock/chest.ron +++ b/assets/common/items/armor/warlock/chest.ron @@ -5,7 +5,7 @@ ItemDef( kind: Chest("Warlock"), stats: ( protection: Normal(40.0), - poise_resilience: Normal(29.0), + poise_resilience: Normal(1.0), ), )), quality: Moderate, diff --git a/assets/common/items/armor/warlock/foot.ron b/assets/common/items/armor/warlock/foot.ron index 2fe2ea919a..ffa18349a2 100644 --- a/assets/common/items/armor/warlock/foot.ron +++ b/assets/common/items/armor/warlock/foot.ron @@ -5,7 +5,7 @@ ItemDef( kind: Foot("Warlock"), stats: ( protection: Normal(8.0), - poise_resilience: Normal(5.0), + poise_resilience: Normal(1.0), ), )), quality: Moderate, diff --git a/assets/common/items/armor/warlock/hand.ron b/assets/common/items/armor/warlock/hand.ron index b05c98b268..2637362601 100644 --- a/assets/common/items/armor/warlock/hand.ron +++ b/assets/common/items/armor/warlock/hand.ron @@ -5,7 +5,7 @@ ItemDef( kind: Hand("Warlock"), stats: ( protection: Normal(15.0), - poise_resilience: Normal(16.0), + poise_resilience: Normal(1.0), ), )), quality: Common, diff --git a/assets/common/items/armor/warlock/head.ron b/assets/common/items/armor/warlock/head.ron index 97ad1c36a7..49e1c592ee 100644 --- a/assets/common/items/armor/warlock/head.ron +++ b/assets/common/items/armor/warlock/head.ron @@ -5,7 +5,7 @@ ItemDef( kind: Head("Warlock"), stats: ( protection: Normal(10.0), - poise_resilience: Normal(10.0), + poise_resilience: Normal(1.0), ), )), quality: Common, diff --git a/assets/common/items/armor/warlock/pants.ron b/assets/common/items/armor/warlock/pants.ron index 8d16738276..985f6cdd1c 100644 --- a/assets/common/items/armor/warlock/pants.ron +++ b/assets/common/items/armor/warlock/pants.ron @@ -5,7 +5,7 @@ ItemDef( kind: Pants("Warlock"), stats: ( protection: Normal(30.0), - poise_resilience: Normal(20.0), + poise_resilience: Normal(1.0), ), )), quality: Moderate, diff --git a/assets/common/items/armor/warlock/shoulder.ron b/assets/common/items/armor/warlock/shoulder.ron index 465b42e175..5ce674fd49 100644 --- a/assets/common/items/armor/warlock/shoulder.ron +++ b/assets/common/items/armor/warlock/shoulder.ron @@ -5,7 +5,7 @@ ItemDef( kind: Shoulder("Warlock"), stats: ( protection: Normal(22.0), - poise_resilience: Normal(15.0), + poise_resilience: Normal(1.0), ), )), quality: Common, diff --git a/assets/common/items/armor/warlord/back.ron b/assets/common/items/armor/warlord/back.ron index 327af6133b..509d315e8c 100644 --- a/assets/common/items/armor/warlord/back.ron +++ b/assets/common/items/armor/warlord/back.ron @@ -5,7 +5,7 @@ ItemDef( kind: Back("Warlord"), stats: ( protection: Normal(4.0), - poise_resilience: Normal(5.0), + poise_resilience: Normal(0.5), ), )), quality: Moderate, diff --git a/assets/common/items/armor/warlord/belt.ron b/assets/common/items/armor/warlord/belt.ron index 1856ae9948..b8e30034dc 100644 --- a/assets/common/items/armor/warlord/belt.ron +++ b/assets/common/items/armor/warlord/belt.ron @@ -5,7 +5,7 @@ ItemDef( kind: Belt("Warlord"), stats: ( protection: Normal(8.0), - poise_resilience: Normal(5.0), + poise_resilience: Normal(1.0), ), )), quality: Moderate, diff --git a/assets/common/items/armor/warlord/chest.ron b/assets/common/items/armor/warlord/chest.ron index b985e3175d..91a79c9a6e 100644 --- a/assets/common/items/armor/warlord/chest.ron +++ b/assets/common/items/armor/warlord/chest.ron @@ -5,7 +5,7 @@ ItemDef( kind: Chest("Warlord"), stats: ( protection: Normal(40.0), - poise_resilience: Normal(29.0), + poise_resilience: Normal(1.0), ), )), quality: Moderate, diff --git a/assets/common/items/armor/warlord/foot.ron b/assets/common/items/armor/warlord/foot.ron index dd795009c8..7451a44a61 100644 --- a/assets/common/items/armor/warlord/foot.ron +++ b/assets/common/items/armor/warlord/foot.ron @@ -5,7 +5,7 @@ ItemDef( kind: Foot("Warlord"), stats: ( protection: Normal(8.0), - poise_resilience: Normal(6.0), + poise_resilience: Normal(1.0), ), )), quality: Moderate, diff --git a/assets/common/items/armor/warlord/hand.ron b/assets/common/items/armor/warlord/hand.ron index 722a1ad6fd..cfb7f7442a 100644 --- a/assets/common/items/armor/warlord/hand.ron +++ b/assets/common/items/armor/warlord/hand.ron @@ -5,7 +5,7 @@ ItemDef( kind: Hand("Warlord"), stats: ( protection: Normal(15.0), - poise_resilience: Normal(14.0), + poise_resilience: Normal(1.0), ), )), quality: Common, diff --git a/assets/common/items/armor/warlord/head.ron b/assets/common/items/armor/warlord/head.ron index a8b13a16b2..c6a9cc1067 100644 --- a/assets/common/items/armor/warlord/head.ron +++ b/assets/common/items/armor/warlord/head.ron @@ -5,7 +5,7 @@ ItemDef( kind: Head("Warlord"), stats: ( protection: Normal(10.0), - poise_resilience: Normal(10.0), + poise_resilience: Normal(1.0), ), )), quality: Common, diff --git a/assets/common/items/armor/warlord/pants.ron b/assets/common/items/armor/warlord/pants.ron index 71b7ae7eab..26281bd21e 100644 --- a/assets/common/items/armor/warlord/pants.ron +++ b/assets/common/items/armor/warlord/pants.ron @@ -5,7 +5,7 @@ ItemDef( kind: Pants("Warlord"), stats: ( protection: Normal(30.0), - poise_resilience: Normal(24.0), + poise_resilience: Normal(1.0), ), )), quality: Moderate, diff --git a/assets/common/items/armor/warlord/shoulder.ron b/assets/common/items/armor/warlord/shoulder.ron index 1c0f8c5416..4261113d21 100644 --- a/assets/common/items/armor/warlord/shoulder.ron +++ b/assets/common/items/armor/warlord/shoulder.ron @@ -5,7 +5,7 @@ ItemDef( kind: Shoulder("Warlord"), stats: ( protection: Normal(22.0), - poise_resilience: Normal(14.0), + poise_resilience: Normal(1.0), ), )), quality: Common, 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 ee6e6b08f4..5d8820d0a1 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 @@ -7,7 +7,7 @@ ItemDef( stats: Direct(( equip_time_secs: 0.0, power: 0.7, - poise_strength: 0.8, + poise_strength: 1.0, speed: 1.0, crit_chance: 0.07589286, crit_mult: 2.0756302, 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 b56136267c..8b30fc8db1 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 @@ -7,7 +7,7 @@ ItemDef( stats: Direct(( equip_time_secs: 0.0, power: 0.3, - poise_strength: 0.8, + poise_strength: 1.0, speed: 1.0, crit_chance: 0.13541667, crit_mult: 2.4065933, 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 cf03335b65..198ae821e5 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 @@ -7,7 +7,7 @@ ItemDef( stats: Direct(( equip_time_secs: 0.0, power: 1.4, - poise_strength: 0.8, + poise_strength: 1.0, speed: 1.0, crit_chance: 0.05357143, crit_mult: 1.7619047, 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 2b1ab1d393..e7999ec7a5 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 @@ -7,7 +7,7 @@ ItemDef( stats: Direct(( equip_time_secs: 0.0, power: 1.7, - poise_strength: 0.8, + poise_strength: 1.0, speed: 1.0, crit_chance: 0.04963235, crit_mult: 1.6772487, 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 325e204db3..25666476e9 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 @@ -7,7 +7,7 @@ ItemDef( stats: Direct(( equip_time_secs: 0.0, power: 1.1, - poise_strength: 0.8, + poise_strength: 1.0, speed: 1.0, crit_chance: 0.05965909, crit_mult: 1.8707483, diff --git a/assets/common/items/npc_weapons/unique/quadmedbasicgentle.ron b/assets/common/items/npc_weapons/unique/quadmedbasicgentle.ron new file mode 100644 index 0000000000..cab72a089f --- /dev/null +++ b/assets/common/items/npc_weapons/unique/quadmedbasicgentle.ron @@ -0,0 +1,18 @@ +ItemDef( + name: "Quad Med Basic", + description: "testing123", + kind: Tool( + ( + kind: Unique(QuadMedBasic), + hands: Two, + stats: Direct(( + equip_time_secs: 0.01, + power: 0.5, + poise_strength: 1.0, + speed: 1.00, + )), + ) + ), + quality: Low, + tags: [], +) diff --git a/assets/common/items/weapons/hammer/bronze_hammer-0.ron b/assets/common/items/weapons/hammer/bronze_hammer-0.ron index 18c8765bed..1a7b47a357 100644 --- a/assets/common/items/weapons/hammer/bronze_hammer-0.ron +++ b/assets/common/items/weapons/hammer/bronze_hammer-0.ron @@ -7,7 +7,7 @@ ItemDef( stats: Direct(( equip_time_secs: 0.5, power: 1.0, - poise_strength: 0.9, + poise_strength: 1.0, speed: 1.0, crit_chance: 0.1125, crit_mult: 1.6349206, diff --git a/assets/common/items/weapons/hammer/cobalt_hammer-0.ron b/assets/common/items/weapons/hammer/cobalt_hammer-0.ron index 40e01e88a8..d1f3b4abdf 100644 --- a/assets/common/items/weapons/hammer/cobalt_hammer-0.ron +++ b/assets/common/items/weapons/hammer/cobalt_hammer-0.ron @@ -7,7 +7,7 @@ ItemDef( stats: Direct(( equip_time_secs: 0.5, power: 1.6, - poise_strength: 1.5, + poise_strength: 1.0, speed: 1.0, crit_chance: 0.121875, crit_mult: 1.4395604, diff --git a/assets/common/items/weapons/hammer/cobalt_hammer-1.ron b/assets/common/items/weapons/hammer/cobalt_hammer-1.ron index de97bb9e32..3238bf08b3 100644 --- a/assets/common/items/weapons/hammer/cobalt_hammer-1.ron +++ b/assets/common/items/weapons/hammer/cobalt_hammer-1.ron @@ -7,7 +7,7 @@ ItemDef( stats: Direct(( equip_time_secs: 0.5, power: 1.6, - poise_strength: 1.4, + poise_strength: 1.0, speed: 1.0, crit_chance: 0.121875, crit_mult: 1.4395604, diff --git a/assets/common/items/weapons/hammer/flimsy_hammer.ron b/assets/common/items/weapons/hammer/flimsy_hammer.ron index 2f5d5adb5a..a34be22bb7 100644 --- a/assets/common/items/weapons/hammer/flimsy_hammer.ron +++ b/assets/common/items/weapons/hammer/flimsy_hammer.ron @@ -7,7 +7,7 @@ ItemDef( stats: Direct(( equip_time_secs: 0.5, power: 0.5, - poise_strength: 0.4, + poise_strength: 1.0, speed: 1.0, crit_chance: 0.09375, crit_mult: 2.2190475, diff --git a/assets/common/items/weapons/hammer/hammer_1.ron b/assets/common/items/weapons/hammer/hammer_1.ron index 89ebe80515..53a3fb5242 100644 --- a/assets/common/items/weapons/hammer/hammer_1.ron +++ b/assets/common/items/weapons/hammer/hammer_1.ron @@ -7,7 +7,7 @@ ItemDef( stats: Direct(( equip_time_secs: 0.5, power: 0.5, - poise_strength: 0.8, + poise_strength: 1.0, speed: 1.0, crit_chance: 0.09375, crit_mult: 2.2190475, diff --git a/assets/common/items/weapons/hammer/iron_hammer-0.ron b/assets/common/items/weapons/hammer/iron_hammer-0.ron index 61cf06639f..2e09ac6219 100644 --- a/assets/common/items/weapons/hammer/iron_hammer-0.ron +++ b/assets/common/items/weapons/hammer/iron_hammer-0.ron @@ -7,7 +7,7 @@ ItemDef( stats: Direct(( equip_time_secs: 0.5, power: 1.2, - poise_strength: 1.4, + poise_strength: 1.0, speed: 1.0, crit_chance: 0.103125, crit_mult: 1.5772005, diff --git a/assets/common/items/weapons/hammer/iron_hammer-1.ron b/assets/common/items/weapons/hammer/iron_hammer-1.ron index 0ea29eb3f3..546e636e0d 100644 --- a/assets/common/items/weapons/hammer/iron_hammer-1.ron +++ b/assets/common/items/weapons/hammer/iron_hammer-1.ron @@ -7,7 +7,7 @@ ItemDef( stats: Direct(( equip_time_secs: 0.5, power: 1.2, - poise_strength: 0.9, + poise_strength: 1.0, speed: 1.0, crit_chance: 0.103125, crit_mult: 1.5772005, diff --git a/assets/common/items/weapons/hammer/iron_hammer-2.ron b/assets/common/items/weapons/hammer/iron_hammer-2.ron index 17da3d2a2a..c8f42fbc8b 100644 --- a/assets/common/items/weapons/hammer/iron_hammer-2.ron +++ b/assets/common/items/weapons/hammer/iron_hammer-2.ron @@ -7,7 +7,7 @@ ItemDef( stats: Direct(( equip_time_secs: 0.5, power: 1.2, - poise_strength: 1.4, + poise_strength: 1.0, speed: 1.0, crit_chance: 0.103125, crit_mult: 1.5772005, diff --git a/assets/common/items/weapons/hammer/iron_hammer-5.ron b/assets/common/items/weapons/hammer/iron_hammer-5.ron index 65b8c04336..4bb9c91459 100644 --- a/assets/common/items/weapons/hammer/iron_hammer-5.ron +++ b/assets/common/items/weapons/hammer/iron_hammer-5.ron @@ -7,7 +7,7 @@ ItemDef( stats: Direct(( equip_time_secs: 0.5, power: 1.2, - poise_strength: 0.8, + poise_strength: 1.0, speed: 1.0, crit_chance: 0.103125, crit_mult: 1.5772005, diff --git a/assets/common/items/weapons/hammer/iron_hammer-6.ron b/assets/common/items/weapons/hammer/iron_hammer-6.ron index 814991bffc..844f188e28 100644 --- a/assets/common/items/weapons/hammer/iron_hammer-6.ron +++ b/assets/common/items/weapons/hammer/iron_hammer-6.ron @@ -7,7 +7,7 @@ ItemDef( stats: Direct(( equip_time_secs: 0.5, power: 1.2, - poise_strength: 1.4, + poise_strength: 1.0, speed: 1.0, crit_chance: 0.103125, crit_mult: 1.5772005, diff --git a/assets/common/items/weapons/hammer/iron_hammer-7.ron b/assets/common/items/weapons/hammer/iron_hammer-7.ron index dac2ad5f86..baa6094fba 100644 --- a/assets/common/items/weapons/hammer/iron_hammer-7.ron +++ b/assets/common/items/weapons/hammer/iron_hammer-7.ron @@ -7,7 +7,7 @@ ItemDef( stats: Direct(( equip_time_secs: 0.5, power: 1.2, - poise_strength: 1.1, + poise_strength: 1.0, speed: 1.0, crit_chance: 0.103125, crit_mult: 1.5772005, diff --git a/assets/common/items/weapons/hammer/iron_hammer-8.ron b/assets/common/items/weapons/hammer/iron_hammer-8.ron index 03c89f574a..2561792269 100644 --- a/assets/common/items/weapons/hammer/iron_hammer-8.ron +++ b/assets/common/items/weapons/hammer/iron_hammer-8.ron @@ -7,7 +7,7 @@ ItemDef( stats: Direct(( equip_time_secs: 0.5, power: 1.2, - poise_strength: 0.8, + poise_strength: 1.0, speed: 1.0, crit_chance: 0.103125, crit_mult: 1.5772005, diff --git a/assets/common/items/weapons/hammer/mjolnir.ron b/assets/common/items/weapons/hammer/mjolnir.ron index cde7dcd2b7..831e3a0a99 100644 --- a/assets/common/items/weapons/hammer/mjolnir.ron +++ b/assets/common/items/weapons/hammer/mjolnir.ron @@ -7,7 +7,7 @@ ItemDef( stats: Direct(( equip_time_secs: 0.5, power: 4.0, - poise_strength: 2.0, + poise_strength: 1.0, speed: 0.5, crit_chance: 0.078125, crit_mult: 1.3657143, diff --git a/assets/common/items/weapons/hammer/ramshead_hammer.ron b/assets/common/items/weapons/hammer/ramshead_hammer.ron index 16df3b496d..68d29e8dd6 100644 --- a/assets/common/items/weapons/hammer/ramshead_hammer.ron +++ b/assets/common/items/weapons/hammer/ramshead_hammer.ron @@ -7,7 +7,7 @@ ItemDef( stats: Direct(( equip_time_secs: 0.5, power: 1.8, - poise_strength: 1.7, + poise_strength: 1.0, speed: 1.0, crit_chance: 0.13611111, crit_mult: 1.4081633, diff --git a/assets/common/items/weapons/hammer/runic_hammer.ron b/assets/common/items/weapons/hammer/runic_hammer.ron index 1211e49796..5ae5ba8bc0 100644 --- a/assets/common/items/weapons/hammer/runic_hammer.ron +++ b/assets/common/items/weapons/hammer/runic_hammer.ron @@ -7,7 +7,7 @@ ItemDef( stats: Direct(( equip_time_secs: 0.5, power: 1.8, - poise_strength: 1.8, + poise_strength: 1.0, speed: 1.0, crit_chance: 0.13611111, crit_mult: 1.4081633, diff --git a/assets/common/items/weapons/hammer/starter_hammer.ron b/assets/common/items/weapons/hammer/starter_hammer.ron index 22b74c4843..c6fcef84a5 100644 --- a/assets/common/items/weapons/hammer/starter_hammer.ron +++ b/assets/common/items/weapons/hammer/starter_hammer.ron @@ -7,7 +7,7 @@ ItemDef( stats: Direct(( equip_time_secs: 0.5, power: 0.5, - poise_strength: 0.9, + poise_strength: 1.0, speed: 1.0, crit_chance: 0.09375, crit_mult: 2.2190475, diff --git a/assets/common/items/weapons/hammer/steel_hammer-0.ron b/assets/common/items/weapons/hammer/steel_hammer-0.ron index e8bd6ae7fb..1f35a09234 100644 --- a/assets/common/items/weapons/hammer/steel_hammer-0.ron +++ b/assets/common/items/weapons/hammer/steel_hammer-0.ron @@ -7,7 +7,7 @@ ItemDef( stats: Direct(( equip_time_secs: 0.5, power: 1.4, - poise_strength: 1.5, + poise_strength: 1.0, speed: 1.0, crit_chance: 0.12857144, crit_mult: 1.4761904, diff --git a/assets/common/items/weapons/hammer/steel_hammer-1.ron b/assets/common/items/weapons/hammer/steel_hammer-1.ron index 3c65e6a16c..5155717fb5 100644 --- a/assets/common/items/weapons/hammer/steel_hammer-1.ron +++ b/assets/common/items/weapons/hammer/steel_hammer-1.ron @@ -7,7 +7,7 @@ ItemDef( stats: Direct(( equip_time_secs: 0.5, power: 1.4, - poise_strength: 1.3, + poise_strength: 1.0, speed: 1.0, crit_chance: 0.12857144, crit_mult: 1.4761904, diff --git a/assets/common/items/weapons/hammer/steel_hammer-3.ron b/assets/common/items/weapons/hammer/steel_hammer-3.ron index ac27c58321..a0d3749f6a 100644 --- a/assets/common/items/weapons/hammer/steel_hammer-3.ron +++ b/assets/common/items/weapons/hammer/steel_hammer-3.ron @@ -7,7 +7,7 @@ ItemDef( stats: Direct(( equip_time_secs: 0.5, power: 1.4, - poise_strength: 1.7, + poise_strength: 1.0, speed: 1.0, crit_chance: 0.12857144, crit_mult: 1.4761904, diff --git a/assets/common/items/weapons/hammer/steel_hammer-4.ron b/assets/common/items/weapons/hammer/steel_hammer-4.ron index e99ea108a5..977c389ea8 100644 --- a/assets/common/items/weapons/hammer/steel_hammer-4.ron +++ b/assets/common/items/weapons/hammer/steel_hammer-4.ron @@ -7,7 +7,7 @@ ItemDef( stats: Direct(( equip_time_secs: 0.5, power: 1.4, - poise_strength: 1.5, + poise_strength: 1.0, speed: 1.0, crit_chance: 0.12857144, crit_mult: 1.4761904, diff --git a/assets/common/items/weapons/hammer/steel_hammer-5.ron b/assets/common/items/weapons/hammer/steel_hammer-5.ron index 91cf515c7a..614c5c0b1e 100644 --- a/assets/common/items/weapons/hammer/steel_hammer-5.ron +++ b/assets/common/items/weapons/hammer/steel_hammer-5.ron @@ -7,7 +7,7 @@ ItemDef( stats: Direct(( equip_time_secs: 0.5, power: 1.4, - poise_strength: 1.3, + poise_strength: 1.0, speed: 1.0, crit_chance: 0.12857144, crit_mult: 1.4761904, diff --git a/assets/common/items/weapons/hammer/stone_hammer-0.ron b/assets/common/items/weapons/hammer/stone_hammer-0.ron index 42a8d38546..5dea51f3a9 100644 --- a/assets/common/items/weapons/hammer/stone_hammer-0.ron +++ b/assets/common/items/weapons/hammer/stone_hammer-0.ron @@ -7,7 +7,7 @@ ItemDef( stats: Direct(( equip_time_secs: 0.5, power: 0.7, - poise_strength: 1.7, + poise_strength: 1.0, speed: 1.0, crit_chance: 0.07589286, crit_mult: 2.0756302, diff --git a/assets/common/items/weapons/hammer/stone_hammer-1.ron b/assets/common/items/weapons/hammer/stone_hammer-1.ron index 12133e53a4..c211bde5b6 100644 --- a/assets/common/items/weapons/hammer/stone_hammer-1.ron +++ b/assets/common/items/weapons/hammer/stone_hammer-1.ron @@ -7,7 +7,7 @@ ItemDef( stats: Direct(( equip_time_secs: 0.5, power: 0.7, - poise_strength: 1.8, + poise_strength: 1.0, speed: 1.0, crit_chance: 0.07589286, crit_mult: 2.0756302, diff --git a/assets/common/items/weapons/hammer/stone_hammer-3.ron b/assets/common/items/weapons/hammer/stone_hammer-3.ron index 54f8401814..7912094cbe 100644 --- a/assets/common/items/weapons/hammer/stone_hammer-3.ron +++ b/assets/common/items/weapons/hammer/stone_hammer-3.ron @@ -7,7 +7,7 @@ ItemDef( stats: Direct(( equip_time_secs: 0.5, power: 0.7, - poise_strength: 1.8, + poise_strength: 1.0, speed: 1.0, crit_chance: 0.07589286, crit_mult: 2.0756302, diff --git a/assets/common/items/weapons/hammer/wood_hammer-0.ron b/assets/common/items/weapons/hammer/wood_hammer-0.ron index 5c2a9a8ae3..6db1eb0258 100644 --- a/assets/common/items/weapons/hammer/wood_hammer-0.ron +++ b/assets/common/items/weapons/hammer/wood_hammer-0.ron @@ -7,7 +7,7 @@ ItemDef( stats: Direct(( equip_time_secs: 0.5, power: 0.6, - poise_strength: 0.8, + poise_strength: 1.0, speed: 1.0, crit_chance: 0.083333336, crit_mult: 2.142857, diff --git a/assets/common/items/weapons/hammer/worn_iron_hammer-1.ron b/assets/common/items/weapons/hammer/worn_iron_hammer-1.ron index 861afda330..cfc7b28c55 100644 --- a/assets/common/items/weapons/hammer/worn_iron_hammer-1.ron +++ b/assets/common/items/weapons/hammer/worn_iron_hammer-1.ron @@ -7,7 +7,7 @@ ItemDef( stats: Direct(( equip_time_secs: 0.5, power: 0.85, - poise_strength: 0.6, + poise_strength: 1.0, speed: 1.0, crit_chance: 0.12242647, crit_mult: 1.6864007, diff --git a/assets/common/items/weapons/hammer/worn_iron_hammer-2.ron b/assets/common/items/weapons/hammer/worn_iron_hammer-2.ron index 940fd61525..2b48d91009 100644 --- a/assets/common/items/weapons/hammer/worn_iron_hammer-2.ron +++ b/assets/common/items/weapons/hammer/worn_iron_hammer-2.ron @@ -7,7 +7,7 @@ ItemDef( stats: Direct(( equip_time_secs: 0.5, power: 0.85, - poise_strength: 0.7, + poise_strength: 1.0, speed: 1.0, crit_chance: 0.12242647, crit_mult: 1.6864007, diff --git a/assets/common/items/weapons/hammer/worn_iron_hammer-3.ron b/assets/common/items/weapons/hammer/worn_iron_hammer-3.ron index 9be311700b..462348e406 100644 --- a/assets/common/items/weapons/hammer/worn_iron_hammer-3.ron +++ b/assets/common/items/weapons/hammer/worn_iron_hammer-3.ron @@ -7,7 +7,7 @@ ItemDef( stats: Direct(( equip_time_secs: 0.5, power: 0.85, - poise_strength: 1.1, + poise_strength: 1.0, speed: 1.0, crit_chance: 0.12242647, crit_mult: 1.6864007, diff --git a/assets/common/items/weapons/sword/bloodsteel-0.ron b/assets/common/items/weapons/sword/bloodsteel-0.ron index 1c21261587..7d694ead4f 100644 --- a/assets/common/items/weapons/sword/bloodsteel-0.ron +++ b/assets/common/items/weapons/sword/bloodsteel-0.ron @@ -7,7 +7,7 @@ ItemDef( stats: Direct(( equip_time_secs: 0.3, power: 1.8, - poise_strength: 0.4, + poise_strength: 1.0, speed: 1.0, crit_chance: 0.13611111, crit_mult: 1.4081633, diff --git a/assets/common/items/weapons/sword/bloodsteel-1.ron b/assets/common/items/weapons/sword/bloodsteel-1.ron index 451bf44d95..5dda7cc296 100644 --- a/assets/common/items/weapons/sword/bloodsteel-1.ron +++ b/assets/common/items/weapons/sword/bloodsteel-1.ron @@ -7,7 +7,7 @@ ItemDef( stats: Direct(( equip_time_secs: 0.3, power: 1.6, - poise_strength: 0.4, + poise_strength: 1.0, speed: 1.2, crit_chance: 0.15511364, crit_mult: 1.4029304, diff --git a/assets/common/items/weapons/sword/bloodsteel-2.ron b/assets/common/items/weapons/sword/bloodsteel-2.ron index ee76c751d6..777156ee26 100644 --- a/assets/common/items/weapons/sword/bloodsteel-2.ron +++ b/assets/common/items/weapons/sword/bloodsteel-2.ron @@ -7,7 +7,7 @@ ItemDef( stats: Direct(( equip_time_secs: 0.3, power: 2.0, - poise_strength: 0.4, + poise_strength: 1.0, speed: 0.8, crit_chance: 0.11666667, crit_mult: 1.4285715, diff --git a/assets/common/items/weapons/sword/bronze-0.ron b/assets/common/items/weapons/sword/bronze-0.ron index 7b935f9393..b920735a17 100644 --- a/assets/common/items/weapons/sword/bronze-0.ron +++ b/assets/common/items/weapons/sword/bronze-0.ron @@ -7,7 +7,7 @@ ItemDef( stats: Direct(( equip_time_secs: 0.3, power: 1.1, - poise_strength: 0.4, + poise_strength: 1.0, speed: 0.9, crit_chance: 0.13564593, crit_mult: 1.574452, diff --git a/assets/common/items/weapons/sword/bronze-1.ron b/assets/common/items/weapons/sword/bronze-1.ron index 3679c3dce1..94d403ab5b 100644 --- a/assets/common/items/weapons/sword/bronze-1.ron +++ b/assets/common/items/weapons/sword/bronze-1.ron @@ -7,7 +7,7 @@ ItemDef( stats: Direct(( equip_time_secs: 0.3, power: 0.9, - poise_strength: 0.4, + poise_strength: 1.0, speed: 1.1, crit_chance: 0.16587302, crit_mult: 1.5741627, diff --git a/assets/common/items/weapons/sword/bronze-2.ron b/assets/common/items/weapons/sword/bronze-2.ron index 10105806ca..5035d46d60 100644 --- a/assets/common/items/weapons/sword/bronze-2.ron +++ b/assets/common/items/weapons/sword/bronze-2.ron @@ -7,7 +7,7 @@ ItemDef( stats: Direct(( equip_time_secs: 0.3, power: 1.0, - poise_strength: 0.4, + poise_strength: 1.0, speed: 1.0, crit_chance: 0.15, crit_mult: 1.5714285, diff --git a/assets/common/items/weapons/sword/caladbolg.ron b/assets/common/items/weapons/sword/caladbolg.ron index 19ac997266..9d8850f0bf 100644 --- a/assets/common/items/weapons/sword/caladbolg.ron +++ b/assets/common/items/weapons/sword/caladbolg.ron @@ -7,7 +7,7 @@ ItemDef( stats: Direct(( equip_time_secs: 0.3, power: 2.5, - poise_strength: 0.4, + poise_strength: 1.0, speed: 0.8, crit_chance: 0.11666667, crit_mult: 1.3918368, diff --git a/assets/common/items/weapons/sword/cobalt-0.ron b/assets/common/items/weapons/sword/cobalt-0.ron index 48eac7169d..1ac72a7566 100644 --- a/assets/common/items/weapons/sword/cobalt-0.ron +++ b/assets/common/items/weapons/sword/cobalt-0.ron @@ -7,7 +7,7 @@ ItemDef( stats: Direct(( equip_time_secs: 0.3, power: 1.5, - poise_strength: 0.4, + poise_strength: 1.0, speed: 1.1, crit_chance: 0.15277778, crit_mult: 1.4363636, diff --git a/assets/common/items/weapons/sword/cobalt-1.ron b/assets/common/items/weapons/sword/cobalt-1.ron index e744622333..eac68d7dbf 100644 --- a/assets/common/items/weapons/sword/cobalt-1.ron +++ b/assets/common/items/weapons/sword/cobalt-1.ron @@ -7,7 +7,7 @@ ItemDef( stats: Direct(( equip_time_secs: 0.3, power: 1.8, - poise_strength: 0.4, + poise_strength: 1.0, speed: 0.8, crit_chance: 0.120987654, crit_mult: 1.4591837, diff --git a/assets/common/items/weapons/sword/cobalt-2.ron b/assets/common/items/weapons/sword/cobalt-2.ron index bf6f213c84..2097972227 100644 --- a/assets/common/items/weapons/sword/cobalt-2.ron +++ b/assets/common/items/weapons/sword/cobalt-2.ron @@ -7,7 +7,7 @@ ItemDef( stats: Direct(( equip_time_secs: 0.3, power: 1.6, - poise_strength: 0.4, + poise_strength: 1.0, speed: 1.0, crit_chance: 0.1421875, crit_mult: 1.4395604, diff --git a/assets/common/items/weapons/sword/cobalt-3.ron b/assets/common/items/weapons/sword/cobalt-3.ron index 4332956175..72a70fb048 100644 --- a/assets/common/items/weapons/sword/cobalt-3.ron +++ b/assets/common/items/weapons/sword/cobalt-3.ron @@ -7,7 +7,7 @@ ItemDef( stats: Direct(( equip_time_secs: 0.3, power: 1.7, - poise_strength: 0.4, + poise_strength: 1.0, speed: 0.9, crit_chance: 0.13165635, crit_mult: 1.4467961, diff --git a/assets/common/items/weapons/sword/cultist.ron b/assets/common/items/weapons/sword/cultist.ron index af6fb883c3..2f5047fea4 100644 --- a/assets/common/items/weapons/sword/cultist.ron +++ b/assets/common/items/weapons/sword/cultist.ron @@ -7,7 +7,7 @@ ItemDef( stats: Direct(( equip_time_secs: 0.5, power: 2.0, - poise_strength: 1.5, + poise_strength: 1.0, speed: 1.0, crit_chance: 0.140625, crit_mult: 1.4063492, diff --git a/assets/common/items/weapons/sword/frost-0.ron b/assets/common/items/weapons/sword/frost-0.ron index 02c232cb97..31d2f3aeb6 100644 --- a/assets/common/items/weapons/sword/frost-0.ron +++ b/assets/common/items/weapons/sword/frost-0.ron @@ -7,7 +7,7 @@ ItemDef( stats: Direct(( equip_time_secs: 0.5, power: 1.7, - poise_strength: 2.0, + poise_strength: 1.0, speed: 1.0, crit_chance: 0.13897058, crit_mult: 1.4232805, diff --git a/assets/common/items/weapons/sword/frost-1.ron b/assets/common/items/weapons/sword/frost-1.ron index 0033cdc135..538878d05a 100644 --- a/assets/common/items/weapons/sword/frost-1.ron +++ b/assets/common/items/weapons/sword/frost-1.ron @@ -7,7 +7,7 @@ ItemDef( stats: Direct(( equip_time_secs: 0.5, power: 1.95, - poise_strength: 1.7, + poise_strength: 1.0, speed: 1.0, crit_chance: 0.14182693, crit_mult: 1.4132365, diff --git a/assets/common/items/weapons/sword/iron-0.ron b/assets/common/items/weapons/sword/iron-0.ron index ecbfd63042..baea0c90a0 100644 --- a/assets/common/items/weapons/sword/iron-0.ron +++ b/assets/common/items/weapons/sword/iron-0.ron @@ -7,7 +7,7 @@ ItemDef( stats: Direct(( equip_time_secs: 0.3, power: 1.25, - poise_strength: 0.4, + poise_strength: 1.0, speed: 0.95, crit_chance: 0.13153847, crit_mult: 1.5213033, diff --git a/assets/common/items/weapons/sword/iron-1.ron b/assets/common/items/weapons/sword/iron-1.ron index 7384feced2..3384891775 100644 --- a/assets/common/items/weapons/sword/iron-1.ron +++ b/assets/common/items/weapons/sword/iron-1.ron @@ -7,7 +7,7 @@ ItemDef( stats: Direct(( equip_time_secs: 0.3, power: 1.45, - poise_strength: 0.4, + poise_strength: 1.0, speed: 0.75, crit_chance: 0.10862069, crit_mult: 1.5442177, diff --git a/assets/common/items/weapons/sword/iron-10.ron b/assets/common/items/weapons/sword/iron-10.ron index 4ce8803401..2eaf2b6c83 100644 --- a/assets/common/items/weapons/sword/iron-10.ron +++ b/assets/common/items/weapons/sword/iron-10.ron @@ -7,7 +7,7 @@ ItemDef( stats: Direct(( equip_time_secs: 0.3, power: 1.35, - poise_strength: 0.4, + poise_strength: 1.0, speed: 0.85, crit_chance: 0.11996997, crit_mult: 1.529233, diff --git a/assets/common/items/weapons/sword/iron-2.ron b/assets/common/items/weapons/sword/iron-2.ron index 14d94e0549..7399fd8cba 100644 --- a/assets/common/items/weapons/sword/iron-2.ron +++ b/assets/common/items/weapons/sword/iron-2.ron @@ -7,7 +7,7 @@ ItemDef( stats: Direct(( equip_time_secs: 0.3, power: 1.1, - poise_strength: 0.4, + poise_strength: 1.0, speed: 1.1, crit_chance: 0.15, crit_mult: 1.5194805, diff --git a/assets/common/items/weapons/sword/iron-3.ron b/assets/common/items/weapons/sword/iron-3.ron index 3648599369..7e032e5d16 100644 --- a/assets/common/items/weapons/sword/iron-3.ron +++ b/assets/common/items/weapons/sword/iron-3.ron @@ -7,7 +7,7 @@ ItemDef( stats: Direct(( equip_time_secs: 0.3, power: 1.15, - poise_strength: 0.4, + poise_strength: 1.0, speed: 1.05, crit_chance: 0.14363733, crit_mult: 1.5189053, diff --git a/assets/common/items/weapons/sword/iron-4.ron b/assets/common/items/weapons/sword/iron-4.ron index ac4916a7dc..ebb84cbe52 100644 --- a/assets/common/items/weapons/sword/iron-4.ron +++ b/assets/common/items/weapons/sword/iron-4.ron @@ -7,7 +7,7 @@ ItemDef( stats: Direct(( equip_time_secs: 0.3, power: 1.3, - poise_strength: 0.4, + poise_strength: 1.0, speed: 0.9, crit_chance: 0.1257085, crit_mult: 1.5244997, diff --git a/assets/common/items/weapons/sword/iron-5.ron b/assets/common/items/weapons/sword/iron-5.ron index b84a5f1cc3..6f23e4967b 100644 --- a/assets/common/items/weapons/sword/iron-5.ron +++ b/assets/common/items/weapons/sword/iron-5.ron @@ -7,7 +7,7 @@ ItemDef( stats: Direct(( equip_time_secs: 0.3, power: 1.05, - poise_strength: 0.4, + poise_strength: 1.0, speed: 1.15, crit_chance: 0.15664452, crit_mult: 1.5211332, diff --git a/assets/common/items/weapons/sword/iron-6.ron b/assets/common/items/weapons/sword/iron-6.ron index 28dfebde2d..c9b5824305 100644 --- a/assets/common/items/weapons/sword/iron-6.ron +++ b/assets/common/items/weapons/sword/iron-6.ron @@ -7,7 +7,7 @@ ItemDef( stats: Direct(( equip_time_secs: 0.3, power: 1.2, - poise_strength: 0.4, + poise_strength: 1.0, speed: 1.0, crit_chance: 0.1375, crit_mult: 1.5194805, diff --git a/assets/common/items/weapons/sword/iron-7.ron b/assets/common/items/weapons/sword/iron-7.ron index 7411e74b1f..81cb65d31a 100644 --- a/assets/common/items/weapons/sword/iron-7.ron +++ b/assets/common/items/weapons/sword/iron-7.ron @@ -7,7 +7,7 @@ ItemDef( stats: Direct(( equip_time_secs: 0.3, power: 1.4, - poise_strength: 0.4, + poise_strength: 1.0, speed: 0.8, crit_chance: 0.114285715, crit_mult: 1.5357143, diff --git a/assets/common/items/weapons/sword/iron-8.ron b/assets/common/items/weapons/sword/iron-8.ron index 520afb4598..bc1f5afdd1 100644 --- a/assets/common/items/weapons/sword/iron-8.ron +++ b/assets/common/items/weapons/sword/iron-8.ron @@ -7,7 +7,7 @@ ItemDef( stats: Direct(( equip_time_secs: 0.3, power: 1.0, - poise_strength: 0.4, + poise_strength: 1.0, speed: 1.2, crit_chance: 0.16363636, crit_mult: 1.5238096, diff --git a/assets/common/items/weapons/sword/iron-9.ron b/assets/common/items/weapons/sword/iron-9.ron index 75ece0f1dc..f3399c7c5c 100644 --- a/assets/common/items/weapons/sword/iron-9.ron +++ b/assets/common/items/weapons/sword/iron-9.ron @@ -7,7 +7,7 @@ ItemDef( stats: Direct(( equip_time_secs: 0.3, power: 0.95, - poise_strength: 0.4, + poise_strength: 1.0, speed: 1.25, crit_chance: 0.17105263, crit_mult: 1.5274725, diff --git a/assets/common/items/weapons/sword/starter.ron b/assets/common/items/weapons/sword/starter.ron index 6e706ecc21..f755182248 100644 --- a/assets/common/items/weapons/sword/starter.ron +++ b/assets/common/items/weapons/sword/starter.ron @@ -7,7 +7,7 @@ ItemDef( stats: Direct(( equip_time_secs: 0.3, power: 0.5, - poise_strength: 0.4, + poise_strength: 1.0, speed: 1.0, crit_chance: 0.09375, crit_mult: 2.2190475, diff --git a/assets/common/items/weapons/sword/steel-0.ron b/assets/common/items/weapons/sword/steel-0.ron index 59d01a983d..e2541750e6 100644 --- a/assets/common/items/weapons/sword/steel-0.ron +++ b/assets/common/items/weapons/sword/steel-0.ron @@ -7,7 +7,7 @@ ItemDef( stats: Direct(( equip_time_secs: 0.3, power: 1.4, - poise_strength: 0.4, + poise_strength: 1.0, speed: 1.0, crit_chance: 0.12857144, crit_mult: 1.4761904, diff --git a/assets/common/items/weapons/sword/steel-1.ron b/assets/common/items/weapons/sword/steel-1.ron index 3e9c2b9b57..e8345bd374 100644 --- a/assets/common/items/weapons/sword/steel-1.ron +++ b/assets/common/items/weapons/sword/steel-1.ron @@ -7,7 +7,7 @@ ItemDef( stats: Direct(( equip_time_secs: 0.3, power: 1.45, - poise_strength: 0.4, + poise_strength: 1.0, speed: 0.95, crit_chance: 0.1234748, crit_mult: 1.4787478, diff --git a/assets/common/items/weapons/sword/steel-2.ron b/assets/common/items/weapons/sword/steel-2.ron index f12146e4cf..8f492c16c1 100644 --- a/assets/common/items/weapons/sword/steel-2.ron +++ b/assets/common/items/weapons/sword/steel-2.ron @@ -7,7 +7,7 @@ ItemDef( stats: Direct(( equip_time_secs: 0.3, power: 1.25, - poise_strength: 0.4, + poise_strength: 1.0, speed: 1.15, crit_chance: 0.14441861, crit_mult: 1.4748102, diff --git a/assets/common/items/weapons/sword/steel-3.ron b/assets/common/items/weapons/sword/steel-3.ron index 90d11d8419..da85244b87 100644 --- a/assets/common/items/weapons/sword/steel-3.ron +++ b/assets/common/items/weapons/sword/steel-3.ron @@ -7,7 +7,7 @@ ItemDef( stats: Direct(( equip_time_secs: 0.3, power: 1.5, - poise_strength: 0.4, + poise_strength: 1.0, speed: 0.9, crit_chance: 0.118421055, crit_mult: 1.4825397, diff --git a/assets/common/items/weapons/sword/steel-4.ron b/assets/common/items/weapons/sword/steel-4.ron index cdd64dac47..17fc51b55c 100644 --- a/assets/common/items/weapons/sword/steel-4.ron +++ b/assets/common/items/weapons/sword/steel-4.ron @@ -7,7 +7,7 @@ ItemDef( stats: Direct(( equip_time_secs: 0.3, power: 1.55, - poise_strength: 0.4, + poise_strength: 1.0, speed: 0.85, crit_chance: 0.113382734, crit_mult: 1.4877245, diff --git a/assets/common/items/weapons/sword/steel-5.ron b/assets/common/items/weapons/sword/steel-5.ron index 929022256e..e727291263 100644 --- a/assets/common/items/weapons/sword/steel-5.ron +++ b/assets/common/items/weapons/sword/steel-5.ron @@ -7,7 +7,7 @@ ItemDef( stats: Direct(( equip_time_secs: 0.3, power: 1.2, - poise_strength: 0.4, + poise_strength: 1.0, speed: 1.2, crit_chance: 0.15, crit_mult: 1.4761904, diff --git a/assets/common/items/weapons/sword/steel-6.ron b/assets/common/items/weapons/sword/steel-6.ron index abcb763450..b26873235b 100644 --- a/assets/common/items/weapons/sword/steel-6.ron +++ b/assets/common/items/weapons/sword/steel-6.ron @@ -7,7 +7,7 @@ ItemDef( stats: Direct(( equip_time_secs: 0.3, power: 1.3, - poise_strength: 0.4, + poise_strength: 1.0, speed: 1.1, crit_chance: 0.139011, crit_mult: 1.4743083, diff --git a/assets/common/items/weapons/sword/steel-7.ron b/assets/common/items/weapons/sword/steel-7.ron index 7b1a672c44..6a0bdf0a0d 100644 --- a/assets/common/items/weapons/sword/steel-7.ron +++ b/assets/common/items/weapons/sword/steel-7.ron @@ -7,7 +7,7 @@ ItemDef( stats: Direct(( equip_time_secs: 0.3, power: 1.6, - poise_strength: 0.4, + poise_strength: 1.0, speed: 0.8, crit_chance: 0.108333334, crit_mult: 1.4945055, diff --git a/assets/common/items/weapons/sword/steel-8.ron b/assets/common/items/weapons/sword/steel-8.ron index 7f7a0eaa7c..77fc65a17c 100644 --- a/assets/common/items/weapons/sword/steel-8.ron +++ b/assets/common/items/weapons/sword/steel-8.ron @@ -7,7 +7,7 @@ ItemDef( stats: Direct(( equip_time_secs: 0.3, power: 1.35, - poise_strength: 0.4, + poise_strength: 1.0, speed: 1.05, crit_chance: 0.13373984, crit_mult: 1.4747431, diff --git a/assets/common/items/weapons/sword/stone-0.ron b/assets/common/items/weapons/sword/stone-0.ron index 5a20089b37..c0b76b3d8b 100644 --- a/assets/common/items/weapons/sword/stone-0.ron +++ b/assets/common/items/weapons/sword/stone-0.ron @@ -7,7 +7,7 @@ ItemDef( stats: Direct(( equip_time_secs: 0.3, power: 1.0, - poise_strength: 0.4, + poise_strength: 1.0, speed: 0.8, crit_chance: 0.055555556, crit_mult: 2.0285714, diff --git a/assets/common/items/weapons/sword/stone-1.ron b/assets/common/items/weapons/sword/stone-1.ron index 7785ce265b..f7d26bf6f0 100644 --- a/assets/common/items/weapons/sword/stone-1.ron +++ b/assets/common/items/weapons/sword/stone-1.ron @@ -7,7 +7,7 @@ ItemDef( stats: Direct(( equip_time_secs: 0.3, power: 0.8, - poise_strength: 0.4, + poise_strength: 1.0, speed: 1.0, crit_chance: 0.0703125, crit_mult: 2.015873, diff --git a/assets/common/items/weapons/sword/stone-2.ron b/assets/common/items/weapons/sword/stone-2.ron index a7b24ad5a9..3f64753c63 100644 --- a/assets/common/items/weapons/sword/stone-2.ron +++ b/assets/common/items/weapons/sword/stone-2.ron @@ -7,7 +7,7 @@ ItemDef( stats: Direct(( equip_time_secs: 0.3, power: 0.9, - poise_strength: 0.4, + poise_strength: 1.0, speed: 0.9, crit_chance: 0.0625, crit_mult: 2.015873, diff --git a/assets/common/items/weapons/sword/wood-0.ron b/assets/common/items/weapons/sword/wood-0.ron index ce7ff0a68b..e1e15c59de 100644 --- a/assets/common/items/weapons/sword/wood-0.ron +++ b/assets/common/items/weapons/sword/wood-0.ron @@ -7,7 +7,7 @@ ItemDef( stats: Direct(( equip_time_secs: 0.3, power: 0.6, - poise_strength: 0.4, + poise_strength: 1.0, speed: 1.0, crit_chance: 0.083333336, crit_mult: 2.142857, diff --git a/assets/common/items/weapons/sword/wood-1.ron b/assets/common/items/weapons/sword/wood-1.ron index 3c9653e9df..9cfb78f27b 100644 --- a/assets/common/items/weapons/sword/wood-1.ron +++ b/assets/common/items/weapons/sword/wood-1.ron @@ -7,7 +7,7 @@ ItemDef( stats: Direct(( equip_time_secs: 0.3, power: 0.8, - poise_strength: 0.4, + poise_strength: 1.0, speed: 0.8, crit_chance: 0.0625, crit_mult: 2.142857, diff --git a/assets/common/items/weapons/sword/wood-2.ron b/assets/common/items/weapons/sword/wood-2.ron index b2b335d08f..c01bf40e5c 100644 --- a/assets/common/items/weapons/sword/wood-2.ron +++ b/assets/common/items/weapons/sword/wood-2.ron @@ -7,7 +7,7 @@ ItemDef( stats: Direct(( equip_time_secs: 0.4, power: 0.5, - poise_strength: 0.5, + poise_strength: 1.0, speed: 1.1, crit_chance: 0.09821428, crit_mult: 2.1636364, diff --git a/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron b/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron index 466a795ef9..4a97ad7ea2 100644 --- a/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron @@ -243,11 +243,11 @@ ), "Tarasque": ( left: ( - vox_spec: ("armor.tarsque.shoulder", (-5.0, -3.5 , 0.0)), + vox_spec: ("armor.tarasque.shoulder", (-5.0, -3.5 , 0.0)), color: None ), right: ( - vox_spec: ("armor.tarsque.shoulder", (-0.0, -3.5, 0.0)), + vox_spec: ("armor.tarasque.shoulder", (-0.0, -3.5, 0.0)), color: None ) ), diff --git a/common/src/comp/body.rs b/common/src/comp/body.rs index 9e595d1b67..f34d5f93b6 100644 --- a/common/src/comp/body.rs +++ b/common/src/comp/body.rs @@ -337,10 +337,10 @@ impl Body { quadruped_medium::Species::Antelope => 300, quadruped_medium::Species::Kelpie => 600, quadruped_medium::Species::Horse => 600, - quadruped_medium::Species::Barghest => 1000, - quadruped_medium::Species::Cattle => 600, - quadruped_medium::Species::Highland => 600, - quadruped_medium::Species::Yak => 600, + quadruped_medium::Species::Barghest => 1700, + quadruped_medium::Species::Cattle => 1000, + quadruped_medium::Species::Highland => 1200, + quadruped_medium::Species::Yak => 1000, quadruped_medium::Species::Panda => 800, quadruped_medium::Species::Bear => 800, _ => 400, @@ -516,7 +516,8 @@ impl Body { pub fn base_poise(&self) -> u32 { match self { Body::Humanoid(_) => 100, - Body::BipedLarge(_) => 200, + Body::BipedLarge(_) => 250, + Body::Golem(_) => 300, _ => 100, } } diff --git a/common/src/comp/inventory/loadout_builder.rs b/common/src/comp/inventory/loadout_builder.rs index fb603fd8cc..59550ae69f 100644 --- a/common/src/comp/inventory/loadout_builder.rs +++ b/common/src/comp/inventory/loadout_builder.rs @@ -126,6 +126,13 @@ impl LoadoutBuilder { "common.items.npc_weapons.unique.quadmedcharge", )); }, + quadruped_medium::Species::Highland + | quadruped_medium::Species::Cattle + | quadruped_medium::Species::Yak => { + main_tool = Some(Item::new_from_asset_expect( + "common.items.npc_weapons.unique.quadmedbasicgentle", + )); + }, _ => { main_tool = Some(Item::new_from_asset_expect( "common.items.npc_weapons.unique.quadmedbasic", @@ -272,17 +279,12 @@ impl LoadoutBuilder { { (biped_small::Species::Gnome, _) => { main_tool = Some(Item::new_from_asset_expect( - "common.items.npc_weapons.staff.gnoll", - )); - }, - (biped_small::Species::Adlet, _) => { - main_tool = Some(Item::new_from_asset_expect( - "common.items.npc_weapons.bow.adlet", + "common.items.npc_weapons.biped_small.adlet.gnoll_staff", )); }, _ => { main_tool = Some(Item::new_from_asset_expect( - "common.items.npc_weapons.spear.wooden_spear", + "common.items.npc_weapons.biped_small.adlet.wooden_spear", )); }, }, diff --git a/common/src/comp/poise.rs b/common/src/comp/poise.rs index 1e13be2f13..99ef69d681 100644 --- a/common/src/comp/poise.rs +++ b/common/src/comp/poise.rs @@ -120,11 +120,11 @@ impl Poise { /// Defines the poise states based on fraction of maximum poise pub fn poise_state(&self) -> PoiseState { - if self.current >= 5 * self.maximum / 10 { + if self.current >= 7 * self.maximum / 10 { PoiseState::Normal - } else if self.current >= 4 * self.maximum / 10 { + } else if self.current >= 5 * self.maximum / 10 { PoiseState::Interrupted - } else if self.current >= 3 * self.maximum / 10 { + } else if self.current >= 4 * self.maximum / 10 { PoiseState::Stunned } else if self.current >= 2 * self.maximum / 10 { PoiseState::Dazed diff --git a/voxygen/anim/src/biped_small/alpha.rs b/voxygen/anim/src/biped_small/alpha.rs index 8139aef2e4..780a117bea 100644 --- a/voxygen/anim/src/biped_small/alpha.rs +++ b/voxygen/anim/src/biped_small/alpha.rs @@ -66,7 +66,7 @@ impl Animation for AlphaAnimation { next.head.orientation = Quaternion::rotation_x(move1abs * 0.2 + move2abs * 0.3) * Quaternion::rotation_z(move1abs * -0.2 + move2abs * 0.6) * Quaternion::rotation_y(move1abs * 0.3 + move2abs * -0.5); - next.chest.position = Vec3::new(0.0, s_a.chest.0, s_a.chest.1) / 13.0; + next.chest.position = Vec3::new(0.0, s_a.chest.0, s_a.chest.1) / 11.0; next.chest.orientation = Quaternion::rotation_x(move1abs * -0.2 + move2abs * 0.3) * Quaternion::rotation_z(move1abs * 0.5 + move2abs * -0.6); diff --git a/voxygen/anim/src/biped_small/mod.rs b/voxygen/anim/src/biped_small/mod.rs index 8eb9e2cf38..6c926679ca 100644 --- a/voxygen/anim/src/biped_small/mod.rs +++ b/voxygen/anim/src/biped_small/mod.rs @@ -3,12 +3,13 @@ pub mod dash; pub mod idle; pub mod run; pub mod shoot; +pub mod stunned; pub mod wield; // Reexports pub use self::{ alpha::AlphaAnimation, dash::DashAnimation, idle::IdleAnimation, run::RunAnimation, - shoot::ShootAnimation, wield::WieldAnimation, + shoot::ShootAnimation, stunned::StunnedAnimation, wield::WieldAnimation, }; use super::{make_bone, vek::*, FigureBoneData, Skeleton}; diff --git a/voxygen/anim/src/biped_small/stunned.rs b/voxygen/anim/src/biped_small/stunned.rs new file mode 100644 index 0000000000..1998e268f1 --- /dev/null +++ b/voxygen/anim/src/biped_small/stunned.rs @@ -0,0 +1,177 @@ +use super::{ + super::{vek::*, Animation}, + BipedSmallSkeleton, SkeletonAttr, +}; +use common::{comp::item::ToolKind, states::utils::StageSection}; +use std::f32::consts::PI; + +pub struct StunnedAnimation; + +type StunnedAnimationDependency = ( + Option, + Vec3, + Vec3, + Vec3, + f32, + Vec3, + f32, + bool, + Option, + f32, +); + +impl Animation for StunnedAnimation { + type Dependency = StunnedAnimationDependency; + type Skeleton = BipedSmallSkeleton; + + #[cfg(feature = "use-dyn-lib")] + const UPDATE_FN: &'static [u8] = b"biped_small_stunned\0"; + + #[cfg_attr(feature = "be-dyn-lib", export_name = "biped_small_stunned")] + + fn update_skeleton_inner( + skeleton: &Self::Skeleton, + ( + active_tool_kind, + velocity, + _orientation, + _last_ori, + global_time, + _avg_vel, + _acc_vel, + wield_status, + stage_section, + timer, + ): Self::Dependency, + anim_time: f32, + _rate: &mut f32, + s_a: &SkeletonAttr, + ) -> Self::Skeleton { + let mut next = (*skeleton).clone(); + let speed = Vec2::::from(velocity).magnitude(); + + let speednorm = speed / 9.4; + if wield_status { + let (movement1base, movement2) = match stage_section { + Some(StageSection::Buildup) => (anim_time.powf(0.25), 0.0), + Some(StageSection::Recover) => (1.0, anim_time.powf(4.0)), + _ => (0.0, 0.0), + }; + let pullback = 1.0 - movement2; + let subtract = global_time - timer; + let check = subtract - subtract.trunc(); + let mirror = (check - 0.5).signum(); + let movement1 = movement1base * pullback * mirror; + let movement1abs = movement1base * pullback; + next.head.position = Vec3::new(0.0, s_a.head.0, s_a.head.1); + next.head.orientation = + Quaternion::rotation_x(movement1 * 0.2) * Quaternion::rotation_z(movement1 * 0.5); + next.chest.position = + Vec3::new(0.0, s_a.chest.0, s_a.chest.1 + movement1abs - 2.0) * s_a.scaler / 11.0; + next.chest.orientation = Quaternion::rotation_z(movement1 * 0.5); + + next.pants.position = Vec3::new(0.0, s_a.pants.0, s_a.pants.1); + + next.tail.position = Vec3::new(0.0, s_a.tail.0, s_a.tail.1); + next.tail.orientation = Quaternion::rotation_x(0.0) * Quaternion::rotation_z(0.0); + + next.main.position = Vec3::new(0.0, 0.0, 0.0); + next.main.orientation = Quaternion::rotation_x(0.0); + + next.hand_l.position = Vec3::new(s_a.grip.0 * 4.0, 0.0, s_a.grip.2); + next.hand_r.position = Vec3::new(-s_a.grip.0 * 4.0, 0.0, s_a.grip.2); + + next.hand_l.orientation = Quaternion::rotation_x(0.0); + next.hand_r.orientation = Quaternion::rotation_x(0.0); + + //IMPORTANT: avoid touching any value attached to grip. grip uses the size of + // the hand bones to correct any irrgularities beween species. Changing + // coefficients to grip will have different effects across species + + match active_tool_kind { + Some(ToolKind::Spear) => { + next.control_l.position = Vec3::new(1.0 - s_a.grip.0 * 2.0, 2.0, -2.0); + next.control_r.position = Vec3::new(-1.0 + s_a.grip.0 * 2.0, 2.0, 2.0); + + next.control.position = Vec3::new( + -3.0, + s_a.grip.2, + -s_a.grip.2 / 2.5 + s_a.grip.0 * -2.0 + speednorm * 2.0, + ); + + next.control_l.orientation = + Quaternion::rotation_x(PI / 1.5) * Quaternion::rotation_y(-0.3); + next.control_r.orientation = + Quaternion::rotation_x(PI / 1.5 + s_a.grip.0 * 0.2) + * Quaternion::rotation_y(0.5 + s_a.grip.0 * 0.2); + + next.control.orientation = Quaternion::rotation_x(-1.35 + 0.5 * speednorm); + }, + + Some(ToolKind::Bow) | Some(ToolKind::BowSimple) => { + next.control_l.position = Vec3::new(1.0 - s_a.grip.0 * 2.0, 0.0, 0.0); + next.control_r.position = Vec3::new(-1.0 + s_a.grip.0 * 2.0, 6.0, -2.0); + + next.control.position = Vec3::new( + -1.0, + 2.0 + s_a.grip.2, + 3.0 + -s_a.grip.2 / 2.5 + s_a.grip.0 * -2.0 + speednorm * 2.0, + ); + + next.control_l.orientation = + Quaternion::rotation_x(PI / 2.0) * Quaternion::rotation_y(-0.3); + next.control_r.orientation = + Quaternion::rotation_x(PI / 2.0 + s_a.grip.0 * 0.2) + * Quaternion::rotation_y(0.5 + s_a.grip.0 * 0.2); + + next.control.orientation = Quaternion::rotation_x(-0.3 + 0.5 * speednorm) + * Quaternion::rotation_y(0.5 * speednorm); + }, + Some(ToolKind::Staff) | Some(ToolKind::StaffSimple) => { + next.control_l.position = Vec3::new(2.0 - s_a.grip.0 * 2.0, 1.0, 3.0); + next.control_r.position = + Vec3::new(7.0 + s_a.grip.0 * 2.0, -4.0, 3.0 + speednorm * -3.0); + + next.control.position = Vec3::new( + -5.0, + -1.0 + s_a.grip.2, + -2.0 + -s_a.grip.2 / 2.5 + s_a.grip.0 * -2.0 + speednorm * 2.0, + ); + + next.control_l.orientation = Quaternion::rotation_x(PI / 2.0) + * Quaternion::rotation_y(-0.3) + * Quaternion::rotation_z(-0.3); + next.control_r.orientation = + Quaternion::rotation_x(PI / 2.0 + s_a.grip.0 * 0.2) + * Quaternion::rotation_y(-0.4 + s_a.grip.0 * 0.2) + * Quaternion::rotation_z(-0.0); + + next.control.orientation = Quaternion::rotation_x(-0.3 + 0.2 * speednorm) + * Quaternion::rotation_y(-0.2 * speednorm) + * Quaternion::rotation_z(0.5); + }, + _ => {}, + } + } else { + next.foot_l.scale = Vec3::one() * s_a.scaler / 11.0; + next.foot_r.scale = Vec3::one() * s_a.scaler / 11.0; + + next.chest.scale = Vec3::one() * s_a.scaler / 11.0; + next.head.position = Vec3::new(0.0, s_a.head.0, s_a.head.1); + + next.chest.position = Vec3::new(0.0, s_a.chest.0, s_a.chest.1) * s_a.scaler / 11.0; + next.pants.position = Vec3::new(0.0, s_a.pants.0, s_a.pants.1); + next.main.position = Vec3::new(2.0, -3.0, -3.0); + next.main.orientation = Quaternion::rotation_y(-0.5) * Quaternion::rotation_z(1.57); + + next.tail.position = Vec3::new(0.0, s_a.tail.0, s_a.tail.1); + next.hand_l.position = Vec3::new(-s_a.hand.0, s_a.hand.1, s_a.hand.2); + next.hand_r.position = Vec3::new(s_a.hand.0, s_a.hand.1, s_a.hand.2); + next.foot_l.position = + Vec3::new(-s_a.foot.0, s_a.foot.1, s_a.foot.2) * s_a.scaler / 11.0; + next.foot_r.position = + Vec3::new(s_a.foot.0, s_a.foot.1, s_a.foot.2) * s_a.scaler / 11.0; + }; + next + } +} diff --git a/voxygen/anim/src/character/mod.rs b/voxygen/anim/src/character/mod.rs index 135d142d46..96fb1b01dc 100644 --- a/voxygen/anim/src/character/mod.rs +++ b/voxygen/anim/src/character/mod.rs @@ -117,7 +117,7 @@ impl Skeleton for CharacterSkeleton { make_bone(control_mat * hand_l_mat * Mat4::::from(self.hold)), ]; // NOTE: lantern_mat.cols.w = lantern_mat * Vec4::unit_w() - (lantern_mat.cols.w / 13.0).xyz() + Vec3::new(-0.3, 0.1, 0.8) + (lantern_mat.cols.w / 13.0).xyz() } } diff --git a/voxygen/anim/src/quadruped_medium/alpha.rs b/voxygen/anim/src/quadruped_medium/alpha.rs index dfc9395c2d..d1c7ac8072 100644 --- a/voxygen/anim/src/quadruped_medium/alpha.rs +++ b/voxygen/anim/src/quadruped_medium/alpha.rs @@ -50,7 +50,7 @@ impl Animation for AlphaAnimation { * Quaternion::rotation_y(movement1 * 0.0) * Quaternion::rotation_z(movement1 * 0.10 + movement1 * -0.15); - next.jaw.orientation = Quaternion::rotation_x(movement1abs * -0.7 + movement2abs * 0.7); + next.jaw.orientation = Quaternion::rotation_x(movement1abs * -0.4 + movement2abs * 0.4); next.tail.orientation = Quaternion::rotation_z( movement1 * 0.5 + movement2 * -0.8 + twitchmovement * 0.2 * mirror, diff --git a/voxygen/anim/src/quadruped_medium/stunned.rs b/voxygen/anim/src/quadruped_medium/stunned.rs index 33e60ee0b5..87ff05da27 100644 --- a/voxygen/anim/src/quadruped_medium/stunned.rs +++ b/voxygen/anim/src/quadruped_medium/stunned.rs @@ -37,11 +37,11 @@ impl Animation for StunnedAnimation { let movement1 = movement1base * mirror * pullback; let movement1abs = movement1base * pullback; - next.head.orientation = Quaternion::rotation_x(movement1abs * -0.45) + next.head.orientation = Quaternion::rotation_x(movement1abs * -0.55) * Quaternion::rotation_y(movement1 * 0.35) * Quaternion::rotation_z(movement1 * 0.15 + twitch * 0.3 * mirror); - next.neck.orientation = Quaternion::rotation_x(movement1abs * -0.3) + next.neck.orientation = Quaternion::rotation_x(movement1abs * -0.4) * Quaternion::rotation_y(movement1 * 0.0) * Quaternion::rotation_z(movement1 * 0.10 + movement1 * -0.15); @@ -55,7 +55,7 @@ impl Animation for StunnedAnimation { ) * s_a.scaler / 11.0; next.torso_front.orientation = - Quaternion::rotation_y(0.0) * Quaternion::rotation_z(movement1 * 0.35); + Quaternion::rotation_y(0.0) * Quaternion::rotation_z(movement1 * 0.15); next.torso_back.orientation = Quaternion::rotation_y(movement1 * 0.18) * Quaternion::rotation_z(movement1 * -0.4); diff --git a/voxygen/src/scene/figure/mod.rs b/voxygen/src/scene/figure/mod.rs index 91e208200f..bd0998d292 100644 --- a/voxygen/src/scene/figure/mod.rs +++ b/voxygen/src/scene/figure/mod.rs @@ -1669,21 +1669,9 @@ impl FigureMgr { match s.static_data.poise_state { PoiseState::Normal | PoiseState::Interrupted - | PoiseState::Stunned => { - anim::quadruped_small::StunnedAnimation::update_skeleton( - &target_base, - ( - vel.0.magnitude(), - time, - Some(s.stage_section), - state.state_time, - ), - stage_progress, - &mut state_animation_rate, - skeleton_attr, - ) - }, - PoiseState::Dazed | PoiseState::KnockedDown => { + | PoiseState::Stunned + | PoiseState::Dazed + | PoiseState::KnockedDown => { anim::quadruped_small::StunnedAnimation::update_skeleton( &target_base, ( @@ -2760,6 +2748,45 @@ impl FigureMgr { skeleton_attr, ) }, + CharacterState::Stunned(s) => { + let stage_time = s.timer.as_secs_f32(); + let wield_status = s.was_wielded; + let stage_progress = match s.stage_section { + StageSection::Buildup => { + stage_time / s.static_data.buildup_duration.as_secs_f32() + }, + StageSection::Recover => { + stage_time / s.static_data.recover_duration.as_secs_f32() + }, + _ => 0.0, + }; + match s.static_data.poise_state { + PoiseState::Normal + | PoiseState::Interrupted + | PoiseState::Stunned + | PoiseState::Dazed + | PoiseState::KnockedDown => { + anim::biped_small::StunnedAnimation::update_skeleton( + &target_base, + ( + active_tool_kind, + vel.0, + ori * anim::vek::Vec3::::unit_y(), + state.last_ori * anim::vek::Vec3::::unit_y(), + time, + state.avg_vel, + state.acc_vel, + wield_status, + Some(s.stage_section), + state.state_time, + ), + stage_progress, + &mut state_animation_rate, + skeleton_attr, + ) + }, + } + }, CharacterState::ChargedRanged(s) => { let stage_time = s.timer.as_secs_f32();