From 896d2a5b63cc204bfb5e7741b65aef2af49cf7d9 Mon Sep 17 00:00:00 2001 From: jshipsey Date: Thu, 15 Apr 2021 02:49:12 -0400 Subject: [PATCH] combat tweaks --- assets/common/abilities/axe/doublestrike.ron | 4 ++-- .../common/abilities/hammer/singlestrike.ron | 2 +- .../abilities/hammersimple/doublestrike.ron | 4 ++-- assets/common/abilities/spear/dash.ron | 2 +- .../common/abilities/spear/doublestrike.ron | 4 ++-- .../common/abilities/sword/triplestrike.ron | 6 +++--- .../abilities/unique/husk/singlestrike.ron | 2 +- .../abilities/unique/husk/triplestrike.ron | 6 +++--- .../unique/quadlowbasic/singlestrike.ron | 2 +- .../unique/quadlowbasic/triplestrike.ron | 6 +++--- .../abilities/unique/quadlowbreathe/dash.ron | 2 +- .../abilities/unique/quadlowquick/dash.ron | 2 +- .../unique/quadlowquick/quadstrike.ron | 14 ++++++------- .../unique/quadlowranged/singlestrike.ron | 2 +- .../unique/quadlowtail/triplestrike.ron | 6 +++--- .../unique/quadmedbasic/singlestrike.ron | 2 +- .../unique/quadmedbasic/triplestrike.ron | 6 +++--- .../abilities/unique/quadmedcharge/dash.ron | 2 +- .../unique/quadmedcharge/doublestrike.ron | 4 ++-- .../abilities/unique/quadmedhoof/basic.ron | 2 +- .../abilities/unique/quadmedquick/dash.ron | 4 ++-- .../unique/quadmedquick/triplestrike.ron | 6 +++--- .../unique/theropodbird/singlestrike.ron | 2 +- .../items/weapons/axe/bloodsteel_axe-0.ron | 2 +- .../items/weapons/axe/bloodsteel_axe-1.ron | 2 +- .../items/weapons/axe/bloodsteel_axe-2.ron | 2 +- .../common/items/weapons/axe/bronze_axe-0.ron | 2 +- .../common/items/weapons/axe/bronze_axe-1.ron | 2 +- .../common/items/weapons/axe/bronze_axe-2.ron | 2 +- .../common/items/weapons/axe/iron_axe-0.ron | 2 +- .../common/items/weapons/axe/iron_axe-1.ron | 2 +- .../common/items/weapons/axe/iron_axe-2.ron | 2 +- .../common/items/weapons/axe/iron_axe-3.ron | 2 +- .../common/items/weapons/axe/iron_axe-4.ron | 2 +- .../common/items/weapons/axe/iron_axe-5.ron | 2 +- .../common/items/weapons/axe/iron_axe-6.ron | 2 +- .../common/items/weapons/axe/iron_axe-7.ron | 2 +- .../common/items/weapons/axe/iron_axe-8.ron | 2 +- .../common/items/weapons/axe/iron_axe-9.ron | 2 +- .../items/weapons/axe/malachite_axe-0.ron | 2 +- assets/common/items/weapons/axe/orc_axe-0.ron | 2 +- assets/common/items/weapons/axe/parashu.ron | 2 +- .../common/items/weapons/axe/starter_axe.ron | 2 +- .../common/items/weapons/axe/steel_axe-0.ron | 2 +- .../common/items/weapons/axe/steel_axe-1.ron | 2 +- .../common/items/weapons/axe/steel_axe-2.ron | 2 +- .../common/items/weapons/axe/steel_axe-3.ron | 2 +- .../common/items/weapons/axe/steel_axe-4.ron | 2 +- .../common/items/weapons/axe/steel_axe-5.ron | 2 +- .../items/weapons/axe/worn_iron_axe-0.ron | 2 +- .../items/weapons/axe/worn_iron_axe-1.ron | 2 +- .../items/weapons/axe/worn_iron_axe-2.ron | 2 +- .../items/weapons/axe/worn_iron_axe-3.ron | 2 +- .../items/weapons/axe/worn_iron_axe-4.ron | 2 +- common/sys/src/character_behavior.rs | 20 +++++++++---------- voxygen/anim/src/biped_small/stunned.rs | 6 +++--- voxygen/anim/src/character/staggered.rs | 9 ++++++--- voxygen/anim/src/character/stunned.rs | 7 ++++--- world/src/site/dungeon/mod.rs | 5 +++-- 59 files changed, 103 insertions(+), 98 deletions(-) diff --git a/assets/common/abilities/axe/doublestrike.ron b/assets/common/abilities/axe/doublestrike.ron index 2864244cb9..cb5e307c79 100644 --- a/assets/common/abilities/axe/doublestrike.ron +++ b/assets/common/abilities/axe/doublestrike.ron @@ -3,7 +3,7 @@ ComboMelee( ( stage: 1, base_damage: 90, - base_poise_damage: 15, + base_poise_damage: 12, damage_increase: 10, poise_damage_increase: 0, knockback: 8.0, @@ -17,7 +17,7 @@ ComboMelee( ( stage: 2, base_damage: 130, - base_poise_damage: 35, + base_poise_damage: 20, damage_increase: 15, poise_damage_increase: 0, knockback: 12.0, diff --git a/assets/common/abilities/hammer/singlestrike.ron b/assets/common/abilities/hammer/singlestrike.ron index 7c4ce65e6d..bfa3e19a25 100644 --- a/assets/common/abilities/hammer/singlestrike.ron +++ b/assets/common/abilities/hammer/singlestrike.ron @@ -3,7 +3,7 @@ ComboMelee( stage: 1, base_damage: 150, damage_increase: 10, - base_poise_damage: 40, + base_poise_damage: 25, poise_damage_increase: 0, knockback: 10.0, range: 4.5, diff --git a/assets/common/abilities/hammersimple/doublestrike.ron b/assets/common/abilities/hammersimple/doublestrike.ron index 7dfe46f9fe..90116affea 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: 45, + base_poise_damage: 30, 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: 45, + base_poise_damage: 30, 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 b15f47e7de..a93ddd39a0 100644 --- a/assets/common/abilities/spear/dash.ron +++ b/assets/common/abilities/spear/dash.ron @@ -2,7 +2,7 @@ DashMelee( energy_cost: 100, base_damage: 80, scaled_damage: 160, - base_poise_damage: 60, + base_poise_damage: 45, scaled_poise_damage: 0, base_knockback: 8.0, scaled_knockback: 7.0, diff --git a/assets/common/abilities/spear/doublestrike.ron b/assets/common/abilities/spear/doublestrike.ron index dcbd38ac54..2501d5b044 100644 --- a/assets/common/abilities/spear/doublestrike.ron +++ b/assets/common/abilities/spear/doublestrike.ron @@ -4,7 +4,7 @@ ComboMelee( stage: 1, base_damage: 90, damage_increase: 10, - base_poise_damage: 30, + base_poise_damage: 18, poise_damage_increase: 0, knockback: 4.0, range: 2.5, @@ -18,7 +18,7 @@ ComboMelee( stage: 2, base_damage: 130, damage_increase: 20, - base_poise_damage: 30, + base_poise_damage: 18, poise_damage_increase: 0, knockback: 7.0, range: 2.5, diff --git a/assets/common/abilities/sword/triplestrike.ron b/assets/common/abilities/sword/triplestrike.ron index 904cf1f750..c8c03b46ee 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: 15, + base_poise_damage: 10, 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: 17, + base_poise_damage: 13, 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: 20, + base_poise_damage: 15, poise_damage_increase: 0, knockback: 14.0, range: 6.0, diff --git a/assets/common/abilities/unique/husk/singlestrike.ron b/assets/common/abilities/unique/husk/singlestrike.ron index a9b41eea6e..3e6c6ba13e 100644 --- a/assets/common/abilities/unique/husk/singlestrike.ron +++ b/assets/common/abilities/unique/husk/singlestrike.ron @@ -4,7 +4,7 @@ ComboMelee( stage: 1, base_damage: 90, damage_increase: 0, - base_poise_damage: 30, + base_poise_damage: 12, poise_damage_increase: 0, knockback: 5.0, range: 3.5, diff --git a/assets/common/abilities/unique/husk/triplestrike.ron b/assets/common/abilities/unique/husk/triplestrike.ron index 6c453419b0..cccb53cb4a 100644 --- a/assets/common/abilities/unique/husk/triplestrike.ron +++ b/assets/common/abilities/unique/husk/triplestrike.ron @@ -4,7 +4,7 @@ ComboMelee( stage: 1, base_damage: 120, damage_increase: 0, - base_poise_damage: 35, + base_poise_damage: 8, poise_damage_increase: 0, knockback: 5.0, range: 3.5, @@ -18,7 +18,7 @@ ComboMelee( stage: 2, base_damage: 120, damage_increase: 0, - base_poise_damage: 35, + base_poise_damage: 10, poise_damage_increase: 0, knockback: 5.0, range: 3.5, @@ -32,7 +32,7 @@ ComboMelee( stage: 3, base_damage: 120, damage_increase: 0, - base_poise_damage: 35, + base_poise_damage: 12, poise_damage_increase: 0, knockback: 5.0, range: 3.5, diff --git a/assets/common/abilities/unique/quadlowbasic/singlestrike.ron b/assets/common/abilities/unique/quadlowbasic/singlestrike.ron index fcfd98953d..f073998ccd 100644 --- a/assets/common/abilities/unique/quadlowbasic/singlestrike.ron +++ b/assets/common/abilities/unique/quadlowbasic/singlestrike.ron @@ -4,7 +4,7 @@ ComboMelee( stage: 1, base_damage: 100, damage_increase: 0, - base_poise_damage: 40, + base_poise_damage: 28, poise_damage_increase: 0, knockback: 3.0, range: 3.5, diff --git a/assets/common/abilities/unique/quadlowbasic/triplestrike.ron b/assets/common/abilities/unique/quadlowbasic/triplestrike.ron index cde38787d3..2f9b7235e1 100644 --- a/assets/common/abilities/unique/quadlowbasic/triplestrike.ron +++ b/assets/common/abilities/unique/quadlowbasic/triplestrike.ron @@ -4,7 +4,7 @@ ComboMelee( stage: 1, base_damage: 120, damage_increase: 0, - base_poise_damage: 30, + base_poise_damage: 15, poise_damage_increase: 0, knockback: 7.0, range: 3.5, @@ -18,7 +18,7 @@ ComboMelee( stage: 2, base_damage: 80, damage_increase: 0, - base_poise_damage: 30, + base_poise_damage: 18, poise_damage_increase: 0, knockback: 7.0, range: 3.5, @@ -32,7 +32,7 @@ ComboMelee( stage: 3, base_damage: 130, damage_increase: 0, - base_poise_damage: 30, + base_poise_damage: 20, poise_damage_increase: 0, knockback: 7.0, range: 3.5, diff --git a/assets/common/abilities/unique/quadlowbreathe/dash.ron b/assets/common/abilities/unique/quadlowbreathe/dash.ron index d3e1effddb..fbd7cf66b0 100644 --- a/assets/common/abilities/unique/quadlowbreathe/dash.ron +++ b/assets/common/abilities/unique/quadlowbreathe/dash.ron @@ -2,7 +2,7 @@ DashMelee( energy_cost: 0, base_damage: 150, scaled_damage: 110, - base_poise_damage: 40, + base_poise_damage: 25, scaled_poise_damage: 0, base_knockback: 4.0, scaled_knockback: 17.0, diff --git a/assets/common/abilities/unique/quadlowquick/dash.ron b/assets/common/abilities/unique/quadlowquick/dash.ron index fee777ea0b..e27e8afae3 100644 --- a/assets/common/abilities/unique/quadlowquick/dash.ron +++ b/assets/common/abilities/unique/quadlowquick/dash.ron @@ -2,7 +2,7 @@ DashMelee( energy_cost: 0, base_damage: 30, scaled_damage: 10, - base_poise_damage: 40, + base_poise_damage: 30, scaled_poise_damage: 0, base_knockback: 2.0, scaled_knockback: 7.0, diff --git a/assets/common/abilities/unique/quadlowquick/quadstrike.ron b/assets/common/abilities/unique/quadlowquick/quadstrike.ron index 12e4cebca5..2551009e94 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: 0, - poise_damage_increase: 30, + base_poise_damage: 15, + 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: 0, - poise_damage_increase: 30, + base_poise_damage: 15, + poise_damage_increase: 0, knockback: 2.0, range: 3.5, angle: 30.0, @@ -32,7 +32,7 @@ ComboMelee( stage: 3, base_damage: 130, damage_increase: 0, - base_poise_damage: 30, + base_poise_damage: 15, poise_damage_increase: 0, knockback: 2.0, range: 3.5, @@ -46,8 +46,8 @@ ComboMelee( stage: 4, base_damage: 130, damage_increase: 0, - base_poise_damage: 0, - poise_damage_increase: 30, + base_poise_damage: 15, + poise_damage_increase: 0, knockback: 8.0, range: 3.5, angle: 30.0, diff --git a/assets/common/abilities/unique/quadlowranged/singlestrike.ron b/assets/common/abilities/unique/quadlowranged/singlestrike.ron index 8601c08693..8f5bd08b47 100644 --- a/assets/common/abilities/unique/quadlowranged/singlestrike.ron +++ b/assets/common/abilities/unique/quadlowranged/singlestrike.ron @@ -4,7 +4,7 @@ ComboMelee( stage: 1, base_damage: 60, damage_increase: 0, - base_poise_damage: 40, + base_poise_damage: 28, poise_damage_increase: 0, knockback: 3.0, range: 3.5, diff --git a/assets/common/abilities/unique/quadlowtail/triplestrike.ron b/assets/common/abilities/unique/quadlowtail/triplestrike.ron index cd47b9f65e..3eb48d0d6d 100644 --- a/assets/common/abilities/unique/quadlowtail/triplestrike.ron +++ b/assets/common/abilities/unique/quadlowtail/triplestrike.ron @@ -5,7 +5,7 @@ ComboMelee( base_damage: 100, damage_increase: 0, base_poise_damage: 0, - poise_damage_increase: 30, + poise_damage_increase: 22, knockback: 10.0, range: 3.5, angle: 30.0, @@ -18,7 +18,7 @@ ComboMelee( stage: 2, base_damage: 120, damage_increase: 0, - base_poise_damage: 30, + base_poise_damage: 22, 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: 30, + base_poise_damage: 22, 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 5818357edf..23b68ba22a 100644 --- a/assets/common/abilities/unique/quadmedbasic/singlestrike.ron +++ b/assets/common/abilities/unique/quadmedbasic/singlestrike.ron @@ -4,7 +4,7 @@ ComboMelee( stage: 1, base_damage: 120, damage_increase: 0, - base_poise_damage: 30, + base_poise_damage: 28, poise_damage_increase: 0, knockback: 5.0, range: 3.5, diff --git a/assets/common/abilities/unique/quadmedbasic/triplestrike.ron b/assets/common/abilities/unique/quadmedbasic/triplestrike.ron index 25d6eb42be..2cb36d3087 100644 --- a/assets/common/abilities/unique/quadmedbasic/triplestrike.ron +++ b/assets/common/abilities/unique/quadmedbasic/triplestrike.ron @@ -4,7 +4,7 @@ ComboMelee( stage: 1, base_damage: 120, damage_increase: 0, - base_poise_damage: 35, + base_poise_damage: 15, poise_damage_increase: 0, knockback: 5.0, range: 3.5, @@ -18,7 +18,7 @@ ComboMelee( stage: 2, base_damage: 120, damage_increase: 0, - base_poise_damage: 35, + base_poise_damage: 18, poise_damage_increase: 0, knockback: 5.0, range: 3.5, @@ -32,7 +32,7 @@ ComboMelee( stage: 3, base_damage: 120, damage_increase: 0, - base_poise_damage: 35, + base_poise_damage: 20, poise_damage_increase: 0, knockback: 5.0, range: 3.5, diff --git a/assets/common/abilities/unique/quadmedcharge/dash.ron b/assets/common/abilities/unique/quadmedcharge/dash.ron index 592890d1c7..92a2629bef 100644 --- a/assets/common/abilities/unique/quadmedcharge/dash.ron +++ b/assets/common/abilities/unique/quadmedcharge/dash.ron @@ -2,7 +2,7 @@ DashMelee( energy_cost: 0, base_damage: 150, scaled_damage: 40, - base_poise_damage: 40, + base_poise_damage: 28, scaled_poise_damage: 40, base_knockback: 8.0, scaled_knockback: 17.0, diff --git a/assets/common/abilities/unique/quadmedcharge/doublestrike.ron b/assets/common/abilities/unique/quadmedcharge/doublestrike.ron index 1a720d49bd..d6f7e75280 100644 --- a/assets/common/abilities/unique/quadmedcharge/doublestrike.ron +++ b/assets/common/abilities/unique/quadmedcharge/doublestrike.ron @@ -4,7 +4,7 @@ ComboMelee( stage: 1, base_damage: 100, damage_increase: 0, - base_poise_damage: 40, + base_poise_damage: 22, poise_damage_increase: 0, knockback: 10.0, range: 3.5, @@ -19,7 +19,7 @@ ComboMelee( base_damage: 80, damage_increase: 0, base_poise_damage: 0, - poise_damage_increase: 40, + poise_damage_increase: 22, 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 5417249f76..1852ca80f9 100644 --- a/assets/common/abilities/unique/quadmedhoof/basic.ron +++ b/assets/common/abilities/unique/quadmedhoof/basic.ron @@ -4,7 +4,7 @@ BasicMelee( swing_duration: 0.5, recover_duration: 0.35, base_damage: 130, - base_poise_damage: 30, + base_poise_damage: 28, knockback: 25.0, range: 3.0, max_angle: 120.0, diff --git a/assets/common/abilities/unique/quadmedquick/dash.ron b/assets/common/abilities/unique/quadmedquick/dash.ron index 8ee8f527a6..0a50952bc9 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: 40, - scaled_poise_damage: 60, + base_poise_damage: 28, + scaled_poise_damage: 28, base_knockback: 3.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 6db2921db3..0772444a59 100644 --- a/assets/common/abilities/unique/quadmedquick/triplestrike.ron +++ b/assets/common/abilities/unique/quadmedquick/triplestrike.ron @@ -4,7 +4,7 @@ ComboMelee( stage: 1, base_damage: 150, damage_increase: 0, - base_poise_damage: 30, + base_poise_damage: 15, poise_damage_increase: 0, knockback: 5.0, range: 3.5, @@ -18,7 +18,7 @@ ComboMelee( stage: 2, base_damage: 150, damage_increase: 0, - base_poise_damage: 30, + base_poise_damage: 17, poise_damage_increase: 0, knockback: 5.0, range: 3.5, @@ -32,7 +32,7 @@ ComboMelee( stage: 3, base_damage: 150, damage_increase: 0, - base_poise_damage: 30, + base_poise_damage: 20, poise_damage_increase: 0, knockback: 5.0, range: 3.5, diff --git a/assets/common/abilities/unique/theropodbird/singlestrike.ron b/assets/common/abilities/unique/theropodbird/singlestrike.ron index 9c97b320bb..07d5e1b04b 100644 --- a/assets/common/abilities/unique/theropodbird/singlestrike.ron +++ b/assets/common/abilities/unique/theropodbird/singlestrike.ron @@ -4,7 +4,7 @@ ComboMelee( stage: 1, base_damage: 150, damage_increase: 0, - base_poise_damage: 40, + base_poise_damage: 28, poise_damage_increase: 0, knockback: 2.0, range: 5.5, diff --git a/assets/common/items/weapons/axe/bloodsteel_axe-0.ron b/assets/common/items/weapons/axe/bloodsteel_axe-0.ron index 58a2c1dd22..e7119f89c3 100644 --- a/assets/common/items/weapons/axe/bloodsteel_axe-0.ron +++ b/assets/common/items/weapons/axe/bloodsteel_axe-0.ron @@ -7,7 +7,7 @@ ItemDef( stats: Direct(( equip_time_secs: 0.4, power: 1.8, - poise_strength: 1.4, + poise_strength: 1.0, speed: 1.0, crit_chance: 0.1421875, crit_mult: 1.4395604, diff --git a/assets/common/items/weapons/axe/bloodsteel_axe-1.ron b/assets/common/items/weapons/axe/bloodsteel_axe-1.ron index 85fb57be60..eb623e23ea 100644 --- a/assets/common/items/weapons/axe/bloodsteel_axe-1.ron +++ b/assets/common/items/weapons/axe/bloodsteel_axe-1.ron @@ -7,7 +7,7 @@ ItemDef( stats: Direct(( equip_time_secs: 0.4, power: 1.8, - poise_strength: 1.8, + poise_strength: 1.0, speed: 1.0, crit_chance: 0.1421875, crit_mult: 1.4395604, diff --git a/assets/common/items/weapons/axe/bloodsteel_axe-2.ron b/assets/common/items/weapons/axe/bloodsteel_axe-2.ron index 51c859d64c..e373f6db35 100644 --- a/assets/common/items/weapons/axe/bloodsteel_axe-2.ron +++ b/assets/common/items/weapons/axe/bloodsteel_axe-2.ron @@ -7,7 +7,7 @@ ItemDef( stats: Direct(( equip_time_secs: 0.4, power: 1.8, - poise_strength: 1.8, + poise_strength: 1.0, speed: 1.0, crit_chance: 0.1421875, crit_mult: 1.4395604, diff --git a/assets/common/items/weapons/axe/bronze_axe-0.ron b/assets/common/items/weapons/axe/bronze_axe-0.ron index b17e4812fc..61fd3b2656 100644 --- a/assets/common/items/weapons/axe/bronze_axe-0.ron +++ b/assets/common/items/weapons/axe/bronze_axe-0.ron @@ -7,7 +7,7 @@ ItemDef( stats: Direct(( equip_time_secs: 0.4, power: 1.0, - poise_strength: 0.9, + poise_strength: 1.0, speed: 1.0, crit_chance: 0.15, crit_mult: 1.5714285, diff --git a/assets/common/items/weapons/axe/bronze_axe-1.ron b/assets/common/items/weapons/axe/bronze_axe-1.ron index ce6d9b6b1a..f911742faa 100644 --- a/assets/common/items/weapons/axe/bronze_axe-1.ron +++ b/assets/common/items/weapons/axe/bronze_axe-1.ron @@ -7,7 +7,7 @@ ItemDef( stats: Direct(( equip_time_secs: 0.4, power: 1.0, - poise_strength: 1.5, + poise_strength: 1.0, speed: 1.0, crit_chance: 0.15, crit_mult: 1.5714285, diff --git a/assets/common/items/weapons/axe/bronze_axe-2.ron b/assets/common/items/weapons/axe/bronze_axe-2.ron index dae9b1d002..df31b93d5b 100644 --- a/assets/common/items/weapons/axe/bronze_axe-2.ron +++ b/assets/common/items/weapons/axe/bronze_axe-2.ron @@ -7,7 +7,7 @@ ItemDef( stats: Direct(( equip_time_secs: 0.4, power: 1.0, - poise_strength: 1.4, + poise_strength: 1.0, speed: 1.0, crit_chance: 0.15, crit_mult: 1.5714285, diff --git a/assets/common/items/weapons/axe/iron_axe-0.ron b/assets/common/items/weapons/axe/iron_axe-0.ron index 2122af63d5..de1c6b000a 100644 --- a/assets/common/items/weapons/axe/iron_axe-0.ron +++ b/assets/common/items/weapons/axe/iron_axe-0.ron @@ -7,7 +7,7 @@ ItemDef( stats: Direct(( equip_time_secs: 0.4, power: 1.2, - poise_strength: 1.7, + poise_strength: 1.0, speed: 1.0, crit_chance: 0.1375, crit_mult: 1.5194805, diff --git a/assets/common/items/weapons/axe/iron_axe-1.ron b/assets/common/items/weapons/axe/iron_axe-1.ron index e047307488..dd27cd78a9 100644 --- a/assets/common/items/weapons/axe/iron_axe-1.ron +++ b/assets/common/items/weapons/axe/iron_axe-1.ron @@ -7,7 +7,7 @@ ItemDef( stats: Direct(( equip_time_secs: 0.4, power: 1.2, - poise_strength: 1.4, + poise_strength: 1.0, speed: 1.0, crit_chance: 0.1375, crit_mult: 1.5194805, diff --git a/assets/common/items/weapons/axe/iron_axe-2.ron b/assets/common/items/weapons/axe/iron_axe-2.ron index 7a3599ab8a..27b60587a9 100644 --- a/assets/common/items/weapons/axe/iron_axe-2.ron +++ b/assets/common/items/weapons/axe/iron_axe-2.ron @@ -7,7 +7,7 @@ ItemDef( stats: Direct(( equip_time_secs: 0.4, power: 1.2, - poise_strength: 1.1, + poise_strength: 1.0, speed: 1.0, crit_chance: 0.1375, crit_mult: 1.5194805, diff --git a/assets/common/items/weapons/axe/iron_axe-3.ron b/assets/common/items/weapons/axe/iron_axe-3.ron index 3d1c4817d4..fd7a82ed07 100644 --- a/assets/common/items/weapons/axe/iron_axe-3.ron +++ b/assets/common/items/weapons/axe/iron_axe-3.ron @@ -7,7 +7,7 @@ ItemDef( stats: Direct(( equip_time_secs: 0.4, power: 1.2, - poise_strength: 1.6, + poise_strength: 1.0, speed: 1.0, crit_chance: 0.1375, crit_mult: 1.5194805, diff --git a/assets/common/items/weapons/axe/iron_axe-4.ron b/assets/common/items/weapons/axe/iron_axe-4.ron index f9221429e6..1480cfea5f 100644 --- a/assets/common/items/weapons/axe/iron_axe-4.ron +++ b/assets/common/items/weapons/axe/iron_axe-4.ron @@ -7,7 +7,7 @@ ItemDef( stats: Direct(( equip_time_secs: 0.4, power: 1.2, - poise_strength: 1.4, + poise_strength: 1.0, speed: 1.0, crit_chance: 0.1375, crit_mult: 1.5194805, diff --git a/assets/common/items/weapons/axe/iron_axe-5.ron b/assets/common/items/weapons/axe/iron_axe-5.ron index 30ba6f9842..e52641bfd4 100644 --- a/assets/common/items/weapons/axe/iron_axe-5.ron +++ b/assets/common/items/weapons/axe/iron_axe-5.ron @@ -7,7 +7,7 @@ ItemDef( stats: Direct(( equip_time_secs: 0.4, power: 1.2, - poise_strength: 1.8, + poise_strength: 1.0, speed: 1.0, crit_chance: 0.1375, crit_mult: 1.5194805, diff --git a/assets/common/items/weapons/axe/iron_axe-6.ron b/assets/common/items/weapons/axe/iron_axe-6.ron index b52c770046..60af0abb88 100644 --- a/assets/common/items/weapons/axe/iron_axe-6.ron +++ b/assets/common/items/weapons/axe/iron_axe-6.ron @@ -7,7 +7,7 @@ ItemDef( stats: Direct(( equip_time_secs: 0.4, power: 1.2, - poise_strength: 1.3, + poise_strength: 1.0, speed: 1.0, crit_chance: 0.1375, crit_mult: 1.5194805, diff --git a/assets/common/items/weapons/axe/iron_axe-7.ron b/assets/common/items/weapons/axe/iron_axe-7.ron index d2a5aeb2df..39b995fc54 100644 --- a/assets/common/items/weapons/axe/iron_axe-7.ron +++ b/assets/common/items/weapons/axe/iron_axe-7.ron @@ -7,7 +7,7 @@ ItemDef( stats: Direct(( equip_time_secs: 0.4, power: 1.2, - poise_strength: 1.6, + poise_strength: 1.0, speed: 1.0, crit_chance: 0.1375, crit_mult: 1.5194805, diff --git a/assets/common/items/weapons/axe/iron_axe-8.ron b/assets/common/items/weapons/axe/iron_axe-8.ron index 9a9dcd41f1..9c0e2d60ff 100644 --- a/assets/common/items/weapons/axe/iron_axe-8.ron +++ b/assets/common/items/weapons/axe/iron_axe-8.ron @@ -7,7 +7,7 @@ ItemDef( stats: Direct(( equip_time_secs: 0.4, power: 1.2, - poise_strength: 0.6, + poise_strength: 1.0, speed: 1.0, crit_chance: 0.1375, crit_mult: 1.5194805, diff --git a/assets/common/items/weapons/axe/iron_axe-9.ron b/assets/common/items/weapons/axe/iron_axe-9.ron index f4a58d644f..b9ee7a66b1 100644 --- a/assets/common/items/weapons/axe/iron_axe-9.ron +++ b/assets/common/items/weapons/axe/iron_axe-9.ron @@ -7,7 +7,7 @@ ItemDef( stats: Direct(( equip_time_secs: 0.4, power: 1.2, - poise_strength: 0.3, + poise_strength: 1.0, speed: 1.0, crit_chance: 0.1375, crit_mult: 1.5194805, diff --git a/assets/common/items/weapons/axe/malachite_axe-0.ron b/assets/common/items/weapons/axe/malachite_axe-0.ron index 1a4b99c75c..a6f5b2ffaf 100644 --- a/assets/common/items/weapons/axe/malachite_axe-0.ron +++ b/assets/common/items/weapons/axe/malachite_axe-0.ron @@ -7,7 +7,7 @@ ItemDef( stats: Direct(( equip_time_secs: 0.4, power: 2.0, - poise_strength: 1.1, + poise_strength: 1.0, speed: 1.0, crit_chance: 0.140625, crit_mult: 1.4063492, diff --git a/assets/common/items/weapons/axe/orc_axe-0.ron b/assets/common/items/weapons/axe/orc_axe-0.ron index 132258eaf9..e4955c1a45 100644 --- a/assets/common/items/weapons/axe/orc_axe-0.ron +++ b/assets/common/items/weapons/axe/orc_axe-0.ron @@ -7,7 +7,7 @@ ItemDef( stats: Direct(( equip_time_secs: 0.4, power: 0.6, - poise_strength: 1.5, + poise_strength: 1.0, speed: 1.0, crit_chance: 0.083333336, crit_mult: 2.142857, diff --git a/assets/common/items/weapons/axe/parashu.ron b/assets/common/items/weapons/axe/parashu.ron index 6cb67c46d0..26f88d65fa 100644 --- a/assets/common/items/weapons/axe/parashu.ron +++ b/assets/common/items/weapons/axe/parashu.ron @@ -7,7 +7,7 @@ ItemDef( stats: Direct(( equip_time_secs: 0.4, power: 2.5, - poise_strength: 1.8, + poise_strength: 1.0, speed: 0.8, crit_chance: 0.11666667, crit_mult: 1.3918368, diff --git a/assets/common/items/weapons/axe/starter_axe.ron b/assets/common/items/weapons/axe/starter_axe.ron index 6516bcaa08..6812184161 100644 --- a/assets/common/items/weapons/axe/starter_axe.ron +++ b/assets/common/items/weapons/axe/starter_axe.ron @@ -7,7 +7,7 @@ ItemDef( stats: Direct(( equip_time_secs: 0.4, power: 0.5, - poise_strength: 2.0, + poise_strength: 1.0, speed: 1.0, crit_chance: 0.09375, crit_mult: 2.2190475, diff --git a/assets/common/items/weapons/axe/steel_axe-0.ron b/assets/common/items/weapons/axe/steel_axe-0.ron index 0982b1e09f..85ac3995d8 100644 --- a/assets/common/items/weapons/axe/steel_axe-0.ron +++ b/assets/common/items/weapons/axe/steel_axe-0.ron @@ -7,7 +7,7 @@ ItemDef( stats: Direct(( equip_time_secs: 0.4, power: 1.4, - poise_strength: 1.2, + poise_strength: 1.0, speed: 1.0, crit_chance: 0.12857144, crit_mult: 1.4761904, diff --git a/assets/common/items/weapons/axe/steel_axe-1.ron b/assets/common/items/weapons/axe/steel_axe-1.ron index f897bf3cfd..c8b6e3d128 100644 --- a/assets/common/items/weapons/axe/steel_axe-1.ron +++ b/assets/common/items/weapons/axe/steel_axe-1.ron @@ -7,7 +7,7 @@ ItemDef( stats: Direct(( equip_time_secs: 0.4, power: 1.4, - poise_strength: 1.2, + poise_strength: 1.0, speed: 1.0, crit_chance: 0.12857144, crit_mult: 1.4761904, diff --git a/assets/common/items/weapons/axe/steel_axe-2.ron b/assets/common/items/weapons/axe/steel_axe-2.ron index 0ecae64791..b5431b0e6b 100644 --- a/assets/common/items/weapons/axe/steel_axe-2.ron +++ b/assets/common/items/weapons/axe/steel_axe-2.ron @@ -7,7 +7,7 @@ ItemDef( stats: Direct(( equip_time_secs: 0.4, power: 1.4, - poise_strength: 1.2, + poise_strength: 1.0, speed: 1.0, crit_chance: 0.12857144, crit_mult: 1.4761904, diff --git a/assets/common/items/weapons/axe/steel_axe-3.ron b/assets/common/items/weapons/axe/steel_axe-3.ron index fd06475d2e..f2a2b0f328 100644 --- a/assets/common/items/weapons/axe/steel_axe-3.ron +++ b/assets/common/items/weapons/axe/steel_axe-3.ron @@ -7,7 +7,7 @@ ItemDef( stats: Direct(( equip_time_secs: 0.4, power: 1.4, - poise_strength: 1.1, + poise_strength: 1.0, speed: 1.0, crit_chance: 0.12857144, crit_mult: 1.4761904, diff --git a/assets/common/items/weapons/axe/steel_axe-4.ron b/assets/common/items/weapons/axe/steel_axe-4.ron index 38794b34ed..64d72ead18 100644 --- a/assets/common/items/weapons/axe/steel_axe-4.ron +++ b/assets/common/items/weapons/axe/steel_axe-4.ron @@ -7,7 +7,7 @@ ItemDef( stats: Direct(( equip_time_secs: 0.4, power: 1.4, - poise_strength: 1.2, + poise_strength: 1.0, speed: 1.0, crit_chance: 0.12857144, crit_mult: 1.4761904, diff --git a/assets/common/items/weapons/axe/steel_axe-5.ron b/assets/common/items/weapons/axe/steel_axe-5.ron index a06dd32489..14743ee9fc 100644 --- a/assets/common/items/weapons/axe/steel_axe-5.ron +++ b/assets/common/items/weapons/axe/steel_axe-5.ron @@ -7,7 +7,7 @@ ItemDef( stats: Direct(( equip_time_secs: 0.4, 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/axe/worn_iron_axe-0.ron b/assets/common/items/weapons/axe/worn_iron_axe-0.ron index 5c25920a8a..d4593edfa5 100644 --- a/assets/common/items/weapons/axe/worn_iron_axe-0.ron +++ b/assets/common/items/weapons/axe/worn_iron_axe-0.ron @@ -7,7 +7,7 @@ ItemDef( stats: Direct(( equip_time_secs: 0.4, 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/axe/worn_iron_axe-1.ron b/assets/common/items/weapons/axe/worn_iron_axe-1.ron index d1be45715d..cfcaea5f71 100644 --- a/assets/common/items/weapons/axe/worn_iron_axe-1.ron +++ b/assets/common/items/weapons/axe/worn_iron_axe-1.ron @@ -7,7 +7,7 @@ ItemDef( stats: Direct(( equip_time_secs: 0.4, 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/axe/worn_iron_axe-2.ron b/assets/common/items/weapons/axe/worn_iron_axe-2.ron index 20d717efb2..cc5445afde 100644 --- a/assets/common/items/weapons/axe/worn_iron_axe-2.ron +++ b/assets/common/items/weapons/axe/worn_iron_axe-2.ron @@ -7,7 +7,7 @@ ItemDef( stats: Direct(( equip_time_secs: 0.4, power: 0.8, - poise_strength: 0.7, + poise_strength: 1.0, speed: 1.0, crit_chance: 0.0703125, crit_mult: 2.015873, diff --git a/assets/common/items/weapons/axe/worn_iron_axe-3.ron b/assets/common/items/weapons/axe/worn_iron_axe-3.ron index 97727d6533..8b40e8a433 100644 --- a/assets/common/items/weapons/axe/worn_iron_axe-3.ron +++ b/assets/common/items/weapons/axe/worn_iron_axe-3.ron @@ -7,7 +7,7 @@ ItemDef( stats: Direct(( equip_time_secs: 0.4, power: 0.8, - poise_strength: 1.1, + poise_strength: 1.0, speed: 1.0, crit_chance: 0.0703125, crit_mult: 2.015873, diff --git a/assets/common/items/weapons/axe/worn_iron_axe-4.ron b/assets/common/items/weapons/axe/worn_iron_axe-4.ron index 591c358d3e..0f338770d7 100644 --- a/assets/common/items/weapons/axe/worn_iron_axe-4.ron +++ b/assets/common/items/weapons/axe/worn_iron_axe-4.ron @@ -7,7 +7,7 @@ ItemDef( stats: Direct(( equip_time_secs: 0.4, power: 0.8, - poise_strength: 0.5, + poise_strength: 1.0, speed: 1.0, crit_chance: 0.0703125, crit_mult: 2.015873, diff --git a/common/sys/src/character_behavior.rs b/common/sys/src/character_behavior.rs index 2a16d55dca..77654af81d 100644 --- a/common/sys/src/character_behavior.rs +++ b/common/sys/src/character_behavior.rs @@ -173,9 +173,9 @@ impl<'a> System<'a> for Sys { *char_state.get_mut_unchecked() = CharacterState::Stunned(common::states::stunned::Data { static_data: common::states::stunned::StaticData { - buildup_duration: Duration::from_millis(150), - recover_duration: Duration::from_millis(150), - movement_speed: 0.4, + buildup_duration: Duration::from_millis(125), + recover_duration: Duration::from_millis(125), + movement_speed: 0.80, poise_state, }, timer: Duration::default(), @@ -188,9 +188,9 @@ impl<'a> System<'a> for Sys { *char_state.get_mut_unchecked() = CharacterState::Stunned(common::states::stunned::Data { static_data: common::states::stunned::StaticData { - buildup_duration: Duration::from_millis(500), + buildup_duration: Duration::from_millis(300), recover_duration: Duration::from_millis(300), - movement_speed: 0.1, + movement_speed: 0.65, poise_state, }, timer: Duration::default(), @@ -207,9 +207,9 @@ impl<'a> System<'a> for Sys { *char_state.get_mut_unchecked() = CharacterState::Stunned(common::states::stunned::Data { static_data: common::states::stunned::StaticData { - buildup_duration: Duration::from_millis(800), + buildup_duration: Duration::from_millis(600), recover_duration: Duration::from_millis(250), - movement_speed: 0.0, + movement_speed: 0.45, poise_state, }, timer: Duration::default(), @@ -226,9 +226,9 @@ impl<'a> System<'a> for Sys { *char_state.get_mut_unchecked() = CharacterState::Stunned(common::states::stunned::Data { static_data: common::states::stunned::StaticData { - buildup_duration: Duration::from_millis(1000), - recover_duration: Duration::from_millis(750), - movement_speed: 0.0, + buildup_duration: Duration::from_millis(750), + recover_duration: Duration::from_millis(500), + movement_speed: 0.4, poise_state, }, timer: Duration::default(), diff --git a/voxygen/anim/src/biped_small/stunned.rs b/voxygen/anim/src/biped_small/stunned.rs index a6ab0e20eb..384b0d6e8b 100644 --- a/voxygen/anim/src/biped_small/stunned.rs +++ b/voxygen/anim/src/biped_small/stunned.rs @@ -68,10 +68,10 @@ impl Animation for StunnedAnimation { 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); + Quaternion::rotation_x(movement1 * 0.2) * Quaternion::rotation_z(movement1 * -0.3); 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); + Vec3::new(0.0, s_a.chest.0, s_a.chest.1 + movement1abs - 3.0) * s_a.scaler / 11.0; + next.chest.orientation = Quaternion::rotation_z(movement1 * 1.2); next.pants.position = Vec3::new(0.0, s_a.pants.0, s_a.pants.1); diff --git a/voxygen/anim/src/character/staggered.rs b/voxygen/anim/src/character/staggered.rs index 8c234f1810..644ab23884 100644 --- a/voxygen/anim/src/character/staggered.rs +++ b/voxygen/anim/src/character/staggered.rs @@ -58,10 +58,11 @@ impl Animation for StaggeredAnimation { let mirror = (check - 0.5).signum(); let movement1 = movement1base * pullback * mirror; let movement1abs = movement1base * pullback; - + next.second.position = Vec3::new(0.0, 0.0, 0.0); + next.second.orientation = Quaternion::rotation_z(0.0); next.head.position = Vec3::new(0.0, s_a.head.0, s_a.head.1); next.head.orientation = - Quaternion::rotation_x(movement1abs * -0.2) * Quaternion::rotation_z(movement1 * 0.3); + Quaternion::rotation_x(movement1abs * -0.2) * Quaternion::rotation_z(movement1 * -0.3); next.shorts.orientation = Quaternion::rotation_x(movement1abs * 0.2) * Quaternion::rotation_z(movement1 * -0.3); next.belt.orientation = @@ -69,10 +70,12 @@ impl Animation for StaggeredAnimation { next.shorts.position = Vec3::new(0.0, s_a.shorts.0 + movement1abs * 1.0, s_a.shorts.1); next.chest.position = Vec3::new(0.0, s_a.chest.0, s_a.chest.1 + movement1abs * -4.0); next.chest.orientation = - Quaternion::rotation_x(movement1abs * -0.1) * Quaternion::rotation_z(movement1 * 1.0); + Quaternion::rotation_x(movement1abs * -0.1) * Quaternion::rotation_z(movement1 * 1.3); if wield_status { next.main.position = Vec3::new(0.0, 0.0, 0.0); next.main.orientation = Quaternion::rotation_x(0.0); + next.second.position = Vec3::new(0.0, 0.0, 0.0); + next.second.orientation = Quaternion::rotation_z(0.0); match (hands, active_tool_kind, second_tool_kind) { ((Some(Hands::Two), _), tool, _) | ((None, Some(Hands::Two)), _, tool) => { match tool { diff --git a/voxygen/anim/src/character/stunned.rs b/voxygen/anim/src/character/stunned.rs index bd47bf02dc..c88a001e91 100644 --- a/voxygen/anim/src/character/stunned.rs +++ b/voxygen/anim/src/character/stunned.rs @@ -60,18 +60,19 @@ impl Animation for StunnedAnimation { let movement1abs = movement1base * pullback; next.head.position = Vec3::new(0.0, s_a.head.0, s_a.head.1); - next.head.orientation = Quaternion::rotation_z(movement1 * 0.3); + next.head.orientation = Quaternion::rotation_z(movement1 * -0.3); next.shorts.orientation = Quaternion::rotation_x(movement1abs * -0.2) * Quaternion::rotation_z(movement1 * -0.3); next.belt.orientation = Quaternion::rotation_x(movement1abs * -0.1) * Quaternion::rotation_z(movement1 * -0.2); next.chest.orientation = - Quaternion::rotation_x(movement1abs * 0.3) * Quaternion::rotation_z(movement1 * 0.5); + Quaternion::rotation_x(movement1abs * 0.3) * Quaternion::rotation_z(movement1 * 1.0); if wield_status { next.main.position = Vec3::new(0.0, 0.0, 0.0); next.main.orientation = Quaternion::rotation_x(0.0); - + next.second.position = Vec3::new(0.0, 0.0, 0.0); + next.second.orientation = Quaternion::rotation_z(0.0); match hands { (Some(Hands::Two), _) | (None, Some(Hands::Two)) => match active_tool_kind { Some(ToolKind::Sword) | Some(ToolKind::SwordSimple) => { diff --git a/world/src/site/dungeon/mod.rs b/world/src/site/dungeon/mod.rs index 7ee5468d6b..4fe3eaab0a 100644 --- a/world/src/site/dungeon/mod.rs +++ b/world/src/site/dungeon/mod.rs @@ -754,10 +754,11 @@ impl Floor { ) .with_loot_drop(chosen.read().choose().to_item()) .with_main_tool(comp::Item::new_from_asset_expect( - match dynamic_rng.gen_range(0..5) { - 0 => "common.items.weapons.axe.malachite_axe-0", + match dynamic_rng.gen_range(0..6) { + 0 => "common.items.weapons.axe_1h.orichalcum-0", 1..=2 => "common.items.weapons.sword.cultist", 3 => "common.items.weapons.hammer.cultist_purp_2h-0", + 4 => "common.items.weapons.hammer_1h.orichalcum-0", _ => "common.items.weapons.bow.bone-1", }, )),