diff --git a/assets/common/abilities/axe/doublestrike.ron b/assets/common/abilities/axe/doublestrike.ron index 7c9f767d46..556a3e14fe 100644 --- a/assets/common/abilities/axe/doublestrike.ron +++ b/assets/common/abilities/axe/doublestrike.ron @@ -4,9 +4,9 @@ ComboMelee( stage: 1, base_damage: 90, max_damage: 110, - base_poise_damage: 20, + base_poise_damage: 0, damage_increase: 10, - poise_damage_increase: 5, + poise_damage_increase: 0, knockback: 8.0, range: 3.5, angle: 50.0, @@ -19,9 +19,9 @@ ComboMelee( stage: 2, base_damage: 130, max_damage: 160, - base_poise_damage: 40, + base_poise_damage: 0, damage_increase: 15, - poise_damage_increase: 15, + poise_damage_increase: 0, knockback: 12.0, range: 3.5, angle: 30.0, diff --git a/assets/common/abilities/axe/leap.ron b/assets/common/abilities/axe/leap.ron index ed8d37c32e..d4518b1b27 100644 --- a/assets/common/abilities/axe/leap.ron +++ b/assets/common/abilities/axe/leap.ron @@ -5,7 +5,7 @@ LeapMelee( swing_duration: 200, recover_duration: 200, base_damage: 240, - base_poise_damage: 70, + base_poise_damage: 0, 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 e70a6acb9e..3e21490f57 100644 --- a/assets/common/abilities/axe/spin.ron +++ b/assets/common/abilities/axe/spin.ron @@ -3,7 +3,7 @@ SpinMelee( swing_duration: 400, recover_duration: 200, base_damage: 60, - base_poise_damage: 20, + base_poise_damage: 0, knockback: 0.0, range: 3.5, energy_cost: 100, diff --git a/assets/common/abilities/bow/basic.ron b/assets/common/abilities/bow/basic.ron index 999207b677..46a791e154 100644 --- a/assets/common/abilities/bow/basic.ron +++ b/assets/common/abilities/bow/basic.ron @@ -4,7 +4,7 @@ BasicRanged( recover_duration: 300, projectile: Arrow( damage: 70.0, - poise_damage: 2, + poise_damage: 0, knockback: 5.0, energy_regen: 40, ), diff --git a/assets/common/abilities/bow/charged.ron b/assets/common/abilities/bow/charged.ron index 76e173a132..3073e5f04a 100644 --- a/assets/common/abilities/bow/charged.ron +++ b/assets/common/abilities/bow/charged.ron @@ -3,8 +3,8 @@ ChargedRanged( energy_drain: 300, initial_damage: 10, scaled_damage: 190, - initial_poise_damage: 10, - scaled_poise_damage: 60, + initial_poise_damage: 0, + scaled_poise_damage: 0, initial_knockback: 10.0, scaled_knockback: 10.0, speed: 1.0, diff --git a/assets/common/abilities/bow/repeater.ron b/assets/common/abilities/bow/repeater.ron index 0dcb04e413..e8e1ebee87 100644 --- a/assets/common/abilities/bow/repeater.ron +++ b/assets/common/abilities/bow/repeater.ron @@ -7,7 +7,7 @@ RepeaterRanged( leap: Some(5.0), projectile: Arrow( damage: 40.0, - poise_damage: 4, + poise_damage: 0, knockback: 5.0, energy_regen: 0, ), diff --git a/assets/common/abilities/dagger/tempbasic.ron b/assets/common/abilities/dagger/tempbasic.ron index c42e13bbd2..96f0bc4415 100644 --- a/assets/common/abilities/dagger/tempbasic.ron +++ b/assets/common/abilities/dagger/tempbasic.ron @@ -4,7 +4,7 @@ BasicMelee( swing_duration: 100, recover_duration: 300, base_damage: 50, - base_poise_damage: 10, + base_poise_damage: 0, knockback: 0.0, range: 3.5, max_angle: 20.0, diff --git a/assets/common/abilities/empty/basic.ron b/assets/common/abilities/empty/basic.ron index 8d2fdf9aee..d4c8eee77a 100644 --- a/assets/common/abilities/empty/basic.ron +++ b/assets/common/abilities/empty/basic.ron @@ -4,7 +4,7 @@ BasicMelee( swing_duration: 100, recover_duration: 900, base_damage: 20, - base_poise_damage: 5, + base_poise_damage: 0, knockback: 0.0, range: 3.5, max_angle: 15.0, diff --git a/assets/common/abilities/farming/basic.ron b/assets/common/abilities/farming/basic.ron index dda81a894a..91761c2515 100644 --- a/assets/common/abilities/farming/basic.ron +++ b/assets/common/abilities/farming/basic.ron @@ -4,7 +4,7 @@ BasicMelee( swing_duration: 100, recover_duration: 150, base_damage: 50, - base_poise_damage: 5, + base_poise_damage: 0, knockback: 0.0, range: 3.5, max_angle: 20.0, diff --git a/assets/common/abilities/hammer/charged.ron b/assets/common/abilities/hammer/charged.ron index 3d9e09471c..85d34ffd8b 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: 5, - scaled_poise_damage: 70, + initial_poise_damage: 0, + scaled_poise_damage: 0, 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 578282360b..079773f94a 100644 --- a/assets/common/abilities/hammer/leap.ron +++ b/assets/common/abilities/hammer/leap.ron @@ -5,7 +5,7 @@ LeapMelee( swing_duration: 150, recover_duration: 200, base_damage: 240, - base_poise_damage: 40, + base_poise_damage: 0, 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 663e9a1f85..34578dcc34 100644 --- a/assets/common/abilities/hammer/singlestrike.ron +++ b/assets/common/abilities/hammer/singlestrike.ron @@ -3,8 +3,8 @@ ComboMelee( stage: 1, base_damage: 130, damage_increase: 10, - base_poise_damage: 10, - poise_damage_increase: 5, + base_poise_damage: 0, + poise_damage_increase: 0, knockback: 0.0, range: 4.5, angle: 50.0, diff --git a/assets/common/abilities/shield/tempbasic.ron b/assets/common/abilities/shield/tempbasic.ron index 3c823cea25..cd78ac1924 100644 --- a/assets/common/abilities/shield/tempbasic.ron +++ b/assets/common/abilities/shield/tempbasic.ron @@ -4,7 +4,7 @@ BasicMelee( swing_duration: 100, recover_duration: 300, base_damage: 40, - base_poise_damage: 20, + base_poise_damage: 0, knockback: 0.0, range: 3.0, max_angle: 120.0, diff --git a/assets/common/abilities/staff/firebomb.ron b/assets/common/abilities/staff/firebomb.ron index 78623f0e5c..b404393f2c 100644 --- a/assets/common/abilities/staff/firebomb.ron +++ b/assets/common/abilities/staff/firebomb.ron @@ -4,7 +4,7 @@ BasicRanged( recover_duration: 350, projectile: Fireball( damage: 100.0, - poise_damage: 10, + poise_damage: 0, radius: 5.0, energy_regen: 50, ), diff --git a/assets/common/abilities/staff/fireshockwave.ron b/assets/common/abilities/staff/fireshockwave.ron index a45a280454..1a3c2c48bc 100644 --- a/assets/common/abilities/staff/fireshockwave.ron +++ b/assets/common/abilities/staff/fireshockwave.ron @@ -4,7 +4,7 @@ Shockwave( swing_duration: 100, recover_duration: 300, damage: 200, - poise_damage: 10, + poise_damage: 0, knockback: Away(25.0), shockwave_angle: 360.0, shockwave_vertical_angle: 90.0, diff --git a/assets/common/abilities/sword/dash.ron b/assets/common/abilities/sword/dash.ron index 97137227eb..355f9a44ee 100644 --- a/assets/common/abilities/sword/dash.ron +++ b/assets/common/abilities/sword/dash.ron @@ -2,8 +2,8 @@ DashMelee( energy_cost: 100, base_damage: 80, scaled_damage: 160, - base_poise_damage: 20, - scaled_poise_damage: 20, + base_poise_damage: 0, + scaled_poise_damage: 0, base_knockback: 8.0, scaled_knockback: 7.0, range: 5.0, diff --git a/assets/common/abilities/sword/spin.ron b/assets/common/abilities/sword/spin.ron index 97d685f085..2b1e09dbcd 100644 --- a/assets/common/abilities/sword/spin.ron +++ b/assets/common/abilities/sword/spin.ron @@ -3,7 +3,7 @@ SpinMelee( swing_duration: 400, recover_duration: 500, base_damage: 160, - base_poise_damage: 10, + base_poise_damage: 0, 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 a5bad53d9a..ad1cbd6c83 100644 --- a/assets/common/abilities/sword/triplestrike.ron +++ b/assets/common/abilities/sword/triplestrike.ron @@ -4,8 +4,8 @@ ComboMelee( stage: 1, base_damage: 100, damage_increase: 10, - base_poise_damage: 10, - poise_damage_increase: 2, + base_poise_damage: 0, + poise_damage_increase: 0, knockback: 10.0, range: 4.0, angle: 30.0, @@ -18,8 +18,8 @@ ComboMelee( stage: 2, base_damage: 80, damage_increase: 15, - base_poise_damage: 10, - poise_damage_increase: 2, + base_poise_damage: 0, + poise_damage_increase: 0, knockback: 12.0, range: 3.5, angle: 180.0, @@ -32,8 +32,8 @@ ComboMelee( stage: 3, base_damage: 130, damage_increase: 20, - base_poise_damage: 10, - poise_damage_increase: 2, + base_poise_damage: 0, + poise_damage_increase: 0, knockback: 14.0, range: 6.0, angle: 10.0, diff --git a/assets/common/abilities/unique/beastclaws/basic.ron b/assets/common/abilities/unique/beastclaws/basic.ron index 26899baacc..cdc3a21430 100644 --- a/assets/common/abilities/unique/beastclaws/basic.ron +++ b/assets/common/abilities/unique/beastclaws/basic.ron @@ -5,7 +5,7 @@ BasicMelee( recover_duration: 250, knockback: 25.0, base_damage: 200, - base_poise_damage: 30, + base_poise_damage: 0, 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 a3fc57484c..7a3066bb06 100644 --- a/assets/common/abilities/unique/quadlowbasic/singlestrike.ron +++ b/assets/common/abilities/unique/quadlowbasic/singlestrike.ron @@ -4,8 +4,8 @@ ComboMelee( stage: 1, base_damage: 100, damage_increase: 0, - base_poise_damage: 30, - poise_damage_increase: 3, + base_poise_damage: 0, + poise_damage_increase: 0, knockback: 5.0, range: 3.5, angle: 60.0, diff --git a/assets/common/abilities/unique/quadlowbasic/triplestrike.ron b/assets/common/abilities/unique/quadlowbasic/triplestrike.ron index 5e3a07a5cd..fa9e4bcf23 100644 --- a/assets/common/abilities/unique/quadlowbasic/triplestrike.ron +++ b/assets/common/abilities/unique/quadlowbasic/triplestrike.ron @@ -4,8 +4,8 @@ ComboMelee( stage: 1, base_damage: 120, damage_increase: 0, - base_poise_damage: 10, - poise_damage_increase: 3, + base_poise_damage: 0, + poise_damage_increase: 0, knockback: 10.0, range: 3.5, angle: 30.0, @@ -18,8 +18,8 @@ ComboMelee( stage: 2, base_damage: 80, damage_increase: 0, - base_poise_damage: 10, - poise_damage_increase: 3, + base_poise_damage: 0, + poise_damage_increase: 0, knockback: 10.0, range: 3.5, angle: 30.0, @@ -32,8 +32,8 @@ ComboMelee( stage: 3, base_damage: 130, damage_increase: 0, - base_poise_damage: 10, - poise_damage_increase: 3, + base_poise_damage: 0, + poise_damage_increase: 0, knockback: 10.0, range: 3.5, angle: 30.0, diff --git a/assets/common/abilities/unique/quadlowbreathe/dash.ron b/assets/common/abilities/unique/quadlowbreathe/dash.ron index 642876f4ab..57709273c7 100644 --- a/assets/common/abilities/unique/quadlowbreathe/dash.ron +++ b/assets/common/abilities/unique/quadlowbreathe/dash.ron @@ -2,8 +2,8 @@ DashMelee( energy_cost: 0, base_damage: 150, scaled_damage: 110, - base_poise_damage: 60, - scaled_poise_damage: 20, + base_poise_damage: 0, + scaled_poise_damage: 0, base_knockback: 8.0, scaled_knockback: 17.0, range: 5.0, diff --git a/assets/common/abilities/unique/quadlowbreathe/triplestrike.ron b/assets/common/abilities/unique/quadlowbreathe/triplestrike.ron index 06897a32ae..1d4512be9a 100644 --- a/assets/common/abilities/unique/quadlowbreathe/triplestrike.ron +++ b/assets/common/abilities/unique/quadlowbreathe/triplestrike.ron @@ -4,8 +4,8 @@ ComboMelee( stage: 1, base_damage: 100, damage_increase: 0, - base_poise_damage: 10, - poise_damage_increase: 3, + base_poise_damage: 0, + poise_damage_increase: 0, knockback: 10.0, range: 4.5, angle: 30.0, @@ -18,8 +18,8 @@ ComboMelee( stage: 2, base_damage: 80, damage_increase: 0, - base_poise_damage: 10, - poise_damage_increase: 3, + base_poise_damage: 0, + poise_damage_increase: 0, knockback: 10.0, range: 3.5, angle: 30.0, @@ -32,8 +32,8 @@ ComboMelee( stage: 3, base_damage: 130, damage_increase: 0, - base_poise_damage: 10, - poise_damage_increase: 3, + base_poise_damage: 0, + poise_damage_increase: 0, knockback: 10.0, range: 3.5, angle: 30.0, diff --git a/assets/common/abilities/unique/quadlowquick/dash.ron b/assets/common/abilities/unique/quadlowquick/dash.ron index 8fe7975f79..7a0faf4799 100644 --- a/assets/common/abilities/unique/quadlowquick/dash.ron +++ b/assets/common/abilities/unique/quadlowquick/dash.ron @@ -2,8 +2,8 @@ DashMelee( energy_cost: 0, base_damage: 30, scaled_damage: 10, - base_poise_damage: 30, - scaled_poise_damage: 20, + base_poise_damage: 0, + scaled_poise_damage: 0, base_knockback: 8.0, scaled_knockback: 7.0, range: 2.0, diff --git a/assets/common/abilities/unique/quadlowquick/quadstrike.ron b/assets/common/abilities/unique/quadlowquick/quadstrike.ron index e4e09a38ab..0defac6e9b 100644 --- a/assets/common/abilities/unique/quadlowquick/quadstrike.ron +++ b/assets/common/abilities/unique/quadlowquick/quadstrike.ron @@ -4,8 +4,8 @@ ComboMelee( stage: 1, base_damage: 100, damage_increase: 0, - base_poise_damage: 10, - poise_damage_increase: 3, + base_poise_damage: 0, + poise_damage_increase: 0, knockback: 2.0, range: 3.5, angle: 30.0, @@ -18,8 +18,8 @@ ComboMelee( stage: 2, base_damage: 130, damage_increase: 0, - base_poise_damage: 10, - poise_damage_increase: 3, + base_poise_damage: 0, + poise_damage_increase: 0, knockback: 2.0, range: 3.5, angle: 30.0, @@ -32,8 +32,8 @@ ComboMelee( stage: 3, base_damage: 130, damage_increase: 0, - base_poise_damage: 10, - poise_damage_increase: 3, + base_poise_damage: 0, + poise_damage_increase: 0, knockback: 2.0, range: 3.5, angle: 30.0, @@ -46,8 +46,8 @@ ComboMelee( stage: 4, base_damage: 130, damage_increase: 0, - base_poise_damage: 10, - poise_damage_increase: 3, + base_poise_damage: 0, + poise_damage_increase: 0, knockback: 8.0, range: 3.5, angle: 30.0, diff --git a/assets/common/abilities/unique/quadlowranged/firebomb.ron b/assets/common/abilities/unique/quadlowranged/firebomb.ron index 266cf07e76..f304e66fa0 100644 --- a/assets/common/abilities/unique/quadlowranged/firebomb.ron +++ b/assets/common/abilities/unique/quadlowranged/firebomb.ron @@ -4,7 +4,7 @@ BasicRanged( recover_duration: 350, projectile: Fireball( damage: 100.0, - poise_damage: 10, + poise_damage: 0, radius: 5.0, energy_regen: 0, ), diff --git a/assets/common/abilities/unique/quadlowranged/singlestrike.ron b/assets/common/abilities/unique/quadlowranged/singlestrike.ron index 044eaeb191..d3711a4c46 100644 --- a/assets/common/abilities/unique/quadlowranged/singlestrike.ron +++ b/assets/common/abilities/unique/quadlowranged/singlestrike.ron @@ -4,8 +4,8 @@ ComboMelee( stage: 1, base_damage: 60, damage_increase: 0, - base_poise_damage: 30, - poise_damage_increase: 3, + base_poise_damage: 0, + poise_damage_increase: 0, knockback: 5.0, range: 3.5, angle: 60.0, diff --git a/assets/common/abilities/unique/quadlowtail/charged.ron b/assets/common/abilities/unique/quadlowtail/charged.ron index ab79490af7..b4a8c0006c 100644 --- a/assets/common/abilities/unique/quadlowtail/charged.ron +++ b/assets/common/abilities/unique/quadlowtail/charged.ron @@ -3,8 +3,8 @@ ChargedMelee( energy_drain: 0, initial_damage: 160, scaled_damage: 40, - initial_poise_damage: 50, - scaled_poise_damage: 20, + initial_poise_damage: 0, + scaled_poise_damage: 0, initial_knockback: 10.0, scaled_knockback: 20.0, range: 6.0, diff --git a/assets/common/abilities/unique/quadlowtail/triplestrike.ron b/assets/common/abilities/unique/quadlowtail/triplestrike.ron index c55935f53c..133304cba4 100644 --- a/assets/common/abilities/unique/quadlowtail/triplestrike.ron +++ b/assets/common/abilities/unique/quadlowtail/triplestrike.ron @@ -4,8 +4,8 @@ ComboMelee( stage: 1, base_damage: 100, damage_increase: 0, - base_poise_damage: 10, - poise_damage_increase: 3, + base_poise_damage: 0, + poise_damage_increase: 0, knockback: 10.0, range: 3.5, angle: 30.0, @@ -18,8 +18,8 @@ ComboMelee( stage: 2, base_damage: 120, damage_increase: 0, - base_poise_damage: 10, - poise_damage_increase: 3, + base_poise_damage: 0, + poise_damage_increase: 0, knockback: 10.0, range: 3.5, angle: 30.0, @@ -32,8 +32,8 @@ ComboMelee( stage: 3, base_damage: 130, damage_increase: 0, - base_poise_damage: 10, - poise_damage_increase: 3, + base_poise_damage: 0, + poise_damage_increase: 0, knockback: 10.0, range: 3.5, angle: 30.0, diff --git a/assets/common/abilities/unique/quadmedbasic/singlestrike.ron b/assets/common/abilities/unique/quadmedbasic/singlestrike.ron index 29ea9ee59c..3138f0e7cd 100644 --- a/assets/common/abilities/unique/quadmedbasic/singlestrike.ron +++ b/assets/common/abilities/unique/quadmedbasic/singlestrike.ron @@ -4,8 +4,8 @@ ComboMelee( stage: 1, base_damage: 120, damage_increase: 0, - base_poise_damage: 10, - poise_damage_increase: 3, + base_poise_damage: 0, + poise_damage_increase: 0, knockback: 5.0, range: 3.5, angle: 60.0, diff --git a/assets/common/abilities/unique/quadmedbasic/triplestrike.ron b/assets/common/abilities/unique/quadmedbasic/triplestrike.ron index 21724f88e9..7479271ed7 100644 --- a/assets/common/abilities/unique/quadmedbasic/triplestrike.ron +++ b/assets/common/abilities/unique/quadmedbasic/triplestrike.ron @@ -4,8 +4,8 @@ ComboMelee( stage: 1, base_damage: 120, damage_increase: 0, - base_poise_damage: 10, - poise_damage_increase: 3, + base_poise_damage: 0, + poise_damage_increase: 0, knockback: 10.0, range: 3.5, angle: 30.0, @@ -18,8 +18,8 @@ ComboMelee( stage: 2, base_damage: 120, damage_increase: 0, - base_poise_damage: 10, - poise_damage_increase: 3, + base_poise_damage: 0, + poise_damage_increase: 0, knockback: 10.0, range: 3.5, angle: 30.0, @@ -32,8 +32,8 @@ ComboMelee( stage: 3, base_damage: 120, damage_increase: 0, - base_poise_damage: 10, - poise_damage_increase: 3, + base_poise_damage: 0, + poise_damage_increase: 0, knockback: 10.0, range: 3.5, angle: 30.0, diff --git a/assets/common/abilities/unique/quadmedcharge/dash.ron b/assets/common/abilities/unique/quadmedcharge/dash.ron index fe589ec6d8..9f4acc580f 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: 40, - scaled_poise_damage: 15, + base_poise_damage: 0, + scaled_poise_damage: 0, 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 10e5d6eed2..850d652f47 100644 --- a/assets/common/abilities/unique/quadmedcharge/doublestrike.ron +++ b/assets/common/abilities/unique/quadmedcharge/doublestrike.ron @@ -4,8 +4,8 @@ ComboMelee( stage: 1, base_damage: 100, damage_increase: 0, - base_poise_damage: 10, - poise_damage_increase: 3, + base_poise_damage: 0, + poise_damage_increase: 0, knockback: 10.0, range: 3.5, angle: 30.0, @@ -18,8 +18,8 @@ ComboMelee( stage: 2, base_damage: 80, damage_increase: 0, - base_poise_damage: 10, - poise_damage_increase: 3, + base_poise_damage: 0, + poise_damage_increase: 0, knockback: 10.0, range: 3.5, angle: 30.0, diff --git a/assets/common/abilities/unique/quadmedhoof/basic.ron b/assets/common/abilities/unique/quadmedhoof/basic.ron index 77916236c2..8e517a4f7f 100644 --- a/assets/common/abilities/unique/quadmedhoof/basic.ron +++ b/assets/common/abilities/unique/quadmedhoof/basic.ron @@ -4,7 +4,7 @@ BasicMelee( swing_duration: 500, recover_duration: 350, base_damage: 130, - base_poise_damage: 70, + base_poise_damage: 0, 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 898249dd4e..68c8084ce9 100644 --- a/assets/common/abilities/unique/quadmedjump/doublestrike.ron +++ b/assets/common/abilities/unique/quadmedjump/doublestrike.ron @@ -4,8 +4,8 @@ ComboMelee( stage: 1, base_damage: 100, damage_increase: 0, - base_poise_damage: 10, - poise_damage_increase: 3, + base_poise_damage: 0, + poise_damage_increase: 0, knockback: 8.0, range: 3.5, angle: 30.0, @@ -18,8 +18,8 @@ ComboMelee( stage: 2, base_damage: 80, damage_increase: 0, - base_poise_damage: 10, - poise_damage_increase: 3, + base_poise_damage: 0, + poise_damage_increase: 0, knockback: 8.0, range: 3.5, angle: 30.0, diff --git a/assets/common/abilities/unique/quadmedjump/leap.ron b/assets/common/abilities/unique/quadmedjump/leap.ron index 0752c561ad..bf6c78c3ce 100644 --- a/assets/common/abilities/unique/quadmedjump/leap.ron +++ b/assets/common/abilities/unique/quadmedjump/leap.ron @@ -5,7 +5,7 @@ LeapMelee( swing_duration: 75, recover_duration: 200, base_damage: 240, - base_poise_damage: 15, + base_poise_damage: 0, knockback: 12.0, range: 4.5, max_angle: 180.0, diff --git a/assets/common/abilities/unique/quadmedjump/quickleap.ron b/assets/common/abilities/unique/quadmedjump/quickleap.ron index 4e119ee0ea..94b614ad12 100644 --- a/assets/common/abilities/unique/quadmedjump/quickleap.ron +++ b/assets/common/abilities/unique/quadmedjump/quickleap.ron @@ -5,7 +5,7 @@ LeapMelee( swing_duration: 75, recover_duration: 125, base_damage: 120, - base_poise_damage: 15, + base_poise_damage: 0, knockback: 7.0, range: 4.5, max_angle: 180.0, diff --git a/assets/common/abilities/unique/quadmedquick/dash.ron b/assets/common/abilities/unique/quadmedquick/dash.ron index d58925638d..c0cd1dc9fc 100644 --- a/assets/common/abilities/unique/quadmedquick/dash.ron +++ b/assets/common/abilities/unique/quadmedquick/dash.ron @@ -2,8 +2,8 @@ DashMelee( energy_cost: 0, base_damage: 130, scaled_damage: 20, - base_poise_damage: 30, - scaled_poise_damage: 5, + base_poise_damage: 0, + scaled_poise_damage: 0, base_knockback: 8.0, scaled_knockback: 7.0, range: 2.0, diff --git a/assets/common/abilities/unique/quadmedquick/triplestrike.ron b/assets/common/abilities/unique/quadmedquick/triplestrike.ron index 762725cb80..b396bedc0d 100644 --- a/assets/common/abilities/unique/quadmedquick/triplestrike.ron +++ b/assets/common/abilities/unique/quadmedquick/triplestrike.ron @@ -4,8 +4,8 @@ ComboMelee( stage: 1, base_damage: 150, damage_increase: 0, - base_poise_damage: 10, - poise_damage_increase: 3, + base_poise_damage: 0, + poise_damage_increase: 0, knockback: 5.0, range: 3.5, angle: 60.0, @@ -18,8 +18,8 @@ ComboMelee( stage: 2, base_damage: 150, damage_increase: 0, - base_poise_damage: 10, - poise_damage_increase: 3, + base_poise_damage: 0, + poise_damage_increase: 0, knockback: 5.0, range: 3.5, angle: 60.0, @@ -32,8 +32,8 @@ ComboMelee( stage: 3, base_damage: 150, damage_increase: 0, - base_poise_damage: 10, - poise_damage_increase: 3, + base_poise_damage: 0, + poise_damage_increase: 0, knockback: 5.0, range: 3.5, angle: 60.0, diff --git a/assets/common/abilities/unique/quadsmallbasic/singlestrike.ron b/assets/common/abilities/unique/quadsmallbasic/singlestrike.ron index 97af22308a..0526899e60 100644 --- a/assets/common/abilities/unique/quadsmallbasic/singlestrike.ron +++ b/assets/common/abilities/unique/quadsmallbasic/singlestrike.ron @@ -4,8 +4,8 @@ ComboMelee( stage: 1, base_damage: 30, damage_increase: 0, - base_poise_damage: 10, - poise_damage_increase: 2, + base_poise_damage: 0, + poise_damage_increase: 0, knockback: 5.0, range: 3.5, angle: 60.0, diff --git a/assets/common/abilities/unique/stonegolemfist/basic.ron b/assets/common/abilities/unique/stonegolemfist/basic.ron index d3c048db89..2dc89b8cac 100644 --- a/assets/common/abilities/unique/stonegolemfist/basic.ron +++ b/assets/common/abilities/unique/stonegolemfist/basic.ron @@ -5,7 +5,7 @@ BasicMelee( recover_duration: 250, knockback: 25.0, base_damage: 200, - base_poise_damage: 90, + base_poise_damage: 0, range: 5.0, max_angle: 120.0, ) diff --git a/assets/common/abilities/unique/stonegolemfist/shockwave.ron b/assets/common/abilities/unique/stonegolemfist/shockwave.ron index 47ec08b62a..7945e5d9c3 100644 --- a/assets/common/abilities/unique/stonegolemfist/shockwave.ron +++ b/assets/common/abilities/unique/stonegolemfist/shockwave.ron @@ -4,7 +4,7 @@ Shockwave( swing_duration: 200, recover_duration: 800, damage: 500, - poise_damage: 50, + poise_damage: 0, knockback: TowardsUp(40.0), shockwave_angle: 90.0, shockwave_vertical_angle: 90.0, diff --git a/assets/common/abilities/unique/stonegolemfist/spin.ron b/assets/common/abilities/unique/stonegolemfist/spin.ron index 06f2756ffb..fb106e851f 100644 --- a/assets/common/abilities/unique/stonegolemfist/spin.ron +++ b/assets/common/abilities/unique/stonegolemfist/spin.ron @@ -3,6 +3,7 @@ SpinMelee( swing_duration: 300, recover_duration: 100, base_damage: 500, + base_poise_damage: 0, knockback: 0.0, range: 7.5, energy_cost: 0, @@ -11,4 +12,4 @@ SpinMelee( is_interruptible: false, forward_speed: 0.0, num_spins: 1, -) \ No newline at end of file +) diff --git a/assets/common/abilities/unique/theropodbasic/singlestrike.ron b/assets/common/abilities/unique/theropodbasic/singlestrike.ron index 1351e14ed1..8c84abc5da 100644 --- a/assets/common/abilities/unique/theropodbasic/singlestrike.ron +++ b/assets/common/abilities/unique/theropodbasic/singlestrike.ron @@ -4,8 +4,8 @@ ComboMelee( stage: 1, base_damage: 150, damage_increase: 0, - base_poise_damage: 15, - poise_damage_increase: 2, + base_poise_damage: 0, + poise_damage_increase: 0, knockback: 5.0, range: 7.5, angle: 60.0, diff --git a/assets/common/abilities/unique/theropodbasic/triplestrike.ron b/assets/common/abilities/unique/theropodbasic/triplestrike.ron index 95b6a3b4de..839749b65b 100644 --- a/assets/common/abilities/unique/theropodbasic/triplestrike.ron +++ b/assets/common/abilities/unique/theropodbasic/triplestrike.ron @@ -4,8 +4,8 @@ ComboMelee( stage: 1, base_damage: 170, damage_increase: 0, - base_poise_damage: 10, - poise_damage_increase: 2, + base_poise_damage: 0, + poise_damage_increase: 0, knockback: 10.0, range: 7.5, angle: 30.0, @@ -18,8 +18,8 @@ ComboMelee( stage: 2, base_damage: 190, damage_increase: 0, - base_poise_damage: 10, - poise_damage_increase: 2, + base_poise_damage: 0, + poise_damage_increase: 0, knockback: 10.0, range: 5.5, angle: 30.0, @@ -32,8 +32,8 @@ ComboMelee( stage: 3, base_damage: 230, damage_increase: 0, - base_poise_damage: 10, - poise_damage_increase: 2, + base_poise_damage: 0, + poise_damage_increase: 0, knockback: 10.0, range: 5.5, angle: 30.0, diff --git a/assets/common/abilities/unique/theropodbird/singlestrike.ron b/assets/common/abilities/unique/theropodbird/singlestrike.ron index 97740a9e73..56f8b3b137 100644 --- a/assets/common/abilities/unique/theropodbird/singlestrike.ron +++ b/assets/common/abilities/unique/theropodbird/singlestrike.ron @@ -4,8 +4,8 @@ ComboMelee( stage: 1, base_damage: 150, damage_increase: 0, - base_poise_damage: 10, - poise_damage_increase: 2, + base_poise_damage: 0, + poise_damage_increase: 0, knockback: 5.0, range: 5.5, angle: 5.0, diff --git a/assets/common/abilities/unique/theropodbird/triplestrike.ron b/assets/common/abilities/unique/theropodbird/triplestrike.ron index 786a6b711f..853c2583a2 100644 --- a/assets/common/abilities/unique/theropodbird/triplestrike.ron +++ b/assets/common/abilities/unique/theropodbird/triplestrike.ron @@ -4,8 +4,8 @@ ComboMelee( stage: 1, base_damage: 170, damage_increase: 0, - base_poise_damage: 10, - poise_damage_increase: 2, + base_poise_damage: 0, + poise_damage_increase: 0, knockback: 10.0, range: 4.5, angle: 5.0, @@ -18,8 +18,8 @@ ComboMelee( stage: 2, base_damage: 190, damage_increase: 0, - base_poise_damage: 10, - poise_damage_increase: 2, + base_poise_damage: 0, + poise_damage_increase: 0, knockback: 10.0, range: 4.0, angle: 10.0, @@ -32,8 +32,8 @@ ComboMelee( stage: 3, base_damage: 230, damage_increase: 0, - base_poise_damage: 10, - poise_damage_increase: 2, + base_poise_damage: 0, + poise_damage_increase: 0, knockback: 10.0, range: 4.0, angle: 10.0, diff --git a/assets/common/items/debug/admin_black_hole.ron b/assets/common/items/debug/admin_black_hole.ron index f2ec6911d7..ed80c08e20 100644 --- a/assets/common/items/debug/admin_black_hole.ron +++ b/assets/common/items/debug/admin_black_hole.ron @@ -4,7 +4,10 @@ ItemDef( kind: Armor( ( kind: Bag("BrownFace"), - stats: (protection: Normal(0.0)), + stats: ( + protection: Normal(0.0), + poise_protection: Normal(0.0) + ), ) ), quality: Artifact, diff --git a/assets/common/items/weapons/sceptre/fork0.ron b/assets/common/items/weapons/sceptre/fork0.ron index 2720258e28..cb0a9d1bda 100644 --- a/assets/common/items/weapons/sceptre/fork0.ron +++ b/assets/common/items/weapons/sceptre/fork0.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 400, power: 2.0, + poise_power: 1.5, speed: 0.8 ), ) diff --git a/assets/common/items/weapons/sceptre/loops0.ron b/assets/common/items/weapons/sceptre/loops0.ron index 4f67fefb71..b7833f4bc9 100644 --- a/assets/common/items/weapons/sceptre/loops0.ron +++ b/assets/common/items/weapons/sceptre/loops0.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 400, power: 1.2, + poise_power: 1.5, speed: 1.5 ), ) diff --git a/assets/common/items/weapons/sceptre/moon0.ron b/assets/common/items/weapons/sceptre/moon0.ron index b77a981837..d2eea6caa9 100644 --- a/assets/common/items/weapons/sceptre/moon0.ron +++ b/assets/common/items/weapons/sceptre/moon0.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 400, power: 1.6, + poise_power: 1.5, speed: 0.5 ), ) diff --git a/assets/common/items/weapons/sceptre/root_evil.ron b/assets/common/items/weapons/sceptre/root_evil.ron index 488423bbad..b51adfc7c1 100644 --- a/assets/common/items/weapons/sceptre/root_evil.ron +++ b/assets/common/items/weapons/sceptre/root_evil.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 400, power: 4.0, + poise_power: 1.5, speed: 0.5 ), ) diff --git a/assets/common/items/weapons/sceptre/root_green0.ron b/assets/common/items/weapons/sceptre/root_green0.ron index a2dc37d073..a5d5d55662 100644 --- a/assets/common/items/weapons/sceptre/root_green0.ron +++ b/assets/common/items/weapons/sceptre/root_green0.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 400, power: 3.5, + poise_power: 1.5, speed: 0.4 ), ) diff --git a/assets/common/items/weapons/sceptre/totem_green.ron b/assets/common/items/weapons/sceptre/totem_green.ron index 54415c7f20..4a500e5b8a 100644 --- a/assets/common/items/weapons/sceptre/totem_green.ron +++ b/assets/common/items/weapons/sceptre/totem_green.ron @@ -8,6 +8,7 @@ ItemDef( stats: ( equip_time_millis: 400, power: 1.0, + poise_power: 1.5, speed: 1.2 ), ) diff --git a/server/src/sys/terrain.rs b/server/src/sys/terrain.rs index 0f303be62a..6c493baf7b 100644 --- a/server/src/sys/terrain.rs +++ b/server/src/sys/terrain.rs @@ -152,7 +152,7 @@ impl<'a> System<'a> for Sys { LoadoutBuilder::build_loadout(body, main_tool, loadout_config).build(); let health = comp::Health::new(body, entity.level.unwrap_or(0)); - let poise = comp::Poise::new(stats.body_type); + let poise = comp::Poise::new(body); let can_speak = match body { comp::Body::Humanoid(_) => alignment == comp::Alignment::Npc, diff --git a/voxygen/src/hud/util.rs b/voxygen/src/hud/util.rs index 6f1740a16c..084ef8d8a7 100644 --- a/voxygen/src/hud/util.rs +++ b/voxygen/src/hud/util.rs @@ -73,14 +73,16 @@ fn armor_desc(armor: &Armor, desc: &str, slots: u16) -> String { Protection::Normal(a) => a.to_string(), Protection::Invincible => "Inf".to_string(), }; - let armor_poise_protection = match armor.get_poise_protection() { - Protection::Normal(a) => a.to_string(), - Protection::Invincible => "Inf".to_string(), - }; + //let armor_poise_protection = match armor.get_poise_protection() { + // Protection::Normal(a) => a.to_string(), + // Protection::Invincible => "Inf".to_string(), + //}; let mut description = format!( - "{}\n\nArmor: {}\n\nPoise Protection: {}", - kind, armor_protection, armor_poise_protection + "{}\n\nArmor: {}", + //"{}\n\nArmor: {}\n\nPoise Protection: {}", + kind, + armor_protection, /* armor_poise_protection // Add back when we are ready for poise */ ); if !desc.is_empty() { @@ -113,28 +115,32 @@ fn tool_desc(tool: &Tool, desc: &str) -> String { // Get tool stats let power = tool.base_power(); - let poise_power = tool.base_poise_power(); + //let poise_power = tool.base_poise_power(); let speed = tool.base_speed(); if !desc.is_empty() { format!( - "{}\n\nDPS: {:0.1}\n\nPower: {:0.1}\n\nPoise Power: {:0.1}\n\nSpeed: \ - {:0.1}\n\n{}\n\n", + "{}\n\nDPS: {:0.1}\n\nPower: {:0.1}\n\nSpeed: {:0.1}\n\n{}\n\n", + // add back when ready for poise + //"{}\n\nDPS: {:0.1}\n\nPower: {:0.1}\n\nPoise Power: {:0.1}\n\nSpeed: \ + // {:0.1}\n\n{}\n\n", kind, speed * power * 10.0, // Damage per second power * 10.0, - poise_power * 10.0, + //poise_power * 10.0, speed, desc ) } else { format!( - "{}\n\nDPS: {:0.1}\n\nPower: {:0.1}\n\nPoise Power: {:0.1}\n\nSpeed: \ - {:0.1}\n\n", + "{}\n\nDPS: {:0.1}\n\nPower: {:0.1}\n\nSpeed: {:0.1}\n\n", + // add back when ready for poise + //"{}\n\nDPS: {:0.1}\n\nPower: {:0.1}\n\nPoise Power: {:0.1}\n\nSpeed: \ + // {:0.1}\n\n", kind, speed * power * 10.0, // Damage per second power * 10.0, - poise_power * 10.0, + //poise_power * 10.0, speed ) }