diff --git a/assets/common/abilities/axe/doublestrike.ron b/assets/common/abilities/axe/doublestrike.ron index 7a1d0111b9..7c9f767d46 100644 --- a/assets/common/abilities/axe/doublestrike.ron +++ b/assets/common/abilities/axe/doublestrike.ron @@ -4,8 +4,9 @@ ComboMelee( stage: 1, base_damage: 90, max_damage: 110, - base_poise_damage: 40, + base_poise_damage: 20, damage_increase: 10, + poise_damage_increase: 5, knockback: 8.0, range: 3.5, angle: 50.0, @@ -20,6 +21,7 @@ ComboMelee( max_damage: 160, base_poise_damage: 40, damage_increase: 15, + poise_damage_increase: 15, knockback: 12.0, range: 3.5, angle: 30.0, diff --git a/assets/common/abilities/bow/basic.ron b/assets/common/abilities/bow/basic.ron index ef04839b0a..999207b677 100644 --- a/assets/common/abilities/bow/basic.ron +++ b/assets/common/abilities/bow/basic.ron @@ -4,6 +4,7 @@ BasicRanged( recover_duration: 300, projectile: Arrow( damage: 70.0, + poise_damage: 2, knockback: 5.0, energy_regen: 40, ), @@ -12,4 +13,4 @@ BasicRanged( projectile_gravity: Some(Gravity(0.2)), projectile_speed: 100.0, can_continue: true, -) \ No newline at end of file +) diff --git a/assets/common/abilities/bow/charged.ron b/assets/common/abilities/bow/charged.ron index 2a20c768b8..76e173a132 100644 --- a/assets/common/abilities/bow/charged.ron +++ b/assets/common/abilities/bow/charged.ron @@ -4,6 +4,7 @@ ChargedRanged( initial_damage: 10, scaled_damage: 190, initial_poise_damage: 10, + scaled_poise_damage: 60, 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 18dc6d0bd2..0dcb04e413 100644 --- a/assets/common/abilities/bow/repeater.ron +++ b/assets/common/abilities/bow/repeater.ron @@ -7,7 +7,8 @@ RepeaterRanged( leap: Some(5.0), projectile: Arrow( damage: 40.0, - knockback: 10.0, + poise_damage: 4, + knockback: 5.0, energy_regen: 0, ), projectile_body: Object(Arrow), @@ -15,4 +16,4 @@ RepeaterRanged( projectile_gravity: Some(Gravity(0.2)), projectile_speed: 100.0, reps_remaining: 3, -) \ No newline at end of file +) diff --git a/assets/common/abilities/hammer/charged.ron b/assets/common/abilities/hammer/charged.ron index bde38d4c43..857d060d0e 100644 --- a/assets/common/abilities/hammer/charged.ron +++ b/assets/common/abilities/hammer/charged.ron @@ -4,6 +4,7 @@ ChargedMelee( initial_damage: 10, scaled_damage: 160, initial_poise_damage: 10, + scaled_poise_damage: 70, initial_knockback: 10.0, scaled_knockback: 50.0, range: 3.5, diff --git a/assets/common/abilities/hammer/singlestrike.ron b/assets/common/abilities/hammer/singlestrike.ron index bd6ea6ff69..93cc1503a6 100644 --- a/assets/common/abilities/hammer/singlestrike.ron +++ b/assets/common/abilities/hammer/singlestrike.ron @@ -4,6 +4,7 @@ ComboMelee( base_damage: 130, damage_increase: 10, base_poise_damage: 30, + poise_damage_increase: 5, knockback: 0.0, range: 4.5, angle: 50.0, diff --git a/assets/common/abilities/sceptre/healingbomb.ron b/assets/common/abilities/sceptre/healingbomb.ron index e653d3931d..731c259e80 100644 --- a/assets/common/abilities/sceptre/healingbomb.ron +++ b/assets/common/abilities/sceptre/healingbomb.ron @@ -5,6 +5,7 @@ BasicRanged( projectile: Heal( heal: 80.0, damage: 60.0, + poise_damage: 0, radius: 6.0, ), projectile_body: Object(BoltNature), @@ -15,4 +16,4 @@ BasicRanged( projectile_gravity: Some(Gravity(0.5)), projectile_speed: 40.0, can_continue: false, -) \ No newline at end of file +) diff --git a/assets/common/abilities/staff/firebomb.ron b/assets/common/abilities/staff/firebomb.ron index 05a18db3d3..78623f0e5c 100644 --- a/assets/common/abilities/staff/firebomb.ron +++ b/assets/common/abilities/staff/firebomb.ron @@ -4,6 +4,7 @@ BasicRanged( recover_duration: 350, projectile: Fireball( damage: 100.0, + poise_damage: 10, radius: 5.0, energy_regen: 50, ), @@ -15,4 +16,4 @@ BasicRanged( projectile_gravity: Some(Gravity(0.3)), projectile_speed: 60.0, can_continue: true, -) \ No newline at end of file +) diff --git a/assets/common/abilities/sword/dash.ron b/assets/common/abilities/sword/dash.ron index 2160ed162a..97137227eb 100644 --- a/assets/common/abilities/sword/dash.ron +++ b/assets/common/abilities/sword/dash.ron @@ -3,6 +3,7 @@ DashMelee( base_damage: 80, scaled_damage: 160, base_poise_damage: 20, + scaled_poise_damage: 20, base_knockback: 8.0, scaled_knockback: 7.0, range: 5.0, diff --git a/assets/common/abilities/sword/triplestrike.ron b/assets/common/abilities/sword/triplestrike.ron index 647eb2e2c6..a5bad53d9a 100644 --- a/assets/common/abilities/sword/triplestrike.ron +++ b/assets/common/abilities/sword/triplestrike.ron @@ -5,6 +5,7 @@ ComboMelee( base_damage: 100, damage_increase: 10, base_poise_damage: 10, + poise_damage_increase: 2, knockback: 10.0, range: 4.0, angle: 30.0, @@ -18,6 +19,7 @@ ComboMelee( base_damage: 80, damage_increase: 15, base_poise_damage: 10, + poise_damage_increase: 2, knockback: 12.0, range: 3.5, angle: 180.0, @@ -31,6 +33,7 @@ ComboMelee( base_damage: 130, damage_increase: 20, base_poise_damage: 10, + poise_damage_increase: 2, knockback: 14.0, range: 6.0, angle: 10.0, diff --git a/assets/common/abilities/unique/quadlowbasic/singlestrike.ron b/assets/common/abilities/unique/quadlowbasic/singlestrike.ron index 1f82c53760..a3fc57484c 100644 --- a/assets/common/abilities/unique/quadlowbasic/singlestrike.ron +++ b/assets/common/abilities/unique/quadlowbasic/singlestrike.ron @@ -5,6 +5,7 @@ ComboMelee( base_damage: 100, damage_increase: 0, base_poise_damage: 30, + poise_damage_increase: 3, 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 ec21c62dfa..5e3a07a5cd 100644 --- a/assets/common/abilities/unique/quadlowbasic/triplestrike.ron +++ b/assets/common/abilities/unique/quadlowbasic/triplestrike.ron @@ -5,6 +5,7 @@ ComboMelee( base_damage: 120, damage_increase: 0, base_poise_damage: 10, + poise_damage_increase: 3, knockback: 10.0, range: 3.5, angle: 30.0, @@ -18,6 +19,7 @@ ComboMelee( base_damage: 80, damage_increase: 0, base_poise_damage: 10, + poise_damage_increase: 3, knockback: 10.0, range: 3.5, angle: 30.0, @@ -31,6 +33,7 @@ ComboMelee( base_damage: 130, damage_increase: 0, base_poise_damage: 10, + poise_damage_increase: 3, 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 3f12815a4a..642876f4ab 100644 --- a/assets/common/abilities/unique/quadlowbreathe/dash.ron +++ b/assets/common/abilities/unique/quadlowbreathe/dash.ron @@ -3,6 +3,7 @@ DashMelee( base_damage: 150, scaled_damage: 110, base_poise_damage: 60, + scaled_poise_damage: 20, 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 ee2db98e39..06897a32ae 100644 --- a/assets/common/abilities/unique/quadlowbreathe/triplestrike.ron +++ b/assets/common/abilities/unique/quadlowbreathe/triplestrike.ron @@ -5,6 +5,7 @@ ComboMelee( base_damage: 100, damage_increase: 0, base_poise_damage: 10, + poise_damage_increase: 3, knockback: 10.0, range: 4.5, angle: 30.0, @@ -18,6 +19,7 @@ ComboMelee( base_damage: 80, damage_increase: 0, base_poise_damage: 10, + poise_damage_increase: 3, knockback: 10.0, range: 3.5, angle: 30.0, @@ -31,6 +33,7 @@ ComboMelee( base_damage: 130, damage_increase: 0, base_poise_damage: 10, + poise_damage_increase: 3, 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 79bdaaeef9..8fe7975f79 100644 --- a/assets/common/abilities/unique/quadlowquick/dash.ron +++ b/assets/common/abilities/unique/quadlowquick/dash.ron @@ -3,6 +3,7 @@ DashMelee( base_damage: 30, scaled_damage: 10, base_poise_damage: 30, + scaled_poise_damage: 20, 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 7dc4c26281..e4e09a38ab 100644 --- a/assets/common/abilities/unique/quadlowquick/quadstrike.ron +++ b/assets/common/abilities/unique/quadlowquick/quadstrike.ron @@ -5,6 +5,7 @@ ComboMelee( base_damage: 100, damage_increase: 0, base_poise_damage: 10, + poise_damage_increase: 3, knockback: 2.0, range: 3.5, angle: 30.0, @@ -18,6 +19,7 @@ ComboMelee( base_damage: 130, damage_increase: 0, base_poise_damage: 10, + poise_damage_increase: 3, knockback: 2.0, range: 3.5, angle: 30.0, @@ -31,6 +33,7 @@ ComboMelee( base_damage: 130, damage_increase: 0, base_poise_damage: 10, + poise_damage_increase: 3, knockback: 2.0, range: 3.5, angle: 30.0, @@ -44,6 +47,7 @@ ComboMelee( base_damage: 130, damage_increase: 0, base_poise_damage: 10, + poise_damage_increase: 3, 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 eb0d41a830..266cf07e76 100644 --- a/assets/common/abilities/unique/quadlowranged/firebomb.ron +++ b/assets/common/abilities/unique/quadlowranged/firebomb.ron @@ -4,6 +4,7 @@ BasicRanged( recover_duration: 350, projectile: Fireball( damage: 100.0, + poise_damage: 10, 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 604ef7f9f8..044eaeb191 100644 --- a/assets/common/abilities/unique/quadlowranged/singlestrike.ron +++ b/assets/common/abilities/unique/quadlowranged/singlestrike.ron @@ -5,6 +5,7 @@ ComboMelee( base_damage: 60, damage_increase: 0, base_poise_damage: 30, + poise_damage_increase: 3, 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 7057a6cf2f..ab79490af7 100644 --- a/assets/common/abilities/unique/quadlowtail/charged.ron +++ b/assets/common/abilities/unique/quadlowtail/charged.ron @@ -4,6 +4,7 @@ ChargedMelee( initial_damage: 160, scaled_damage: 40, initial_poise_damage: 50, + scaled_poise_damage: 20, 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 d7e08a9f61..c55935f53c 100644 --- a/assets/common/abilities/unique/quadlowtail/triplestrike.ron +++ b/assets/common/abilities/unique/quadlowtail/triplestrike.ron @@ -5,6 +5,7 @@ ComboMelee( base_damage: 100, damage_increase: 0, base_poise_damage: 10, + poise_damage_increase: 3, knockback: 10.0, range: 3.5, angle: 30.0, @@ -18,6 +19,7 @@ ComboMelee( base_damage: 120, damage_increase: 0, base_poise_damage: 10, + poise_damage_increase: 3, knockback: 10.0, range: 3.5, angle: 30.0, @@ -31,6 +33,7 @@ ComboMelee( base_damage: 130, damage_increase: 0, base_poise_damage: 10, + poise_damage_increase: 3, 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 5fc4cdd675..29ea9ee59c 100644 --- a/assets/common/abilities/unique/quadmedbasic/singlestrike.ron +++ b/assets/common/abilities/unique/quadmedbasic/singlestrike.ron @@ -5,6 +5,7 @@ ComboMelee( base_damage: 120, damage_increase: 0, base_poise_damage: 10, + poise_damage_increase: 3, 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 cbec45247c..21724f88e9 100644 --- a/assets/common/abilities/unique/quadmedbasic/triplestrike.ron +++ b/assets/common/abilities/unique/quadmedbasic/triplestrike.ron @@ -5,6 +5,7 @@ ComboMelee( base_damage: 120, damage_increase: 0, base_poise_damage: 10, + poise_damage_increase: 3, knockback: 10.0, range: 3.5, angle: 30.0, @@ -18,6 +19,7 @@ ComboMelee( base_damage: 120, damage_increase: 0, base_poise_damage: 10, + poise_damage_increase: 3, knockback: 10.0, range: 3.5, angle: 30.0, @@ -31,6 +33,7 @@ ComboMelee( base_damage: 120, damage_increase: 0, base_poise_damage: 10, + poise_damage_increase: 3, 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 fff283cfa5..fe589ec6d8 100644 --- a/assets/common/abilities/unique/quadmedcharge/dash.ron +++ b/assets/common/abilities/unique/quadmedcharge/dash.ron @@ -3,6 +3,7 @@ DashMelee( base_damage: 150, scaled_damage: 40, base_poise_damage: 40, + scaled_poise_damage: 15, 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 d627b2ef72..10e5d6eed2 100644 --- a/assets/common/abilities/unique/quadmedcharge/doublestrike.ron +++ b/assets/common/abilities/unique/quadmedcharge/doublestrike.ron @@ -5,6 +5,7 @@ ComboMelee( base_damage: 100, damage_increase: 0, base_poise_damage: 10, + poise_damage_increase: 3, knockback: 10.0, range: 3.5, angle: 30.0, @@ -18,6 +19,7 @@ ComboMelee( base_damage: 80, damage_increase: 0, base_poise_damage: 10, + poise_damage_increase: 3, knockback: 10.0, range: 3.5, angle: 30.0, diff --git a/assets/common/abilities/unique/quadmedjump/doublestrike.ron b/assets/common/abilities/unique/quadmedjump/doublestrike.ron index 105824fcf5..898249dd4e 100644 --- a/assets/common/abilities/unique/quadmedjump/doublestrike.ron +++ b/assets/common/abilities/unique/quadmedjump/doublestrike.ron @@ -5,6 +5,7 @@ ComboMelee( base_damage: 100, damage_increase: 0, base_poise_damage: 10, + poise_damage_increase: 3, knockback: 8.0, range: 3.5, angle: 30.0, @@ -18,6 +19,7 @@ ComboMelee( base_damage: 80, damage_increase: 0, base_poise_damage: 10, + poise_damage_increase: 3, knockback: 8.0, range: 3.5, angle: 30.0, diff --git a/assets/common/abilities/unique/quadmedquick/dash.ron b/assets/common/abilities/unique/quadmedquick/dash.ron index 99e556e8ee..d58925638d 100644 --- a/assets/common/abilities/unique/quadmedquick/dash.ron +++ b/assets/common/abilities/unique/quadmedquick/dash.ron @@ -3,6 +3,7 @@ DashMelee( base_damage: 130, scaled_damage: 20, base_poise_damage: 30, + scaled_poise_damage: 5, 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 f853e22543..762725cb80 100644 --- a/assets/common/abilities/unique/quadmedquick/triplestrike.ron +++ b/assets/common/abilities/unique/quadmedquick/triplestrike.ron @@ -5,6 +5,7 @@ ComboMelee( base_damage: 150, damage_increase: 0, base_poise_damage: 10, + poise_damage_increase: 3, knockback: 5.0, range: 3.5, angle: 60.0, @@ -18,6 +19,7 @@ ComboMelee( base_damage: 150, damage_increase: 0, base_poise_damage: 10, + poise_damage_increase: 3, knockback: 5.0, range: 3.5, angle: 60.0, @@ -31,6 +33,7 @@ ComboMelee( base_damage: 150, damage_increase: 0, base_poise_damage: 10, + poise_damage_increase: 3, 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 d2f2f8262b..97af22308a 100644 --- a/assets/common/abilities/unique/quadsmallbasic/singlestrike.ron +++ b/assets/common/abilities/unique/quadsmallbasic/singlestrike.ron @@ -5,6 +5,7 @@ ComboMelee( base_damage: 30, damage_increase: 0, base_poise_damage: 10, + poise_damage_increase: 2, 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 b42bbcd256..d3c048db89 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: 80, + base_poise_damage: 90, range: 5.0, max_angle: 120.0, ) diff --git a/assets/common/abilities/unique/theropodbasic/singlestrike.ron b/assets/common/abilities/unique/theropodbasic/singlestrike.ron index 4b4878dfe5..1351e14ed1 100644 --- a/assets/common/abilities/unique/theropodbasic/singlestrike.ron +++ b/assets/common/abilities/unique/theropodbasic/singlestrike.ron @@ -5,6 +5,7 @@ ComboMelee( base_damage: 150, damage_increase: 0, base_poise_damage: 15, + poise_damage_increase: 2, 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 739aaf9234..95b6a3b4de 100644 --- a/assets/common/abilities/unique/theropodbasic/triplestrike.ron +++ b/assets/common/abilities/unique/theropodbasic/triplestrike.ron @@ -5,6 +5,7 @@ ComboMelee( base_damage: 170, damage_increase: 0, base_poise_damage: 10, + poise_damage_increase: 2, knockback: 10.0, range: 7.5, angle: 30.0, @@ -18,6 +19,7 @@ ComboMelee( base_damage: 190, damage_increase: 0, base_poise_damage: 10, + poise_damage_increase: 2, knockback: 10.0, range: 5.5, angle: 30.0, @@ -31,6 +33,7 @@ ComboMelee( base_damage: 230, damage_increase: 0, base_poise_damage: 10, + poise_damage_increase: 2, 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 c19995d2b6..97740a9e73 100644 --- a/assets/common/abilities/unique/theropodbird/singlestrike.ron +++ b/assets/common/abilities/unique/theropodbird/singlestrike.ron @@ -5,6 +5,7 @@ ComboMelee( base_damage: 150, damage_increase: 0, base_poise_damage: 10, + poise_damage_increase: 2, 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 4c33e0bbe9..786a6b711f 100644 --- a/assets/common/abilities/unique/theropodbird/triplestrike.ron +++ b/assets/common/abilities/unique/theropodbird/triplestrike.ron @@ -5,6 +5,7 @@ ComboMelee( base_damage: 170, damage_increase: 0, base_poise_damage: 10, + poise_damage_increase: 2, knockback: 10.0, range: 4.5, angle: 5.0, @@ -18,6 +19,7 @@ ComboMelee( base_damage: 190, damage_increase: 0, base_poise_damage: 10, + poise_damage_increase: 2, knockback: 10.0, range: 4.0, angle: 10.0, @@ -31,6 +33,7 @@ ComboMelee( base_damage: 230, damage_increase: 0, base_poise_damage: 10, + poise_damage_increase: 2, knockback: 10.0, range: 4.0, angle: 10.0, diff --git a/assets/common/items/armor/back/admin.ron b/assets/common/items/armor/back/admin.ron index 1a6bcd9759..048e196395 100644 --- a/assets/common/items/armor/back/admin.ron +++ b/assets/common/items/armor/back/admin.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Back("Admin"), stats: ( - protection: Normal(0.0)), + protection: Invincible, + poise_protection: Invincible, + ), ) ), quality: Debug, diff --git a/assets/common/items/armor/back/backpack_0.ron b/assets/common/items/armor/back/backpack_0.ron index 0b623b4fcc..9bbafa8171 100644 --- a/assets/common/items/armor/back/backpack_0.ron +++ b/assets/common/items/armor/back/backpack_0.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Back("Backpack0"), stats: ( - protection: Normal(0.0)), + protection: Normal(0.0), + poise_protection: Normal(0.0), + ), ) ), quality: High, diff --git a/assets/common/items/armor/back/dungeon_purple-0.ron b/assets/common/items/armor/back/dungeon_purple-0.ron index 943df27e07..1366d50d58 100644 --- a/assets/common/items/armor/back/dungeon_purple-0.ron +++ b/assets/common/items/armor/back/dungeon_purple-0.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Back("DungPurp0"), stats: ( - protection: Normal(3.0)), + protection: Normal(3.0), + poise_protection: Normal(3.0) + ), ) ), quality: Epic, diff --git a/assets/common/items/armor/back/leather_adventurer.ron b/assets/common/items/armor/back/leather_adventurer.ron index 90dde99935..162f67ff32 100644 --- a/assets/common/items/armor/back/leather_adventurer.ron +++ b/assets/common/items/armor/back/leather_adventurer.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Back("Short2"), stats: ( - protection: Normal(0.2)), + protection: Normal(0.2), + poise_protection: Normal(0.2), + ), ) ), quality: Common, diff --git a/assets/common/items/armor/back/short_0.ron b/assets/common/items/armor/back/short_0.ron index 17f4858f70..20f2c15ba2 100644 --- a/assets/common/items/armor/back/short_0.ron +++ b/assets/common/items/armor/back/short_0.ron @@ -5,8 +5,9 @@ ItemDef( ( kind: Back("Short0"), stats: ( - protection: Normal(0.3) - ), + protection: Normal(0.3), + poise_protection: Normal(0.3), + ), ) ), quality: Moderate, diff --git a/assets/common/items/armor/back/short_1.ron b/assets/common/items/armor/back/short_1.ron index 556a4683c4..0dedb2118f 100644 --- a/assets/common/items/armor/back/short_1.ron +++ b/assets/common/items/armor/back/short_1.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Back("Short1"), stats: ( - protection: Normal(0.1)), + protection: Normal(0.1), + poise_protection: Normal(0.1), + ), ) ), quality: Common, diff --git a/assets/common/items/armor/back/velorite_mage_0.ron b/assets/common/items/armor/back/velorite_mage_0.ron index 76fda525bc..965418420d 100644 --- a/assets/common/items/armor/back/velorite_mage_0.ron +++ b/assets/common/items/armor/back/velorite_mage_0.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Back("VeloriteMage0"), stats: ( - protection: Normal(2.8)), + protection: Normal(2.8), + poise_protection: Normal(2.8), + ), ) ), quality: High, diff --git a/assets/common/items/armor/back/warlock.ron b/assets/common/items/armor/back/warlock.ron index aefb29bf8f..cbf2fba0ae 100644 --- a/assets/common/items/armor/back/warlock.ron +++ b/assets/common/items/armor/back/warlock.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Back("Warlock"), stats: ( - protection: Normal(4.0)), + protection: Normal(4.0), + poise_protection: Normal(4.0), + ), ) ), quality: Moderate, diff --git a/assets/common/items/armor/back/warlord.ron b/assets/common/items/armor/back/warlord.ron index c1bf1dad60..d5de61e11f 100644 --- a/assets/common/items/armor/back/warlord.ron +++ b/assets/common/items/armor/back/warlord.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Back("Warlord"), stats: ( - protection: Normal(4.0)), + protection: Normal(4.0), + poise_protection: Normal(4.0), + ), ) ), quality: Moderate, diff --git a/assets/common/items/armor/belt/assassin.ron b/assets/common/items/armor/belt/assassin.ron index bc784b4abe..1de9474589 100644 --- a/assets/common/items/armor/belt/assassin.ron +++ b/assets/common/items/armor/belt/assassin.ron @@ -5,8 +5,9 @@ ItemDef( ( kind: Belt("Assassin"), stats: ( - protection: Normal(2.0) - ), + protection: Normal(2.0), + poise_protection: Normal(2.0), + ), ) ), quality: Moderate, diff --git a/assets/common/items/armor/belt/bonerattler.ron b/assets/common/items/armor/belt/bonerattler.ron index e87969c5d8..64332f2f29 100644 --- a/assets/common/items/armor/belt/bonerattler.ron +++ b/assets/common/items/armor/belt/bonerattler.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Belt("Bonerattler"), stats: ( - protection: Normal(3.0)), + protection: Normal(3.0), + poise_protection: Normal(3.0), + ), ) ), quality: High, diff --git a/assets/common/items/armor/belt/cloth_blue_0.ron b/assets/common/items/armor/belt/cloth_blue_0.ron index fe96d5508b..fee453fca8 100644 --- a/assets/common/items/armor/belt/cloth_blue_0.ron +++ b/assets/common/items/armor/belt/cloth_blue_0.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Belt("ClothBlue0"), stats: ( - protection: Normal(1.0)), + protection: Normal(1.0), + poise_protection: Normal(1.0), + ), ) ), quality: Common, diff --git a/assets/common/items/armor/belt/cloth_green_0.ron b/assets/common/items/armor/belt/cloth_green_0.ron index 31482c185c..40778a4651 100644 --- a/assets/common/items/armor/belt/cloth_green_0.ron +++ b/assets/common/items/armor/belt/cloth_green_0.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Belt("ClothGreen0"), stats: ( - protection: Normal(1.0)), + protection: Normal(1.0), + poise_protection: Normal(1.0), + ), ) ), quality: Common, diff --git a/assets/common/items/armor/belt/cloth_purple_0.ron b/assets/common/items/armor/belt/cloth_purple_0.ron index 06a4797cb0..fe4ce1652d 100644 --- a/assets/common/items/armor/belt/cloth_purple_0.ron +++ b/assets/common/items/armor/belt/cloth_purple_0.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Belt("ClothPurple0"), stats: ( - protection: Normal(1.0)), + protection: Normal(1.0), + poise_protection: Normal(1.0), + ), ) ), quality: Common, diff --git a/assets/common/items/armor/belt/cultist_belt.ron b/assets/common/items/armor/belt/cultist_belt.ron index ba621bf791..10459560db 100644 --- a/assets/common/items/armor/belt/cultist_belt.ron +++ b/assets/common/items/armor/belt/cultist_belt.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Belt("Cultist"), stats: ( - protection: Normal(6.0)), + protection: Normal(6.0), + poise_protection: Normal(6.0), + ), ) ), quality: Epic, diff --git a/assets/common/items/armor/belt/druid.ron b/assets/common/items/armor/belt/druid.ron index c46390ef68..8ad26c5363 100644 --- a/assets/common/items/armor/belt/druid.ron +++ b/assets/common/items/armor/belt/druid.ron @@ -5,8 +5,9 @@ ItemDef( ( kind: Belt("Druid"), stats: ( - protection: Normal(2.0) - ), + protection: Normal(2.0), + poise_protection: Normal(2.0), + ), ) ), quality: Moderate, diff --git a/assets/common/items/armor/belt/leather_0.ron b/assets/common/items/armor/belt/leather_0.ron index 237baffb3e..5d690dd4be 100644 --- a/assets/common/items/armor/belt/leather_0.ron +++ b/assets/common/items/armor/belt/leather_0.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Belt("Leather0"), stats: ( - protection: Normal(1.0)), + protection: Normal(1.0), + poise_protection: Normal(1.0), + ), ) ), quality: Common, diff --git a/assets/common/items/armor/belt/leather_2.ron b/assets/common/items/armor/belt/leather_2.ron index 5a15c5c9c5..ab1d303584 100644 --- a/assets/common/items/armor/belt/leather_2.ron +++ b/assets/common/items/armor/belt/leather_2.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Belt("Leather2"), stats: ( - protection: Normal(1.0)), + protection: Normal(1.0), + poise_protection: Normal(1.0), + ), ) ), quality: Common, diff --git a/assets/common/items/armor/belt/leather_adventurer.ron b/assets/common/items/armor/belt/leather_adventurer.ron index d5cf8072f4..7053be8dde 100644 --- a/assets/common/items/armor/belt/leather_adventurer.ron +++ b/assets/common/items/armor/belt/leather_adventurer.ron @@ -5,8 +5,9 @@ ItemDef( ( kind: Belt("Leather2"), stats: ( - protection: Normal(1.0) - ), + protection: Normal(1.0), + poise_protection: Normal(1.0), + ), ) ), quality: Moderate, diff --git a/assets/common/items/armor/belt/plate_0.ron b/assets/common/items/armor/belt/plate_0.ron index bd28bb8763..5a1839243f 100644 --- a/assets/common/items/armor/belt/plate_0.ron +++ b/assets/common/items/armor/belt/plate_0.ron @@ -5,8 +5,9 @@ ItemDef( ( kind: Belt("Plate0"), stats: ( - protection: Normal(3.0) - ), + protection: Normal(3.0), + poise_protection: Normal(3.0), + ), ) ), quality: Moderate, diff --git a/assets/common/items/armor/belt/steel_0.ron b/assets/common/items/armor/belt/steel_0.ron index 9d2bdbd190..77dbbb4dd2 100644 --- a/assets/common/items/armor/belt/steel_0.ron +++ b/assets/common/items/armor/belt/steel_0.ron @@ -5,8 +5,9 @@ ItemDef( ( kind: Belt("Steel0"), stats: ( - protection: Normal(4.0) - ), + protection: Normal(4.0), + poise_protection: Normal(4.0), + ), ) ), quality: Moderate, diff --git a/assets/common/items/armor/belt/tarasque.ron b/assets/common/items/armor/belt/tarasque.ron index ad8b73c7b4..7f106d5a1b 100644 --- a/assets/common/items/armor/belt/tarasque.ron +++ b/assets/common/items/armor/belt/tarasque.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Belt("Tarasque"), stats: ( - protection: Normal(3.0)), + protection: Normal(3.0), + poise_protection: Normal(3.0), + ), ) ), quality: High, diff --git a/assets/common/items/armor/belt/twig.ron b/assets/common/items/armor/belt/twig.ron index 5a2807f827..8bfd312f3f 100644 --- a/assets/common/items/armor/belt/twig.ron +++ b/assets/common/items/armor/belt/twig.ron @@ -5,8 +5,9 @@ ItemDef( ( kind: Belt("Twig"), stats: ( - protection: Normal(2.0) - ), + protection: Normal(2.0), + poise_protection: Normal(2.0), + ), ) ), quality: Moderate, diff --git a/assets/common/items/armor/belt/twigsflowers.ron b/assets/common/items/armor/belt/twigsflowers.ron index 15d51493ef..1244ff9ad8 100644 --- a/assets/common/items/armor/belt/twigsflowers.ron +++ b/assets/common/items/armor/belt/twigsflowers.ron @@ -5,8 +5,9 @@ ItemDef( ( kind: Belt("Twigsflowers"), stats: ( - protection: Normal(2.0) - ), + protection: Normal(2.0), + poise_protection: Normal(2.0), + ), ) ), quality: Moderate, diff --git a/assets/common/items/armor/belt/twigsleaves.ron b/assets/common/items/armor/belt/twigsleaves.ron index c73e91f103..0002f686ad 100644 --- a/assets/common/items/armor/belt/twigsleaves.ron +++ b/assets/common/items/armor/belt/twigsleaves.ron @@ -5,8 +5,9 @@ ItemDef( ( kind: Belt("Twigsleaves"), stats: ( - protection: Normal(2.0) - ), + protection: Normal(2.0), + poise_protection: Normal(2.0), + ), ) ), quality: Moderate, diff --git a/assets/common/items/armor/belt/velorite_mage_0.ron b/assets/common/items/armor/belt/velorite_mage_0.ron index d06b094920..0ad537c8c5 100644 --- a/assets/common/items/armor/belt/velorite_mage_0.ron +++ b/assets/common/items/armor/belt/velorite_mage_0.ron @@ -5,8 +5,9 @@ ItemDef( ( kind: Belt("VeloriteMage0"), stats: ( - protection: Normal(5.8) - ), + protection: Normal(5.8), + poise_protection: Normal(5.8), + ), ) ), quality: High, diff --git a/assets/common/items/armor/belt/warlock.ron b/assets/common/items/armor/belt/warlock.ron index 1ae5d83c5d..15b8470714 100644 --- a/assets/common/items/armor/belt/warlock.ron +++ b/assets/common/items/armor/belt/warlock.ron @@ -5,8 +5,9 @@ ItemDef( ( kind: Belt("Warlock"), stats: ( - protection: Normal(8.0) - ), + protection: Normal(8.0), + poise_protection: Normal(8.0), + ), ) ), quality: Moderate, diff --git a/assets/common/items/armor/belt/warlord.ron b/assets/common/items/armor/belt/warlord.ron index ca0173c1cc..d45e522d53 100644 --- a/assets/common/items/armor/belt/warlord.ron +++ b/assets/common/items/armor/belt/warlord.ron @@ -5,8 +5,9 @@ ItemDef( ( kind: Belt("Warlord"), stats: ( - protection: Normal(8.0) - ), + protection: Normal(8.0), + poise_protection: Normal(8.0), + ), ) ), quality: Moderate, diff --git a/assets/common/items/armor/chest/assassin.ron b/assets/common/items/armor/chest/assassin.ron index 8aff55ab7e..6113a1c565 100644 --- a/assets/common/items/armor/chest/assassin.ron +++ b/assets/common/items/armor/chest/assassin.ron @@ -5,8 +5,9 @@ ItemDef( ( kind: Chest("Assassin"), stats: ( - protection: Normal(15.0) - ), + protection: Normal(15.0), + poise_protection: Normal(15.0), + ), ) ), quality: Moderate, diff --git a/assets/common/items/armor/chest/bonerattler.ron b/assets/common/items/armor/chest/bonerattler.ron index d8de4a5ec3..c798ba2f26 100644 --- a/assets/common/items/armor/chest/bonerattler.ron +++ b/assets/common/items/armor/chest/bonerattler.ron @@ -5,8 +5,10 @@ ItemDef( ( kind: Chest("Bonerattler"), stats: ( - protection: Normal(25.0)), + protection: Normal(25.0), + poise_protection: Normal(25.0), + ), ) ), quality: High, -) \ No newline at end of file +) diff --git a/assets/common/items/armor/chest/cloth_blue_0.ron b/assets/common/items/armor/chest/cloth_blue_0.ron index 661b1ae8a0..e0e486ad74 100644 --- a/assets/common/items/armor/chest/cloth_blue_0.ron +++ b/assets/common/items/armor/chest/cloth_blue_0.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Chest("ClothBlue0"), stats: ( - protection: Normal(1.0)), + protection: Normal(1.0), + poise_protection: Normal(1.0), + ), ) ), quality: Common, diff --git a/assets/common/items/armor/chest/cloth_green_0.ron b/assets/common/items/armor/chest/cloth_green_0.ron index a958dee2bb..34916646a9 100644 --- a/assets/common/items/armor/chest/cloth_green_0.ron +++ b/assets/common/items/armor/chest/cloth_green_0.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Chest("ClothGreen0"), stats: ( - protection: Normal(1.0)), + protection: Normal(1.0), + poise_protection: Normal(1.0), + ), ) ), quality: Common, diff --git a/assets/common/items/armor/chest/cloth_purple_0.ron b/assets/common/items/armor/chest/cloth_purple_0.ron index bc2828bff5..c387c407c5 100644 --- a/assets/common/items/armor/chest/cloth_purple_0.ron +++ b/assets/common/items/armor/chest/cloth_purple_0.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Chest("ClothPurple0"), stats: ( - protection: Normal(1.0)), + protection: Normal(1.0), + poise_protection: Normal(1.0), + ), ) ), quality: Common, diff --git a/assets/common/items/armor/chest/cultist_chest_blue.ron b/assets/common/items/armor/chest/cultist_chest_blue.ron index c5449652f2..1a0544647e 100644 --- a/assets/common/items/armor/chest/cultist_chest_blue.ron +++ b/assets/common/items/armor/chest/cultist_chest_blue.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Chest("VeloriteMage0"), stats: ( - protection: Normal(30.0)), + protection: Normal(30.0), + poise_protection: Normal(30.0), + ), ) ), quality: Epic, diff --git a/assets/common/items/armor/chest/cultist_chest_purple.ron b/assets/common/items/armor/chest/cultist_chest_purple.ron index 57838b09cb..c0ae9ce679 100644 --- a/assets/common/items/armor/chest/cultist_chest_purple.ron +++ b/assets/common/items/armor/chest/cultist_chest_purple.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Chest("CultistPurple"), stats: ( - protection: Normal(30.0)), + protection: Normal(30.0), + poise_protection: Normal(30.0), + ), ) ), quality: Epic, diff --git a/assets/common/items/armor/chest/druid.ron b/assets/common/items/armor/chest/druid.ron index 583004b13b..eb0ab16c9e 100644 --- a/assets/common/items/armor/chest/druid.ron +++ b/assets/common/items/armor/chest/druid.ron @@ -5,8 +5,9 @@ ItemDef( ( kind: Chest("Druid"), stats: ( - protection: Normal(6.0) - ), + protection: Normal(6.0), + poise_protection: Normal(6.0), + ), ) ), quality: Moderate, diff --git a/assets/common/items/armor/chest/leather_0.ron b/assets/common/items/armor/chest/leather_0.ron index 5bfd1f5f6e..813ac219dd 100644 --- a/assets/common/items/armor/chest/leather_0.ron +++ b/assets/common/items/armor/chest/leather_0.ron @@ -5,8 +5,9 @@ ItemDef( ( kind: Chest("Leather0"), stats: ( - protection: Normal(10.0) - ), + protection: Normal(10.0), + poise_protection: Normal(10.0), + ), ) ), quality: Moderate, diff --git a/assets/common/items/armor/chest/leather_2.ron b/assets/common/items/armor/chest/leather_2.ron index 974ee75c09..a70d363825 100644 --- a/assets/common/items/armor/chest/leather_2.ron +++ b/assets/common/items/armor/chest/leather_2.ron @@ -5,9 +5,10 @@ ItemDef( ( kind: Chest("Leather2"), stats: ( - protection: Normal(10.0) - ), + protection: Normal(10.0), + poise_protection: Normal(10.0), + ), ) ), quality: Moderate, -) \ No newline at end of file +) diff --git a/assets/common/items/armor/chest/leather_adventurer.ron b/assets/common/items/armor/chest/leather_adventurer.ron index cb4cb0afc0..fabc88942e 100644 --- a/assets/common/items/armor/chest/leather_adventurer.ron +++ b/assets/common/items/armor/chest/leather_adventurer.ron @@ -5,8 +5,9 @@ ItemDef( ( kind: Chest("Leather2"), stats: ( - protection: Normal(8.0) - ), + protection: Normal(8.0), + poise_protection: Normal(8.0), + ), ) ), quality: Moderate, diff --git a/assets/common/items/armor/chest/plate_green_0.ron b/assets/common/items/armor/chest/plate_green_0.ron index 8838aa1a8d..ca63bac807 100644 --- a/assets/common/items/armor/chest/plate_green_0.ron +++ b/assets/common/items/armor/chest/plate_green_0.ron @@ -5,8 +5,9 @@ ItemDef( ( kind: Chest("PlateGreen0"), stats: ( - protection: Normal(20.0) - ), + protection: Normal(20.0), + poise_protection: Normal(20.0), + ), ) ), quality: Moderate, diff --git a/assets/common/items/armor/chest/steel_0.ron b/assets/common/items/armor/chest/steel_0.ron index 74bc4751e3..38d39923ca 100644 --- a/assets/common/items/armor/chest/steel_0.ron +++ b/assets/common/items/armor/chest/steel_0.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Chest("Steel0"), stats: ( - protection: Normal(25.0)), + protection: Normal(25.0), + poise_protection: Normal(25.0), + ), ) ), quality: High, diff --git a/assets/common/items/armor/chest/tarasque.ron b/assets/common/items/armor/chest/tarasque.ron index d2acaca9d8..12c45f6205 100644 --- a/assets/common/items/armor/chest/tarasque.ron +++ b/assets/common/items/armor/chest/tarasque.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Chest("Tarasque"), stats: ( - protection: Normal(25.0)), + protection: Normal(25.0), + poise_protection: Normal(25.0), + ), ) ), quality: High, diff --git a/assets/common/items/armor/chest/twig.ron b/assets/common/items/armor/chest/twig.ron index f02cccb93f..61ecf0cdfa 100644 --- a/assets/common/items/armor/chest/twig.ron +++ b/assets/common/items/armor/chest/twig.ron @@ -5,8 +5,9 @@ ItemDef( ( kind: Chest("Twig"), stats: ( - protection: Normal(15.0) - ), + protection: Normal(15.0), + poise_protection: Normal(15.0), + ), ) ), quality: Moderate, diff --git a/assets/common/items/armor/chest/twigsflowers.ron b/assets/common/items/armor/chest/twigsflowers.ron index 5c866b1de2..1adb866952 100644 --- a/assets/common/items/armor/chest/twigsflowers.ron +++ b/assets/common/items/armor/chest/twigsflowers.ron @@ -5,8 +5,9 @@ ItemDef( ( kind: Chest("Twigsflowers"), stats: ( - protection: Normal(15.0) - ), + protection: Normal(15.0), + poise_protection: Normal(15.0), + ), ) ), quality: Moderate, diff --git a/assets/common/items/armor/chest/twigsleaves.ron b/assets/common/items/armor/chest/twigsleaves.ron index 303f4cfe57..b0a056a2fb 100644 --- a/assets/common/items/armor/chest/twigsleaves.ron +++ b/assets/common/items/armor/chest/twigsleaves.ron @@ -5,8 +5,9 @@ ItemDef( ( kind: Chest("Twigsleaves"), stats: ( - protection: Normal(15.0) - ), + protection: Normal(15.0), + poise_protection: Normal(15.0), + ), ) ), quality: Moderate, diff --git a/assets/common/items/armor/chest/velorite_mage_0.ron b/assets/common/items/armor/chest/velorite_mage_0.ron index 9d8a1773d8..2b8fb3a339 100644 --- a/assets/common/items/armor/chest/velorite_mage_0.ron +++ b/assets/common/items/armor/chest/velorite_mage_0.ron @@ -5,8 +5,9 @@ ItemDef( ( kind: Chest("VeloriteMage0"), stats: ( - protection: Normal(28.0) - ), + protection: Normal(28.0), + poise_protection: Normal(28.0), + ), ) ), quality: High, diff --git a/assets/common/items/armor/chest/warlock.ron b/assets/common/items/armor/chest/warlock.ron index 9095ae409a..2d26ff39b0 100644 --- a/assets/common/items/armor/chest/warlock.ron +++ b/assets/common/items/armor/chest/warlock.ron @@ -5,8 +5,9 @@ ItemDef( ( kind: Chest("Warlock"), stats: ( - protection: Normal(40.0) - ), + protection: Normal(40.0), + poise_protection: Normal(40.0), + ), ) ), quality: Moderate, diff --git a/assets/common/items/armor/chest/warlord.ron b/assets/common/items/armor/chest/warlord.ron index 5400ffcc0b..424f348ee1 100644 --- a/assets/common/items/armor/chest/warlord.ron +++ b/assets/common/items/armor/chest/warlord.ron @@ -5,8 +5,9 @@ ItemDef( ( kind: Chest("Warlord"), stats: ( - protection: Normal(40.0) - ), + protection: Normal(40.0), + poise_protection: Normal(40.0), + ), ) ), quality: Moderate, diff --git a/assets/common/items/armor/chest/worker_green_0.ron b/assets/common/items/armor/chest/worker_green_0.ron index e12cedf33a..8ce2830435 100644 --- a/assets/common/items/armor/chest/worker_green_0.ron +++ b/assets/common/items/armor/chest/worker_green_0.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Chest("WorkerGreen0"), stats: ( - protection: Normal(1.0)), + protection: Normal(1.0), + poise_protection: Normal(1.0), + ), ) ), quality: Low, diff --git a/assets/common/items/armor/chest/worker_green_1.ron b/assets/common/items/armor/chest/worker_green_1.ron index 1f9583a25a..3f8cf13375 100644 --- a/assets/common/items/armor/chest/worker_green_1.ron +++ b/assets/common/items/armor/chest/worker_green_1.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Chest("WorkerGreen1"), stats: ( - protection: Normal(1.0)), + protection: Normal(1.0), + poise_protection: Normal(1.0), + ), ) ), quality: Low, diff --git a/assets/common/items/armor/chest/worker_orange_0.ron b/assets/common/items/armor/chest/worker_orange_0.ron index 87a952eb2e..292eec0530 100644 --- a/assets/common/items/armor/chest/worker_orange_0.ron +++ b/assets/common/items/armor/chest/worker_orange_0.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Chest("WorkerOrange0"), stats: ( - protection: Normal(1.0)), + protection: Normal(1.0), + poise_protection: Normal(1.0), + ), ) ), quality: Low, diff --git a/assets/common/items/armor/chest/worker_orange_1.ron b/assets/common/items/armor/chest/worker_orange_1.ron index 43fe0517dc..a24a8fb2b6 100644 --- a/assets/common/items/armor/chest/worker_orange_1.ron +++ b/assets/common/items/armor/chest/worker_orange_1.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Chest("WorkerOrange1"), stats: ( - protection: Normal(1.0)), + protection: Normal(1.0), + poise_protection: Normal(1.0), + ), ) ), quality: Low, diff --git a/assets/common/items/armor/chest/worker_purple_0.ron b/assets/common/items/armor/chest/worker_purple_0.ron index ab2ceee463..c125f34903 100644 --- a/assets/common/items/armor/chest/worker_purple_0.ron +++ b/assets/common/items/armor/chest/worker_purple_0.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Chest("WorkerPurple0"), stats: ( - protection: Normal(1.0)), + protection: Normal(1.0), + poise_protection: Normal(1.0), + ), ) ), quality: Low, diff --git a/assets/common/items/armor/chest/worker_purple_1.ron b/assets/common/items/armor/chest/worker_purple_1.ron index 0ec0f3385c..eac9d1046d 100644 --- a/assets/common/items/armor/chest/worker_purple_1.ron +++ b/assets/common/items/armor/chest/worker_purple_1.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Chest("WorkerPurple1"), stats: ( - protection: Normal(1.0)), + protection: Normal(1.0), + poise_protection: Normal(1.0), + ), ) ), quality: Low, diff --git a/assets/common/items/armor/chest/worker_red_0.ron b/assets/common/items/armor/chest/worker_red_0.ron index 6f9183ca2a..c7585b7a19 100644 --- a/assets/common/items/armor/chest/worker_red_0.ron +++ b/assets/common/items/armor/chest/worker_red_0.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Chest("WorkerRed0"), stats: ( - protection: Normal(1.0)), + protection: Normal(1.0), + poise_protection: Normal(1.0), + ), ) ), quality: Low, diff --git a/assets/common/items/armor/chest/worker_red_1.ron b/assets/common/items/armor/chest/worker_red_1.ron index caafc13601..f32c5fdb4d 100644 --- a/assets/common/items/armor/chest/worker_red_1.ron +++ b/assets/common/items/armor/chest/worker_red_1.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Chest("WorkerRed1"), stats: ( - protection: Normal(1.0)), + protection: Normal(1.0), + poise_protection: Normal(1.0), + ), ) ), quality: Low, diff --git a/assets/common/items/armor/chest/worker_yellow_0.ron b/assets/common/items/armor/chest/worker_yellow_0.ron index 368a3b5a4e..fed422d41e 100644 --- a/assets/common/items/armor/chest/worker_yellow_0.ron +++ b/assets/common/items/armor/chest/worker_yellow_0.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Chest("WorkerYellow0"), stats: ( - protection: Normal(1.0)), + protection: Normal(1.0), + poise_protection: Normal(1.0), + ), ) ), quality: Low, diff --git a/assets/common/items/armor/chest/worker_yellow_1.ron b/assets/common/items/armor/chest/worker_yellow_1.ron index b5d78b0deb..74afcc1a29 100644 --- a/assets/common/items/armor/chest/worker_yellow_1.ron +++ b/assets/common/items/armor/chest/worker_yellow_1.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Chest("WorkerYellow1"), stats: ( - protection: Normal(1.0)), + protection: Normal(1.0), + poise_protection: Normal(1.0), + ), ) ), quality: Low, diff --git a/assets/common/items/armor/foot/assassin.ron b/assets/common/items/armor/foot/assassin.ron index de74557c1d..7b9294970e 100644 --- a/assets/common/items/armor/foot/assassin.ron +++ b/assets/common/items/armor/foot/assassin.ron @@ -5,8 +5,9 @@ ItemDef( ( kind: Foot("Assassin"), stats: ( - protection: Normal(4.0) - ), + protection: Normal(4.0), + poise_protection: Normal(4.0), + ), ) ), quality: Moderate, diff --git a/assets/common/items/armor/foot/bonerattler.ron b/assets/common/items/armor/foot/bonerattler.ron index 678e9f8cdf..d0c62846ae 100644 --- a/assets/common/items/armor/foot/bonerattler.ron +++ b/assets/common/items/armor/foot/bonerattler.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Foot("Bonerattler"), stats: ( - protection: Normal(5.0)), + protection: Normal(5.0), + poise_protection: Normal(5.0), + ), ) ), quality: High, diff --git a/assets/common/items/armor/foot/cloth_blue_0.ron b/assets/common/items/armor/foot/cloth_blue_0.ron index d672c007a0..0cc4f2312e 100644 --- a/assets/common/items/armor/foot/cloth_blue_0.ron +++ b/assets/common/items/armor/foot/cloth_blue_0.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Foot("ClothBlue0"), stats: ( - protection: Normal(0.0)), + protection: Normal(0.0), + poise_protection: Normal(0.0), + ), ) ), quality: Common, diff --git a/assets/common/items/armor/foot/cloth_green_0.ron b/assets/common/items/armor/foot/cloth_green_0.ron index 06bb0b3d58..5fcbb896a0 100644 --- a/assets/common/items/armor/foot/cloth_green_0.ron +++ b/assets/common/items/armor/foot/cloth_green_0.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Foot("ClothGreen0"), stats: ( - protection: Normal(0.0)), + protection: Normal(0.0), + poise_protection: Normal(0.0), + ), ) ), quality: Common, diff --git a/assets/common/items/armor/foot/cloth_purple_0.ron b/assets/common/items/armor/foot/cloth_purple_0.ron index fa7df73d6c..81ecbab724 100644 --- a/assets/common/items/armor/foot/cloth_purple_0.ron +++ b/assets/common/items/armor/foot/cloth_purple_0.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Foot("ClothPurple0"), stats: ( - protection: Normal(0.0)), + protection: Normal(0.0), + poise_protection: Normal(0.0), + ), ) ), quality: Common, diff --git a/assets/common/items/armor/foot/cultist_boots.ron b/assets/common/items/armor/foot/cultist_boots.ron index 6c683b4c69..862c9613c7 100644 --- a/assets/common/items/armor/foot/cultist_boots.ron +++ b/assets/common/items/armor/foot/cultist_boots.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Foot("Cultist"), stats: ( - protection: Normal(6.0)), + protection: Normal(6.0), + poise_protection: Normal(6.0), + ), ) ), quality: Epic, diff --git a/assets/common/items/armor/foot/druid.ron b/assets/common/items/armor/foot/druid.ron index d07bdd9481..81598674ae 100644 --- a/assets/common/items/armor/foot/druid.ron +++ b/assets/common/items/armor/foot/druid.ron @@ -5,8 +5,9 @@ ItemDef( ( kind: Foot("Druid"), stats: ( - protection: Normal(1.0) - ), + protection: Normal(1.0), + poise_protection: Normal(1.0), + ), ) ), quality: Moderate, diff --git a/assets/common/items/armor/foot/jackalope_slippers.ron b/assets/common/items/armor/foot/jackalope_slippers.ron index 60ff901ff4..147cf08aff 100644 --- a/assets/common/items/armor/foot/jackalope_slippers.ron +++ b/assets/common/items/armor/foot/jackalope_slippers.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Foot("JackalopeSlips"), stats: ( - protection: Normal(0.0)), + protection: Normal(0.0), + poise_protection: Normal(0.0), + ), ) ), quality: High, diff --git a/assets/common/items/armor/foot/leather_0.ron b/assets/common/items/armor/foot/leather_0.ron index 1f774ec0ef..7b73d97d51 100644 --- a/assets/common/items/armor/foot/leather_0.ron +++ b/assets/common/items/armor/foot/leather_0.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Foot("Leather0"), stats: ( - protection: Normal(2.0)), + protection: Normal(2.0), + poise_protection: Normal(2.0), + ), ) ), quality: Common, diff --git a/assets/common/items/armor/foot/leather_2.ron b/assets/common/items/armor/foot/leather_2.ron index 8dcc285e7c..7f9692e7ac 100644 --- a/assets/common/items/armor/foot/leather_2.ron +++ b/assets/common/items/armor/foot/leather_2.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Foot("Leather2"), stats: ( - protection: Normal(2.0)), + protection: Normal(2.0), + poise_protection: Normal(2.0), + ), ) ), quality: Common, diff --git a/assets/common/items/armor/foot/leather_adventurer.ron b/assets/common/items/armor/foot/leather_adventurer.ron index 4048f926fa..bca44d8e63 100644 --- a/assets/common/items/armor/foot/leather_adventurer.ron +++ b/assets/common/items/armor/foot/leather_adventurer.ron @@ -5,8 +5,9 @@ ItemDef( ( kind: Foot("Leather2"), stats: ( - protection: Normal(2.0) - ), + protection: Normal(2.0), + poise_protection: Normal(2.0), + ), ) ), quality: Moderate, diff --git a/assets/common/items/armor/foot/plate_0.ron b/assets/common/items/armor/foot/plate_0.ron index 1a3c400c41..a8fe2e35b6 100644 --- a/assets/common/items/armor/foot/plate_0.ron +++ b/assets/common/items/armor/foot/plate_0.ron @@ -5,8 +5,9 @@ ItemDef( ( kind: Foot("Plate0"), stats: ( - protection: Normal(4.0) - ), + protection: Normal(4.0), + poise_protection: Normal(4.0), + ), ) ), quality: Moderate, diff --git a/assets/common/items/armor/foot/steel_0.ron b/assets/common/items/armor/foot/steel_0.ron index 9c8e7bda31..e0149a53bc 100644 --- a/assets/common/items/armor/foot/steel_0.ron +++ b/assets/common/items/armor/foot/steel_0.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Foot("Steel0"), stats: ( - protection: Normal(5.0)), + protection: Normal(5.0), + poise_protection: Normal(5.0), + ), ) ), quality: High, diff --git a/assets/common/items/armor/foot/tarasque.ron b/assets/common/items/armor/foot/tarasque.ron index 6964184c23..943cabc984 100644 --- a/assets/common/items/armor/foot/tarasque.ron +++ b/assets/common/items/armor/foot/tarasque.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Foot("Tarasque"), stats: ( - protection: Normal(5.0)), + protection: Normal(5.0), + poise_protection: Normal(5.0), + ), ) ), quality: High, diff --git a/assets/common/items/armor/foot/twig.ron b/assets/common/items/armor/foot/twig.ron index 6a8d2be421..dfcb6d69b1 100644 --- a/assets/common/items/armor/foot/twig.ron +++ b/assets/common/items/armor/foot/twig.ron @@ -5,8 +5,9 @@ ItemDef( ( kind: Foot("Twig"), stats: ( - protection: Normal(3.0) - ), + protection: Normal(3.0), + poise_protection: Normal(3.0), + ), ) ), quality: Moderate, diff --git a/assets/common/items/armor/foot/twigsflowers.ron b/assets/common/items/armor/foot/twigsflowers.ron index 8177d58192..63f231bae6 100644 --- a/assets/common/items/armor/foot/twigsflowers.ron +++ b/assets/common/items/armor/foot/twigsflowers.ron @@ -5,8 +5,9 @@ ItemDef( ( kind: Foot("Twigsflowers"), stats: ( - protection: Normal(3.0) - ), + protection: Normal(3.0), + poise_protection: Normal(3.0), + ), ) ), quality: Moderate, diff --git a/assets/common/items/armor/foot/twigsleaves.ron b/assets/common/items/armor/foot/twigsleaves.ron index 0de5383eae..75f3b9d45a 100644 --- a/assets/common/items/armor/foot/twigsleaves.ron +++ b/assets/common/items/armor/foot/twigsleaves.ron @@ -5,8 +5,9 @@ ItemDef( ( kind: Foot("Twigsleaves"), stats: ( - protection: Normal(3.0) - ), + protection: Normal(3.0), + poise_protection: Normal(3.0), + ), ) ), quality: Moderate, diff --git a/assets/common/items/armor/foot/velorite_mage_0.ron b/assets/common/items/armor/foot/velorite_mage_0.ron index 7b48e3cd75..f1cbf70c86 100644 --- a/assets/common/items/armor/foot/velorite_mage_0.ron +++ b/assets/common/items/armor/foot/velorite_mage_0.ron @@ -5,8 +5,9 @@ ItemDef( ( kind: Foot("VeloriteMage0"), stats: ( - protection: Normal(5.9) - ), + protection: Normal(5.9), + poise_protection: Normal(5.9), + ), ) ), quality: High, diff --git a/assets/common/items/armor/foot/warlock.ron b/assets/common/items/armor/foot/warlock.ron index 3bd1951429..6aa7b9a91e 100644 --- a/assets/common/items/armor/foot/warlock.ron +++ b/assets/common/items/armor/foot/warlock.ron @@ -5,8 +5,9 @@ ItemDef( ( kind: Foot("Warlock"), stats: ( - protection: Normal(8.0) - ), + protection: Normal(8.0), + poise_protection: Normal(8.0), + ), ) ), quality: Moderate, diff --git a/assets/common/items/armor/foot/warlord.ron b/assets/common/items/armor/foot/warlord.ron index 74f7cef132..a3a4bbc84e 100644 --- a/assets/common/items/armor/foot/warlord.ron +++ b/assets/common/items/armor/foot/warlord.ron @@ -5,8 +5,9 @@ ItemDef( ( kind: Foot("Warlord"), stats: ( - protection: Normal(8.0) - ), + protection: Normal(8.0), + poise_protection: Normal(8.0), + ), ) ), quality: Moderate, diff --git a/assets/common/items/armor/hand/assassin.ron b/assets/common/items/armor/hand/assassin.ron index f1f5892eb7..95450cc92d 100644 --- a/assets/common/items/armor/hand/assassin.ron +++ b/assets/common/items/armor/hand/assassin.ron @@ -5,8 +5,9 @@ ItemDef( ( kind: Hand("Assassin"), stats: ( - protection: Normal(6.0) - ), + protection: Normal(6.0), + poise_protection: Normal(6.0), + ), ) ), quality: Moderate, diff --git a/assets/common/items/armor/hand/bonerattler.ron b/assets/common/items/armor/hand/bonerattler.ron index 0ed619deea..d78f676564 100644 --- a/assets/common/items/armor/hand/bonerattler.ron +++ b/assets/common/items/armor/hand/bonerattler.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Hand("Bonerattler"), stats: ( - protection: Normal(10.0)), + protection: Normal(10.0), + poise_protection: Normal(10.0), + ), ) ), quality: High, diff --git a/assets/common/items/armor/hand/cloth_blue_0.ron b/assets/common/items/armor/hand/cloth_blue_0.ron index ce0d8350be..baef2df7da 100644 --- a/assets/common/items/armor/hand/cloth_blue_0.ron +++ b/assets/common/items/armor/hand/cloth_blue_0.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Hand("ClothBlue0"), stats: ( - protection: Normal(0.0)), + protection: Normal(0.0), + poise_protection: Normal(0.0), + ), ) ), quality: Common, diff --git a/assets/common/items/armor/hand/cloth_green_0.ron b/assets/common/items/armor/hand/cloth_green_0.ron index 66a847089e..d17e6b63fb 100644 --- a/assets/common/items/armor/hand/cloth_green_0.ron +++ b/assets/common/items/armor/hand/cloth_green_0.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Hand("ClothGreen0"), stats: ( - protection: Normal(0.0)), + protection: Normal(0.0), + poise_protection: Normal(0.0), + ), ) ), quality: Common, diff --git a/assets/common/items/armor/hand/cloth_purple_0.ron b/assets/common/items/armor/hand/cloth_purple_0.ron index 1392bf82dd..f0a7d6b253 100644 --- a/assets/common/items/armor/hand/cloth_purple_0.ron +++ b/assets/common/items/armor/hand/cloth_purple_0.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Hand("ClothPurple0"), stats: ( - protection: Normal(0.0)), + protection: Normal(0.0), + poise_protection: Normal(0.0), + ), ) ), quality: Common, diff --git a/assets/common/items/armor/hand/cultist_hands_blue.ron b/assets/common/items/armor/hand/cultist_hands_blue.ron index 959b095af4..2fe9f2b680 100644 --- a/assets/common/items/armor/hand/cultist_hands_blue.ron +++ b/assets/common/items/armor/hand/cultist_hands_blue.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Hand("VeloriteMage0"), stats: ( - protection: Normal(12.0)), + protection: Normal(12.0), + poise_protection: Normal(12.0), + ), ) ), quality: Epic, diff --git a/assets/common/items/armor/hand/cultist_hands_purple.ron b/assets/common/items/armor/hand/cultist_hands_purple.ron index b2aba0a762..51dd24f8c4 100644 --- a/assets/common/items/armor/hand/cultist_hands_purple.ron +++ b/assets/common/items/armor/hand/cultist_hands_purple.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Hand("CultistPurple"), stats: ( - protection: Normal(12.0)), + protection: Normal(12.0), + poise_protection: Normal(12.0), + ), ) ), quality: Epic, diff --git a/assets/common/items/armor/hand/druid.ron b/assets/common/items/armor/hand/druid.ron index 9f19a6419d..39f0a6bf5d 100644 --- a/assets/common/items/armor/hand/druid.ron +++ b/assets/common/items/armor/hand/druid.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Hand("Druid"), stats: ( - protection: Normal(2.0)), + protection: Normal(2.0), + poise_protection: Normal(2.0), + ), ) ), quality: Common, diff --git a/assets/common/items/armor/hand/leather_0.ron b/assets/common/items/armor/hand/leather_0.ron index 4cf5ff780a..796dc8fca8 100644 --- a/assets/common/items/armor/hand/leather_0.ron +++ b/assets/common/items/armor/hand/leather_0.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Hand("Leather0"), stats: ( - protection: Normal(4.0)), + protection: Normal(4.0), + poise_protection: Normal(4.0), + ), ) ), quality: Common, diff --git a/assets/common/items/armor/hand/leather_2.ron b/assets/common/items/armor/hand/leather_2.ron index bdacce9bc7..4170378ceb 100644 --- a/assets/common/items/armor/hand/leather_2.ron +++ b/assets/common/items/armor/hand/leather_2.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Hand("Leather2"), stats: ( - protection: Normal(4.0)), + protection: Normal(4.0), + poise_protection: Normal(4.0), + ), ) ), quality: Common, diff --git a/assets/common/items/armor/hand/leather_adventurer.ron b/assets/common/items/armor/hand/leather_adventurer.ron index 99dfec383c..8a04897ce2 100644 --- a/assets/common/items/armor/hand/leather_adventurer.ron +++ b/assets/common/items/armor/hand/leather_adventurer.ron @@ -5,8 +5,9 @@ ItemDef( ( kind: Hand("Leather2"), stats: ( - protection: Normal(4.0) - ), + protection: Normal(4.0), + poise_protection: Normal(4.0), + ), ) ), quality: Moderate, diff --git a/assets/common/items/armor/hand/plate_0.ron b/assets/common/items/armor/hand/plate_0.ron index 9b7ffe5395..3bb81d2cdc 100644 --- a/assets/common/items/armor/hand/plate_0.ron +++ b/assets/common/items/armor/hand/plate_0.ron @@ -5,8 +5,9 @@ ItemDef( ( kind: Hand("Plate0"), stats: ( - protection: Normal(8.0) - ), + protection: Normal(8.0), + poise_protection: Normal(8.0), + ), ) ), quality: Moderate, diff --git a/assets/common/items/armor/hand/steel_0.ron b/assets/common/items/armor/hand/steel_0.ron index df5c895a55..22513effe1 100644 --- a/assets/common/items/armor/hand/steel_0.ron +++ b/assets/common/items/armor/hand/steel_0.ron @@ -5,8 +5,9 @@ ItemDef( ( kind: Hand("Steel0"), stats: ( - protection: Normal(10.0) - ), + protection: Normal(10.0), + poise_protection: Normal(10.0), + ), ) ), quality: Moderate, diff --git a/assets/common/items/armor/hand/tarasque.ron b/assets/common/items/armor/hand/tarasque.ron index da6293a96e..916da7c2c0 100644 --- a/assets/common/items/armor/hand/tarasque.ron +++ b/assets/common/items/armor/hand/tarasque.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Hand("Tarasque"), stats: ( - protection: Normal(10.0)), + protection: Normal(10.0), + poise_protection: Normal(10.0), + ), ) ), quality: High, diff --git a/assets/common/items/armor/hand/twig.ron b/assets/common/items/armor/hand/twig.ron index a9435d1738..1432b30cbe 100644 --- a/assets/common/items/armor/hand/twig.ron +++ b/assets/common/items/armor/hand/twig.ron @@ -5,8 +5,9 @@ ItemDef( ( kind: Hand("Twig"), stats: ( - protection: Normal(6.0) - ), + protection: Normal(6.0), + poise_protection: Normal(6.0), + ), ) ), quality: Moderate, diff --git a/assets/common/items/armor/hand/twigsflowers.ron b/assets/common/items/armor/hand/twigsflowers.ron index 715eb2d4af..d1f201a9ef 100644 --- a/assets/common/items/armor/hand/twigsflowers.ron +++ b/assets/common/items/armor/hand/twigsflowers.ron @@ -5,8 +5,9 @@ ItemDef( ( kind: Hand("Twigsflowers"), stats: ( - protection: Normal(6.0) - ), + protection: Normal(6.0), + poise_protection: Normal(6.0), + ), ) ), quality: Moderate, diff --git a/assets/common/items/armor/hand/twigsleaves.ron b/assets/common/items/armor/hand/twigsleaves.ron index 5e66795bfb..905027e43d 100644 --- a/assets/common/items/armor/hand/twigsleaves.ron +++ b/assets/common/items/armor/hand/twigsleaves.ron @@ -5,8 +5,9 @@ ItemDef( ( kind: Hand("Twigsleaves"), stats: ( - protection: Normal(6.0) - ), + protection: Normal(6.0), + poise_protection: Normal(6.0), + ), ) ), quality: Moderate, diff --git a/assets/common/items/armor/hand/velorite_mage_0.ron b/assets/common/items/armor/hand/velorite_mage_0.ron index 64a6e0ebb4..abef7c24e8 100644 --- a/assets/common/items/armor/hand/velorite_mage_0.ron +++ b/assets/common/items/armor/hand/velorite_mage_0.ron @@ -5,8 +5,9 @@ ItemDef( ( kind: Hand("VeloriteMage0"), stats: ( - protection: Normal(11.5) - ), + protection: Normal(11.5), + poise_protection: Normal(11.5), + ), ) ), quality: High, diff --git a/assets/common/items/armor/hand/warlock.ron b/assets/common/items/armor/hand/warlock.ron index 371868f9ec..43a5070086 100644 --- a/assets/common/items/armor/hand/warlock.ron +++ b/assets/common/items/armor/hand/warlock.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Hand("Warlock"), stats: ( - protection: Normal(15.0)), + protection: Normal(15.0), + poise_protection: Normal(15.0), + ), ) ), quality: Common, diff --git a/assets/common/items/armor/hand/warlord.ron b/assets/common/items/armor/hand/warlord.ron index b923282a31..421bc31ad0 100644 --- a/assets/common/items/armor/hand/warlord.ron +++ b/assets/common/items/armor/hand/warlord.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Hand("Warlord"), stats: ( - protection: Normal(15.0)), + protection: Normal(15.0), + poise_protection: Normal(15.0), + ), ) ), quality: Common, diff --git a/assets/common/items/armor/head/assa_mask_0.ron b/assets/common/items/armor/head/assa_mask_0.ron index b68f0f32a9..fe3c1e9359 100644 --- a/assets/common/items/armor/head/assa_mask_0.ron +++ b/assets/common/items/armor/head/assa_mask_0.ron @@ -5,8 +5,9 @@ ItemDef( ( kind: Head("AssaMask0"), stats: ( - protection: Normal(0.0) - ), + protection: Normal(0.0), + poise_protection: Normal(0.0), + ), ) ), quality: Moderate, diff --git a/assets/common/items/armor/head/leather_0.ron b/assets/common/items/armor/head/leather_0.ron index 7844e0f34e..296427caab 100644 --- a/assets/common/items/armor/head/leather_0.ron +++ b/assets/common/items/armor/head/leather_0.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Head("Leather0"), stats: ( - protection: Normal(0.0)), + protection: Normal(0.0), + poise_protection: Normal(0.0), + ), ) ), quality: Common, diff --git a/assets/common/items/armor/head/warlock.ron b/assets/common/items/armor/head/warlock.ron index b0a56ec629..6d784ff978 100644 --- a/assets/common/items/armor/head/warlock.ron +++ b/assets/common/items/armor/head/warlock.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Head("Warlock"), stats: ( - protection: Normal(10.0)), + protection: Normal(10.0), + poise_protection: Normal(10.0), + ), ) ), quality: Common, diff --git a/assets/common/items/armor/head/warlord.ron b/assets/common/items/armor/head/warlord.ron index 6ecc46f802..42619e4f4c 100644 --- a/assets/common/items/armor/head/warlord.ron +++ b/assets/common/items/armor/head/warlord.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Head("Warlord"), stats: ( - protection: Normal(10.0)), + protection: Normal(10.0), + poise_protection: Normal(10.0), + ), ) ), quality: Common, diff --git a/assets/common/items/armor/neck/neck_0.ron b/assets/common/items/armor/neck/neck_0.ron index 8f2a59e977..58b7bdc43b 100644 --- a/assets/common/items/armor/neck/neck_0.ron +++ b/assets/common/items/armor/neck/neck_0.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Neck("Neck0"), stats: ( - protection: Normal(1.0)), + protection: Normal(1.0), + poise_protection: Normal(1.0), + ), ) ), quality: Common, diff --git a/assets/common/items/armor/neck/neck_1.ron b/assets/common/items/armor/neck/neck_1.ron index 0820a2731c..327d5f9bd3 100644 --- a/assets/common/items/armor/neck/neck_1.ron +++ b/assets/common/items/armor/neck/neck_1.ron @@ -5,8 +5,9 @@ ItemDef( ( kind: Neck("Neck1"), stats: ( - protection: Normal(2.0) - ), + protection: Normal(2.0), + poise_protection: Normal(2.0), + ), ) ), quality: Moderate, diff --git a/assets/common/items/armor/pants/assassin.ron b/assets/common/items/armor/pants/assassin.ron index 9de8dc7603..682b51cc23 100644 --- a/assets/common/items/armor/pants/assassin.ron +++ b/assets/common/items/armor/pants/assassin.ron @@ -5,8 +5,9 @@ ItemDef( ( kind: Pants("Assassin"), stats: ( - protection: Normal(10.0) - ), + protection: Normal(10.0), + poise_protection: Normal(10.0), + ), ) ), quality: Moderate, diff --git a/assets/common/items/armor/pants/bonerattler.ron b/assets/common/items/armor/pants/bonerattler.ron index 73aa86acf7..90ad1c8b4e 100644 --- a/assets/common/items/armor/pants/bonerattler.ron +++ b/assets/common/items/armor/pants/bonerattler.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Pants("Bonerattler"), stats: ( - protection: Normal(20.0)), + protection: Normal(20.0), + poise_protection: Normal(20.0), + ), ) ), quality: High, diff --git a/assets/common/items/armor/pants/cloth_blue_0.ron b/assets/common/items/armor/pants/cloth_blue_0.ron index 6ea7360ec6..272bf3145b 100644 --- a/assets/common/items/armor/pants/cloth_blue_0.ron +++ b/assets/common/items/armor/pants/cloth_blue_0.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Pants("ClothBlue0"), stats: ( - protection: Normal(1.0)), + protection: Normal(1.0), + poise_protection: Normal(1.0), + ), ) ), quality: Common, diff --git a/assets/common/items/armor/pants/cloth_green_0.ron b/assets/common/items/armor/pants/cloth_green_0.ron index 7371957d6d..fc7063325b 100644 --- a/assets/common/items/armor/pants/cloth_green_0.ron +++ b/assets/common/items/armor/pants/cloth_green_0.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Pants("ClothGreen0"), stats: ( - protection: Normal(1.0)), + protection: Normal(1.0), + poise_protection: Normal(1.0), + ), ) ), quality: Common, diff --git a/assets/common/items/armor/pants/cloth_purple_0.ron b/assets/common/items/armor/pants/cloth_purple_0.ron index 155e26b9e8..5bbf79b764 100644 --- a/assets/common/items/armor/pants/cloth_purple_0.ron +++ b/assets/common/items/armor/pants/cloth_purple_0.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Pants("ClothPurple0"), stats: ( - protection: Normal(1.0)), + protection: Normal(1.0), + poise_protection: Normal(1.0), + ), ) ), quality: Common, diff --git a/assets/common/items/armor/pants/cultist_legs_blue.ron b/assets/common/items/armor/pants/cultist_legs_blue.ron index 4f965a7355..601dc97f91 100644 --- a/assets/common/items/armor/pants/cultist_legs_blue.ron +++ b/assets/common/items/armor/pants/cultist_legs_blue.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Pants("VeloriteMage0"), stats: ( - protection: Normal(24.0)), + protection: Normal(24.0), + poise_protection: Normal(24.0), + ), ) ), quality: Epic, diff --git a/assets/common/items/armor/pants/cultist_legs_purple.ron b/assets/common/items/armor/pants/cultist_legs_purple.ron index 8863aad0f9..d19780d7c9 100644 --- a/assets/common/items/armor/pants/cultist_legs_purple.ron +++ b/assets/common/items/armor/pants/cultist_legs_purple.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Pants("CultistPurple"), stats: ( - protection: Normal(24.0)), + protection: Normal(24.0), + poise_protection: Normal(24.0), + ), ) ), quality: Epic, diff --git a/assets/common/items/armor/pants/druid.ron b/assets/common/items/armor/pants/druid.ron index 31a6d529a6..d3d93f948b 100644 --- a/assets/common/items/armor/pants/druid.ron +++ b/assets/common/items/armor/pants/druid.ron @@ -5,8 +5,9 @@ ItemDef( ( kind: Pants("Druid"), stats: ( - protection: Normal(4.0) - ), + protection: Normal(4.0), + poise_protection: Normal(4.0), + ), ) ), quality: Moderate, diff --git a/assets/common/items/armor/pants/hunting.ron b/assets/common/items/armor/pants/hunting.ron index 1a0b0fba47..40571bb6e3 100644 --- a/assets/common/items/armor/pants/hunting.ron +++ b/assets/common/items/armor/pants/hunting.ron @@ -5,8 +5,9 @@ ItemDef( ( kind: Pants("Hunting"), stats: ( - protection: Normal(8.0) - ), + protection: Normal(8.0), + poise_protection: Normal(8.0), + ), ) ), quality: Moderate, diff --git a/assets/common/items/armor/pants/leather_0.ron b/assets/common/items/armor/pants/leather_0.ron index 7546ee2c25..6ffea50e25 100644 --- a/assets/common/items/armor/pants/leather_0.ron +++ b/assets/common/items/armor/pants/leather_0.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Pants("Leather0"), stats: ( - protection: Normal(8.0)), + protection: Normal(8.0), + poise_protection: Normal(8.0), + ), ) ), quality: Common, diff --git a/assets/common/items/armor/pants/leather_2.ron b/assets/common/items/armor/pants/leather_2.ron index 910b966416..4de3b3c13e 100644 --- a/assets/common/items/armor/pants/leather_2.ron +++ b/assets/common/items/armor/pants/leather_2.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Pants("Leather2"), stats: ( - protection: Normal(8.0)), + protection: Normal(8.0), + poise_protection: Normal(8.0), + ), ) ), quality: Common, diff --git a/assets/common/items/armor/pants/leather_adventurer.ron b/assets/common/items/armor/pants/leather_adventurer.ron index 7bde4e749c..f884358bea 100644 --- a/assets/common/items/armor/pants/leather_adventurer.ron +++ b/assets/common/items/armor/pants/leather_adventurer.ron @@ -5,8 +5,9 @@ ItemDef( ( kind: Pants("Leather2"), stats: ( - protection: Normal(6.0) - ), + protection: Normal(6.0), + poise_protection: Normal(6.0), + ), ) ), quality: Moderate, diff --git a/assets/common/items/armor/pants/plate_green_0.ron b/assets/common/items/armor/pants/plate_green_0.ron index 59dd99ad58..91608dd4e8 100644 --- a/assets/common/items/armor/pants/plate_green_0.ron +++ b/assets/common/items/armor/pants/plate_green_0.ron @@ -5,8 +5,9 @@ ItemDef( ( kind: Pants("PlateGreen0"), stats: ( - protection: Normal(16.0) - ), + protection: Normal(16.0), + poise_protection: Normal(16.0), + ), ) ), quality: Moderate, diff --git a/assets/common/items/armor/pants/steel_0.ron b/assets/common/items/armor/pants/steel_0.ron index c5ed8c7a8e..053b2dc4f7 100644 --- a/assets/common/items/armor/pants/steel_0.ron +++ b/assets/common/items/armor/pants/steel_0.ron @@ -5,8 +5,9 @@ ItemDef( ( kind: Pants("Steel0"), stats: ( - protection: Normal(20.0) - ), + protection: Normal(20.0), + poise_protection: Normal(20.0), + ), ) ), quality: Moderate, diff --git a/assets/common/items/armor/pants/tarasque.ron b/assets/common/items/armor/pants/tarasque.ron index e82af5f2cc..50ab6b05fa 100644 --- a/assets/common/items/armor/pants/tarasque.ron +++ b/assets/common/items/armor/pants/tarasque.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Pants("Tarasque"), stats: ( - protection: Normal(20.0)), + protection: Normal(20.0), + poise_protection: Normal(20.0), + ), ) ), quality: High, diff --git a/assets/common/items/armor/pants/twig.ron b/assets/common/items/armor/pants/twig.ron index 773a392b75..681e19e214 100644 --- a/assets/common/items/armor/pants/twig.ron +++ b/assets/common/items/armor/pants/twig.ron @@ -5,8 +5,9 @@ ItemDef( ( kind: Pants("Twig"), stats: ( - protection: Normal(12.0) - ), + protection: Normal(12.0), + poise_protection: Normal(12.0), + ), ) ), quality: Moderate, diff --git a/assets/common/items/armor/pants/twigsflowers.ron b/assets/common/items/armor/pants/twigsflowers.ron index cfd06d0c74..0b1bf9d12e 100644 --- a/assets/common/items/armor/pants/twigsflowers.ron +++ b/assets/common/items/armor/pants/twigsflowers.ron @@ -5,8 +5,9 @@ ItemDef( ( kind: Pants("Twigsflowers"), stats: ( - protection: Normal(12.0) - ), + protection: Normal(12.0), + poise_protection: Normal(12.0), + ), ) ), quality: Moderate, diff --git a/assets/common/items/armor/pants/twigsleaves.ron b/assets/common/items/armor/pants/twigsleaves.ron index c121ac383a..41a039044d 100644 --- a/assets/common/items/armor/pants/twigsleaves.ron +++ b/assets/common/items/armor/pants/twigsleaves.ron @@ -5,8 +5,9 @@ ItemDef( ( kind: Pants("Twigsleaves"), stats: ( - protection: Normal(12.0) - ), + protection: Normal(12.0), + poise_protection: Normal(12.0), + ), ) ), quality: Moderate, diff --git a/assets/common/items/armor/pants/velorite_mage_0.ron b/assets/common/items/armor/pants/velorite_mage_0.ron index c8e7093470..f535d9e98e 100644 --- a/assets/common/items/armor/pants/velorite_mage_0.ron +++ b/assets/common/items/armor/pants/velorite_mage_0.ron @@ -5,8 +5,9 @@ ItemDef( ( kind: Pants("VeloriteMage0"), stats: ( - protection: Normal(23.0) - ), + protection: Normal(23.0), + poise_protection: Normal(23.0), + ), ) ), quality: High, diff --git a/assets/common/items/armor/pants/warlock.ron b/assets/common/items/armor/pants/warlock.ron index 782b2bbf05..1851d47312 100644 --- a/assets/common/items/armor/pants/warlock.ron +++ b/assets/common/items/armor/pants/warlock.ron @@ -5,8 +5,9 @@ ItemDef( ( kind: Pants("Warlock"), stats: ( - protection: Normal(30.0) - ), + protection: Normal(30.0), + poise_protection: Normal(30.0), + ), ) ), quality: Moderate, diff --git a/assets/common/items/armor/pants/warlord.ron b/assets/common/items/armor/pants/warlord.ron index 3836043c68..317b581f02 100644 --- a/assets/common/items/armor/pants/warlord.ron +++ b/assets/common/items/armor/pants/warlord.ron @@ -5,8 +5,9 @@ ItemDef( ( kind: Pants("Warlord"), stats: ( - protection: Normal(30.0) - ), + protection: Normal(30.0), + poise_protection: Normal(30.0), + ), ) ), quality: Moderate, diff --git a/assets/common/items/armor/pants/worker_blue_0.ron b/assets/common/items/armor/pants/worker_blue_0.ron index 8d5faa1e14..5966cbb41c 100644 --- a/assets/common/items/armor/pants/worker_blue_0.ron +++ b/assets/common/items/armor/pants/worker_blue_0.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Pants("WorkerBlue0"), stats: ( - protection: Normal(1.0)), + protection: Normal(1.0), + poise_protection: Normal(1.0), + ), ) ), quality: Low, diff --git a/assets/common/items/armor/ring/ring_0.ron b/assets/common/items/armor/ring/ring_0.ron index fbcda86466..c80d88af8a 100644 --- a/assets/common/items/armor/ring/ring_0.ron +++ b/assets/common/items/armor/ring/ring_0.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Ring("Ring0"), stats: ( - protection: Normal(0.1)), + protection: Normal(0.1), + poise_protection: Normal(0.1), + ), ) ), quality: Low, diff --git a/assets/common/items/armor/ring/ring_gold_0.ron b/assets/common/items/armor/ring/ring_gold_0.ron index 30a880c69d..91a8609f02 100644 --- a/assets/common/items/armor/ring/ring_gold_0.ron +++ b/assets/common/items/armor/ring/ring_gold_0.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Ring("RingGold0"), stats: ( - protection: Normal(0.5)), + protection: Normal(0.5), + poise_protection: Normal(0.5), + ), ) ), quality: Moderate, diff --git a/assets/common/items/armor/ring/ring_purp_high_0.ron b/assets/common/items/armor/ring/ring_purp_high_0.ron index addad514be..9c13da06a0 100644 --- a/assets/common/items/armor/ring/ring_purp_high_0.ron +++ b/assets/common/items/armor/ring/ring_purp_high_0.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Ring("RingSkull0"), stats: ( - protection: Normal(3.0)), + protection: Normal(3.0), + poise_protection: Normal(3.0), + ), ) ), quality: High, diff --git a/assets/common/items/armor/shoulder/assassin.ron b/assets/common/items/armor/shoulder/assassin.ron index 7ab33f9c58..9abc1260f3 100644 --- a/assets/common/items/armor/shoulder/assassin.ron +++ b/assets/common/items/armor/shoulder/assassin.ron @@ -5,8 +5,9 @@ ItemDef( ( kind: Shoulder("Assassin"), stats: ( - protection: Normal(8.0) - ), + protection: Normal(8.0), + poise_protection: Normal(8.0), + ), ) ), quality: Moderate, diff --git a/assets/common/items/armor/shoulder/bonerattler.ron b/assets/common/items/armor/shoulder/bonerattler.ron index 2168901ca6..7e3d2e9c7d 100644 --- a/assets/common/items/armor/shoulder/bonerattler.ron +++ b/assets/common/items/armor/shoulder/bonerattler.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Shoulder("Bonerattler"), stats: ( - protection: Normal(15.0)), + protection: Normal(15.0), + poise_protection: Normal(15.0), + ), ) ), quality: High, diff --git a/assets/common/items/armor/shoulder/cloth_blue_0.ron b/assets/common/items/armor/shoulder/cloth_blue_0.ron index a8f683b171..862ac8ff92 100644 --- a/assets/common/items/armor/shoulder/cloth_blue_0.ron +++ b/assets/common/items/armor/shoulder/cloth_blue_0.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Shoulder("ClothBlue0"), stats: ( - protection: Normal(1.0)), + protection: Normal(1.0), + poise_protection: Normal(1.0), + ), ) ), quality: Common, diff --git a/assets/common/items/armor/shoulder/cloth_blue_1.ron b/assets/common/items/armor/shoulder/cloth_blue_1.ron index 43cd74fcfa..7838333050 100644 --- a/assets/common/items/armor/shoulder/cloth_blue_1.ron +++ b/assets/common/items/armor/shoulder/cloth_blue_1.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Shoulder("ClothBlue1"), stats: ( - protection: Normal(1.0)), + protection: Normal(1.0), + poise_protection: Normal(1.0), + ), ) ), quality: Common, diff --git a/assets/common/items/armor/shoulder/cloth_green_0.ron b/assets/common/items/armor/shoulder/cloth_green_0.ron index 30409c7778..f2eb62d66d 100644 --- a/assets/common/items/armor/shoulder/cloth_green_0.ron +++ b/assets/common/items/armor/shoulder/cloth_green_0.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Shoulder("ClothGreen0"), stats: ( - protection: Normal(1.0)), + protection: Normal(1.0), + poise_protection: Normal(1.0), + ), ) ), quality: Common, diff --git a/assets/common/items/armor/shoulder/cloth_purple_0.ron b/assets/common/items/armor/shoulder/cloth_purple_0.ron index ad81ea146b..be11c3a74f 100644 --- a/assets/common/items/armor/shoulder/cloth_purple_0.ron +++ b/assets/common/items/armor/shoulder/cloth_purple_0.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Shoulder("ClothPurple0"), stats: ( - protection: Normal(1.0)), + protection: Normal(1.0), + poise_protection: Normal(1.0), + ), ) ), quality: Common, diff --git a/assets/common/items/armor/shoulder/cultist_shoulder_blue.ron b/assets/common/items/armor/shoulder/cultist_shoulder_blue.ron index 7f07f1797f..45d255daa9 100644 --- a/assets/common/items/armor/shoulder/cultist_shoulder_blue.ron +++ b/assets/common/items/armor/shoulder/cultist_shoulder_blue.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Shoulder("VeloriteMage0"), stats: ( - protection: Normal(18.0)), + protection: Normal(18.0), + poise_protection: Normal(18.0), + ), ) ), quality: Epic, diff --git a/assets/common/items/armor/shoulder/cultist_shoulder_purple.ron b/assets/common/items/armor/shoulder/cultist_shoulder_purple.ron index 3d11f7a84d..080efcec72 100644 --- a/assets/common/items/armor/shoulder/cultist_shoulder_purple.ron +++ b/assets/common/items/armor/shoulder/cultist_shoulder_purple.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Shoulder("CultistPurple"), stats: ( - protection: Normal(18.0)), + protection: Normal(18.0), + poise_protection: Normal(18.0), + ), ) ), quality: Epic, diff --git a/assets/common/items/armor/shoulder/druidshoulder.ron b/assets/common/items/armor/shoulder/druidshoulder.ron index fafffff09f..558290d0a6 100644 --- a/assets/common/items/armor/shoulder/druidshoulder.ron +++ b/assets/common/items/armor/shoulder/druidshoulder.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Shoulder("DruidShoulder"), stats: ( - protection: Normal(3.0)), + protection: Normal(3.0), + poise_protection: Normal(3.0), + ), ) ), quality: Common, diff --git a/assets/common/items/armor/shoulder/iron_spikes.ron b/assets/common/items/armor/shoulder/iron_spikes.ron index 6dadb09b87..cc08a60deb 100644 --- a/assets/common/items/armor/shoulder/iron_spikes.ron +++ b/assets/common/items/armor/shoulder/iron_spikes.ron @@ -5,8 +5,9 @@ ItemDef( ( kind: Shoulder("IronSpikes"), stats: ( - protection: Normal(12.0) - ), + protection: Normal(12.0), + poise_protection: Normal(12.0), + ), ) ), quality: Moderate, diff --git a/assets/common/items/armor/shoulder/leather_0.ron b/assets/common/items/armor/shoulder/leather_0.ron index ea2bd0888c..c44e7a7520 100644 --- a/assets/common/items/armor/shoulder/leather_0.ron +++ b/assets/common/items/armor/shoulder/leather_0.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Shoulder("Leather0"), stats: ( - protection: Normal(6.0)), + protection: Normal(6.0), + poise_protection: Normal(6.0), + ), ) ), quality: Common, diff --git a/assets/common/items/armor/shoulder/leather_1.ron b/assets/common/items/armor/shoulder/leather_1.ron index 0a80a4a8a3..df814b6af8 100644 --- a/assets/common/items/armor/shoulder/leather_1.ron +++ b/assets/common/items/armor/shoulder/leather_1.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Shoulder("Leather1"), stats: ( - protection: Normal(6.0)), + protection: Normal(6.0), + poise_protection: Normal(6.0), + ), ) ), quality: Common, diff --git a/assets/common/items/armor/shoulder/leather_2.ron b/assets/common/items/armor/shoulder/leather_2.ron index 4a05c53bbd..32b67a32a1 100644 --- a/assets/common/items/armor/shoulder/leather_2.ron +++ b/assets/common/items/armor/shoulder/leather_2.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Shoulder("Leather2"), stats: ( - protection: Normal(6.0)), + protection: Normal(6.0), + poise_protection: Normal(6.0), + ), ) ), quality: Common, diff --git a/assets/common/items/armor/shoulder/leather_adventurer.ron b/assets/common/items/armor/shoulder/leather_adventurer.ron index b1a7c9fe95..57caf4d057 100644 --- a/assets/common/items/armor/shoulder/leather_adventurer.ron +++ b/assets/common/items/armor/shoulder/leather_adventurer.ron @@ -5,8 +5,9 @@ ItemDef( ( kind: Shoulder("Leather2"), stats: ( - protection: Normal(8.0) - ), + protection: Normal(8.0), + poise_protection: Normal(8.0), + ), ) ), quality: Moderate, diff --git a/assets/common/items/armor/shoulder/leather_iron_0.ron b/assets/common/items/armor/shoulder/leather_iron_0.ron index 84731d1446..48514de458 100644 --- a/assets/common/items/armor/shoulder/leather_iron_0.ron +++ b/assets/common/items/armor/shoulder/leather_iron_0.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Shoulder("IronLeather0"), stats: ( - protection: Normal(9.0)), + protection: Normal(9.0), + poise_protection: Normal(9.0), + ), ) ), quality: Common, diff --git a/assets/common/items/armor/shoulder/leather_iron_1.ron b/assets/common/items/armor/shoulder/leather_iron_1.ron index 31d9e2ee1e..74a2099e37 100644 --- a/assets/common/items/armor/shoulder/leather_iron_1.ron +++ b/assets/common/items/armor/shoulder/leather_iron_1.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Shoulder("IronLeather1"), stats: ( - protection: Normal(9.0)), + protection: Normal(9.0), + poise_protection: Normal(9.0), + ), ) ), quality: Common, diff --git a/assets/common/items/armor/shoulder/leather_iron_2.ron b/assets/common/items/armor/shoulder/leather_iron_2.ron index 2bc7a82817..895990894d 100644 --- a/assets/common/items/armor/shoulder/leather_iron_2.ron +++ b/assets/common/items/armor/shoulder/leather_iron_2.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Shoulder("IronLeather2"), stats: ( - protection: Normal(9.0)), + protection: Normal(9.0), + poise_protection: Normal(9.0), + ), ) ), quality: Common, diff --git a/assets/common/items/armor/shoulder/leather_iron_3.ron b/assets/common/items/armor/shoulder/leather_iron_3.ron index 181eb465af..080d6b999d 100644 --- a/assets/common/items/armor/shoulder/leather_iron_3.ron +++ b/assets/common/items/armor/shoulder/leather_iron_3.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Shoulder("IronLeather3"), stats: ( - protection: Normal(9.0)), + protection: Normal(9.0), + poise_protection: Normal(9.0), + ), ) ), quality: Common, diff --git a/assets/common/items/armor/shoulder/leather_strips.ron b/assets/common/items/armor/shoulder/leather_strips.ron index a47ae472cc..e709b06ade 100644 --- a/assets/common/items/armor/shoulder/leather_strips.ron +++ b/assets/common/items/armor/shoulder/leather_strips.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Shoulder("LeatherStrips"), stats: ( - protection: Normal(4.0)), + protection: Normal(4.0), + poise_protection: Normal(4.0), + ), ) ), quality: Low, diff --git a/assets/common/items/armor/shoulder/plate_0.ron b/assets/common/items/armor/shoulder/plate_0.ron index c92f2be8eb..49233e3539 100644 --- a/assets/common/items/armor/shoulder/plate_0.ron +++ b/assets/common/items/armor/shoulder/plate_0.ron @@ -5,8 +5,9 @@ ItemDef( ( kind: Shoulder("Plate0"), stats: ( - protection: Normal(12.0) - ), + protection: Normal(12.0), + poise_protection: Normal(12.0), + ), ) ), quality: Moderate, diff --git a/assets/common/items/armor/shoulder/steel_0.ron b/assets/common/items/armor/shoulder/steel_0.ron index caec1c6619..1a42ac98db 100644 --- a/assets/common/items/armor/shoulder/steel_0.ron +++ b/assets/common/items/armor/shoulder/steel_0.ron @@ -5,8 +5,9 @@ ItemDef( ( kind: Shoulder("Steel0"), stats: ( - protection: Normal(15.0) - ), + protection: Normal(15.0), + poise_protection: Normal(15.0), + ), ) ), quality: Moderate, diff --git a/assets/common/items/armor/shoulder/tarasque.ron b/assets/common/items/armor/shoulder/tarasque.ron index 72fc33b92e..c36dd0d8bb 100644 --- a/assets/common/items/armor/shoulder/tarasque.ron +++ b/assets/common/items/armor/shoulder/tarasque.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Shoulder("Tarasque"), stats: ( - protection: Normal(15.0)), + protection: Normal(15.0), + poise_protection: Normal(15.0), + ), ) ), quality: High, diff --git a/assets/common/items/armor/shoulder/twigs.ron b/assets/common/items/armor/shoulder/twigs.ron index 6a2e3e7298..4119d695fa 100644 --- a/assets/common/items/armor/shoulder/twigs.ron +++ b/assets/common/items/armor/shoulder/twigs.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Shoulder("TwiggyShoulder"), stats: ( - protection: Normal(9.0)), + protection: Normal(9.0), + poise_protection: Normal(9.0), + ), ) ), quality: Common, diff --git a/assets/common/items/armor/shoulder/twigsflowers.ron b/assets/common/items/armor/shoulder/twigsflowers.ron index 12c0f77f7b..8c3ec79476 100644 --- a/assets/common/items/armor/shoulder/twigsflowers.ron +++ b/assets/common/items/armor/shoulder/twigsflowers.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Shoulder("FlowerShoulder"), stats: ( - protection: Normal(9.0)), + protection: Normal(9.0), + poise_protection: Normal(9.0), + ), ) ), quality: Common, diff --git a/assets/common/items/armor/shoulder/twigsleaves.ron b/assets/common/items/armor/shoulder/twigsleaves.ron index bf91b9bf69..c710157b19 100644 --- a/assets/common/items/armor/shoulder/twigsleaves.ron +++ b/assets/common/items/armor/shoulder/twigsleaves.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Shoulder("LeafyShoulder"), stats: ( - protection: Normal(9.0)), + protection: Normal(9.0), + poise_protection: Normal(9.0), + ), ) ), quality: Common, diff --git a/assets/common/items/armor/shoulder/velorite_mage_0.ron b/assets/common/items/armor/shoulder/velorite_mage_0.ron index 4f4ab63871..a7cfbbd0ae 100644 --- a/assets/common/items/armor/shoulder/velorite_mage_0.ron +++ b/assets/common/items/armor/shoulder/velorite_mage_0.ron @@ -5,8 +5,9 @@ ItemDef( ( kind: Shoulder("VeloriteMage0"), stats: ( - protection: Normal(17.0) - ), + protection: Normal(17.0), + poise_protection: Normal(17.0), + ), ) ), quality: High, diff --git a/assets/common/items/armor/shoulder/warlock.ron b/assets/common/items/armor/shoulder/warlock.ron index ee077bbc5f..ec4ba04684 100644 --- a/assets/common/items/armor/shoulder/warlock.ron +++ b/assets/common/items/armor/shoulder/warlock.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Shoulder("Warlock"), stats: ( - protection: Normal(22.0)), + protection: Normal(22.0), + poise_protection: Normal(22.0), + ), ) ), quality: Common, diff --git a/assets/common/items/armor/shoulder/warlord.ron b/assets/common/items/armor/shoulder/warlord.ron index d7163c9155..ac03adcd99 100644 --- a/assets/common/items/armor/shoulder/warlord.ron +++ b/assets/common/items/armor/shoulder/warlord.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Shoulder("Warlord"), stats: ( - protection: Normal(22.0)), + protection: Normal(22.0), + poise_protection: Normal(22.0), + ), ) ), quality: Common, diff --git a/assets/common/items/armor/starter/rugged_chest.ron b/assets/common/items/armor/starter/rugged_chest.ron index 8da94b8122..875a2eca4d 100644 --- a/assets/common/items/armor/starter/rugged_chest.ron +++ b/assets/common/items/armor/starter/rugged_chest.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Chest("Rugged0"), stats: ( - protection: Normal(1.0)), + protection: Normal(1.0), + poise_protection: Normal(1.0), + ), ) ), quality: Low, diff --git a/assets/common/items/armor/starter/rugged_pants.ron b/assets/common/items/armor/starter/rugged_pants.ron index f9863dbee8..406f74ef4a 100644 --- a/assets/common/items/armor/starter/rugged_pants.ron +++ b/assets/common/items/armor/starter/rugged_pants.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Pants("Rugged0"), stats: ( - protection: Normal(1.0)), + protection: Normal(1.0), + poise_protection: Normal(1.0), + ), ) ), quality: Low, diff --git a/assets/common/items/armor/starter/sandals_0.ron b/assets/common/items/armor/starter/sandals_0.ron index 4852d8a71e..e817909913 100644 --- a/assets/common/items/armor/starter/sandals_0.ron +++ b/assets/common/items/armor/starter/sandals_0.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Foot("Sandal0"), stats: ( - protection: Normal(0.0)), + protection: Normal(0.0), + poise_protection: Normal(0.0), + ), ) ), quality: Low, diff --git a/assets/common/items/armor/tabard/admin.ron b/assets/common/items/armor/tabard/admin.ron index eea10b1096..6b872f3470 100644 --- a/assets/common/items/armor/tabard/admin.ron +++ b/assets/common/items/armor/tabard/admin.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Tabard("Admin"), stats: ( - protection: Normal(0.0)), + protection: Invincible, + poise_protection: Invincible, + ), ) ), quality: Debug, diff --git a/assets/common/items/debug/admin.ron b/assets/common/items/debug/admin.ron index 028d729140..6b872f3470 100644 --- a/assets/common/items/debug/admin.ron +++ b/assets/common/items/debug/admin.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Tabard("Admin"), stats: ( - protection: Invincible), + protection: Invincible, + poise_protection: Invincible, + ), ) ), quality: Debug, diff --git a/assets/common/items/debug/admin_back.ron b/assets/common/items/debug/admin_back.ron index 2b8648185a..048e196395 100644 --- a/assets/common/items/debug/admin_back.ron +++ b/assets/common/items/debug/admin_back.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Back("Admin"), stats: ( - protection: Invincible), + protection: Invincible, + poise_protection: Invincible, + ), ) ), quality: Debug, diff --git a/assets/common/items/debug/boost.ron b/assets/common/items/debug/boost.ron index 10a95d2195..ac3ff906ed 100644 --- a/assets/common/items/debug/boost.ron +++ b/assets/common/items/debug/boost.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 0, power: 1.00, + poise_reduction_power: 1.00, speed: 1.0 ), ) diff --git a/assets/common/items/debug/cultist_belt.ron b/assets/common/items/debug/cultist_belt.ron index b9823f35e9..c6c29c20a1 100644 --- a/assets/common/items/debug/cultist_belt.ron +++ b/assets/common/items/debug/cultist_belt.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Belt("VeloriteMage0"), stats: ( - protection: Invincible), + protection: Invincible, + poise_protection: Invincible, + ), ) ), quality: Debug, diff --git a/assets/common/items/debug/cultist_boots.ron b/assets/common/items/debug/cultist_boots.ron index e212095431..a3f19ee1b1 100644 --- a/assets/common/items/debug/cultist_boots.ron +++ b/assets/common/items/debug/cultist_boots.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Foot("VeloriteMage0"), stats: ( - protection: Invincible), + protection: Invincible, + poise_protection: Invincible, + ), ) ), quality: Debug, diff --git a/assets/common/items/debug/cultist_chest_blue.ron b/assets/common/items/debug/cultist_chest_blue.ron index 9a0339c8d0..1ea375fbad 100644 --- a/assets/common/items/debug/cultist_chest_blue.ron +++ b/assets/common/items/debug/cultist_chest_blue.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Chest("VeloriteMage0"), stats: ( - protection: Invincible), + protection: Invincible, + poise_protection: Invincible, + ), ) ), quality: Debug, diff --git a/assets/common/items/debug/cultist_hands_blue.ron b/assets/common/items/debug/cultist_hands_blue.ron index 5138204320..bcd9c41b93 100644 --- a/assets/common/items/debug/cultist_hands_blue.ron +++ b/assets/common/items/debug/cultist_hands_blue.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Hand("VeloriteMage0"), stats: ( - protection: Invincible), + protection: Invincible, + poise_protection: Invincible, + ), ) ), quality: Debug, diff --git a/assets/common/items/debug/cultist_legs_blue.ron b/assets/common/items/debug/cultist_legs_blue.ron index 7fd62d77f4..b917f35313 100644 --- a/assets/common/items/debug/cultist_legs_blue.ron +++ b/assets/common/items/debug/cultist_legs_blue.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Pants("VeloriteMage0"), stats: ( - protection: Invincible), + protection: Invincible, + poise_protection: Invincible, + ), ) ), quality: Debug, diff --git a/assets/common/items/debug/cultist_purp_2h_boss-0.ron b/assets/common/items/debug/cultist_purp_2h_boss-0.ron index 0ce9a87270..2417c55031 100644 --- a/assets/common/items/debug/cultist_purp_2h_boss-0.ron +++ b/assets/common/items/debug/cultist_purp_2h_boss-0.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 0, power: 1000.0, + poise_reduction_power: 1000.0, speed: 1.0 ), ) diff --git a/assets/common/items/debug/cultist_shoulder_blue.ron b/assets/common/items/debug/cultist_shoulder_blue.ron index ee114ab8ff..1468b11511 100644 --- a/assets/common/items/debug/cultist_shoulder_blue.ron +++ b/assets/common/items/debug/cultist_shoulder_blue.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Shoulder("VeloriteMage0"), stats: ( - protection: Invincible), + protection: Invincible, + poise_protection: Invincible, + ), ) ), quality: Debug, diff --git a/assets/common/items/debug/dungeon_purple-0.ron b/assets/common/items/debug/dungeon_purple-0.ron index 200482c826..7ada1e0e48 100644 --- a/assets/common/items/debug/dungeon_purple-0.ron +++ b/assets/common/items/debug/dungeon_purple-0.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Back("VeloriteMage0"), stats: ( - protection: Invincible), + protection: Invincible, + poise_protection: Invincible, + ), ) ), quality: Debug, diff --git a/assets/common/items/debug/possess.ron b/assets/common/items/debug/possess.ron index 10a95d2195..ac3ff906ed 100644 --- a/assets/common/items/debug/possess.ron +++ b/assets/common/items/debug/possess.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 0, power: 1.00, + poise_reduction_power: 1.00, speed: 1.0 ), ) diff --git a/assets/common/items/npc_armor/back/backpack_0.ron b/assets/common/items/npc_armor/back/backpack_0.ron index 00a64c0d47..67d28e2ae8 100644 --- a/assets/common/items/npc_armor/back/backpack_0.ron +++ b/assets/common/items/npc_armor/back/backpack_0.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Back("Backpack0"), stats: ( - protection: Normal(0.0)), + protection: Normal(0.0), + poise_protection: Normal(0.0), + ), ) ), quality: Moderate, diff --git a/assets/common/items/npc_armor/back/backpack_blue_0.ron b/assets/common/items/npc_armor/back/backpack_blue_0.ron index 66446c93f2..a4faee6084 100644 --- a/assets/common/items/npc_armor/back/backpack_blue_0.ron +++ b/assets/common/items/npc_armor/back/backpack_blue_0.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Back("BackpackBlue0"), stats: ( - protection: Normal(0.0)), + protection: Normal(0.0), + poise_protection: Normal(0.0), + ), ) ), quality: Moderate, diff --git a/assets/common/items/npc_armor/back/dungeon_purple-0.ron b/assets/common/items/npc_armor/back/dungeon_purple-0.ron index 310286b04b..de7b84450b 100644 --- a/assets/common/items/npc_armor/back/dungeon_purple-0.ron +++ b/assets/common/items/npc_armor/back/dungeon_purple-0.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Back("DungPurp0"), stats: ( - protection: Normal(1.0)), + protection: Normal(1.0), + poise_protection: Normal(0.0), + ), ) ), quality: Low, diff --git a/assets/common/items/npc_armor/back/leather_blue_0.ron b/assets/common/items/npc_armor/back/leather_blue_0.ron index 3cc34c285d..199c4df83e 100644 --- a/assets/common/items/npc_armor/back/leather_blue_0.ron +++ b/assets/common/items/npc_armor/back/leather_blue_0.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Back("LeatherBlue0"), stats: ( - protection: Normal(1.0)), + protection: Normal(1.0), + poise_protection: Normal(0.0), + ), ) ), quality: Moderate, diff --git a/assets/common/items/npc_armor/belt/cultist_belt.ron b/assets/common/items/npc_armor/belt/cultist_belt.ron index 69a81186be..582187be79 100644 --- a/assets/common/items/npc_armor/belt/cultist_belt.ron +++ b/assets/common/items/npc_armor/belt/cultist_belt.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Belt("Cultist"), stats: ( - protection: Normal(0.0)), + protection: Normal(0.0), + poise_protection: Normal(0.0), + ), ) ), quality: Low, diff --git a/assets/common/items/npc_armor/chest/cultist_chest_purple.ron b/assets/common/items/npc_armor/chest/cultist_chest_purple.ron index 475fd3eb82..9deacf4190 100644 --- a/assets/common/items/npc_armor/chest/cultist_chest_purple.ron +++ b/assets/common/items/npc_armor/chest/cultist_chest_purple.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Chest("CultistPurple"), stats: ( - protection: Normal(5.0)), + protection: Normal(5.0), + poise_protection: Normal(5.0), + ), ) ), quality: Low, diff --git a/assets/common/items/npc_armor/chest/leather_blue_0.ron b/assets/common/items/npc_armor/chest/leather_blue_0.ron index 0a07cbe40a..636e277555 100644 --- a/assets/common/items/npc_armor/chest/leather_blue_0.ron +++ b/assets/common/items/npc_armor/chest/leather_blue_0.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Chest("LeatherBlue0"), stats: ( - protection: Normal(5.0)), + protection: Normal(5.0), + poise_protection: Normal(5.0), + ), ) ), quality: Moderate, diff --git a/assets/common/items/npc_armor/chest/plate_green_0.ron b/assets/common/items/npc_armor/chest/plate_green_0.ron index 6218a465dd..a68246b17f 100644 --- a/assets/common/items/npc_armor/chest/plate_green_0.ron +++ b/assets/common/items/npc_armor/chest/plate_green_0.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Chest("PlateGreen0"), stats: ( - protection: Normal(5.0)), + protection: Normal(5.0), + poise_protection: Normal(5.0), + ), ) ), quality: Low, diff --git a/assets/common/items/npc_armor/chest/plate_red_0.ron b/assets/common/items/npc_armor/chest/plate_red_0.ron index 35ed8aeecf..ee54da964e 100644 --- a/assets/common/items/npc_armor/chest/plate_red_0.ron +++ b/assets/common/items/npc_armor/chest/plate_red_0.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Chest("PlateRed0"), stats: ( - protection: Normal(5.0)), + protection: Normal(5.0), + poise_protection: Normal(5.0), + ), ) ), quality: Low, diff --git a/assets/common/items/npc_armor/chest/worker_green_0.ron b/assets/common/items/npc_armor/chest/worker_green_0.ron index e599e76361..6557bec2ae 100644 --- a/assets/common/items/npc_armor/chest/worker_green_0.ron +++ b/assets/common/items/npc_armor/chest/worker_green_0.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Chest("WorkerGreen0"), stats: ( - protection: Normal(80.0)), + protection: Normal(80.0), + poise_protection: Normal(80.0), + ), ) ), quality: Low, diff --git a/assets/common/items/npc_armor/chest/worker_green_1.ron b/assets/common/items/npc_armor/chest/worker_green_1.ron index 7dc2529f59..e4e0ba352a 100644 --- a/assets/common/items/npc_armor/chest/worker_green_1.ron +++ b/assets/common/items/npc_armor/chest/worker_green_1.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Chest("WorkerGreen1"), stats: ( - protection: Normal(80.0)), + protection: Normal(80.0), + poise_protection: Normal(80.0), + ), ) ), quality: Low, diff --git a/assets/common/items/npc_armor/chest/worker_orange_0.ron b/assets/common/items/npc_armor/chest/worker_orange_0.ron index a6d930ebab..6de9320085 100644 --- a/assets/common/items/npc_armor/chest/worker_orange_0.ron +++ b/assets/common/items/npc_armor/chest/worker_orange_0.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Chest("WorkerOrange0"), stats: ( - protection: Normal(80.0)), + protection: Normal(80.0), + poise_protection: Normal(80.0), + ), ) ), quality: Low, diff --git a/assets/common/items/npc_armor/chest/worker_orange_1.ron b/assets/common/items/npc_armor/chest/worker_orange_1.ron index 3974902a17..8cdea1a49e 100644 --- a/assets/common/items/npc_armor/chest/worker_orange_1.ron +++ b/assets/common/items/npc_armor/chest/worker_orange_1.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Chest("WorkerOrange1"), stats: ( - protection: Normal(80.0)), + protection: Normal(80.0), + poise_protection: Normal(80.0), + ), ) ), quality: Low, diff --git a/assets/common/items/npc_armor/chest/worker_purple_0.ron b/assets/common/items/npc_armor/chest/worker_purple_0.ron index 454eb832e1..7cdfa7a64b 100644 --- a/assets/common/items/npc_armor/chest/worker_purple_0.ron +++ b/assets/common/items/npc_armor/chest/worker_purple_0.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Chest("WorkerPurple0"), stats: ( - protection: Normal(80.0)), + protection: Normal(80.0), + poise_protection: Normal(80.0), + ), ) ), quality: Low, diff --git a/assets/common/items/npc_armor/chest/worker_purple_1.ron b/assets/common/items/npc_armor/chest/worker_purple_1.ron index b33ef2caf1..8cf05f185c 100644 --- a/assets/common/items/npc_armor/chest/worker_purple_1.ron +++ b/assets/common/items/npc_armor/chest/worker_purple_1.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Chest("WorkerPurple1"), stats: ( - protection: Normal(80.0)), + protection: Normal(80.0), + poise_protection: Normal(80.0), + ), ) ), quality: Low, diff --git a/assets/common/items/npc_armor/chest/worker_red_0.ron b/assets/common/items/npc_armor/chest/worker_red_0.ron index da06489316..a3441e563d 100644 --- a/assets/common/items/npc_armor/chest/worker_red_0.ron +++ b/assets/common/items/npc_armor/chest/worker_red_0.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Chest("WorkerRed0"), stats: ( - protection: Normal(80.0)), + protection: Normal(80.0), + poise_protection: Normal(80.0), + ), ) ), quality: Low, diff --git a/assets/common/items/npc_armor/chest/worker_red_1.ron b/assets/common/items/npc_armor/chest/worker_red_1.ron index 78b7b42045..629e9b1ce2 100644 --- a/assets/common/items/npc_armor/chest/worker_red_1.ron +++ b/assets/common/items/npc_armor/chest/worker_red_1.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Chest("WorkerRed1"), stats: ( - protection: Normal(80.0)), + protection: Normal(80.0), + poise_protection: Normal(80.0), + ), ) ), quality: Low, diff --git a/assets/common/items/npc_armor/chest/worker_yellow_0.ron b/assets/common/items/npc_armor/chest/worker_yellow_0.ron index a5dc3fddbb..5a5921aa57 100644 --- a/assets/common/items/npc_armor/chest/worker_yellow_0.ron +++ b/assets/common/items/npc_armor/chest/worker_yellow_0.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Chest("WorkerYellow0"), stats: ( - protection: Normal(80.0)), + protection: Normal(80.0), + poise_protection: Normal(80.0), + ), ) ), quality: Low, diff --git a/assets/common/items/npc_armor/chest/worker_yellow_1.ron b/assets/common/items/npc_armor/chest/worker_yellow_1.ron index 8976176dda..2e6754c039 100644 --- a/assets/common/items/npc_armor/chest/worker_yellow_1.ron +++ b/assets/common/items/npc_armor/chest/worker_yellow_1.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Chest("WorkerYellow1"), stats: ( - protection: Normal(80.0)), + protection: Normal(80.0), + poise_protection: Normal(80.0), + ), ) ), quality: Low, diff --git a/assets/common/items/npc_armor/foot/cultist_boots.ron b/assets/common/items/npc_armor/foot/cultist_boots.ron index e2cdcc8ecf..17ec1dd002 100644 --- a/assets/common/items/npc_armor/foot/cultist_boots.ron +++ b/assets/common/items/npc_armor/foot/cultist_boots.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Foot("Cultist"), stats: ( - protection: Normal(1.0)), + protection: Normal(1.0), + poise_protection: Normal(1.0), + ), ) ), quality: Low, diff --git a/assets/common/items/npc_armor/hand/cultist_hands_purple.ron b/assets/common/items/npc_armor/hand/cultist_hands_purple.ron index 4fdcf555c0..2f8934a5e3 100644 --- a/assets/common/items/npc_armor/hand/cultist_hands_purple.ron +++ b/assets/common/items/npc_armor/hand/cultist_hands_purple.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Hand("CultistPurple"), stats: ( - protection: Normal(2.0)), + protection: Normal(2.0), + poise_protection: Normal(2.0), + ), ) ), quality: Low, diff --git a/assets/common/items/npc_armor/pants/cultist_legs_purple.ron b/assets/common/items/npc_armor/pants/cultist_legs_purple.ron index 1a10bbe4e0..308edc5bad 100644 --- a/assets/common/items/npc_armor/pants/cultist_legs_purple.ron +++ b/assets/common/items/npc_armor/pants/cultist_legs_purple.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Pants("CultistPurple"), stats: ( - protection: Normal(10.0)), + protection: Normal(10.0), + poise_protection: Normal(10.0), + ), ) ), quality: Low, diff --git a/assets/common/items/npc_armor/pants/leather_blue_0.ron b/assets/common/items/npc_armor/pants/leather_blue_0.ron index 02eab70c3e..84d4312ce0 100644 --- a/assets/common/items/npc_armor/pants/leather_blue_0.ron +++ b/assets/common/items/npc_armor/pants/leather_blue_0.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Pants("LeatherBlue0"), stats: ( - protection: Normal(10.0)), + protection: Normal(10.0), + poise_protection: Normal(10.0), + ), ) ), quality: Low, diff --git a/assets/common/items/npc_armor/pants/plate_green_0.ron b/assets/common/items/npc_armor/pants/plate_green_0.ron index a5853d21a9..1fa9c5f9b8 100644 --- a/assets/common/items/npc_armor/pants/plate_green_0.ron +++ b/assets/common/items/npc_armor/pants/plate_green_0.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Pants("PlateGreen0"), stats: ( - protection: Normal(10.0)), + protection: Normal(10.0), + poise_protection: Normal(10.0), + ), ) ), quality: Low, diff --git a/assets/common/items/npc_armor/pants/plate_red_0.ron b/assets/common/items/npc_armor/pants/plate_red_0.ron index 6b86f92c7f..bab021b7f5 100644 --- a/assets/common/items/npc_armor/pants/plate_red_0.ron +++ b/assets/common/items/npc_armor/pants/plate_red_0.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Pants("PlateRed0"), stats: ( - protection: Normal(10.0)), + protection: Normal(10.0), + poise_protection: Normal(10.0), + ), ) ), quality: Low, diff --git a/assets/common/items/npc_armor/shoulder/cultist_shoulder_purple.ron b/assets/common/items/npc_armor/shoulder/cultist_shoulder_purple.ron index 2d1b71ec11..f2e95e2ff8 100644 --- a/assets/common/items/npc_armor/shoulder/cultist_shoulder_purple.ron +++ b/assets/common/items/npc_armor/shoulder/cultist_shoulder_purple.ron @@ -5,7 +5,9 @@ ItemDef( ( kind: Shoulder("CultistPurple"), stats: ( - protection: Normal(5.0)), + protection: Normal(5.0), + poise_protection: Normal(5.0), + ), ) ), quality: Low, diff --git a/assets/common/items/npc_weapons/axe/malachite_axe-0.ron b/assets/common/items/npc_weapons/axe/malachite_axe-0.ron index 2a9ac446f8..132d684ac3 100644 --- a/assets/common/items/npc_weapons/axe/malachite_axe-0.ron +++ b/assets/common/items/npc_weapons/axe/malachite_axe-0.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 400, power: 0.50, + poise_reduction_power: 0.50, speed: 1.0 ), ) diff --git a/assets/common/items/npc_weapons/axe/starter_axe.ron b/assets/common/items/npc_weapons/axe/starter_axe.ron index b867f649aa..715f5ea64e 100644 --- a/assets/common/items/npc_weapons/axe/starter_axe.ron +++ b/assets/common/items/npc_weapons/axe/starter_axe.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 400, power: 0.50, + poise_reduction_power: 0.50, speed: 1.0 ), ) diff --git a/assets/common/items/npc_weapons/bow/horn_longbow-0.ron b/assets/common/items/npc_weapons/bow/horn_longbow-0.ron index 3e2b78e8b7..1e715bd422 100644 --- a/assets/common/items/npc_weapons/bow/horn_longbow-0.ron +++ b/assets/common/items/npc_weapons/bow/horn_longbow-0.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 400, power: 0.5, + poise_reduction_power: 0.50, speed: 1.0 ), ) diff --git a/assets/common/items/npc_weapons/bow/saurok_bow.ron b/assets/common/items/npc_weapons/bow/saurok_bow.ron index d546b84ced..229bcc814d 100644 --- a/assets/common/items/npc_weapons/bow/saurok_bow.ron +++ b/assets/common/items/npc_weapons/bow/saurok_bow.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 1.00, + poise_reduction_power: 1.00, speed: 1.0 ), ) diff --git a/assets/common/items/npc_weapons/dagger/starter_dagger.ron b/assets/common/items/npc_weapons/dagger/starter_dagger.ron index 63ce0843cc..142dbe1d59 100644 --- a/assets/common/items/npc_weapons/dagger/starter_dagger.ron +++ b/assets/common/items/npc_weapons/dagger/starter_dagger.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 300, power: 1.00, + poise_reduction_power: 1.00, speed: 1.0 ), ) diff --git a/assets/common/items/npc_weapons/empty/empty.ron b/assets/common/items/npc_weapons/empty/empty.ron index a19e674e7a..2113948aeb 100644 --- a/assets/common/items/npc_weapons/empty/empty.ron +++ b/assets/common/items/npc_weapons/empty/empty.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 200, power: 1.00, + poise_reduction_power: 1.00, speed: 1.0 ), ) diff --git a/assets/common/items/npc_weapons/hammer/cultist_purp_2h-0.ron b/assets/common/items/npc_weapons/hammer/cultist_purp_2h-0.ron index a73d6eb0b9..822211118c 100644 --- a/assets/common/items/npc_weapons/hammer/cultist_purp_2h-0.ron +++ b/assets/common/items/npc_weapons/hammer/cultist_purp_2h-0.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 0.5, + poise_reduction_power: 0.5, speed: 1.0 ), ) diff --git a/assets/common/items/npc_weapons/hammer/cyclops_hammer.ron b/assets/common/items/npc_weapons/hammer/cyclops_hammer.ron index 0ed47448cd..80f5900715 100644 --- a/assets/common/items/npc_weapons/hammer/cyclops_hammer.ron +++ b/assets/common/items/npc_weapons/hammer/cyclops_hammer.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 1.00, + poise_reduction_power: 1.00, speed: 1.0 ), ) diff --git a/assets/common/items/npc_weapons/hammer/ogre_hammer.ron b/assets/common/items/npc_weapons/hammer/ogre_hammer.ron index 2ddb48d615..c3ada55ba3 100644 --- a/assets/common/items/npc_weapons/hammer/ogre_hammer.ron +++ b/assets/common/items/npc_weapons/hammer/ogre_hammer.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 1.00, + poise_reduction_power: 1.00, speed: 1.0 ), ) diff --git a/assets/common/items/npc_weapons/hammer/starter_hammer.ron b/assets/common/items/npc_weapons/hammer/starter_hammer.ron index 35d167e7a8..7d0f184d06 100644 --- a/assets/common/items/npc_weapons/hammer/starter_hammer.ron +++ b/assets/common/items/npc_weapons/hammer/starter_hammer.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 0.50, + poise_reduction_power: 0.50, speed: 1.0 ), ) diff --git a/assets/common/items/npc_weapons/hammer/troll_hammer.ron b/assets/common/items/npc_weapons/hammer/troll_hammer.ron index 173ca7f65d..586d0506b7 100644 --- a/assets/common/items/npc_weapons/hammer/troll_hammer.ron +++ b/assets/common/items/npc_weapons/hammer/troll_hammer.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 1.00, + poise_reduction_power: 1.00, speed: 1.0 ), ) diff --git a/assets/common/items/npc_weapons/hammer/wendigo_hammer.ron b/assets/common/items/npc_weapons/hammer/wendigo_hammer.ron index daa3a55f29..11afb36e7c 100644 --- a/assets/common/items/npc_weapons/hammer/wendigo_hammer.ron +++ b/assets/common/items/npc_weapons/hammer/wendigo_hammer.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 1.00, + poise_reduction_power: 1.00, speed: 1.0 ), ) diff --git a/assets/common/items/npc_weapons/shield/shield_1.ron b/assets/common/items/npc_weapons/shield/shield_1.ron index 1bb911aa93..2894e69d88 100644 --- a/assets/common/items/npc_weapons/shield/shield_1.ron +++ b/assets/common/items/npc_weapons/shield/shield_1.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 400, power: 1.00, + poise_reduction_power: 1.00, speed: 1.0 ), ) diff --git a/assets/common/items/npc_weapons/staff/bone_staff.ron b/assets/common/items/npc_weapons/staff/bone_staff.ron index a26aeda05b..126389ad1c 100644 --- a/assets/common/items/npc_weapons/staff/bone_staff.ron +++ b/assets/common/items/npc_weapons/staff/bone_staff.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 300, power: 0.8, + poise_reduction_power: 0.8, speed: 1.0 ), ) diff --git a/assets/common/items/npc_weapons/staff/cultist_staff.ron b/assets/common/items/npc_weapons/staff/cultist_staff.ron index 41eda11f81..ff89005932 100644 --- a/assets/common/items/npc_weapons/staff/cultist_staff.ron +++ b/assets/common/items/npc_weapons/staff/cultist_staff.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 300, power: 0.8, + poise_reduction_power: 0.8, speed: 1.0 ), ) diff --git a/assets/common/items/npc_weapons/staff/mindflayer_staff.ron b/assets/common/items/npc_weapons/staff/mindflayer_staff.ron index 2d6dabf364..541bfccbb8 100644 --- a/assets/common/items/npc_weapons/staff/mindflayer_staff.ron +++ b/assets/common/items/npc_weapons/staff/mindflayer_staff.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 300, power: 3.0, + poise_reduction_power: 1.00, speed: 1.5, ), ) diff --git a/assets/common/items/npc_weapons/staff/ogre_staff.ron b/assets/common/items/npc_weapons/staff/ogre_staff.ron index 99d34ea909..699ceb9df1 100644 --- a/assets/common/items/npc_weapons/staff/ogre_staff.ron +++ b/assets/common/items/npc_weapons/staff/ogre_staff.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 1.00, + poise_reduction_power: 1.00, speed: 1.0 ), ) diff --git a/assets/common/items/npc_weapons/staff/saurok_staff.ron b/assets/common/items/npc_weapons/staff/saurok_staff.ron index 15b1d9d24d..0fc53dc6ac 100644 --- a/assets/common/items/npc_weapons/staff/saurok_staff.ron +++ b/assets/common/items/npc_weapons/staff/saurok_staff.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 1.00, + poise_reduction_power: 1.00, speed: 1.0 ), ) diff --git a/assets/common/items/npc_weapons/sword/cultist_purp_2h-0.ron b/assets/common/items/npc_weapons/sword/cultist_purp_2h-0.ron index f1918612ca..a93773b4ff 100644 --- a/assets/common/items/npc_weapons/sword/cultist_purp_2h-0.ron +++ b/assets/common/items/npc_weapons/sword/cultist_purp_2h-0.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 0.5, + poise_reduction_power: 0.5, speed: 1.0 ), ) diff --git a/assets/common/items/npc_weapons/sword/cultist_purp_2h_boss-0.ron b/assets/common/items/npc_weapons/sword/cultist_purp_2h_boss-0.ron index b757822657..5c36b1c3f3 100644 --- a/assets/common/items/npc_weapons/sword/cultist_purp_2h_boss-0.ron +++ b/assets/common/items/npc_weapons/sword/cultist_purp_2h_boss-0.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 1.0, + poise_reduction_power: 1.0, speed: 1.0 ), ) diff --git a/assets/common/items/npc_weapons/sword/dullahan_sword.ron b/assets/common/items/npc_weapons/sword/dullahan_sword.ron index 6dab58cb39..c0b8db9784 100644 --- a/assets/common/items/npc_weapons/sword/dullahan_sword.ron +++ b/assets/common/items/npc_weapons/sword/dullahan_sword.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 1.00, + poise_reduction_power: 1.00, speed: 1.0 ), ) diff --git a/assets/common/items/npc_weapons/sword/saurok_sword.ron b/assets/common/items/npc_weapons/sword/saurok_sword.ron index fe0e59b4b9..8f9ce71916 100644 --- a/assets/common/items/npc_weapons/sword/saurok_sword.ron +++ b/assets/common/items/npc_weapons/sword/saurok_sword.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 1.00, + poise_reduction_power: 1.00, speed: 1.0 ), ) diff --git a/assets/common/items/npc_weapons/sword/starter_sword.ron b/assets/common/items/npc_weapons/sword/starter_sword.ron index 0e4f7bed26..c5eaf61c21 100644 --- a/assets/common/items/npc_weapons/sword/starter_sword.ron +++ b/assets/common/items/npc_weapons/sword/starter_sword.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 300, power: 0.50, + poise_reduction_power: 0.50, speed: 1.0 ), ) diff --git a/assets/common/items/npc_weapons/sword/zweihander_sword_0.ron b/assets/common/items/npc_weapons/sword/zweihander_sword_0.ron index 95d9cf4fba..9913ba1090 100644 --- a/assets/common/items/npc_weapons/sword/zweihander_sword_0.ron +++ b/assets/common/items/npc_weapons/sword/zweihander_sword_0.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 0.75, + poise_reduction_power: 0.75, speed: 1.0 ), ) diff --git a/assets/common/items/npc_weapons/tool/broom.ron b/assets/common/items/npc_weapons/tool/broom.ron index ce72baa6f6..06fa1070c0 100644 --- a/assets/common/items/npc_weapons/tool/broom.ron +++ b/assets/common/items/npc_weapons/tool/broom.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 400, power: 1.5, + poise_reduction_power: 1.5, speed: 1.0 ), ) diff --git a/assets/common/items/npc_weapons/tool/fishing_rod.ron b/assets/common/items/npc_weapons/tool/fishing_rod.ron index 4602d7123d..c6d6c5f118 100644 --- a/assets/common/items/npc_weapons/tool/fishing_rod.ron +++ b/assets/common/items/npc_weapons/tool/fishing_rod.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 400, power: 1.5, + poise_reduction_power: 1.5, speed: 1.0 ), ) diff --git a/assets/common/items/npc_weapons/tool/hoe.ron b/assets/common/items/npc_weapons/tool/hoe.ron index 6036295c9e..f259317dd6 100644 --- a/assets/common/items/npc_weapons/tool/hoe.ron +++ b/assets/common/items/npc_weapons/tool/hoe.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 400, power: 1.50, + poise_reduction_power: 1.50, speed: 1.0 ), ) diff --git a/assets/common/items/npc_weapons/tool/pickaxe.ron b/assets/common/items/npc_weapons/tool/pickaxe.ron index 59c317df95..22b78a71f9 100644 --- a/assets/common/items/npc_weapons/tool/pickaxe.ron +++ b/assets/common/items/npc_weapons/tool/pickaxe.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 400, power: 1.50, + poise_reduction_power: 1.50, speed: 1.0 ), ) diff --git a/assets/common/items/npc_weapons/tool/pitchfork.ron b/assets/common/items/npc_weapons/tool/pitchfork.ron index 2bfbe7ddb0..9c7dbc343b 100644 --- a/assets/common/items/npc_weapons/tool/pitchfork.ron +++ b/assets/common/items/npc_weapons/tool/pitchfork.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 400, power: 1.50, + poise_reduction_power: 1.50, speed: 1.0 ), ) diff --git a/assets/common/items/npc_weapons/tool/rake.ron b/assets/common/items/npc_weapons/tool/rake.ron index 1ff77b9c4a..cf85646fd5 100644 --- a/assets/common/items/npc_weapons/tool/rake.ron +++ b/assets/common/items/npc_weapons/tool/rake.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 400, power: 1.50, + poise_reduction_power: 1.50, speed: 1.0 ), ) diff --git a/assets/common/items/npc_weapons/tool/shovel-0.ron b/assets/common/items/npc_weapons/tool/shovel-0.ron index be185121e4..7673e8b601 100644 --- a/assets/common/items/npc_weapons/tool/shovel-0.ron +++ b/assets/common/items/npc_weapons/tool/shovel-0.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 400, power: 1.50, + poise_reduction_power: 1.50, speed: 1.0 ), ) diff --git a/assets/common/items/npc_weapons/tool/shovel-1.ron b/assets/common/items/npc_weapons/tool/shovel-1.ron index 0acb72575c..003e6d8ffd 100644 --- a/assets/common/items/npc_weapons/tool/shovel-1.ron +++ b/assets/common/items/npc_weapons/tool/shovel-1.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 400, power: 1.50, + poise_reduction_power: 1.50, speed: 1.0 ), ) diff --git a/assets/common/items/npc_weapons/unique/beast_claws.ron b/assets/common/items/npc_weapons/unique/beast_claws.ron index e871f541e4..e23dd88209 100644 --- a/assets/common/items/npc_weapons/unique/beast_claws.ron +++ b/assets/common/items/npc_weapons/unique/beast_claws.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 1.00, + poise_reduction_power: 1.00, speed: 1.0, ), ) diff --git a/assets/common/items/npc_weapons/unique/quadlowbasic.ron b/assets/common/items/npc_weapons/unique/quadlowbasic.ron index d82fc3409c..195bbc3ce0 100644 --- a/assets/common/items/npc_weapons/unique/quadlowbasic.ron +++ b/assets/common/items/npc_weapons/unique/quadlowbasic.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 10, power: 1.00, + poise_reduction_power: 1.00, speed: 1.00, ), ) diff --git a/assets/common/items/npc_weapons/unique/quadlowbreathe.ron b/assets/common/items/npc_weapons/unique/quadlowbreathe.ron index 04b230bc6c..5fc19195ba 100644 --- a/assets/common/items/npc_weapons/unique/quadlowbreathe.ron +++ b/assets/common/items/npc_weapons/unique/quadlowbreathe.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 10, power: 1.00, + poise_reduction_power: 1.00, speed: 1.00, ), ) diff --git a/assets/common/items/npc_weapons/unique/quadlowquick.ron b/assets/common/items/npc_weapons/unique/quadlowquick.ron index 4bcae60ed5..f56c38af7d 100644 --- a/assets/common/items/npc_weapons/unique/quadlowquick.ron +++ b/assets/common/items/npc_weapons/unique/quadlowquick.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 10, power: 1.00, + poise_reduction_power: 1.00, speed: 1.00, ), ) diff --git a/assets/common/items/npc_weapons/unique/quadlowranged.ron b/assets/common/items/npc_weapons/unique/quadlowranged.ron index 282c1fa15a..5ee67eb02c 100644 --- a/assets/common/items/npc_weapons/unique/quadlowranged.ron +++ b/assets/common/items/npc_weapons/unique/quadlowranged.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 10, power: 1.00, + poise_reduction_power: 1.00, speed: 1.00, ), ) diff --git a/assets/common/items/npc_weapons/unique/quadlowtail.ron b/assets/common/items/npc_weapons/unique/quadlowtail.ron index a79007335f..804d18e497 100644 --- a/assets/common/items/npc_weapons/unique/quadlowtail.ron +++ b/assets/common/items/npc_weapons/unique/quadlowtail.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 10, power: 1.00, + poise_reduction_power: 1.00, speed: 1.00, ), ) diff --git a/assets/common/items/npc_weapons/unique/quadmedbasic.ron b/assets/common/items/npc_weapons/unique/quadmedbasic.ron index b1950b89e4..58fee593df 100644 --- a/assets/common/items/npc_weapons/unique/quadmedbasic.ron +++ b/assets/common/items/npc_weapons/unique/quadmedbasic.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 10, power: 1.00, + poise_reduction_power: 1.00, speed: 1.00, ), ) diff --git a/assets/common/items/npc_weapons/unique/quadmedcharge.ron b/assets/common/items/npc_weapons/unique/quadmedcharge.ron index 990f56637b..f305d9bbfc 100644 --- a/assets/common/items/npc_weapons/unique/quadmedcharge.ron +++ b/assets/common/items/npc_weapons/unique/quadmedcharge.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 10, power: 1.00, + poise_reduction_power: 1.00, speed: 1.00, ), ) diff --git a/assets/common/items/npc_weapons/unique/quadmedhoof.ron b/assets/common/items/npc_weapons/unique/quadmedhoof.ron index 0cb269c2a6..69e94727c4 100644 --- a/assets/common/items/npc_weapons/unique/quadmedhoof.ron +++ b/assets/common/items/npc_weapons/unique/quadmedhoof.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 10, power: 1.00, + poise_reduction_power: 1.00, speed: 1.00, ), ) diff --git a/assets/common/items/npc_weapons/unique/quadmedjump.ron b/assets/common/items/npc_weapons/unique/quadmedjump.ron index 88fa3a2151..312df80b23 100644 --- a/assets/common/items/npc_weapons/unique/quadmedjump.ron +++ b/assets/common/items/npc_weapons/unique/quadmedjump.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 10, power: 1.00, + poise_reduction_power: 1.00, speed: 1.0, ), ) diff --git a/assets/common/items/npc_weapons/unique/quadmedquick.ron b/assets/common/items/npc_weapons/unique/quadmedquick.ron index 299ba3ab35..40cdb27875 100644 --- a/assets/common/items/npc_weapons/unique/quadmedquick.ron +++ b/assets/common/items/npc_weapons/unique/quadmedquick.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 10, power: 1.00, + poise_reduction_power: 1.00, speed: 1.0, ), ) diff --git a/assets/common/items/npc_weapons/unique/quadsmallbasic.ron b/assets/common/items/npc_weapons/unique/quadsmallbasic.ron index da263d6109..b62961f1be 100644 --- a/assets/common/items/npc_weapons/unique/quadsmallbasic.ron +++ b/assets/common/items/npc_weapons/unique/quadsmallbasic.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 10, power: 1.00, + poise_reduction_power: 1.00, speed: 1.00, ), ) diff --git a/assets/common/items/npc_weapons/unique/stone_golems_fist.ron b/assets/common/items/npc_weapons/unique/stone_golems_fist.ron index 3e665d9b61..8e3f298730 100644 --- a/assets/common/items/npc_weapons/unique/stone_golems_fist.ron +++ b/assets/common/items/npc_weapons/unique/stone_golems_fist.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 1.00, + poise_reduction_power: 1.00, speed: 1.0 ), ) diff --git a/assets/common/items/npc_weapons/unique/theropodbasic.ron b/assets/common/items/npc_weapons/unique/theropodbasic.ron index 19bf867622..11d3757795 100644 --- a/assets/common/items/npc_weapons/unique/theropodbasic.ron +++ b/assets/common/items/npc_weapons/unique/theropodbasic.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 10, power: 1.00, + poise_reduction_power: 1.00, speed: 1.00, ), ) diff --git a/assets/common/items/npc_weapons/unique/theropodbird.ron b/assets/common/items/npc_weapons/unique/theropodbird.ron index 28e8b88293..a1138ea25c 100644 --- a/assets/common/items/npc_weapons/unique/theropodbird.ron +++ b/assets/common/items/npc_weapons/unique/theropodbird.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 10, power: 1.00, + poise_reduction_power: 1.00, speed: 1.00, ), ) diff --git a/assets/common/items/weapons/axe/bloodsteel_axe-0.ron b/assets/common/items/weapons/axe/bloodsteel_axe-0.ron index 0be056e32f..16c297d7cf 100644 --- a/assets/common/items/weapons/axe/bloodsteel_axe-0.ron +++ b/assets/common/items/weapons/axe/bloodsteel_axe-0.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 400, power: 1.60, + poise_reduction_power: 1.60, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/axe/bloodsteel_axe-1.ron b/assets/common/items/weapons/axe/bloodsteel_axe-1.ron index a8b1463cc7..e5c2ce1817 100644 --- a/assets/common/items/weapons/axe/bloodsteel_axe-1.ron +++ b/assets/common/items/weapons/axe/bloodsteel_axe-1.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 400, power: 1.60, + poise_reduction_power: 1.60, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/axe/bloodsteel_axe-2.ron b/assets/common/items/weapons/axe/bloodsteel_axe-2.ron index 749baeabe1..08a88cdca8 100644 --- a/assets/common/items/weapons/axe/bloodsteel_axe-2.ron +++ b/assets/common/items/weapons/axe/bloodsteel_axe-2.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 400, power: 1.60, + poise_reduction_power: 1.60, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/axe/bronze_axe-0.ron b/assets/common/items/weapons/axe/bronze_axe-0.ron index 831a96c31d..b1d7d587d6 100644 --- a/assets/common/items/weapons/axe/bronze_axe-0.ron +++ b/assets/common/items/weapons/axe/bronze_axe-0.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 400, power: 1.00, + poise_reduction_power: 1.00, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/axe/bronze_axe-1.ron b/assets/common/items/weapons/axe/bronze_axe-1.ron index 2db56ad6af..0046453587 100644 --- a/assets/common/items/weapons/axe/bronze_axe-1.ron +++ b/assets/common/items/weapons/axe/bronze_axe-1.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 400, power: 1.00, + poise_reduction_power: 1.00, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/axe/cobalt_axe-0.ron b/assets/common/items/weapons/axe/cobalt_axe-0.ron index 6857a20150..5729a46dbc 100644 --- a/assets/common/items/weapons/axe/cobalt_axe-0.ron +++ b/assets/common/items/weapons/axe/cobalt_axe-0.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 400, power: 1.80, + poise_reduction_power: 1.80, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/axe/iron_axe-0.ron b/assets/common/items/weapons/axe/iron_axe-0.ron index 860558e075..501f6a5a22 100644 --- a/assets/common/items/weapons/axe/iron_axe-0.ron +++ b/assets/common/items/weapons/axe/iron_axe-0.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 400, power: 1.20, + poise_reduction_power: 1.20, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/axe/iron_axe-1.ron b/assets/common/items/weapons/axe/iron_axe-1.ron index 034de7040c..4cae908183 100644 --- a/assets/common/items/weapons/axe/iron_axe-1.ron +++ b/assets/common/items/weapons/axe/iron_axe-1.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 400, power: 1.20, + poise_reduction_power: 1.20, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/axe/iron_axe-2.ron b/assets/common/items/weapons/axe/iron_axe-2.ron index 4d504a54ef..0dc089f576 100644 --- a/assets/common/items/weapons/axe/iron_axe-2.ron +++ b/assets/common/items/weapons/axe/iron_axe-2.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 400, power: 1.20, + poise_reduction_power: 1.20, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/axe/iron_axe-3.ron b/assets/common/items/weapons/axe/iron_axe-3.ron index 5f3bae741f..70abf9d717 100644 --- a/assets/common/items/weapons/axe/iron_axe-3.ron +++ b/assets/common/items/weapons/axe/iron_axe-3.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 400, power: 1.20, + poise_reduction_power: 1.20, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/axe/iron_axe-4.ron b/assets/common/items/weapons/axe/iron_axe-4.ron index 3666abd029..2bca17ab71 100644 --- a/assets/common/items/weapons/axe/iron_axe-4.ron +++ b/assets/common/items/weapons/axe/iron_axe-4.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 400, power: 1.20, + poise_reduction_power: 1.20, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/axe/iron_axe-5.ron b/assets/common/items/weapons/axe/iron_axe-5.ron index f610d87614..692118285e 100644 --- a/assets/common/items/weapons/axe/iron_axe-5.ron +++ b/assets/common/items/weapons/axe/iron_axe-5.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 400, power: 1.20, + poise_reduction_power: 1.20, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/axe/iron_axe-6.ron b/assets/common/items/weapons/axe/iron_axe-6.ron index 26de17601e..56b3efd107 100644 --- a/assets/common/items/weapons/axe/iron_axe-6.ron +++ b/assets/common/items/weapons/axe/iron_axe-6.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 400, power: 1.20, + poise_reduction_power: 1.20, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/axe/iron_axe-7.ron b/assets/common/items/weapons/axe/iron_axe-7.ron index 2dda4e512b..16facaa8b1 100644 --- a/assets/common/items/weapons/axe/iron_axe-7.ron +++ b/assets/common/items/weapons/axe/iron_axe-7.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 400, power: 1.20, + poise_reduction_power: 1.20, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/axe/iron_axe-8.ron b/assets/common/items/weapons/axe/iron_axe-8.ron index 96da8a3311..811965c622 100644 --- a/assets/common/items/weapons/axe/iron_axe-8.ron +++ b/assets/common/items/weapons/axe/iron_axe-8.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 400, power: 1.20, + poise_reduction_power: 1.20, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/axe/iron_axe-9.ron b/assets/common/items/weapons/axe/iron_axe-9.ron index 6fe9ac4c57..18fd8fe202 100644 --- a/assets/common/items/weapons/axe/iron_axe-9.ron +++ b/assets/common/items/weapons/axe/iron_axe-9.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 400, power: 1.20, + poise_reduction_power: 1.20, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/axe/malachite_axe-0.ron b/assets/common/items/weapons/axe/malachite_axe-0.ron index d53a11f47d..f1b35db3b5 100644 --- a/assets/common/items/weapons/axe/malachite_axe-0.ron +++ b/assets/common/items/weapons/axe/malachite_axe-0.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 400, power: 2.00, + poise_reduction_power: 2.00, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/axe/orc_axe-0.ron b/assets/common/items/weapons/axe/orc_axe-0.ron index f725de2891..f37fec6d72 100644 --- a/assets/common/items/weapons/axe/orc_axe-0.ron +++ b/assets/common/items/weapons/axe/orc_axe-0.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 400, power: 0.60, + poise_reduction_power: 0.60, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/axe/starter_axe.ron b/assets/common/items/weapons/axe/starter_axe.ron index b867f649aa..715f5ea64e 100644 --- a/assets/common/items/weapons/axe/starter_axe.ron +++ b/assets/common/items/weapons/axe/starter_axe.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 400, power: 0.50, + poise_reduction_power: 0.50, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/axe/steel_axe-0.ron b/assets/common/items/weapons/axe/steel_axe-0.ron index a422646047..ef90f311b8 100644 --- a/assets/common/items/weapons/axe/steel_axe-0.ron +++ b/assets/common/items/weapons/axe/steel_axe-0.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 400, power: 1.40, + poise_reduction_power: 1.40, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/axe/steel_axe-1.ron b/assets/common/items/weapons/axe/steel_axe-1.ron index b5e3365c24..e0fd68b678 100644 --- a/assets/common/items/weapons/axe/steel_axe-1.ron +++ b/assets/common/items/weapons/axe/steel_axe-1.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 400, power: 1.40, + poise_reduction_power: 1.40, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/axe/steel_axe-2.ron b/assets/common/items/weapons/axe/steel_axe-2.ron index aeab3c660e..0fe6822f19 100644 --- a/assets/common/items/weapons/axe/steel_axe-2.ron +++ b/assets/common/items/weapons/axe/steel_axe-2.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 400, power: 1.40, + poise_reduction_power: 1.40, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/axe/steel_axe-3.ron b/assets/common/items/weapons/axe/steel_axe-3.ron index 279638b999..8990545243 100644 --- a/assets/common/items/weapons/axe/steel_axe-3.ron +++ b/assets/common/items/weapons/axe/steel_axe-3.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 400, power: 1.40, + poise_reduction_power: 1.40, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/axe/steel_axe-4.ron b/assets/common/items/weapons/axe/steel_axe-4.ron index f79705a9a6..2d082fda21 100644 --- a/assets/common/items/weapons/axe/steel_axe-4.ron +++ b/assets/common/items/weapons/axe/steel_axe-4.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 400, power: 1.40, + poise_reduction_power: 1.40, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/axe/steel_axe-5.ron b/assets/common/items/weapons/axe/steel_axe-5.ron index f0e90d9539..c1d967810d 100644 --- a/assets/common/items/weapons/axe/steel_axe-5.ron +++ b/assets/common/items/weapons/axe/steel_axe-5.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 400, power: 1.40, + poise_reduction_power: 1.40, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/axe/steel_axe-6.ron b/assets/common/items/weapons/axe/steel_axe-6.ron index 70af8b071b..78c6761af3 100644 --- a/assets/common/items/weapons/axe/steel_axe-6.ron +++ b/assets/common/items/weapons/axe/steel_axe-6.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 400, power: 1.40, + poise_reduction_power: 1.40, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/axe/worn_iron_axe-0.ron b/assets/common/items/weapons/axe/worn_iron_axe-0.ron index f28034eca3..03e614d274 100644 --- a/assets/common/items/weapons/axe/worn_iron_axe-0.ron +++ b/assets/common/items/weapons/axe/worn_iron_axe-0.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 400, power: 0.80, + poise_reduction_power: 0.80, speed: 1.0 ), ) 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 ea846a768c..17ae52592f 100644 --- a/assets/common/items/weapons/axe/worn_iron_axe-1.ron +++ b/assets/common/items/weapons/axe/worn_iron_axe-1.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 400, power: 0.80, + poise_reduction_power: 0.80, speed: 1.0 ), ) 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 11d8a79165..c731e62782 100644 --- a/assets/common/items/weapons/axe/worn_iron_axe-2.ron +++ b/assets/common/items/weapons/axe/worn_iron_axe-2.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 400, power: 0.80, + poise_reduction_power: 0.80, speed: 1.0 ), ) 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 a8de78ee0d..3a3b9ce966 100644 --- a/assets/common/items/weapons/axe/worn_iron_axe-3.ron +++ b/assets/common/items/weapons/axe/worn_iron_axe-3.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 400, power: 0.80, + poise_reduction_power: 0.80, speed: 1.0 ), ) 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 891cbbc2d2..b52a5a4f9a 100644 --- a/assets/common/items/weapons/axe/worn_iron_axe-4.ron +++ b/assets/common/items/weapons/axe/worn_iron_axe-4.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 400, power: 0.80, + poise_reduction_power: 0.80, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/bow/horn_longbow-0.ron b/assets/common/items/weapons/bow/horn_longbow-0.ron index 2cae3a5cb6..20287d6cc5 100644 --- a/assets/common/items/weapons/bow/horn_longbow-0.ron +++ b/assets/common/items/weapons/bow/horn_longbow-0.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 400, power: 1.50, + poise_reduction_power: 1.50, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/bow/iron_longbow-0.ron b/assets/common/items/weapons/bow/iron_longbow-0.ron index e762de291d..da8422d6c1 100644 --- a/assets/common/items/weapons/bow/iron_longbow-0.ron +++ b/assets/common/items/weapons/bow/iron_longbow-0.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 400, power: 1.75, + poise_reduction_power: 1.75, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/bow/leafy_longbow-0.ron b/assets/common/items/weapons/bow/leafy_longbow-0.ron index 2861d9ae72..09e2fbf931 100644 --- a/assets/common/items/weapons/bow/leafy_longbow-0.ron +++ b/assets/common/items/weapons/bow/leafy_longbow-0.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 400, power: 1.25, + poise_reduction_power: 1.25, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/bow/leafy_shortbow-0.ron b/assets/common/items/weapons/bow/leafy_shortbow-0.ron index 50037a7ac2..35cedc38ba 100644 --- a/assets/common/items/weapons/bow/leafy_shortbow-0.ron +++ b/assets/common/items/weapons/bow/leafy_shortbow-0.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 400, power: 1.00, + poise_reduction_power: 1.00, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/bow/nature_ore_longbow-0.ron b/assets/common/items/weapons/bow/nature_ore_longbow-0.ron index 8053a3785c..3fc9b38a3e 100644 --- a/assets/common/items/weapons/bow/nature_ore_longbow-0.ron +++ b/assets/common/items/weapons/bow/nature_ore_longbow-0.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 400, power: 2.00, + poise_reduction_power: 2.00, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/bow/rare_longbow.ron b/assets/common/items/weapons/bow/rare_longbow.ron index a1fb137a44..3ec5742715 100644 --- a/assets/common/items/weapons/bow/rare_longbow.ron +++ b/assets/common/items/weapons/bow/rare_longbow.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 400, power: 2.00, + poise_reduction_power: 2.00, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/bow/starter_bow.ron b/assets/common/items/weapons/bow/starter_bow.ron index 053d52ffec..ece1e7c964 100644 --- a/assets/common/items/weapons/bow/starter_bow.ron +++ b/assets/common/items/weapons/bow/starter_bow.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 400, power: 0.50, + poise_reduction_power: 0.50, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/bow/wood_longbow-0.ron b/assets/common/items/weapons/bow/wood_longbow-0.ron index 52f2576f1d..bbc24379c7 100644 --- a/assets/common/items/weapons/bow/wood_longbow-0.ron +++ b/assets/common/items/weapons/bow/wood_longbow-0.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 400, power: 1.00, + poise_reduction_power: 1.00, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/bow/wood_longbow-1.ron b/assets/common/items/weapons/bow/wood_longbow-1.ron index 16e3bf322a..06bf0f01e2 100644 --- a/assets/common/items/weapons/bow/wood_longbow-1.ron +++ b/assets/common/items/weapons/bow/wood_longbow-1.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 400, power: 1.00, + poise_reduction_power: 1.00, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/bow/wood_shortbow-0.ron b/assets/common/items/weapons/bow/wood_shortbow-0.ron index 75cc167f2f..3dc8f472e1 100644 --- a/assets/common/items/weapons/bow/wood_shortbow-0.ron +++ b/assets/common/items/weapons/bow/wood_shortbow-0.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 400, power: 0.8, + poise_reduction_power: 0.80, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/bow/wood_shortbow-1.ron b/assets/common/items/weapons/bow/wood_shortbow-1.ron index 26dffba37b..c906c159cd 100644 --- a/assets/common/items/weapons/bow/wood_shortbow-1.ron +++ b/assets/common/items/weapons/bow/wood_shortbow-1.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 400, power: 0.75, + poise_reduction_power: 0.75, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/dagger/basic_0.ron b/assets/common/items/weapons/dagger/basic_0.ron index 4ee3f82ff6..86fe8f22bc 100644 --- a/assets/common/items/weapons/dagger/basic_0.ron +++ b/assets/common/items/weapons/dagger/basic_0.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 0, power: 1.80, + poise_reduction_power: 1.80, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/dagger/cultist_0.ron b/assets/common/items/weapons/dagger/cultist_0.ron index d581e75484..1b9278de66 100644 --- a/assets/common/items/weapons/dagger/cultist_0.ron +++ b/assets/common/items/weapons/dagger/cultist_0.ron @@ -7,7 +7,8 @@ ItemDef( stats: ( equip_time_millis: 0, power: 2.00, - speed: 1.5 + poise_reduction_power: 2.00, + speed: 1.0 ), ) ), diff --git a/assets/common/items/weapons/dagger/starter_dagger.ron b/assets/common/items/weapons/dagger/starter_dagger.ron index a0118d0aca..a235e8d93d 100644 --- a/assets/common/items/weapons/dagger/starter_dagger.ron +++ b/assets/common/items/weapons/dagger/starter_dagger.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 300, power: 1.00, + poise_reduction_power: 1.00, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/empty/empty.ron b/assets/common/items/weapons/empty/empty.ron index ca1672b393..921310f38d 100644 --- a/assets/common/items/weapons/empty/empty.ron +++ b/assets/common/items/weapons/empty/empty.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 200, power: 1.00, + poise_reduction_power: 1.00, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/hammer/bronze_hammer-0.ron b/assets/common/items/weapons/hammer/bronze_hammer-0.ron index a558558585..9c4e32aecc 100644 --- a/assets/common/items/weapons/hammer/bronze_hammer-0.ron +++ b/assets/common/items/weapons/hammer/bronze_hammer-0.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 1.00, + poise_reduction_power: 1.00, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/hammer/bronze_hammer-1.ron b/assets/common/items/weapons/hammer/bronze_hammer-1.ron index 3fbff62c53..c9b980d189 100644 --- a/assets/common/items/weapons/hammer/bronze_hammer-1.ron +++ b/assets/common/items/weapons/hammer/bronze_hammer-1.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 1.00, + poise_reduction_power: 1.00, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/hammer/cobalt_hammer-0.ron b/assets/common/items/weapons/hammer/cobalt_hammer-0.ron index 726cb8c524..701bdc8da5 100644 --- a/assets/common/items/weapons/hammer/cobalt_hammer-0.ron +++ b/assets/common/items/weapons/hammer/cobalt_hammer-0.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 1.60, + poise_reduction_power: 1.60, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/hammer/cobalt_hammer-1.ron b/assets/common/items/weapons/hammer/cobalt_hammer-1.ron index 02bb324bfb..b9a5a585be 100644 --- a/assets/common/items/weapons/hammer/cobalt_hammer-1.ron +++ b/assets/common/items/weapons/hammer/cobalt_hammer-1.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 1.60, + poise_reduction_power: 1.60, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/hammer/cultist_purp_2h-0.ron b/assets/common/items/weapons/hammer/cultist_purp_2h-0.ron index 942d2c86d4..0e25cb6f33 100644 --- a/assets/common/items/weapons/hammer/cultist_purp_2h-0.ron +++ b/assets/common/items/weapons/hammer/cultist_purp_2h-0.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 2.00, + poise_reduction_power: 2.00, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/hammer/flimsy_hammer.ron b/assets/common/items/weapons/hammer/flimsy_hammer.ron index 02b087a584..619c0a481e 100644 --- a/assets/common/items/weapons/hammer/flimsy_hammer.ron +++ b/assets/common/items/weapons/hammer/flimsy_hammer.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 0.50, + poise_reduction_power: 0.50, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/hammer/hammer_1.ron b/assets/common/items/weapons/hammer/hammer_1.ron index 47b01d509b..1e4f2f0c24 100644 --- a/assets/common/items/weapons/hammer/hammer_1.ron +++ b/assets/common/items/weapons/hammer/hammer_1.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 0.50, + poise_reduction_power: 0.50, speed: 1.0 ), quality: Low, diff --git a/assets/common/items/weapons/hammer/iron_hammer-0.ron b/assets/common/items/weapons/hammer/iron_hammer-0.ron index 226db9e7d3..69b51845ec 100644 --- a/assets/common/items/weapons/hammer/iron_hammer-0.ron +++ b/assets/common/items/weapons/hammer/iron_hammer-0.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 1.20, + poise_reduction_power: 1.20, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/hammer/iron_hammer-1.ron b/assets/common/items/weapons/hammer/iron_hammer-1.ron index 70fc39cda6..7447a8b8ab 100644 --- a/assets/common/items/weapons/hammer/iron_hammer-1.ron +++ b/assets/common/items/weapons/hammer/iron_hammer-1.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 1.20, + poise_reduction_power: 1.20, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/hammer/iron_hammer-2.ron b/assets/common/items/weapons/hammer/iron_hammer-2.ron index 11f045abe7..681d04224a 100644 --- a/assets/common/items/weapons/hammer/iron_hammer-2.ron +++ b/assets/common/items/weapons/hammer/iron_hammer-2.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 1.20, + poise_reduction_power: 1.20, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/hammer/iron_hammer-3.ron b/assets/common/items/weapons/hammer/iron_hammer-3.ron index 7af920efb4..f888071ff1 100644 --- a/assets/common/items/weapons/hammer/iron_hammer-3.ron +++ b/assets/common/items/weapons/hammer/iron_hammer-3.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 1.20, + poise_reduction_power: 1.20, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/hammer/iron_hammer-4.ron b/assets/common/items/weapons/hammer/iron_hammer-4.ron index e7e7b0d2cf..e7e27d0f2e 100644 --- a/assets/common/items/weapons/hammer/iron_hammer-4.ron +++ b/assets/common/items/weapons/hammer/iron_hammer-4.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 1.20, + poise_reduction_power: 1.20, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/hammer/iron_hammer-5.ron b/assets/common/items/weapons/hammer/iron_hammer-5.ron index 63a1bd1b41..28dce8b412 100644 --- a/assets/common/items/weapons/hammer/iron_hammer-5.ron +++ b/assets/common/items/weapons/hammer/iron_hammer-5.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 1.20, + poise_reduction_power: 1.20, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/hammer/iron_hammer-6.ron b/assets/common/items/weapons/hammer/iron_hammer-6.ron index f87de3f0e8..72ddfd7bfd 100644 --- a/assets/common/items/weapons/hammer/iron_hammer-6.ron +++ b/assets/common/items/weapons/hammer/iron_hammer-6.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 1.20, + poise_reduction_power: 1.20, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/hammer/iron_hammer-7.ron b/assets/common/items/weapons/hammer/iron_hammer-7.ron index bda62278e3..ae5894f356 100644 --- a/assets/common/items/weapons/hammer/iron_hammer-7.ron +++ b/assets/common/items/weapons/hammer/iron_hammer-7.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 1.20, + poise_reduction_power: 1.20, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/hammer/iron_hammer-8.ron b/assets/common/items/weapons/hammer/iron_hammer-8.ron index 9b2ae813ad..281c0ae047 100644 --- a/assets/common/items/weapons/hammer/iron_hammer-8.ron +++ b/assets/common/items/weapons/hammer/iron_hammer-8.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 1.20, + poise_reduction_power: 1.20, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/hammer/mjolnir.ron b/assets/common/items/weapons/hammer/mjolnir.ron index 81b190becb..8d825c1746 100644 --- a/assets/common/items/weapons/hammer/mjolnir.ron +++ b/assets/common/items/weapons/hammer/mjolnir.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 4.00, + poise_reduction_power: 2.00, speed: 0.5 ), ) diff --git a/assets/common/items/weapons/hammer/ramshead_hammer.ron b/assets/common/items/weapons/hammer/ramshead_hammer.ron index 0f1c2887a6..ca7fb2ceae 100644 --- a/assets/common/items/weapons/hammer/ramshead_hammer.ron +++ b/assets/common/items/weapons/hammer/ramshead_hammer.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 1.80, + poise_reduction_power: 1.80, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/hammer/runic_hammer.ron b/assets/common/items/weapons/hammer/runic_hammer.ron index 3b32590023..52eb5d18ee 100644 --- a/assets/common/items/weapons/hammer/runic_hammer.ron +++ b/assets/common/items/weapons/hammer/runic_hammer.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 1.80, + poise_reduction_power: 1.80, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/hammer/starter_hammer.ron b/assets/common/items/weapons/hammer/starter_hammer.ron index 35d167e7a8..7d0f184d06 100644 --- a/assets/common/items/weapons/hammer/starter_hammer.ron +++ b/assets/common/items/weapons/hammer/starter_hammer.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 0.50, + poise_reduction_power: 0.50, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/hammer/steel_hammer-0.ron b/assets/common/items/weapons/hammer/steel_hammer-0.ron index a952a02129..078aa6e1bc 100644 --- a/assets/common/items/weapons/hammer/steel_hammer-0.ron +++ b/assets/common/items/weapons/hammer/steel_hammer-0.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 1.40, + poise_reduction_power: 1.40, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/hammer/steel_hammer-1.ron b/assets/common/items/weapons/hammer/steel_hammer-1.ron index 0550316424..bde8a287fe 100644 --- a/assets/common/items/weapons/hammer/steel_hammer-1.ron +++ b/assets/common/items/weapons/hammer/steel_hammer-1.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 1.40, + poise_reduction_power: 1.40, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/hammer/steel_hammer-2.ron b/assets/common/items/weapons/hammer/steel_hammer-2.ron index 9556767429..c68645e407 100644 --- a/assets/common/items/weapons/hammer/steel_hammer-2.ron +++ b/assets/common/items/weapons/hammer/steel_hammer-2.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 1.40, + poise_reduction_power: 1.40, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/hammer/steel_hammer-3.ron b/assets/common/items/weapons/hammer/steel_hammer-3.ron index aff74b45a8..f22db96d9d 100644 --- a/assets/common/items/weapons/hammer/steel_hammer-3.ron +++ b/assets/common/items/weapons/hammer/steel_hammer-3.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 1.40, + poise_reduction_power: 1.40, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/hammer/steel_hammer-4.ron b/assets/common/items/weapons/hammer/steel_hammer-4.ron index b5a6c46b8a..56d6aee2ef 100644 --- a/assets/common/items/weapons/hammer/steel_hammer-4.ron +++ b/assets/common/items/weapons/hammer/steel_hammer-4.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 1.40, + poise_reduction_power: 1.40, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/hammer/steel_hammer-5.ron b/assets/common/items/weapons/hammer/steel_hammer-5.ron index 9b2bc8b565..8754e285e3 100644 --- a/assets/common/items/weapons/hammer/steel_hammer-5.ron +++ b/assets/common/items/weapons/hammer/steel_hammer-5.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 1.40, + poise_reduction_power: 1.40, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/hammer/stone_hammer-0.ron b/assets/common/items/weapons/hammer/stone_hammer-0.ron index 6b5c9141e2..5b9d14ddb2 100644 --- a/assets/common/items/weapons/hammer/stone_hammer-0.ron +++ b/assets/common/items/weapons/hammer/stone_hammer-0.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 0.70, + poise_reduction_power: 0.70, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/hammer/stone_hammer-1.ron b/assets/common/items/weapons/hammer/stone_hammer-1.ron index 02fc44688a..76f92bed33 100644 --- a/assets/common/items/weapons/hammer/stone_hammer-1.ron +++ b/assets/common/items/weapons/hammer/stone_hammer-1.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 0.70, + poise_reduction_power: 0.70, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/hammer/stone_hammer-2.ron b/assets/common/items/weapons/hammer/stone_hammer-2.ron index ead1e3cdd9..dba99eee94 100644 --- a/assets/common/items/weapons/hammer/stone_hammer-2.ron +++ b/assets/common/items/weapons/hammer/stone_hammer-2.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 0.70, + poise_reduction_power: 0.70, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/hammer/stone_hammer-3.ron b/assets/common/items/weapons/hammer/stone_hammer-3.ron index 8817aec322..86145ec7ad 100644 --- a/assets/common/items/weapons/hammer/stone_hammer-3.ron +++ b/assets/common/items/weapons/hammer/stone_hammer-3.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 0.70, + poise_reduction_power: 0.70, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/hammer/wood_hammer-0.ron b/assets/common/items/weapons/hammer/wood_hammer-0.ron index 9c9d66a659..78b6087a80 100644 --- a/assets/common/items/weapons/hammer/wood_hammer-0.ron +++ b/assets/common/items/weapons/hammer/wood_hammer-0.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 0.60, + poise_reduction_power: 0.60, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/hammer/worn_iron_hammer-0.ron b/assets/common/items/weapons/hammer/worn_iron_hammer-0.ron index e48ae526da..9e3ce47a40 100644 --- a/assets/common/items/weapons/hammer/worn_iron_hammer-0.ron +++ b/assets/common/items/weapons/hammer/worn_iron_hammer-0.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 0.85, + poise_reduction_power: 0.85, speed: 1.0 ), ) 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 42aa2614f8..09763942c7 100644 --- a/assets/common/items/weapons/hammer/worn_iron_hammer-1.ron +++ b/assets/common/items/weapons/hammer/worn_iron_hammer-1.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 0.85, + poise_reduction_power: 0.85, speed: 1.0 ), ) 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 e005ea5254..01b092c16a 100644 --- a/assets/common/items/weapons/hammer/worn_iron_hammer-2.ron +++ b/assets/common/items/weapons/hammer/worn_iron_hammer-2.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 0.85, + poise_reduction_power: 0.85, speed: 1.0 ), ) 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 c5c42c6b31..37a48190cd 100644 --- a/assets/common/items/weapons/hammer/worn_iron_hammer-3.ron +++ b/assets/common/items/weapons/hammer/worn_iron_hammer-3.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 0.85, + poise_reduction_power: 0.85, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/sceptre/sceptre_velorite_0.ron b/assets/common/items/weapons/sceptre/sceptre_velorite_0.ron index 848210af87..b7b85f8013 100644 --- a/assets/common/items/weapons/sceptre/sceptre_velorite_0.ron +++ b/assets/common/items/weapons/sceptre/sceptre_velorite_0.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 400, power: 1.2, + poise_reduction_power: 2.00, speed: 1.6 ), ) diff --git a/assets/common/items/weapons/sceptre/staff_nature.ron b/assets/common/items/weapons/sceptre/staff_nature.ron index 22d675987e..d7975320fc 100644 --- a/assets/common/items/weapons/sceptre/staff_nature.ron +++ b/assets/common/items/weapons/sceptre/staff_nature.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 400, power: 0.91, + poise_reduction_power: 1.00, speed: 1.1 ), ) diff --git a/assets/common/items/weapons/sceptre/starter_sceptre.ron b/assets/common/items/weapons/sceptre/starter_sceptre.ron index a0769a37e2..6bde465ac4 100644 --- a/assets/common/items/weapons/sceptre/starter_sceptre.ron +++ b/assets/common/items/weapons/sceptre/starter_sceptre.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 400, power: 0.50, + poise_reduction_power: 0.50, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/shield/shield_1.ron b/assets/common/items/weapons/shield/shield_1.ron index a0afddac2a..c0b9087726 100644 --- a/assets/common/items/weapons/shield/shield_1.ron +++ b/assets/common/items/weapons/shield/shield_1.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 400, power: 1.00, + poise_reduction_power: 1.00, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/staff/amethyst_staff.ron b/assets/common/items/weapons/staff/amethyst_staff.ron index f5cbf8dd5b..5912838dfc 100644 --- a/assets/common/items/weapons/staff/amethyst_staff.ron +++ b/assets/common/items/weapons/staff/amethyst_staff.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 300, power: 1.50, + poise_reduction_power: 1.50, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/staff/bone_staff.ron b/assets/common/items/weapons/staff/bone_staff.ron index 95c82f7687..9276494320 100644 --- a/assets/common/items/weapons/staff/bone_staff.ron +++ b/assets/common/items/weapons/staff/bone_staff.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 300, power: 1.00, + poise_reduction_power: 1.00, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/staff/cultist_staff.ron b/assets/common/items/weapons/staff/cultist_staff.ron index c7c28d3ce6..5394c7a959 100644 --- a/assets/common/items/weapons/staff/cultist_staff.ron +++ b/assets/common/items/weapons/staff/cultist_staff.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 300, power: 2.00, + poise_reduction_power: 2.00, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/staff/staff_1.ron b/assets/common/items/weapons/staff/staff_1.ron index 8b3080ec0c..40ff73992d 100644 --- a/assets/common/items/weapons/staff/staff_1.ron +++ b/assets/common/items/weapons/staff/staff_1.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 200, power: 0.50, + poise_reduction_power: 0.50, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/staff/starter_staff.ron b/assets/common/items/weapons/staff/starter_staff.ron index 8fc27aa382..66ecf094de 100644 --- a/assets/common/items/weapons/staff/starter_staff.ron +++ b/assets/common/items/weapons/staff/starter_staff.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 300, power: 0.50, + poise_reduction_power: 0.50, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/sword/cultist_purp_2h-0.ron b/assets/common/items/weapons/sword/cultist_purp_2h-0.ron index 38cff1c841..b1f51a818b 100644 --- a/assets/common/items/weapons/sword/cultist_purp_2h-0.ron +++ b/assets/common/items/weapons/sword/cultist_purp_2h-0.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 2.00, + poise_reduction_power: 2.00, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/sword/frost_cleaver_2h-0.ron b/assets/common/items/weapons/sword/frost_cleaver_2h-0.ron index f8ebee6226..57cbcf88d4 100644 --- a/assets/common/items/weapons/sword/frost_cleaver_2h-0.ron +++ b/assets/common/items/weapons/sword/frost_cleaver_2h-0.ron @@ -6,7 +6,10 @@ ItemDef( kind: Sword, stats: ( equip_time_millis: 500, - power: 1.70), + power: 1.70, + poise_reduction_power: 1.70, + speed: 1.0 + ), ) ), quality: High, diff --git a/assets/common/items/weapons/sword/frost_cleaver_2h-1.ron b/assets/common/items/weapons/sword/frost_cleaver_2h-1.ron index 26ae101c97..8b24d09c91 100644 --- a/assets/common/items/weapons/sword/frost_cleaver_2h-1.ron +++ b/assets/common/items/weapons/sword/frost_cleaver_2h-1.ron @@ -6,7 +6,10 @@ ItemDef( kind: Sword, stats: ( equip_time_millis: 500, - power: 1.95), + power: 1.95, + poise_reduction_power: 1.95, + speed: 1.0 + ), ) ), quality: Epic, diff --git a/assets/common/items/weapons/sword/greatsword_2h_dam-0.ron b/assets/common/items/weapons/sword/greatsword_2h_dam-0.ron index b154161895..1a4d5c7ddc 100644 --- a/assets/common/items/weapons/sword/greatsword_2h_dam-0.ron +++ b/assets/common/items/weapons/sword/greatsword_2h_dam-0.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 0.80, + poise_reduction_power: 0.80, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/sword/greatsword_2h_dam-1.ron b/assets/common/items/weapons/sword/greatsword_2h_dam-1.ron index b154161895..1a4d5c7ddc 100644 --- a/assets/common/items/weapons/sword/greatsword_2h_dam-1.ron +++ b/assets/common/items/weapons/sword/greatsword_2h_dam-1.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 0.80, + poise_reduction_power: 0.80, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/sword/greatsword_2h_dam-2.ron b/assets/common/items/weapons/sword/greatsword_2h_dam-2.ron index b154161895..1a4d5c7ddc 100644 --- a/assets/common/items/weapons/sword/greatsword_2h_dam-2.ron +++ b/assets/common/items/weapons/sword/greatsword_2h_dam-2.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 0.80, + poise_reduction_power: 0.80, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/sword/greatsword_2h_fine-0.ron b/assets/common/items/weapons/sword/greatsword_2h_fine-0.ron index e6628d0292..3ebf723ef5 100644 --- a/assets/common/items/weapons/sword/greatsword_2h_fine-0.ron +++ b/assets/common/items/weapons/sword/greatsword_2h_fine-0.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 1.40, + poise_reduction_power: 1.40, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/sword/greatsword_2h_fine-1.ron b/assets/common/items/weapons/sword/greatsword_2h_fine-1.ron index e6628d0292..3ebf723ef5 100644 --- a/assets/common/items/weapons/sword/greatsword_2h_fine-1.ron +++ b/assets/common/items/weapons/sword/greatsword_2h_fine-1.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 1.40, + poise_reduction_power: 1.40, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/sword/greatsword_2h_fine-2.ron b/assets/common/items/weapons/sword/greatsword_2h_fine-2.ron index e6628d0292..3ebf723ef5 100644 --- a/assets/common/items/weapons/sword/greatsword_2h_fine-2.ron +++ b/assets/common/items/weapons/sword/greatsword_2h_fine-2.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 1.40, + poise_reduction_power: 1.40, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/sword/greatsword_2h_orn-0.ron b/assets/common/items/weapons/sword/greatsword_2h_orn-0.ron index 9f30811969..2094e00f42 100644 --- a/assets/common/items/weapons/sword/greatsword_2h_orn-0.ron +++ b/assets/common/items/weapons/sword/greatsword_2h_orn-0.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 1.70, + poise_reduction_power: 1.70, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/sword/greatsword_2h_orn-1.ron b/assets/common/items/weapons/sword/greatsword_2h_orn-1.ron index 9f30811969..2094e00f42 100644 --- a/assets/common/items/weapons/sword/greatsword_2h_orn-1.ron +++ b/assets/common/items/weapons/sword/greatsword_2h_orn-1.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 1.70, + poise_reduction_power: 1.70, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/sword/greatsword_2h_orn-2.ron b/assets/common/items/weapons/sword/greatsword_2h_orn-2.ron index 9f30811969..2094e00f42 100644 --- a/assets/common/items/weapons/sword/greatsword_2h_orn-2.ron +++ b/assets/common/items/weapons/sword/greatsword_2h_orn-2.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 1.70, + poise_reduction_power: 1.70, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/sword/greatsword_2h_simple-0.ron b/assets/common/items/weapons/sword/greatsword_2h_simple-0.ron index 1c23454b2e..1111cc66cd 100644 --- a/assets/common/items/weapons/sword/greatsword_2h_simple-0.ron +++ b/assets/common/items/weapons/sword/greatsword_2h_simple-0.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 1.10, + poise_reduction_power: 1.10, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/sword/greatsword_2h_simple-1.ron b/assets/common/items/weapons/sword/greatsword_2h_simple-1.ron index 1c23454b2e..1111cc66cd 100644 --- a/assets/common/items/weapons/sword/greatsword_2h_simple-1.ron +++ b/assets/common/items/weapons/sword/greatsword_2h_simple-1.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 1.10, + poise_reduction_power: 1.10, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/sword/greatsword_2h_simple-2.ron b/assets/common/items/weapons/sword/greatsword_2h_simple-2.ron index 1c23454b2e..1111cc66cd 100644 --- a/assets/common/items/weapons/sword/greatsword_2h_simple-2.ron +++ b/assets/common/items/weapons/sword/greatsword_2h_simple-2.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 1.10, + poise_reduction_power: 1.10, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/sword/long_2h_dam-0.ron b/assets/common/items/weapons/sword/long_2h_dam-0.ron index 50617f1647..17117f0fb6 100644 --- a/assets/common/items/weapons/sword/long_2h_dam-0.ron +++ b/assets/common/items/weapons/sword/long_2h_dam-0.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 0.60, + poise_reduction_power: 0.60, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/sword/long_2h_dam-1.ron b/assets/common/items/weapons/sword/long_2h_dam-1.ron index 50617f1647..17117f0fb6 100644 --- a/assets/common/items/weapons/sword/long_2h_dam-1.ron +++ b/assets/common/items/weapons/sword/long_2h_dam-1.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 0.60, + poise_reduction_power: 0.60, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/sword/long_2h_dam-2.ron b/assets/common/items/weapons/sword/long_2h_dam-2.ron index 50617f1647..17117f0fb6 100644 --- a/assets/common/items/weapons/sword/long_2h_dam-2.ron +++ b/assets/common/items/weapons/sword/long_2h_dam-2.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 0.60, + poise_reduction_power: 0.60, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/sword/long_2h_dam-3.ron b/assets/common/items/weapons/sword/long_2h_dam-3.ron index 50617f1647..17117f0fb6 100644 --- a/assets/common/items/weapons/sword/long_2h_dam-3.ron +++ b/assets/common/items/weapons/sword/long_2h_dam-3.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 0.60, + poise_reduction_power: 0.60, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/sword/long_2h_dam-4.ron b/assets/common/items/weapons/sword/long_2h_dam-4.ron index 50617f1647..17117f0fb6 100644 --- a/assets/common/items/weapons/sword/long_2h_dam-4.ron +++ b/assets/common/items/weapons/sword/long_2h_dam-4.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 0.60, + poise_reduction_power: 0.60, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/sword/long_2h_dam-5.ron b/assets/common/items/weapons/sword/long_2h_dam-5.ron index 50617f1647..17117f0fb6 100644 --- a/assets/common/items/weapons/sword/long_2h_dam-5.ron +++ b/assets/common/items/weapons/sword/long_2h_dam-5.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 0.60, + poise_reduction_power: 0.60, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/sword/long_2h_fine-0.ron b/assets/common/items/weapons/sword/long_2h_fine-0.ron index ca339b1ea7..a708dc84ac 100644 --- a/assets/common/items/weapons/sword/long_2h_fine-0.ron +++ b/assets/common/items/weapons/sword/long_2h_fine-0.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 1.20, + poise_reduction_power: 1.20, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/sword/long_2h_fine-1.ron b/assets/common/items/weapons/sword/long_2h_fine-1.ron index ca339b1ea7..a708dc84ac 100644 --- a/assets/common/items/weapons/sword/long_2h_fine-1.ron +++ b/assets/common/items/weapons/sword/long_2h_fine-1.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 1.20, + poise_reduction_power: 1.20, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/sword/long_2h_fine-2.ron b/assets/common/items/weapons/sword/long_2h_fine-2.ron index ca339b1ea7..a708dc84ac 100644 --- a/assets/common/items/weapons/sword/long_2h_fine-2.ron +++ b/assets/common/items/weapons/sword/long_2h_fine-2.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 1.20, + poise_reduction_power: 1.20, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/sword/long_2h_fine-3.ron b/assets/common/items/weapons/sword/long_2h_fine-3.ron index ca339b1ea7..a708dc84ac 100644 --- a/assets/common/items/weapons/sword/long_2h_fine-3.ron +++ b/assets/common/items/weapons/sword/long_2h_fine-3.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 1.20, + poise_reduction_power: 1.20, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/sword/long_2h_fine-4.ron b/assets/common/items/weapons/sword/long_2h_fine-4.ron index ca339b1ea7..a708dc84ac 100644 --- a/assets/common/items/weapons/sword/long_2h_fine-4.ron +++ b/assets/common/items/weapons/sword/long_2h_fine-4.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 1.20, + poise_reduction_power: 1.20, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/sword/long_2h_fine-5.ron b/assets/common/items/weapons/sword/long_2h_fine-5.ron index ca339b1ea7..a708dc84ac 100644 --- a/assets/common/items/weapons/sword/long_2h_fine-5.ron +++ b/assets/common/items/weapons/sword/long_2h_fine-5.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 1.20, + poise_reduction_power: 1.20, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/sword/long_2h_orn-0.ron b/assets/common/items/weapons/sword/long_2h_orn-0.ron index 30f9362ce5..b0eb602f57 100644 --- a/assets/common/items/weapons/sword/long_2h_orn-0.ron +++ b/assets/common/items/weapons/sword/long_2h_orn-0.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 1.50, + poise_reduction_power: 1.50, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/sword/long_2h_orn-1.ron b/assets/common/items/weapons/sword/long_2h_orn-1.ron index 30f9362ce5..b0eb602f57 100644 --- a/assets/common/items/weapons/sword/long_2h_orn-1.ron +++ b/assets/common/items/weapons/sword/long_2h_orn-1.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 1.50, + poise_reduction_power: 1.50, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/sword/long_2h_orn-2.ron b/assets/common/items/weapons/sword/long_2h_orn-2.ron index 30f9362ce5..b0eb602f57 100644 --- a/assets/common/items/weapons/sword/long_2h_orn-2.ron +++ b/assets/common/items/weapons/sword/long_2h_orn-2.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 1.50, + poise_reduction_power: 1.50, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/sword/long_2h_orn-3.ron b/assets/common/items/weapons/sword/long_2h_orn-3.ron index 30f9362ce5..b0eb602f57 100644 --- a/assets/common/items/weapons/sword/long_2h_orn-3.ron +++ b/assets/common/items/weapons/sword/long_2h_orn-3.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 1.50, + poise_reduction_power: 1.50, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/sword/long_2h_orn-4.ron b/assets/common/items/weapons/sword/long_2h_orn-4.ron index 30f9362ce5..b0eb602f57 100644 --- a/assets/common/items/weapons/sword/long_2h_orn-4.ron +++ b/assets/common/items/weapons/sword/long_2h_orn-4.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 1.50, + poise_reduction_power: 1.50, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/sword/long_2h_orn-5.ron b/assets/common/items/weapons/sword/long_2h_orn-5.ron index 30f9362ce5..b0eb602f57 100644 --- a/assets/common/items/weapons/sword/long_2h_orn-5.ron +++ b/assets/common/items/weapons/sword/long_2h_orn-5.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 1.50, + poise_reduction_power: 1.50, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/sword/long_2h_simple-0.ron b/assets/common/items/weapons/sword/long_2h_simple-0.ron index 834db5e8f9..09fcf6f3ee 100644 --- a/assets/common/items/weapons/sword/long_2h_simple-0.ron +++ b/assets/common/items/weapons/sword/long_2h_simple-0.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 0.90, + poise_reduction_power: 0.90, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/sword/long_2h_simple-1.ron b/assets/common/items/weapons/sword/long_2h_simple-1.ron index 834db5e8f9..09fcf6f3ee 100644 --- a/assets/common/items/weapons/sword/long_2h_simple-1.ron +++ b/assets/common/items/weapons/sword/long_2h_simple-1.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 0.90, + poise_reduction_power: 0.90, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/sword/long_2h_simple-2.ron b/assets/common/items/weapons/sword/long_2h_simple-2.ron index 834db5e8f9..09fcf6f3ee 100644 --- a/assets/common/items/weapons/sword/long_2h_simple-2.ron +++ b/assets/common/items/weapons/sword/long_2h_simple-2.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 0.90, + poise_reduction_power: 0.90, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/sword/long_2h_simple-3.ron b/assets/common/items/weapons/sword/long_2h_simple-3.ron index 834db5e8f9..09fcf6f3ee 100644 --- a/assets/common/items/weapons/sword/long_2h_simple-3.ron +++ b/assets/common/items/weapons/sword/long_2h_simple-3.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 0.90, + poise_reduction_power: 0.90, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/sword/long_2h_simple-4.ron b/assets/common/items/weapons/sword/long_2h_simple-4.ron index 834db5e8f9..09fcf6f3ee 100644 --- a/assets/common/items/weapons/sword/long_2h_simple-4.ron +++ b/assets/common/items/weapons/sword/long_2h_simple-4.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 0.90, + poise_reduction_power: 0.90, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/sword/long_2h_simple-5.ron b/assets/common/items/weapons/sword/long_2h_simple-5.ron index 834db5e8f9..09fcf6f3ee 100644 --- a/assets/common/items/weapons/sword/long_2h_simple-5.ron +++ b/assets/common/items/weapons/sword/long_2h_simple-5.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 0.90, + poise_reduction_power: 0.90, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/sword/short_sword_0.ron b/assets/common/items/weapons/sword/short_sword_0.ron index 32322d16f6..5aa2201ed4 100644 --- a/assets/common/items/weapons/sword/short_sword_0.ron +++ b/assets/common/items/weapons/sword/short_sword_0.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 400, power: 0.75, + poise_reduction_power: 0.75, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/sword/starter_sword.ron b/assets/common/items/weapons/sword/starter_sword.ron index 0e4f7bed26..c5eaf61c21 100644 --- a/assets/common/items/weapons/sword/starter_sword.ron +++ b/assets/common/items/weapons/sword/starter_sword.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 300, power: 0.50, + poise_reduction_power: 0.50, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/sword/wood_sword.ron b/assets/common/items/weapons/sword/wood_sword.ron index c061ac0ecb..ea20e61b05 100644 --- a/assets/common/items/weapons/sword/wood_sword.ron +++ b/assets/common/items/weapons/sword/wood_sword.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 400, power: 0.8, + poise_reduction_power: 0.8, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/sword/zweihander_sword_0.ron b/assets/common/items/weapons/sword/zweihander_sword_0.ron index 4570f5f508..a8f9f383d1 100644 --- a/assets/common/items/weapons/sword/zweihander_sword_0.ron +++ b/assets/common/items/weapons/sword/zweihander_sword_0.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 1.50, + poise_reduction_power: 1.50, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/tool/broom.ron b/assets/common/items/weapons/tool/broom.ron index fce5d07407..19610b2af0 100644 --- a/assets/common/items/weapons/tool/broom.ron +++ b/assets/common/items/weapons/tool/broom.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 400, power: 1.00, + poise_reduction_power: 1.00, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/tool/fishing_rod.ron b/assets/common/items/weapons/tool/fishing_rod.ron index da171bf0df..0836f62498 100644 --- a/assets/common/items/weapons/tool/fishing_rod.ron +++ b/assets/common/items/weapons/tool/fishing_rod.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 400, power: 1.00, + poise_reduction_power: 1.00, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/tool/hoe.ron b/assets/common/items/weapons/tool/hoe.ron index 2d2af04949..52a178b390 100644 --- a/assets/common/items/weapons/tool/hoe.ron +++ b/assets/common/items/weapons/tool/hoe.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 400, power: 1.00, + poise_reduction_power: 1.00, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/tool/pickaxe.ron b/assets/common/items/weapons/tool/pickaxe.ron index 3215e311d1..1d207fc796 100644 --- a/assets/common/items/weapons/tool/pickaxe.ron +++ b/assets/common/items/weapons/tool/pickaxe.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 400, power: 1.00, + poise_reduction_power: 1.00, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/tool/pitchfork.ron b/assets/common/items/weapons/tool/pitchfork.ron index 8f9c33a851..c4d66eb9e0 100644 --- a/assets/common/items/weapons/tool/pitchfork.ron +++ b/assets/common/items/weapons/tool/pitchfork.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 400, power: 1.00, + poise_reduction_power: 1.00, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/tool/rake.ron b/assets/common/items/weapons/tool/rake.ron index 12357d1d60..1527f03a25 100644 --- a/assets/common/items/weapons/tool/rake.ron +++ b/assets/common/items/weapons/tool/rake.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 400, power: 1.00, + poise_reduction_power: 1.00, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/tool/shovel-0.ron b/assets/common/items/weapons/tool/shovel-0.ron index 55c06b76b9..9bec67a15b 100644 --- a/assets/common/items/weapons/tool/shovel-0.ron +++ b/assets/common/items/weapons/tool/shovel-0.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 400, power: 1.00, + poise_reduction_power: 1.00, speed: 1.0 ), ) diff --git a/assets/common/items/weapons/tool/shovel-1.ron b/assets/common/items/weapons/tool/shovel-1.ron index a9b0a19c53..aa553591f9 100644 --- a/assets/common/items/weapons/tool/shovel-1.ron +++ b/assets/common/items/weapons/tool/shovel-1.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 400, power: 1.00, + poise_reduction_power: 1.00, speed: 1.0 ), ) diff --git a/common/src/bin/csv_export/main.rs b/common/src/bin/csv_export/main.rs index cdfa9bc220..a225b1bf1d 100644 --- a/common/src/bin/csv_export/main.rs +++ b/common/src/bin/csv_export/main.rs @@ -43,7 +43,15 @@ fn armor_stats() -> Result<(), Box> { fn weapon_stats() -> Result<(), Box> { let mut wtr = csv::Writer::from_path("weaponstats.csv")?; - wtr.write_record(&["Path", "Kind", "Name", "Power", "Speed", "Equip Time (ms)"])?; + wtr.write_record(&[ + "Path", + "Kind", + "Name", + "Power", + "Poise Reduction Power", + "Speed", + "Equip Time (ms)", + ])?; for item in comp::item::Item::new_from_asset_glob("common.items.weapons.*") .expect("Failed to iterate over item folders!") @@ -51,6 +59,7 @@ fn weapon_stats() -> Result<(), Box> { match item.kind() { comp::item::ItemKind::Tool(tool) => { let power = tool.base_power().to_string(); + let poise_reduction_power = tool.base_poise_reduction_power().to_string(); let speed = tool.base_speed().to_string(); let equip_time = tool.equip_time().subsec_millis().to_string(); let kind = get_tool_kind(&tool.kind); @@ -60,6 +69,7 @@ fn weapon_stats() -> Result<(), Box> { &kind, item.name(), &power, + &poise_reduction_power, &speed, &equip_time, ])?; diff --git a/common/src/comp/ability.rs b/common/src/comp/ability.rs index ec0bfe2f02..b2cdc9e17f 100644 --- a/common/src/comp/ability.rs +++ b/common/src/comp/ability.rs @@ -100,6 +100,7 @@ pub enum CharacterAbility { base_damage: u32, scaled_damage: u32, base_poise_damage: u32, + scaled_poise_damage: u32, base_knockback: f32, scaled_knockback: f32, range: f32, @@ -167,6 +168,7 @@ pub enum CharacterAbility { initial_damage: u32, scaled_damage: u32, initial_poise_damage: u32, + scaled_poise_damage: u32, initial_knockback: f32, scaled_knockback: f32, range: f32, @@ -183,6 +185,7 @@ pub enum CharacterAbility { initial_damage: u32, scaled_damage: u32, initial_poise_damage: u32, + scaled_poise_damage: u32, initial_knockback: f32, scaled_knockback: f32, speed: f32, @@ -321,7 +324,7 @@ impl CharacterAbility { } } - pub fn adjusted_by_stats(mut self, power: f32, speed: f32) -> Self { + pub fn adjusted_by_stats(mut self, power: f32, poise_reduction_power: f32, speed: f32) -> Self { use CharacterAbility::*; match self { BasicMelee { @@ -329,12 +332,14 @@ impl CharacterAbility { ref mut swing_duration, ref mut recover_duration, ref mut base_damage, + ref mut base_poise_damage, .. } => { *buildup_duration = (*buildup_duration as f32 / speed) as u64; *swing_duration = (*swing_duration as f32 / speed) as u64; *recover_duration = (*recover_duration as f32 / speed) as u64; *base_damage = (*base_damage as f32 * power) as u32; + *base_poise_damage = (*base_poise_damage as f32 * poise_reduction_power) as u32; }, BasicRanged { ref mut buildup_duration, @@ -369,6 +374,8 @@ impl CharacterAbility { DashMelee { ref mut base_damage, ref mut scaled_damage, + ref mut base_poise_damage, + ref mut scaled_poise_damage, ref mut buildup_duration, ref mut swing_duration, ref mut recover_duration, @@ -376,6 +383,8 @@ impl CharacterAbility { } => { *base_damage = (*base_damage as f32 * power) as u32; *scaled_damage = (*scaled_damage as f32 * power) as u32; + *base_poise_damage = (*base_damage as f32 * poise_reduction_power) as u32; + *scaled_poise_damage = (*scaled_poise_damage as f32 * poise_reduction_power) as u32; *buildup_duration = (*buildup_duration as f32 / speed) as u64; *swing_duration = (*swing_duration as f32 / speed) as u64; *recover_duration = (*recover_duration as f32 / speed) as u64; @@ -396,7 +405,7 @@ impl CharacterAbility { } => { *stage_data = stage_data .iter_mut() - .map(|s| s.adjusted_by_stats(power, speed)) + .map(|s| s.adjusted_by_stats(power, poise_reduction_power, speed)) .collect(); }, LeapMelee { @@ -405,6 +414,7 @@ impl CharacterAbility { ref mut swing_duration, ref mut recover_duration, ref mut base_damage, + ref mut base_poise_damage, .. } => { *buildup_duration = (*buildup_duration as f32 / speed) as u64; @@ -412,22 +422,27 @@ impl CharacterAbility { *swing_duration = (*swing_duration as f32 / speed) as u64; *recover_duration = (*recover_duration as f32 / speed) as u64; *base_damage = (*base_damage as f32 * power) as u32; + *base_poise_damage = (*base_poise_damage as f32 * poise_reduction_power) as u32; }, SpinMelee { ref mut buildup_duration, ref mut swing_duration, ref mut recover_duration, ref mut base_damage, + ref mut base_poise_damage, .. } => { *buildup_duration = (*buildup_duration as f32 / speed) as u64; *swing_duration = (*swing_duration as f32 / speed) as u64; *recover_duration = (*recover_duration as f32 / speed) as u64; *base_damage = (*base_damage as f32 * power) as u32; + *base_poise_damage = (*base_poise_damage as f32 * poise_reduction_power) as u32; }, ChargedMelee { ref mut initial_damage, ref mut scaled_damage, + ref mut initial_poise_damage, + ref mut scaled_poise_damage, speed: ref mut ability_speed, ref mut charge_duration, ref mut swing_duration, @@ -436,6 +451,9 @@ impl CharacterAbility { } => { *initial_damage = (*initial_damage as f32 * power) as u32; *scaled_damage = (*scaled_damage as f32 * power) as u32; + *initial_poise_damage = + (*initial_poise_damage as f32 * poise_reduction_power) as u32; + *scaled_poise_damage = (*scaled_poise_damage as f32 * poise_reduction_power) as u32; *ability_speed *= speed; *charge_duration = (*charge_duration as f32 / speed) as u64; *swing_duration = (*swing_duration as f32 / speed) as u64; @@ -456,18 +474,21 @@ impl CharacterAbility { *buildup_duration = (*buildup_duration as f32 / speed) as u64; *charge_duration = (*charge_duration as f32 / speed) as u64; *recover_duration = (*recover_duration as f32 / speed) as u64; + // TODO do projectile poise }, Shockwave { ref mut buildup_duration, ref mut swing_duration, ref mut recover_duration, ref mut damage, + ref mut poise_damage, .. } => { *buildup_duration = (*buildup_duration as f32 / speed) as u64; *swing_duration = (*swing_duration as f32 / speed) as u64; *recover_duration = (*recover_duration as f32 / speed) as u64; *damage = (*damage as f32 * power) as u32; + *poise_damage = (*poise_damage as f32 * poise_reduction_power) as u32; }, BasicBeam { ref mut buildup_duration, @@ -1142,6 +1163,7 @@ impl From<(&CharacterAbility, AbilityKey)> for CharacterState { base_damage, scaled_damage, base_poise_damage, + scaled_poise_damage, base_knockback, scaled_knockback, range, @@ -1159,6 +1181,7 @@ impl From<(&CharacterAbility, AbilityKey)> for CharacterState { base_damage: *base_damage, scaled_damage: *scaled_damage, base_poise_damage: *base_poise_damage, + scaled_poise_damage: *scaled_poise_damage, base_knockback: *base_knockback, scaled_knockback: *scaled_knockback, range: *range, @@ -1281,7 +1304,7 @@ impl From<(&CharacterAbility, AbilityKey)> for CharacterState { swing_duration: Duration::from_millis(*swing_duration), recover_duration: Duration::from_millis(*recover_duration), base_damage: *base_damage, - base_poise_damage: *base_damage, + base_poise_damage: *base_poise_damage, knockback: *knockback, range: *range, energy_cost: *energy_cost, @@ -1303,6 +1326,7 @@ impl From<(&CharacterAbility, AbilityKey)> for CharacterState { initial_damage, scaled_damage, initial_poise_damage, + scaled_poise_damage, initial_knockback, scaled_knockback, speed, @@ -1319,6 +1343,7 @@ impl From<(&CharacterAbility, AbilityKey)> for CharacterState { initial_damage: *initial_damage, scaled_damage: *scaled_damage, initial_poise_damage: *initial_poise_damage, + scaled_poise_damage: *scaled_poise_damage, initial_knockback: *initial_knockback, scaled_knockback: *scaled_knockback, speed: *speed, @@ -1341,6 +1366,7 @@ impl From<(&CharacterAbility, AbilityKey)> for CharacterState { initial_damage, scaled_damage, initial_poise_damage, + scaled_poise_damage, initial_knockback, scaled_knockback, speed, @@ -1362,6 +1388,7 @@ impl From<(&CharacterAbility, AbilityKey)> for CharacterState { initial_damage: *initial_damage, scaled_damage: *scaled_damage, initial_poise_damage: *initial_poise_damage, + scaled_poise_damage: *scaled_poise_damage, speed: *speed, initial_knockback: *initial_knockback, scaled_knockback: *scaled_knockback, diff --git a/common/src/comp/inventory/item/armor.rs b/common/src/comp/inventory/item/armor.rs index aba06d5873..398d436174 100644 --- a/common/src/comp/inventory/item/armor.rs +++ b/common/src/comp/inventory/item/armor.rs @@ -28,6 +28,7 @@ impl Armor { #[derive(Clone, Copy, Debug, PartialEq, Serialize, Deserialize)] pub struct Stats { protection: Protection, + poise_protection: Protection, } #[derive(Clone, Copy, Debug, PartialEq, Serialize, Deserialize)] @@ -45,6 +46,8 @@ pub struct Armor { impl Armor { pub fn get_protection(&self) -> Protection { self.stats.protection } + pub fn get_poise_protection(&self) -> Protection { self.stats.poise_protection } + #[cfg(test)] pub fn test_armor(kind: ArmorKind, protection: Protection) -> Armor { Armor { diff --git a/common/src/comp/inventory/item/tool.rs b/common/src/comp/inventory/item/tool.rs index 729281ad6a..af6583d618 100644 --- a/common/src/comp/inventory/item/tool.rs +++ b/common/src/comp/inventory/item/tool.rs @@ -55,6 +55,7 @@ pub enum Hands { pub struct Stats { equip_time_millis: u32, power: f32, + poise_reduction_power: f32, speed: f32, } @@ -73,6 +74,7 @@ impl Tool { equip_time_millis: 0, power: 1.00, speed: 1.00, + poise_reduction_power: 1.00, }, } } @@ -80,6 +82,8 @@ impl Tool { // Keep power between 0.5 and 2.00 pub fn base_power(&self) -> f32 { self.stats.power } + pub fn base_poise_reduction_power(&self) -> f32 { self.stats.poise_reduction_power } + pub fn base_speed(&self) -> f32 { self.stats.speed } pub fn equip_time(&self) -> Duration { @@ -107,8 +111,14 @@ pub struct AbilitySet { } impl AbilitySet { - fn modified_by_tool(self, tool: &Tool) -> Self { - self.map(|a| a.adjusted_by_stats(tool.base_power(), tool.base_speed())) + pub fn modified_by_tool(self, tool: &Tool) -> Self { + self.map(|a| { + a.adjusted_by_stats( + tool.base_power(), + tool.base_poise_reduction_power(), + tool.base_speed(), + ) + }) } } diff --git a/common/src/comp/poise.rs b/common/src/comp/poise.rs index 8f32734932..7d9962e317 100644 --- a/common/src/comp/poise.rs +++ b/common/src/comp/poise.rs @@ -1,11 +1,8 @@ -use crate::{ - comp::{Body, Loadout}, - sync::Uid, - DamageSource, -}; +use crate::comp::{Body, Loadout}; use serde::{Deserialize, Serialize}; use specs::{Component, FlaggedStorage}; use specs_idvs::IdvStorage; +use vek::*; #[derive(Clone, Copy, Debug, PartialEq, Serialize, Deserialize)] pub struct PoiseChange { @@ -14,16 +11,23 @@ pub struct PoiseChange { } impl PoiseChange { - pub fn modify_poise_damage(self, loadout: Option<&Loadout>, uid: Option) -> PoiseChange { - println!("Pre modified: {:?}", self.amount); - let mut poise_damage = -self.amount as f32; + pub fn set_zero(self) -> Self { + Self { + amount: 0, + source: self.source, + } + } + + pub fn modify_poise_damage(self, loadout: Option<&Loadout>) -> PoiseChange { + let mut poise_damage = self.amount as f32; match self.source { PoiseSource::Melee => { // Armor - let damage_reduction = loadout.map_or(0.0, |l| l.get_poise_damage_reduction()); - poise_damage *= 1.0 - damage_reduction; + let poise_damage_reduction = + loadout.map_or(0.0, |l| l.get_poise_damage_reduction()); + poise_damage *= 1.0 - poise_damage_reduction; PoiseChange { - amount: -poise_damage as i32, + amount: poise_damage as i32, source: PoiseSource::Melee, } }, @@ -32,7 +36,7 @@ impl PoiseChange { let damage_reduction = loadout.map_or(0.0, |l| l.get_poise_damage_reduction()); poise_damage *= 1.0 - damage_reduction; PoiseChange { - amount: -poise_damage as i32, + amount: poise_damage as i32, source: PoiseSource::Projectile, } }, @@ -41,7 +45,7 @@ impl PoiseChange { let damage_reduction = loadout.map_or(0.0, |l| l.get_poise_damage_reduction()); poise_damage *= 1.0 - damage_reduction; PoiseChange { - amount: -poise_damage as i32, + amount: poise_damage as i32, source: PoiseSource::Shockwave, } }, @@ -50,7 +54,7 @@ impl PoiseChange { let damage_reduction = loadout.map_or(0.0, |l| l.get_poise_damage_reduction()); poise_damage *= 1.0 - damage_reduction; PoiseChange { - amount: -poise_damage as i32, + amount: poise_damage as i32, source: PoiseSource::Explosion, } }, @@ -61,7 +65,7 @@ impl PoiseChange { poise_damage = 0.0; } PoiseChange { - amount: -poise_damage as i32, + amount: poise_damage as i32, source: PoiseSource::Falling, } }, @@ -92,6 +96,8 @@ pub struct Poise { base_max: u32, current: u32, maximum: u32, + knockback: Vec3, + pub last_change: (f64, PoiseChange), pub is_interrupted: bool, pub is_stunned: bool, pub is_dazed: bool, @@ -105,6 +111,11 @@ impl Default for Poise { current: 0, maximum: 0, base_max: 0, + knockback: Vec3::zero(), + last_change: (0.0, PoiseChange { + amount: 0, + source: PoiseSource::Revive, + }), is_interrupted: false, is_stunned: false, is_dazed: false, @@ -127,19 +138,21 @@ impl Poise { pub fn new(body: Body) -> Self { let mut poise = Poise::default(); poise.update_max_poise(Some(body)); - poise.set_to(poise.maximum()); + poise.set_to(poise.maximum(), PoiseSource::Revive); poise } + pub fn knockback(&self) -> Vec3 { self.knockback } + pub fn poise_state(&self) -> PoiseState { - if self.current >= 5 * self.maximum / 10 { + if self.current >= 8 * self.maximum / 10 { PoiseState::Normal - } else if self.current >= 4 * self.maximum / 10 { + } else if self.current >= 7 * self.maximum / 10 { PoiseState::Interrupted - } else if self.current >= 3 * self.maximum / 10 { + } else if self.current >= 6 * self.maximum / 10 { PoiseState::Stunned - } else if self.current >= 2 * self.maximum / 10 { + } else if self.current >= 4 * self.maximum / 10 { PoiseState::Dazed } else { PoiseState::KnockedDown @@ -150,13 +163,23 @@ impl Poise { pub fn maximum(&self) -> u32 { self.maximum } - pub fn set_to(&mut self, amount: u32) { + pub fn set_to(&mut self, amount: u32, cause: PoiseSource) { let amount = amount.min(self.maximum); + self.last_change = (0.0, PoiseChange { + amount: amount as i32 - self.current as i32, + source: cause, + }); self.current = amount; } - pub fn change_by(&mut self, change: PoiseChange) { + pub fn change_by(&mut self, change: PoiseChange, impulse: Vec3) { + println!("Poise change: {:?}", change); self.current = ((self.current as i32 + change.amount).max(0) as u32).min(self.maximum); + self.knockback = impulse; + self.last_change = (0.0, PoiseChange { + amount: change.amount, + source: change.source, + }); } pub fn reset(&mut self) { self.current = self.maximum; } diff --git a/common/src/comp/projectile.rs b/common/src/comp/projectile.rs index cc68a396dc..7378141a5b 100644 --- a/common/src/comp/projectile.rs +++ b/common/src/comp/projectile.rs @@ -14,7 +14,8 @@ use std::time::Duration; #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] pub enum Effect { - Damage(Option, Damage, PoiseChange), + Damage(Option, Damage), + PoiseChange(Option, PoiseChange), Knockback(Knockback), RewardEnergy(u32), Explode(Explosion), @@ -48,11 +49,13 @@ impl Component for Projectile { pub enum ProjectileConstructor { Arrow { damage: f32, + poise_damage: i32, knockback: f32, energy_regen: u32, }, Fireball { damage: f32, + poise_damage: i32, radius: f32, energy_regen: u32, }, @@ -62,6 +65,7 @@ pub enum ProjectileConstructor { }, Heal { heal: f32, + poise_damage: i32, damage: f32, radius: f32, }, @@ -74,6 +78,7 @@ impl ProjectileConstructor { match self { Arrow { damage, + poise_damage, knockback, energy_regen, } => { @@ -88,17 +93,14 @@ impl ProjectileConstructor { Projectile { hit_solid: vec![Effect::Stick], hit_entity: vec![ - Effect::Damage( - Some(GroupTarget::OutOfGroup), - Damage { - source: DamageSource::Projectile, - value: damage, - }, - PoiseChange { - amount: 0, - source: PoiseSource::Projectile, - }, - ), + Effect::Damage(Some(GroupTarget::OutOfGroup), Damage { + source: DamageSource::Projectile, + value: damage, + }), + Effect::PoiseChange(Some(GroupTarget::OutOfGroup), PoiseChange { + source: PoiseSource::Projectile, + amount: -poise_damage, + }), Effect::Knockback(Knockback::Away(knockback)), Effect::RewardEnergy(energy_regen), Effect::Vanish, @@ -114,18 +116,27 @@ impl ProjectileConstructor { }, Fireball { damage, + poise_damage, radius, energy_regen, } => Projectile { hit_solid: vec![ Effect::Explode(Explosion { effects: vec![ - RadiusEffect::Entity(Some(GroupTarget::OutOfGroup), vec![ + RadiusEffect::Entity( + Some(GroupTarget::OutOfGroup), effect::Effect::Damage(Damage { source: DamageSource::Explosion, value: damage, }), - ]), + ), + RadiusEffect::Entity( + Some(GroupTarget::OutOfGroup), + effect::Effect::PoiseChange(PoiseChange { + amount: -poise_damage, + source: PoiseSource::Explosion, + }), + ), RadiusEffect::TerrainDestruction(2.0), ], radius, @@ -135,12 +146,22 @@ impl ProjectileConstructor { ], hit_entity: vec![ Effect::Explode(Explosion { - effects: vec![RadiusEffect::Entity(Some(GroupTarget::OutOfGroup), vec![ - effect::Effect::Damage(Damage { - source: DamageSource::Explosion, - value: damage, - }), - ])], + effects: vec![ + RadiusEffect::Entity( + Some(GroupTarget::OutOfGroup), + effect::Effect::Damage(Damage { + source: DamageSource::Explosion, + value: damage, + }), + ), + RadiusEffect::Entity( + Some(GroupTarget::OutOfGroup), + effect::Effect::PoiseChange(PoiseChange { + amount: -poise_damage, + source: PoiseSource::Explosion, + }), + ), + ], radius, energy_regen, }), @@ -170,23 +191,33 @@ impl ProjectileConstructor { Heal { heal, damage, + poise_damage, radius, } => Projectile { hit_solid: vec![ Effect::Explode(Explosion { effects: vec![ - RadiusEffect::Entity(Some(GroupTarget::OutOfGroup), vec![ + RadiusEffect::Entity( + Some(GroupTarget::OutOfGroup), effect::Effect::Damage(Damage { source: DamageSource::Explosion, value: damage, }), - ]), - RadiusEffect::Entity(Some(GroupTarget::InGroup), vec![ + ), + RadiusEffect::Entity( + Some(GroupTarget::InGroup), effect::Effect::Damage(Damage { source: DamageSource::Healing, value: heal, }), - ]), + ), + RadiusEffect::Entity( + Some(GroupTarget::OutOfGroup), + effect::Effect::PoiseChange(PoiseChange { + amount: -poise_damage, + source: PoiseSource::Explosion, + }), + ), ], radius, energy_regen: 0, @@ -196,18 +227,27 @@ impl ProjectileConstructor { hit_entity: vec![ Effect::Explode(Explosion { effects: vec![ - RadiusEffect::Entity(Some(GroupTarget::OutOfGroup), vec![ + RadiusEffect::Entity( + Some(GroupTarget::OutOfGroup), effect::Effect::Damage(Damage { source: DamageSource::Explosion, value: damage, }), - ]), - RadiusEffect::Entity(Some(GroupTarget::InGroup), vec![ + ), + RadiusEffect::Entity( + Some(GroupTarget::InGroup), effect::Effect::Damage(Damage { source: DamageSource::Healing, value: heal, }), - ]), + ), + RadiusEffect::Entity( + Some(GroupTarget::OutOfGroup), + effect::Effect::PoiseChange(PoiseChange { + amount: -poise_damage, + source: PoiseSource::Explosion, + }), + ), ], radius, energy_regen: 0, diff --git a/common/src/effect.rs b/common/src/effect.rs index 2d825c9947..aca9cf0ca8 100644 --- a/common/src/effect.rs +++ b/common/src/effect.rs @@ -5,7 +5,7 @@ use serde::{Deserialize, Serialize}; #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] pub enum Effect { Health(comp::HealthChange), - Poise(comp::PoiseChange), + PoiseChange(comp::PoiseChange), Damage(combat::Damage), Buff(BuffEffect), } @@ -22,7 +22,7 @@ impl Effect { pub fn info(&self) -> String { match self { Effect::Health(c) => format!("{:+} health", c.amount), - Effect::Poise(c) => format!("{:+} poise", c.amount), + Effect::PoiseChange(c) => format!("{:+} poise", c.amount), Effect::Damage(d) => format!("{:+}", d.value), Effect::Buff(e) => format!("{:?} buff", e), } @@ -33,7 +33,7 @@ impl Effect { Effect::Health(change) => { change.amount = (change.amount as f32 * modifier) as i32; }, - Effect::Poise(change) => { + Effect::PoiseChange(change) => { change.amount = (change.amount as f32 * modifier) as i32; }, Effect::Damage(damage) => { diff --git a/common/src/explosion.rs b/common/src/explosion.rs index e6c5ef4696..889602ecd2 100644 --- a/common/src/explosion.rs +++ b/common/src/explosion.rs @@ -11,5 +11,5 @@ pub struct Explosion { #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] pub enum RadiusEffect { TerrainDestruction(f32), - Entity(Option, Vec), + Entity(Option, Effect), } diff --git a/common/src/states/charged_melee.rs b/common/src/states/charged_melee.rs index cc8555688d..23205f1b72 100644 --- a/common/src/states/charged_melee.rs +++ b/common/src/states/charged_melee.rs @@ -23,12 +23,14 @@ pub struct StaticData { pub initial_damage: u32, /// How much the damage is scaled by pub scaled_damage: u32, + /// How much poise damage is dealt with no charge + pub initial_poise_damage: u32, + /// How much poise damage is scaled by + pub scaled_poise_damage: u32, /// How much knockback there is with no charge pub initial_knockback: f32, /// How much the knockback is scaled by pub scaled_knockback: f32, - /// Initial poise damage - pub initial_poise_damage: u32, /// Max range pub range: f32, /// Max angle (45.0 will give you a 90.0 angle window) @@ -158,8 +160,10 @@ impl CharacterBehavior for Data { value: self.static_data.initial_damage as f32 + self.charge_amount * self.static_data.scaled_damage as f32, }; - let mut poise_damage = PoiseChange { - amount: -(self.static_data.initial_poise_damage as i32), + let poise_damage = PoiseChange { + amount: -(self.static_data.initial_poise_damage as f32 + + self.charge_amount * self.static_data.scaled_poise_damage as f32) + as i32, source: PoiseSource::Melee, }; let knockback = self.static_data.initial_knockback diff --git a/common/src/states/charged_ranged.rs b/common/src/states/charged_ranged.rs index 6701725b9a..d6694ed9c6 100644 --- a/common/src/states/charged_ranged.rs +++ b/common/src/states/charged_ranged.rs @@ -30,8 +30,10 @@ pub struct StaticData { pub initial_damage: u32, /// How much the damage scales as it is charged pub scaled_damage: u32, - /// Initial poise damage + /// How much poise damage is dealt with no charge pub initial_poise_damage: u32, + /// How much the poise damage scales as it is charged + pub scaled_poise_damage: u32, /// How much knockback there is with no charge pub initial_knockback: f32, /// How much the knockback scales as it is charged @@ -109,8 +111,10 @@ impl CharacterBehavior for Data { value: self.static_data.initial_damage as f32 + charge_frac * self.static_data.scaled_damage as f32, }; - let mut poise_damage = PoiseChange { - amount: -(self.static_data.initial_poise_damage as i32), + let poise_damage = PoiseChange { + amount: -(self.static_data.initial_poise_damage as f32 + + charge_frac * self.static_data.scaled_poise_damage as f32) + as i32, source: PoiseSource::Projectile, }; let knockback = self.static_data.initial_knockback @@ -119,9 +123,9 @@ impl CharacterBehavior for Data { let projectile = Projectile { hit_solid: vec![projectile::Effect::Stick], hit_entity: vec![ - projectile::Effect::Damage( + projectile::Effect::Damage(Some(GroupTarget::OutOfGroup), damage), + projectile::Effect::PoiseChange( Some(GroupTarget::OutOfGroup), - damage, poise_damage, ), projectile::Effect::Knockback(Knockback::Away(knockback)), diff --git a/common/src/states/combo_melee.rs b/common/src/states/combo_melee.rs index 2411702b82..275c038525 100644 --- a/common/src/states/combo_melee.rs +++ b/common/src/states/combo_melee.rs @@ -22,6 +22,8 @@ pub struct Stage { pub damage_increase: u32, /// Initial poise damage of stage pub base_poise_damage: u32, + /// Poise damage scaling per combo + pub poise_damage_increase: u32, /// Knockback of stage pub knockback: f32, /// Range of attack @@ -46,6 +48,7 @@ impl Stage { base_damage: self.base_damage, damage_increase: self.damage_increase, base_poise_damage: self.base_poise_damage, + poise_damage_increase: self.poise_damage_increase, knockback: self.knockback, range: self.range, angle: self.angle, @@ -56,9 +59,12 @@ impl Stage { } } - pub fn adjusted_by_stats(mut self, power: f32, speed: f32) -> Self { + pub fn adjusted_by_stats(mut self, power: f32, poise_reduction_power: f32, speed: f32) -> Self { self.base_damage = (self.base_damage as f32 * power) as u32; self.damage_increase = (self.damage_increase as f32 * power) as u32; + self.base_poise_damage = (self.base_poise_damage as f32 * poise_reduction_power) as u32; + self.poise_damage_increase = + (self.poise_damage_increase as f32 * poise_reduction_power) as u32; self.base_buildup_duration = (self.base_buildup_duration as f32 / speed) as u64; self.base_swing_duration = (self.base_swing_duration as f32 / speed) as u64; self.base_recover_duration = (self.base_recover_duration as f32 / speed) as u64; @@ -169,7 +175,13 @@ impl CharacterBehavior for Data { .scales_from_combo .min(self.combo / self.static_data.num_stages) * self.static_data.stage_data[stage_index].damage_increase; - let poise_damage = self.static_data.stage_data[stage_index].base_poise_damage; + + let poise_damage = self.static_data.stage_data[stage_index].base_poise_damage + + self + .static_data + .scales_from_combo + .min(self.combo / self.static_data.num_stages) + * self.static_data.stage_data[stage_index].poise_damage_increase; data.updater.insert(data.entity, Attacking { effects: vec![( Some(GroupTarget::OutOfGroup), diff --git a/common/src/states/dash_melee.rs b/common/src/states/dash_melee.rs index 4ea8084bef..3c71ba8fbc 100644 --- a/common/src/states/dash_melee.rs +++ b/common/src/states/dash_melee.rs @@ -22,6 +22,8 @@ pub struct StaticData { pub scaled_damage: u32, /// Initial poise damage pub base_poise_damage: u32, + /// How much the attac scales in poise damage + pub scaled_poise_damage: u32, /// How much the attack knocks the target back initially pub base_knockback: f32, /// How much the attack scales in knockback @@ -135,8 +137,10 @@ impl CharacterBehavior for Data { value: self.static_data.base_damage as f32 + charge_frac * self.static_data.scaled_damage as f32, }; - let mut poise_damage = PoiseChange { - amount: -(self.static_data.base_poise_damage as i32), + let poise_damage = PoiseChange { + amount: -(self.static_data.base_poise_damage as f32 + + charge_frac * self.static_data.scaled_poise_damage as f32) + as i32, source: PoiseSource::Melee, }; let knockback = self.static_data.base_knockback diff --git a/common/src/states/staggered.rs b/common/src/states/staggered.rs index 44b2127b12..af6049f85d 100644 --- a/common/src/states/staggered.rs +++ b/common/src/states/staggered.rs @@ -2,7 +2,6 @@ use super::utils::*; use crate::{ comp::{CharacterState, StateUpdate}, states::behavior::{CharacterBehavior, JoinData}, - Knockback, }; use serde::{Deserialize, Serialize}; use std::time::Duration; @@ -14,8 +13,6 @@ pub struct StaticData { pub buildup_duration: Duration, /// How long the state has until exiting pub recover_duration: Duration, - /// Knockback - pub knockback: Knockback, } #[derive(Copy, Clone, Debug, PartialEq, Serialize, Deserialize)] diff --git a/common/src/states/stunned.rs b/common/src/states/stunned.rs index 16d609efbf..337249ba1b 100644 --- a/common/src/states/stunned.rs +++ b/common/src/states/stunned.rs @@ -2,7 +2,6 @@ use super::utils::*; use crate::{ comp::{CharacterState, StateUpdate}, states::behavior::{CharacterBehavior, JoinData}, - Knockback, }; use serde::{Deserialize, Serialize}; use std::time::Duration; @@ -14,8 +13,6 @@ pub struct StaticData { pub buildup_duration: Duration, /// How long the state has until exiting pub recover_duration: Duration, - /// Knockback - pub knockback: Knockback, } #[derive(Copy, Clone, Debug, PartialEq, Serialize, Deserialize)] diff --git a/common/sys/src/beam.rs b/common/sys/src/beam.rs index feb3d734ca..8b98380e9c 100644 --- a/common/sys/src/beam.rs +++ b/common/sys/src/beam.rs @@ -168,8 +168,7 @@ impl<'a> System<'a> for Sys { // Modify damage let change = damage.modify_damage(inventories.get(b), beam_segment.owner); - let poise_change = poise_damage - .modify_poise_damage(inventories.get(b), beam_segment.owner); + let poise_change = poise_damage.modify_poise_damage(inventories.get(b)); let kb_dir = Dir::new((pos_b.0 - pos.0).try_normalized().unwrap_or(*ori.0)); match target { diff --git a/common/sys/src/melee.rs b/common/sys/src/melee.rs index 7d4cee0162..8dd8d4a62c 100644 --- a/common/sys/src/melee.rs +++ b/common/sys/src/melee.rs @@ -126,16 +126,19 @@ impl<'a> System<'a> for Sys { for (target, damage, poise_change) in attack.effects.iter() { if let Some(target) = target { if *target != target_group - || (!matches!(target, GroupTarget::InGroup) - && (is_dodge || is_stunned)) + || (!matches!(target, GroupTarget::InGroup) && is_dodge) { continue; } } let change = damage.modify_damage(inventories.get(b), Some(*uid)); - //let poise_change = - // poise_change.modify_poise_damage(loadouts.get(b), Some(*uid)); + let poise_change = if is_stunned { + poise_change.set_zero() + } else { + poise_change.modify_poise_damage(inventories.get(b)) + }; + server_emitter.emit(ServerEvent::Damage { entity: b, change }); // Apply bleeding buff on melee hits with 10% chance // TODO: Don't have buff uniformly applied on all melee attacks @@ -162,8 +165,8 @@ impl<'a> System<'a> for Sys { server_emitter.emit(ServerEvent::PoiseChange { entity: b, - change: *poise_change, - kb_dir: *kb_dir, + change: poise_change, + kb_dir: *Dir::slerp(kb_dir, Dir::new(Vec3::unit_z()), 0.5), }); attack.hit_count += 1; diff --git a/common/sys/src/projectile.rs b/common/sys/src/projectile.rs index 3c58a18369..7d1b150795 100644 --- a/common/sys/src/projectile.rs +++ b/common/sys/src/projectile.rs @@ -102,7 +102,7 @@ impl<'a> System<'a> for Sys { let projectile = &mut *projectile; for effect in projectile.hit_entity.drain(..) { match effect { - projectile::Effect::Damage(target, damage, poise_damage) => { + projectile::Effect::Damage(target, damage) => { if Some(other) == projectile.owner { continue; } @@ -125,6 +125,25 @@ impl<'a> System<'a> for Sys { entity: other_entity, change, }); + } + }, + projectile::Effect::PoiseChange(target, poise_damage) => { + if Some(other) == projectile.owner { + continue; + } + + if let Some(target) = target { + if target != target_group { + continue; + } + } + + if let Some(other_entity) = + uid_allocator.retrieve_entity_internal(other.into()) + { + let other_entity_loadout = loadouts.get(other_entity); + let poise_change = + poise_damage.modify_poise_damage(other_entity_loadout); server_emitter.emit(ServerEvent::PoiseChange { entity: other_entity, change: poise_change, diff --git a/common/sys/src/stats.rs b/common/sys/src/stats.rs index 7298c5b509..e72dd5ccb1 100644 --- a/common/sys/src/stats.rs +++ b/common/sys/src/stats.rs @@ -2,7 +2,7 @@ use common::{ comp::{ skills::{GeneralSkill, Skill}, Body, CharacterState, Energy, EnergyChange, EnergySource, Health, Poise, PoiseChange, - PoiseSource, Pos, Stats, + PoiseSource, PoiseState, Pos, Stats, }, event::{EventBus, ServerEvent}, metrics::SysMetrics, @@ -13,9 +13,11 @@ use common::{ }; use hashbrown::HashSet; use specs::{Entities, Join, Read, ReadExpect, ReadStorage, System, Write, WriteStorage}; +use std::time::Duration; +use vek::Vec3; const ENERGY_REGEN_ACCEL: f32 = 10.0; -//const POISE_REGEN_ACCEL: f32 = 5.0; +const POISE_REGEN_ACCEL: f32 = 2.0; /// This system kills players, levels them up, and regenerates energy. pub struct Sys; @@ -26,7 +28,7 @@ impl<'a> System<'a> for Sys { Read<'a, DeltaTime>, Read<'a, EventBus>, ReadExpect<'a, SysMetrics>, - ReadStorage<'a, CharacterState>, + WriteStorage<'a, CharacterState>, WriteStorage<'a, Stats>, WriteStorage<'a, Health>, WriteStorage<'a, Poise>, @@ -44,7 +46,7 @@ impl<'a> System<'a> for Sys { dt, server_event_bus, sys_metrics, - character_states, + mut character_states, mut stats, mut healths, mut poises, @@ -61,17 +63,24 @@ impl<'a> System<'a> for Sys { // Increment last change timer healths.set_event_emission(false); // avoid unnecessary syncing - for mut health in (&mut healths).join() { + poises.set_event_emission(false); // avoid unnecessary syncing + for health in (&mut healths).join() { health.last_change.0 += f64::from(dt.0); } + for poise in (&mut poises).join() { + poise.last_change.0 += f64::from(dt.0); + } healths.set_event_emission(true); + poises.set_event_emission(true); // Update stats - for (entity, uid, mut stats, mut health, pos) in ( + for (entity, uid, mut stats, mut health, mut poise, character_state, pos) in ( &entities, &uids, &mut stats.restrict_mut(), &mut healths.restrict_mut(), + &mut poises.restrict_mut(), + &mut character_states, &positions, ) .join() @@ -149,6 +158,67 @@ impl<'a> System<'a> for Sys { let mut stat = stats.get_mut_unchecked(); stat.skill_set.modify_energy = false; } + + let was_wielded = character_state.is_wield(); + let poise = poise.get_mut_unchecked(); + match poise.poise_state() { + PoiseState::Normal => {}, + PoiseState::Interrupted => { + poise.reset(); + *character_state = CharacterState::Stunned(common::states::stunned::Data { + static_data: common::states::stunned::StaticData { + buildup_duration: Duration::from_millis(100), + recover_duration: Duration::from_millis(100), + }, + timer: Duration::default(), + stage_section: common::states::utils::StageSection::Buildup, + was_wielded, + }); + }, + PoiseState::Stunned => { + poise.reset(); + *character_state = CharacterState::Stunned(common::states::stunned::Data { + static_data: common::states::stunned::StaticData { + buildup_duration: Duration::from_millis(500), + recover_duration: Duration::from_millis(500), + }, + timer: Duration::default(), + stage_section: common::states::utils::StageSection::Buildup, + was_wielded, + }); + server_event_emitter.emit(ServerEvent::Knockback { + entity, + impulse: 5.0 * poise.knockback(), + }); + //handle_knockback(server, entity, 5.0 * knockback_dir); + }, + PoiseState::Dazed => { + poise.reset(); + *character_state = CharacterState::Staggered(common::states::staggered::Data { + static_data: common::states::staggered::StaticData { + buildup_duration: Duration::from_millis(1000), + recover_duration: Duration::from_millis(1000), + }, + timer: Duration::default(), + stage_section: common::states::utils::StageSection::Buildup, + was_wielded, + }); + //handle_knockback(server, entity, 10.0 * knockback_dir); + }, + PoiseState::KnockedDown => { + poise.reset(); + *character_state = CharacterState::Staggered(common::states::staggered::Data { + static_data: common::states::staggered::StaticData { + buildup_duration: Duration::from_millis(5000), + recover_duration: Duration::from_millis(250), + }, + timer: Duration::default(), + stage_section: common::states::utils::StageSection::Buildup, + was_wielded, + }); + //handle_knockback(server, entity, 10.0 * knockback_dir); + }, + } } // Update energies and poises @@ -188,22 +258,24 @@ impl<'a> System<'a> for Sys { (energy.regen_rate + ENERGY_REGEN_ACCEL * dt.0).min(100.0); } - //let res_poise = { - // let poise = poise.get_unchecked(); - // poise.current() < poise.maximum() - //}; + let res_poise = { + let poise = poise.get_unchecked(); + poise.current() < poise.maximum() + }; - //if res_poise { - // let mut poise = poise.get_mut_unchecked(); - // poise.change_by(PoiseChange { - // amount: (poise.regen_rate * dt.0 - // + POISE_REGEN_ACCEL * dt.0.powi(2) / 2.0) - // as i32, - // source: PoiseSource::Regen, - // }); - // poise.regen_rate = (poise.regen_rate + - // POISE_REGEN_ACCEL * dt.0).min(100.0); - //} + if res_poise { + let mut poise = poise.get_mut_unchecked(); + poise.change_by( + PoiseChange { + amount: (poise.regen_rate * dt.0 + + POISE_REGEN_ACCEL * dt.0.powi(2) / 2.0) + as i32, + source: PoiseSource::Regen, + }, + Vec3::zero(), + ); + poise.regen_rate = (poise.regen_rate + POISE_REGEN_ACCEL * dt.0).min(10.0); + } }, // Ability and glider use does not regen and sets the rate back to zero. CharacterState::Glide { .. } @@ -221,6 +293,9 @@ impl<'a> System<'a> for Sys { if energy.get_unchecked().regen_rate != 0.0 { energy.get_mut_unchecked().regen_rate = 0.0 } + if poise.get_unchecked().regen_rate != 0.0 { + poise.get_mut_unchecked().regen_rate = 0.0 + } }, // recover small amount of passive energy from blocking, and bonus energy from // blocking attacks? @@ -242,10 +317,7 @@ impl<'a> System<'a> for Sys { CharacterState::Roll { .. } | CharacterState::Climb { .. } | CharacterState::Stunned { .. } - | CharacterState::Staggered { .. } => { - let poise = poise.get_unchecked(); - println!("Poise: {:?}", poise.current()); - }, + | CharacterState::Staggered { .. } => {}, } } sys_metrics.stats_ns.store( diff --git a/server/src/cmd.rs b/server/src/cmd.rs index 75f6429ceb..baa017914a 100644 --- a/server/src/cmd.rs +++ b/server/src/cmd.rs @@ -1360,10 +1360,13 @@ fn handle_explosion( pos: pos.0, explosion: Explosion { effects: vec![ - RadiusEffect::Entity(None, vec![Effect::Damage(Damage { - source: DamageSource::Explosion, - value: 100.0 * power, - })]), + RadiusEffect::Entity( + None, + Effect::Damage(Damage { + source: DamageSource::Explosion, + value: 100.0 * power, + }), + ), RadiusEffect::TerrainDestruction(power), ], radius: 3.0 * power, diff --git a/server/src/events/entity_manipulation.rs b/server/src/events/entity_manipulation.rs index 1aa3040e0f..6f14849597 100644 --- a/server/src/events/entity_manipulation.rs +++ b/server/src/events/entity_manipulation.rs @@ -13,9 +13,8 @@ use common::{ comp::{ self, aura, buff, chat::{KillSource, KillType}, - object, poise, Alignment, Body, Energy, EnergyChange, Group, Health, HealthChange, - HealthSource, Inventory, Item, Player, Poise, PoiseChange, PoiseSource, PoiseState, Pos, - Stats, + object, Alignment, Body, Energy, EnergyChange, Group, Health, HealthChange, HealthSource, + Inventory, Item, Player, Poise, PoiseChange, PoiseSource, Pos, Stats, }, effect::Effect, lottery::Lottery, @@ -24,7 +23,7 @@ use common::{ terrain::{Block, TerrainGrid}, uid::{Uid, UidAllocator}, vol::ReadVol, - Damage, DamageSource, Explosion, GroupTarget, Knockback, RadiusEffect, + Damage, DamageSource, Explosion, GroupTarget, RadiusEffect, }; use common_net::{msg::ServerGeneral, sync::WorldSyncExt}; use common_sys::state::BlockChange; @@ -32,7 +31,6 @@ use comp::item::Reagent; use hashbrown::HashSet; use rand::prelude::*; use specs::{join::Join, saveload::MarkerAllocator, Entity as EcsEntity, WorldExt}; -use std::time::Duration; use tracing::error; use vek::Vec3; @@ -44,86 +42,10 @@ pub fn handle_poise( ) { let ecs = &server.state.ecs(); if let Some(poise) = ecs.write_storage::().get_mut(entity) { - poise.change_by(change); - println!("poise: {:?}", change); - let was_wielded = - if let Some(character_state) = ecs.read_storage::().get(entity) { - character_state.is_wield() - } else { - false - }; - match poise.poise_state() { - PoiseState::Normal => {}, - PoiseState::Interrupted => { - poise.reset(); - let _ = ecs.write_storage::().insert( - entity, - comp::CharacterState::Stunned(common::states::stunned::Data { - static_data: common::states::stunned::StaticData { - buildup_duration: Duration::from_millis(250), - recover_duration: Duration::from_millis(250), - knockback: Knockback::Away(20.0), - }, - timer: Duration::default(), - stage_section: common::states::utils::StageSection::Buildup, - was_wielded, - }), - ); - }, - PoiseState::Stunned => { - poise.reset(); - let _ = ecs.write_storage::().insert( - entity, - comp::CharacterState::Stunned(common::states::stunned::Data { - static_data: common::states::stunned::StaticData { - buildup_duration: Duration::from_millis(500), - recover_duration: Duration::from_millis(500), - knockback: Knockback::Away(40.0), - }, - timer: Duration::default(), - stage_section: common::states::utils::StageSection::Buildup, - was_wielded, - }), - ); - handle_knockback(server, entity, 50.0 * knockback_dir); - }, - PoiseState::Dazed => { - poise.reset(); - let _ = ecs.write_storage::().insert( - entity, - comp::CharacterState::Staggered(common::states::staggered::Data { - static_data: common::states::staggered::StaticData { - buildup_duration: Duration::from_millis(1000), - recover_duration: Duration::from_millis(1000), - knockback: Knockback::Away(50.0), - }, - timer: Duration::default(), - stage_section: common::states::utils::StageSection::Buildup, - was_wielded, - }), - ); - handle_knockback(server, entity, 50.0 * knockback_dir); - }, - PoiseState::KnockedDown => { - poise.reset(); - let _ = ecs.write_storage::().insert( - entity, - comp::CharacterState::Staggered(common::states::staggered::Data { - static_data: common::states::staggered::StaticData { - buildup_duration: Duration::from_millis(5000), - recover_duration: Duration::from_millis(250), - knockback: Knockback::Away(200.0), - }, - timer: Duration::default(), - stage_section: common::states::utils::StageSection::Buildup, - was_wielded, - }), - ); - handle_knockback(server, entity, 100.0 * knockback_dir); - }, - } + poise.change_by(change, knockback_dir); } } + pub fn handle_damage(server: &Server, entity: EcsEntity, change: HealthChange) { let ecs = &server.state.ecs(); if let Some(health) = ecs.write_storage::().get_mut(entity) { @@ -587,7 +509,7 @@ pub fn handle_land_on_ground(server: &Server, entity: EcsEntity, vel: Vec3) let change = damage.modify_damage(inventories.get(entity), None); let poise_change = poise_damage.modify_poise_damage(inventories.get(entity), None); health.change_by(change); - poise.change_by(poise_change); + poise.change_by(poise_change, Vec3::zero()); } } } @@ -662,29 +584,15 @@ pub fn handle_explosion( } else { 1.0 }; - ecs.write_resource::>() .push(Outcome::Explosion { pos, power: outcome_power, radius: explosion.radius, - is_attack: true, //explosion - //.effects - //.iter() - ////.any(|e| matches!(e, RadiusEffect::Entity(_, Effect::Damage(_)))), - //.any(|e| match e { - // RadiusEffect::Entity(_, effect_vec) => { - // effect_vec.iter().any(|f| { - // matches!( - // f, - // Effect::Damage(Damage { - // source: DamageSource::Healing, - // .. - // }) - // ) - // }) - // }, - //}), + is_attack: explosion + .effects + .iter() + .any(|e| matches!(e, RadiusEffect::Entity(_, Effect::Damage(_)))), reagent, }); let owner_entity = owner.and_then(|uid| { @@ -768,7 +676,7 @@ pub fn handle_explosion( .cast(); } }, - RadiusEffect::Entity(target, mut effects) => { + RadiusEffect::Entity(target, mut effect) => { for (entity_b, pos_b) in (&ecs.entities(), &ecs.read_storage::()).join() { // See if entities are in the same group @@ -802,19 +710,17 @@ pub fn handle_explosion( .map_or(false, |h| !h.is_dead); if is_alive { - for effect in effects.iter_mut() { - effect.modify_strength(strength); - server.state().apply_effect(entity_b, effect.clone(), owner); - // Apply energy change - if let Some(owner) = owner_entity { - if let Some(mut energy) = - ecs.write_storage::().get_mut(owner) - { - energy.change_by(EnergyChange { - amount: explosion.energy_regen as i32, - source: comp::EnergySource::HitEnemy, - }); - } + effect.modify_strength(strength); + server.state().apply_effect(entity_b, effect.clone(), owner); + // Apply energy change + if let Some(owner) = owner_entity { + if let Some(energy) = + ecs.write_storage::().get_mut(owner) + { + energy.change_by(EnergyChange { + amount: explosion.energy_regen as i32, + source: comp::EnergySource::HitEnemy, + }); } } } diff --git a/server/src/state_ext.rs b/server/src/state_ext.rs index fc4e10e28f..f5de034ca6 100644 --- a/server/src/state_ext.rs +++ b/server/src/state_ext.rs @@ -96,11 +96,13 @@ impl StateExt for State { .get_mut(entity) .map(|mut health| health.change_by(change)); }, - Effect::Poise(change) => { + Effect::PoiseChange(poise_damage) => { + let loadouts = self.ecs().read_storage::(); + let change = poise_damage.modify_poise_damage(loadouts.get(entity)); self.ecs() .write_storage::() .get_mut(entity) - .map(|poise| poise.change_by(change)); + .map(|poise| poise.change_by(change, Vec3::zero())); }, Effect::Buff(buff) => { self.ecs() diff --git a/server/src/sys/object.rs b/server/src/sys/object.rs index 7812aad09b..ae577b40e0 100644 --- a/server/src/sys/object.rs +++ b/server/src/sys/object.rs @@ -49,16 +49,20 @@ impl<'a> System<'a> for Sys { pos: pos.0, explosion: Explosion { effects: vec![ - RadiusEffect::Entity(None, vec![ + RadiusEffect::Entity( + None, Effect::Damage(Damage { source: DamageSource::Explosion, value: 500.0, }), - Effect::Poise(PoiseChange { - amount: -80, + ), + RadiusEffect::Entity( + None, + Effect::PoiseChange(PoiseChange { source: PoiseSource::Explosion, + amount: -100, }), - ]), + ), RadiusEffect::TerrainDestruction(4.0), ], radius: 12.0, @@ -79,16 +83,20 @@ impl<'a> System<'a> for Sys { pos: pos.0, explosion: Explosion { effects: vec![ - RadiusEffect::Entity(None, vec![ + RadiusEffect::Entity( + None, Effect::Damage(Damage { source: DamageSource::Explosion, value: 50.0, }), - Effect::Poise(PoiseChange { - amount: -30, + ), + RadiusEffect::Entity( + None, + Effect::PoiseChange(PoiseChange { source: PoiseSource::Explosion, + amount: -40, }), - ]), + ), RadiusEffect::TerrainDestruction(4.0), ], radius: 12.0,