diff --git a/assets/common/abilities/sword/agile_cascade.ron b/assets/common/abilities/sword/agile_cascade.ron
index fce91cdce4..d937f33da3 100644
--- a/assets/common/abilities/sword/agile_cascade.ron
+++ b/assets/common/abilities/sword/agile_cascade.ron
@@ -3,7 +3,7 @@ ComboMelee2(
         (
             melee_constructor: (
                 kind: Slash(
-                    damage: 16,
+                    damage: 12,
                     poise: 5,
                     knockback: 0,
                     energy_regen: 0,
@@ -12,11 +12,11 @@ ComboMelee2(
                 angle: 15.0,
             ),
             buildup_duration: 0.2,
-            swing_duration: 0.1,
+            swing_duration: 0.05,
             hit_timing: 0.5,
             recover_duration: 0.1,
             ori_modifier: 0.6,
         ),
     ],
-    energy_cost_per_strike: 10,
+    energy_cost_per_strike: 5,
 )
\ No newline at end of file
diff --git a/assets/common/abilities/sword/agile_crescent_slash.ron b/assets/common/abilities/sword/agile_crescent_slash.ron
index d256fb447e..364c4188cb 100644
--- a/assets/common/abilities/sword/agile_crescent_slash.ron
+++ b/assets/common/abilities/sword/agile_crescent_slash.ron
@@ -3,7 +3,7 @@ ComboMelee2(
         (
             melee_constructor: (
                 kind: Slash(
-                    damage: 12,
+                    damage: 9,
                     poise: 5,
                     knockback: 0,
                     energy_regen: 0,
@@ -12,11 +12,11 @@ ComboMelee2(
                 angle: 60.0,
             ),
             buildup_duration: 0.05,
-            swing_duration: 0.1,
+            swing_duration: 0.05,
             hit_timing: 0.5,
             recover_duration: 0.1,
             ori_modifier: 0.6,
         ),
     ],
-    energy_cost_per_strike: 10,
+    energy_cost_per_strike: 5,
 )
\ No newline at end of file
diff --git a/assets/common/abilities/sword/agile_cross_cut.ron b/assets/common/abilities/sword/agile_cross_cut.ron
index 68ad7b6a75..c69b3a3c71 100644
--- a/assets/common/abilities/sword/agile_cross_cut.ron
+++ b/assets/common/abilities/sword/agile_cross_cut.ron
@@ -3,30 +3,13 @@ ComboMelee2(
         (
             melee_constructor: (
                 kind: Slash(
-                    damage: 6,
-                    poise: 3,
+                    damage: 5,
+                    poise: 5,
                     knockback: 0,
                     energy_regen: 0,
                 ),
                 range: 3.5,
-                angle: 50.0,
-            ),
-            buildup_duration: 0.1,
-            swing_duration: 0.05,
-            hit_timing: 0.5,
-            recover_duration: 0.2,
-            ori_modifier: 0.6,
-        ),
-        (
-            melee_constructor: (
-                kind: Slash(
-                    damage: 6,
-                    poise: 3,
-                    knockback: 0,
-                    energy_regen: 0,
-                ),
-                range: 3.5,
-                angle: 50.0,
+                angle: 90.0,
             ),
             buildup_duration: 0.1,
             swing_duration: 0.05,
@@ -34,7 +17,24 @@ ComboMelee2(
             recover_duration: 0.1,
             ori_modifier: 0.6,
         ),
+        (
+            melee_constructor: (
+                kind: Slash(
+                    damage: 7,
+                    poise: 5,
+                    knockback: 0,
+                    energy_regen: 0,
+                ),
+                range: 3.5,
+                angle: 90.0,
+            ),
+            buildup_duration: 0.1,
+            swing_duration: 0.05,
+            hit_timing: 0.5,
+            recover_duration: 0.05,
+            ori_modifier: 0.6,
+        ),
     ],
-    energy_cost_per_strike: 7.5,
+    energy_cost_per_strike: 2.5,
     auto_progress: true,
 )
\ No newline at end of file
diff --git a/assets/common/abilities/sword/agile_dancing_edge.ron b/assets/common/abilities/sword/agile_dancing_edge.ron
index 9d41d47983..0583b7a18d 100644
--- a/assets/common/abilities/sword/agile_dancing_edge.ron
+++ b/assets/common/abilities/sword/agile_dancing_edge.ron
@@ -4,8 +4,8 @@ SelfBuff(
     recover_duration: 0.3,
     buff_kind: Hastened,
     buff_strength: 0.25,
-    buff_duration: Some(30.0),
-    energy_cost: 30,
+    buff_duration: Some(20.0),
+    energy_cost: 20,
     meta: (
         requirements: (stance: Some(Sword(Agile))),
     ),
diff --git a/assets/common/abilities/sword/agile_double_slash.ron b/assets/common/abilities/sword/agile_double_slash.ron
index 55b27eaa72..da678eefee 100644
--- a/assets/common/abilities/sword/agile_double_slash.ron
+++ b/assets/common/abilities/sword/agile_double_slash.ron
@@ -3,32 +3,32 @@ ComboMelee2(
         (
             melee_constructor: (
                 kind: Slash(
-                    damage: 3,
-                    poise: 2,
+                    damage: 2,
+                    poise: 5,
                     knockback: 0,
                     energy_regen: 5,
                 ),
                 range: 3.0,
                 angle: 45.0,
             ),
-            buildup_duration: 0.1,
+            buildup_duration: 0.05,
             swing_duration: 0.05,
             hit_timing: 0.5,
-            recover_duration: 0.1,
+            recover_duration: 0.05,
             ori_modifier: 0.6,
         ),
         (
             melee_constructor: (
                 kind: Slash(
-                    damage: 6,
-                    poise: 3,
+                    damage: 3,
+                    poise: 5,
                     knockback: 0,
-                    energy_regen: 5,
+                    energy_regen: 10,
                 ),
                 range: 3.0,
                 angle: 45.0,
             ),
-            buildup_duration: 0.1,
+            buildup_duration: 0.05,
             swing_duration: 0.05,
             hit_timing: 0.5,
             recover_duration: 0.1,
diff --git a/assets/common/abilities/sword/agile_feint.ron b/assets/common/abilities/sword/agile_feint.ron
index e0fb76b97c..e29e6e623e 100644
--- a/assets/common/abilities/sword/agile_feint.ron
+++ b/assets/common/abilities/sword/agile_feint.ron
@@ -3,7 +3,7 @@ ComboMelee2(
         (
             melee_constructor: (
                 kind: Slash(
-                    damage: 12,
+                    damage: 8,
                     poise: 5,
                     knockback: 0,
                     energy_regen: 0,
@@ -23,7 +23,7 @@ ComboMelee2(
             ori_modifier: 0.6,
         ),
     ],
-    energy_cost_per_strike: 10,
+    energy_cost_per_strike: 0,
     meta: (
         init_event: Some(EnterStance(Sword(Agile))),
     ),
diff --git a/assets/common/abilities/sword/agile_fell_strike.ron b/assets/common/abilities/sword/agile_fell_strike.ron
index 7d3ac7d410..71827ae572 100644
--- a/assets/common/abilities/sword/agile_fell_strike.ron
+++ b/assets/common/abilities/sword/agile_fell_strike.ron
@@ -3,7 +3,7 @@ ComboMelee2(
         (
             melee_constructor: (
                 kind: Slash(
-                    damage: 16,
+                    damage: 12,
                     poise: 5,
                     knockback: 0,
                     energy_regen: 0,
@@ -14,9 +14,9 @@ ComboMelee2(
             buildup_duration: 0.05,
             swing_duration: 0.05,
             hit_timing: 0.5,
-            recover_duration: 0.45,
+            recover_duration: 0.3,
             ori_modifier: 0.6,
         ),
     ],
-    energy_cost_per_strike: 15,
+    energy_cost_per_strike: 5,
 )
\ No newline at end of file
diff --git a/assets/common/abilities/sword/agile_flurry.ron b/assets/common/abilities/sword/agile_flurry.ron
index 1a86ccec55..7bbbe86389 100644
--- a/assets/common/abilities/sword/agile_flurry.ron
+++ b/assets/common/abilities/sword/agile_flurry.ron
@@ -4,7 +4,7 @@ RapidMelee(
     recover_duration: 0.1,
     melee_constructor: (
         kind: Slash(
-            damage: 8,
+            damage: 10,
             poise: 3,
             knockback: 0,
             energy_regen: 0,
@@ -12,7 +12,7 @@ RapidMelee(
         range: 6.0,
         angle: 10.0,
     ),
-    energy_cost: 10,
+    energy_cost: 5,
     max_strikes: Some(3),
     move_modifier: 0.35,
     ori_modifier: 0.25,
diff --git a/assets/common/abilities/sword/agile_hundred_cuts.ron b/assets/common/abilities/sword/agile_hundred_cuts.ron
index b8990fe6ca..c243aad42c 100644
--- a/assets/common/abilities/sword/agile_hundred_cuts.ron
+++ b/assets/common/abilities/sword/agile_hundred_cuts.ron
@@ -4,7 +4,7 @@ RapidMelee(
     recover_duration: 0.1,
     melee_constructor: (
         kind: Slash(
-            damage: 2,
+            damage: 3,
             poise: 0,
             knockback: 0,
             energy_regen: 0,
@@ -12,7 +12,7 @@ RapidMelee(
         range: 3.0,
         angle: 10.0,
     ),
-    energy_cost: 2,
+    energy_cost: 1,
     max_strikes: Some(20),
     move_modifier: 0.6,
     ori_modifier: 0.4,
diff --git a/assets/common/abilities/sword/agile_perforate.ron b/assets/common/abilities/sword/agile_perforate.ron
index cd8538c19e..e25f86db76 100644
--- a/assets/common/abilities/sword/agile_perforate.ron
+++ b/assets/common/abilities/sword/agile_perforate.ron
@@ -1,6 +1,6 @@
 RapidMelee(
     buildup_duration: 0.2,
-    swing_duration: 0.15,
+    swing_duration: 0.2,
     recover_duration: 0.3,
     melee_constructor: (
         kind: Slash(
diff --git a/assets/common/abilities/sword/agile_quick_draw.ron b/assets/common/abilities/sword/agile_quick_draw.ron
index 421c2d7c1b..68f63e0921 100644
--- a/assets/common/abilities/sword/agile_quick_draw.ron
+++ b/assets/common/abilities/sword/agile_quick_draw.ron
@@ -3,7 +3,7 @@ ComboMelee2(
         (
             melee_constructor: (
                 kind: Slash(
-                    damage: 8,
+                    damage: 12,
                     poise: 5,
                     knockback: 0,
                     energy_regen: 0,
@@ -11,19 +11,19 @@ ComboMelee2(
                 range: 5.0,
                 angle: 20.0,
             ),
-            buildup_duration: 0.2,
+            buildup_duration: 0.15,
             swing_duration: 0.05,
             hit_timing: 0.5,
-            recover_duration: 0.05,
+            recover_duration: 0.1,
             movement: (
-                buildup: None,
+                buildup: Some(Forward(1.0)),
                 swing: Some(Forward(3.0)),
-                recover: Some(Forward(2.0)),
+                recover: Some(Forward(1.0)),
             ),
             ori_modifier: 0.6,
         ),
     ],
-    energy_cost_per_strike: 10,
+    energy_cost_per_strike: 5,
     meta: (
         init_event: Some(EnterStance(Sword(Agile))),
     ),
diff --git a/assets/common/abilities/sword/agile_skewer.ron b/assets/common/abilities/sword/agile_skewer.ron
index fa3621b42c..98f0621027 100644
--- a/assets/common/abilities/sword/agile_skewer.ron
+++ b/assets/common/abilities/sword/agile_skewer.ron
@@ -3,7 +3,7 @@ ComboMelee2(
         (
             melee_constructor: (
                 kind: Stab(
-                    damage: 12,
+                    damage: 9,
                     poise: 5,
                     knockback: 0,
                     energy_regen: 0,
@@ -14,14 +14,14 @@ ComboMelee2(
             buildup_duration: 0.1,
             swing_duration: 0.1,
             hit_timing: 0.5,
-            recover_duration: 0.25,
+            recover_duration: 0.2,
             ori_modifier: 0.6,
             movement: (
-                buildup: Some(Forward(2.0)),
+                buildup: Some(Forward(3.0)),
                 swing: Some(Forward(2.0)),
                 recover: None,
             ),
         ),
     ],
-    energy_cost_per_strike: 10,
+    energy_cost_per_strike: 5,
 )
\ No newline at end of file
diff --git a/assets/common/abilities/sword/basic_cascade.ron b/assets/common/abilities/sword/basic_cascade.ron
index 822bc6363f..3d5723658b 100644
--- a/assets/common/abilities/sword/basic_cascade.ron
+++ b/assets/common/abilities/sword/basic_cascade.ron
@@ -11,12 +11,12 @@ ComboMelee2(
                 range: 4.0,
                 angle: 15.0,
             ),
-            buildup_duration: 0.35,
+            buildup_duration: 0.4,
             swing_duration: 0.1,
             hit_timing: 0.5,
             recover_duration: 0.2,
             ori_modifier: 0.6,
         ),
     ],
-    energy_cost_per_strike: 10,
+    energy_cost_per_strike: 5,
 )
\ No newline at end of file
diff --git a/assets/common/abilities/sword/basic_crescent_slash.ron b/assets/common/abilities/sword/basic_crescent_slash.ron
index 500f0e56fc..87f54a8d33 100644
--- a/assets/common/abilities/sword/basic_crescent_slash.ron
+++ b/assets/common/abilities/sword/basic_crescent_slash.ron
@@ -18,5 +18,5 @@ ComboMelee2(
             ori_modifier: 0.6,
         ),
     ],
-    energy_cost_per_strike: 10,
+    energy_cost_per_strike: 5,
 )
\ No newline at end of file
diff --git a/assets/common/abilities/sword/basic_cross_cut.ron b/assets/common/abilities/sword/basic_cross_cut.ron
index f4a51976ab..d5fbee507b 100644
--- a/assets/common/abilities/sword/basic_cross_cut.ron
+++ b/assets/common/abilities/sword/basic_cross_cut.ron
@@ -4,12 +4,12 @@ ComboMelee2(
             melee_constructor: (
                 kind: Slash(
                     damage: 10,
-                    poise: 3,
+                    poise: 5,
                     knockback: 0,
                     energy_regen: 0,
                 ),
                 range: 3.5,
-                angle: 50.0,
+                angle: 90.0,
             ),
             buildup_duration: 0.15,
             swing_duration: 0.1,
@@ -20,13 +20,13 @@ ComboMelee2(
         (
             melee_constructor: (
                 kind: Slash(
-                    damage: 10,
-                    poise: 3,
+                    damage: 14,
+                    poise: 5,
                     knockback: 0,
                     energy_regen: 0,
                 ),
                 range: 3.5,
-                angle: 50.0,
+                angle: 90.0,
             ),
             buildup_duration: 0.15,
             swing_duration: 0.1,
@@ -35,6 +35,6 @@ ComboMelee2(
             ori_modifier: 0.6,
         ),
     ],
-    energy_cost_per_strike: 7.5,
+    energy_cost_per_strike: 2.5,
     auto_progress: true,
 )
\ No newline at end of file
diff --git a/assets/common/abilities/sword/basic_double_slash.ron b/assets/common/abilities/sword/basic_double_slash.ron
index 5fdbfc2304..9a814b5868 100644
--- a/assets/common/abilities/sword/basic_double_slash.ron
+++ b/assets/common/abilities/sword/basic_double_slash.ron
@@ -3,7 +3,7 @@ ComboMelee2(
         (
             melee_constructor: (
                 kind: Slash(
-                    damage: 5,
+                    damage: 4,
                     poise: 5,
                     knockback: 0,
                     energy_regen: 5,
@@ -20,7 +20,7 @@ ComboMelee2(
         (
             melee_constructor: (
                 kind: Slash(
-                    damage: 10,
+                    damage: 7,
                     poise: 5,
                     knockback: 0,
                     energy_regen: 10,
diff --git a/assets/common/abilities/sword/basic_fell_strike.ron b/assets/common/abilities/sword/basic_fell_strike.ron
index fc70a6bc93..b586fc7a7e 100644
--- a/assets/common/abilities/sword/basic_fell_strike.ron
+++ b/assets/common/abilities/sword/basic_fell_strike.ron
@@ -18,5 +18,5 @@ ComboMelee2(
             ori_modifier: 0.6,
         ),
     ],
-    energy_cost_per_strike: 15,
+    energy_cost_per_strike: 5,
 )
\ No newline at end of file
diff --git a/assets/common/abilities/sword/basic_skewer.ron b/assets/common/abilities/sword/basic_skewer.ron
index 93bb04f8ae..39a0ef28cc 100644
--- a/assets/common/abilities/sword/basic_skewer.ron
+++ b/assets/common/abilities/sword/basic_skewer.ron
@@ -23,5 +23,5 @@ ComboMelee2(
             ),
         ),
     ],
-    energy_cost_per_strike: 10,
+    energy_cost_per_strike: 5,
 )
\ No newline at end of file
diff --git a/assets/common/abilities/sword/basic_thrust.ron b/assets/common/abilities/sword/basic_thrust.ron
index 70d3c7b639..6811c9d64c 100644
--- a/assets/common/abilities/sword/basic_thrust.ron
+++ b/assets/common/abilities/sword/basic_thrust.ron
@@ -9,10 +9,10 @@ ChargedMelee(
             energy_regen: 0,
         ),
         scaled: Some(Stab(
-            damage: 20,
-            poise: 10,
+            damage: 15,
+            poise: 5,
             knockback: 0,
-            energy_regen: 20,
+            energy_regen: 15,
         )),
         range: 4.5,
         angle: 10.0,
diff --git a/assets/common/abilities/sword/cleaving_blade_fever.ron b/assets/common/abilities/sword/cleaving_blade_fever.ron
index 729041cf3a..ad21ac2ea1 100644
--- a/assets/common/abilities/sword/cleaving_blade_fever.ron
+++ b/assets/common/abilities/sword/cleaving_blade_fever.ron
@@ -4,8 +4,8 @@ SelfBuff(
     recover_duration: 0.3,
     buff_kind: Reckless,
     buff_strength: 0.25,
-    buff_duration: Some(30.0),
-    energy_cost: 30,
+    buff_duration: Some(20.0),
+    energy_cost: 20,
     meta: (
         requirements: (stance: Some(Sword(Cleaving))),
     ),
diff --git a/assets/common/abilities/sword/cleaving_bladestorm.ron b/assets/common/abilities/sword/cleaving_bladestorm.ron
index fee006cfde..ffbdfe1af5 100644
--- a/assets/common/abilities/sword/cleaving_bladestorm.ron
+++ b/assets/common/abilities/sword/cleaving_bladestorm.ron
@@ -13,7 +13,7 @@ RapidMelee(
         angle: 360.0,
         multi_target: Some(Normal),
     ),
-    energy_cost: 5,
+    energy_cost: 3.33,
     max_strikes: Some(6),
     move_modifier: 0.8,
     ori_modifier: 1.0,
diff --git a/assets/common/abilities/sword/cleaving_cascade.ron b/assets/common/abilities/sword/cleaving_cascade.ron
index 3f57153fee..405b603cf7 100644
--- a/assets/common/abilities/sword/cleaving_cascade.ron
+++ b/assets/common/abilities/sword/cleaving_cascade.ron
@@ -3,21 +3,21 @@ ComboMelee2(
         (
             melee_constructor: (
                 kind: Slash(
-                    damage: 19,
+                    damage: 24,
                     poise: 5,
                     knockback: 0,
                     energy_regen: 0,
                 ),
                 range: 4.0,
-                angle: 25.0,
+                angle: 15.0,
                 multi_target: Some(Normal),
             ),
-            buildup_duration: 0.35,
-            swing_duration: 0.1,
+            buildup_duration: 0.5,
+            swing_duration: 0.15,
             hit_timing: 0.5,
-            recover_duration: 0.2,
+            recover_duration: 0.25,
             ori_modifier: 0.6,
         ),
     ],
-    energy_cost_per_strike: 10,
+    energy_cost_per_strike: 5,
 )
\ No newline at end of file
diff --git a/assets/common/abilities/sword/cleaving_crescent_slash.ron b/assets/common/abilities/sword/cleaving_crescent_slash.ron
index 6af054c286..260967c30f 100644
--- a/assets/common/abilities/sword/cleaving_crescent_slash.ron
+++ b/assets/common/abilities/sword/cleaving_crescent_slash.ron
@@ -3,21 +3,21 @@ ComboMelee2(
         (
             melee_constructor: (
                 kind: Slash(
-                    damage: 15,
+                    damage: 18,
                     poise: 5,
                     knockback: 0,
                     energy_regen: 0,
                 ),
                 range: 3.0,
-                angle: 75.0,
+                angle: 60.0,
                 multi_target: Some(Normal),
             ),
-            buildup_duration: 0.1,
-            swing_duration: 0.1,
+            buildup_duration: 0.15,
+            swing_duration: 0.15,
             hit_timing: 0.5,
-            recover_duration: 0.2,
+            recover_duration: 0.25,
             ori_modifier: 0.6,
         ),
     ],
-    energy_cost_per_strike: 10,
+    energy_cost_per_strike: 5,
 )
\ No newline at end of file
diff --git a/assets/common/abilities/sword/cleaving_cross_cut.ron b/assets/common/abilities/sword/cleaving_cross_cut.ron
index ddcba64b64..c0cd0a8ac8 100644
--- a/assets/common/abilities/sword/cleaving_cross_cut.ron
+++ b/assets/common/abilities/sword/cleaving_cross_cut.ron
@@ -4,39 +4,39 @@ ComboMelee2(
             melee_constructor: (
                 kind: Slash(
                     damage: 10,
-                    poise: 3,
+                    poise: 5,
                     knockback: 0,
                     energy_regen: 0,
                 ),
                 range: 3.5,
-                angle: 60.0,
+                angle: 90.0,
                 multi_target: Some(Normal),
             ),
-            buildup_duration: 0.15,
-            swing_duration: 0.1,
+            buildup_duration: 0.2,
+            swing_duration: 0.15,
             hit_timing: 0.5,
-            recover_duration: 0.2,
+            recover_duration: 0.25,
             ori_modifier: 0.6,
         ),
         (
             melee_constructor: (
                 kind: Slash(
-                    damage: 10,
-                    poise: 3,
+                    damage: 14,
+                    poise: 5,
                     knockback: 0,
                     energy_regen: 0,
                 ),
                 range: 3.5,
-                angle: 60.0,
+                angle: 90.0,
                 multi_target: Some(Normal),
             ),
-            buildup_duration: 0.15,
-            swing_duration: 0.1,
+            buildup_duration: 0.2,
+            swing_duration: 0.15,
             hit_timing: 0.5,
-            recover_duration: 0.1,
+            recover_duration: 0.15,
             ori_modifier: 0.6,
         ),
     ],
-    energy_cost_per_strike: 7.5,
+    energy_cost_per_strike: 2.5,
     auto_progress: true,
 )
\ No newline at end of file
diff --git a/assets/common/abilities/sword/cleaving_double_slash.ron b/assets/common/abilities/sword/cleaving_double_slash.ron
index 237301445f..4d2ed0b2f3 100644
--- a/assets/common/abilities/sword/cleaving_double_slash.ron
+++ b/assets/common/abilities/sword/cleaving_double_slash.ron
@@ -3,7 +3,7 @@ ComboMelee2(
         (
             melee_constructor: (
                 kind: Slash(
-                    damage: 5,
+                    damage: 4,
                     poise: 5,
                     knockback: 0,
                     energy_regen: 5,
@@ -13,25 +13,25 @@ ComboMelee2(
                 multi_target: Some(Normal),
             ),
             buildup_duration: 0.2,
-            swing_duration: 0.05,
+            swing_duration: 0.1,
             hit_timing: 0.5,
-            recover_duration: 0.1,
+            recover_duration: 0.15,
             ori_modifier: 0.6,
         ),
         (
             melee_constructor: (
                 kind: Slash(
-                    damage: 10,
+                    damage: 7,
                     poise: 5,
                     knockback: 0,
-                    energy_regen: 5,
+                    energy_regen: 10,
                 ),
                 range: 3.0,
                 angle: 45.0,
                 multi_target: Some(Normal),
             ),
             buildup_duration: 0.15,
-            swing_duration: 0.1,
+            swing_duration: 0.15,
             hit_timing: 0.5,
             recover_duration: 0.25,
             ori_modifier: 0.6,
diff --git a/assets/common/abilities/sword/cleaving_earth_splitter.ron b/assets/common/abilities/sword/cleaving_earth_splitter.ron
index ab9eba51b3..9906baed98 100644
--- a/assets/common/abilities/sword/cleaving_earth_splitter.ron
+++ b/assets/common/abilities/sword/cleaving_earth_splitter.ron
@@ -1,5 +1,5 @@
 DiveMelee(
-    energy_cost: 15,
+    energy_cost: 5,
     vertical_speed: 5,
     buildup_duration: Some(0.1),
     movement_duration: 5,
@@ -7,13 +7,13 @@ DiveMelee(
     recover_duration: 0.3,
     melee_constructor: (
         kind: Slash(
-            damage: 5,
+            damage: 10,
             poise: 5,
             knockback: 0,
             energy_regen: 0,
         ),
         scaled: Some(Slash(
-            damage: 10,
+            damage: 15,
             poise: 10,
             knockback: 0,
             energy_regen: 0,
@@ -22,7 +22,7 @@ DiveMelee(
         angle: 15.0,
         multi_target: Some(Normal),
     ),
-    max_scaling: 10.0,
+    max_scaling: 6.0,
     meta: (
         init_event: Some(EnterStance(Sword(Cleaving))),
     ),
diff --git a/assets/common/abilities/sword/cleaving_fell_strike.ron b/assets/common/abilities/sword/cleaving_fell_strike.ron
index 6275cd338d..11d87db46e 100644
--- a/assets/common/abilities/sword/cleaving_fell_strike.ron
+++ b/assets/common/abilities/sword/cleaving_fell_strike.ron
@@ -9,15 +9,15 @@ ComboMelee2(
                     energy_regen: 0,
                 ),
                 range: 3.5,
-                angle: 30.0,
+                angle: 20.0,
                 multi_target: Some(Normal),
             ),
-            buildup_duration: 0.05,
-            swing_duration: 0.05,
+            buildup_duration: 0.1,
+            swing_duration: 0.1,
             hit_timing: 0.5,
-            recover_duration: 0.7,
+            recover_duration: 0.8,
             ori_modifier: 0.6,
         ),
     ],
-    energy_cost_per_strike: 15,
+    energy_cost_per_strike: 5,
 )
\ No newline at end of file
diff --git a/assets/common/abilities/sword/cleaving_skewer.ron b/assets/common/abilities/sword/cleaving_skewer.ron
index 85ceca2bc0..8a200b852e 100644
--- a/assets/common/abilities/sword/cleaving_skewer.ron
+++ b/assets/common/abilities/sword/cleaving_skewer.ron
@@ -3,26 +3,26 @@ ComboMelee2(
         (
             melee_constructor: (
                 kind: Stab(
-                    damage: 14,
+                    damage: 18,
                     poise: 5,
                     knockback: 0,
                     energy_regen: 0,
                 ),
                 range: 5.0,
-                angle: 7.5,
+                angle: 5.0,
                 multi_target: Some(Normal),
             ),
-            buildup_duration: 0.15,
-            swing_duration: 0.1,
+            buildup_duration: 0.2,
+            swing_duration: 0.15,
             hit_timing: 0.5,
-            recover_duration: 0.4,
+            recover_duration: 0.5,
             ori_modifier: 0.6,
             movement: (
-                buildup: Some(Forward(2.0)),
-                swing: Some(Forward(2.0)),
+                buildup: Some(Forward(1.5)),
+                swing: Some(Forward(1.5)),
                 recover: None,
             ),
         ),
     ],
-    energy_cost_per_strike: 10,
+    energy_cost_per_strike: 5,
 )
\ No newline at end of file
diff --git a/assets/common/abilities/sword/cleaving_whirlwind_slice.ron b/assets/common/abilities/sword/cleaving_whirlwind_slice.ron
index 74e9223d92..d3d65acf2c 100644
--- a/assets/common/abilities/sword/cleaving_whirlwind_slice.ron
+++ b/assets/common/abilities/sword/cleaving_whirlwind_slice.ron
@@ -4,7 +4,7 @@ RapidMelee(
     recover_duration: 0.4,
     melee_constructor: (
         kind: Slash(
-            damage: 12,
+            damage: 14,
             poise: 5,
             knockback: 0,
             energy_regen: 0,
@@ -13,7 +13,7 @@ RapidMelee(
         angle: 360.0,
         multi_target: Some(Normal),
     ),
-    energy_cost: 10,
+    energy_cost: 5,
     max_strikes: Some(2),
     ori_modifier: 1.0,
     move_modifier: 1.0,
diff --git a/assets/common/abilities/sword/crippling_bloody_gash.ron b/assets/common/abilities/sword/crippling_bloody_gash.ron
index d038409cb5..1a22d971e5 100644
--- a/assets/common/abilities/sword/crippling_bloody_gash.ron
+++ b/assets/common/abilities/sword/crippling_bloody_gash.ron
@@ -3,7 +3,7 @@ ComboMelee2(
         (
             melee_constructor: (
                 kind: Slash(
-                    damage: 15,
+                    damage: 18,
                     poise: 5,
                     knockback: 0,
                     energy_regen: 5,
@@ -19,7 +19,7 @@ ComboMelee2(
             ori_modifier: 0.6,
         ),
     ],
-    energy_cost_per_strike: 20,
+    energy_cost_per_strike: 10,
     meta: (
         requirements: (stance: Some(Sword(Crippling))),
     ),
diff --git a/assets/common/abilities/sword/crippling_cascade.ron b/assets/common/abilities/sword/crippling_cascade.ron
index cd8f9bfdcc..b4190453b4 100644
--- a/assets/common/abilities/sword/crippling_cascade.ron
+++ b/assets/common/abilities/sword/crippling_cascade.ron
@@ -3,7 +3,7 @@ ComboMelee2(
         (
             melee_constructor: (
                 kind: Slash(
-                    damage: 18,
+                    damage: 20,
                     poise: 5,
                     knockback: 0,
                     energy_regen: 0,
@@ -14,15 +14,15 @@ ComboMelee2(
                     kind: Bleeding,
                     dur_secs: 8.0,
                     strength: DamageFraction(0.25),
-                    chance: 0.25,
+                    chance: 1.0,
                 ))),
             ),
-            buildup_duration: 0.35,
+            buildup_duration: 0.4,
             swing_duration: 0.1,
             hit_timing: 0.5,
             recover_duration: 0.2,
             ori_modifier: 0.6,
         ),
     ],
-    energy_cost_per_strike: 10,
+    energy_cost_per_strike: 5,
 )
\ No newline at end of file
diff --git a/assets/common/abilities/sword/crippling_crescent_slash.ron b/assets/common/abilities/sword/crippling_crescent_slash.ron
index 531109a28c..32e619fa8a 100644
--- a/assets/common/abilities/sword/crippling_crescent_slash.ron
+++ b/assets/common/abilities/sword/crippling_crescent_slash.ron
@@ -3,7 +3,7 @@ ComboMelee2(
         (
             melee_constructor: (
                 kind: Slash(
-                    damage: 14,
+                    damage: 15,
                     poise: 5,
                     knockback: 0,
                     energy_regen: 0,
@@ -14,7 +14,7 @@ ComboMelee2(
                     kind: Bleeding,
                     dur_secs: 8.0,
                     strength: DamageFraction(0.25),
-                    chance: 0.25,
+                    chance: 1.0,
                 ))),
             ),
             buildup_duration: 0.1,
@@ -24,5 +24,5 @@ ComboMelee2(
             ori_modifier: 0.6,
         ),
     ],
-    energy_cost_per_strike: 10,
+    energy_cost_per_strike: 5,
 )
\ No newline at end of file
diff --git a/assets/common/abilities/sword/crippling_cross_cut.ron b/assets/common/abilities/sword/crippling_cross_cut.ron
index bb659d9084..8f9fe6c3ed 100644
--- a/assets/common/abilities/sword/crippling_cross_cut.ron
+++ b/assets/common/abilities/sword/crippling_cross_cut.ron
@@ -4,17 +4,17 @@ ComboMelee2(
             melee_constructor: (
                 kind: Slash(
                     damage: 7,
-                    poise: 3,
+                    poise: 5,
                     knockback: 0,
                     energy_regen: 0,
                 ),
                 range: 3.5,
-                angle: 50.0,
+                angle: 90.0,
                 damage_effect: Some(Buff((
                     kind: Bleeding,
                     dur_secs: 8.0,
                     strength: DamageFraction(0.25),
-                    chance: 0.25,
+                    chance: 1.0,
                 ))),
             ),
             buildup_duration: 0.15,
@@ -26,18 +26,18 @@ ComboMelee2(
         (
             melee_constructor: (
                 kind: Slash(
-                    damage: 7,
-                    poise: 3,
+                    damage: 11,
+                    poise: 5,
                     knockback: 0,
                     energy_regen: 0,
                 ),
                 range: 3.5,
-                angle: 50.0,
+                angle: 90.0,
                 damage_effect: Some(Buff((
                     kind: Bleeding,
                     dur_secs: 8.0,
                     strength: DamageFraction(0.25),
-                    chance: 0.25,
+                    chance: 1.0,
                 ))),
             ),
             buildup_duration: 0.15,
@@ -47,6 +47,6 @@ ComboMelee2(
             ori_modifier: 0.6,
         ),
     ],
-    energy_cost_per_strike: 7.5,
+    energy_cost_per_strike: 2.5,
     auto_progress: true,
 )
\ No newline at end of file
diff --git a/assets/common/abilities/sword/crippling_deep_rend.ron b/assets/common/abilities/sword/crippling_deep_rend.ron
index 066a89ee6f..a0593015a0 100644
--- a/assets/common/abilities/sword/crippling_deep_rend.ron
+++ b/assets/common/abilities/sword/crippling_deep_rend.ron
@@ -9,10 +9,10 @@ ChargedMelee(
             energy_regen: 0,
         ),
         scaled: Some(Slash(
-            damage: 12,
+            damage: 15,
             poise: 5,
             knockback: 0,
-            energy_regen: 15,
+            energy_regen: 10,
         )),
         damage_effect: Some(BuffsVulnerable(0.5, Bleeding)),
         range: 4.5,
diff --git a/assets/common/abilities/sword/crippling_double_slash.ron b/assets/common/abilities/sword/crippling_double_slash.ron
index 3f0a601405..be78731749 100644
--- a/assets/common/abilities/sword/crippling_double_slash.ron
+++ b/assets/common/abilities/sword/crippling_double_slash.ron
@@ -3,7 +3,7 @@ ComboMelee2(
         (
             melee_constructor: (
                 kind: Slash(
-                    damage: 5,
+                    damage: 4,
                     poise: 5,
                     knockback: 0,
                     energy_regen: 5,
@@ -21,7 +21,7 @@ ComboMelee2(
         (
             melee_constructor: (
                 kind: Slash(
-                    damage: 10,
+                    damage: 7,
                     poise: 5,
                     knockback: 0,
                     energy_regen: 10,
diff --git a/assets/common/abilities/sword/crippling_eviscerate.ron b/assets/common/abilities/sword/crippling_eviscerate.ron
index 911da31f66..b7dc2cf7a8 100644
--- a/assets/common/abilities/sword/crippling_eviscerate.ron
+++ b/assets/common/abilities/sword/crippling_eviscerate.ron
@@ -3,7 +3,7 @@ ComboMelee2(
         (
             melee_constructor: (
                 kind: Slash(
-                    damage: 15,
+                    damage: 18,
                     poise: 5,
                     knockback: 0,
                     energy_regen: 0,
@@ -19,7 +19,7 @@ ComboMelee2(
             ori_modifier: 0.6,
         ),
     ],
-    energy_cost_per_strike: 25,
+    energy_cost_per_strike: 10,
     meta: (
         requirements: (stance: Some(Sword(Crippling))),
     ),
diff --git a/assets/common/abilities/sword/crippling_fell_strike.ron b/assets/common/abilities/sword/crippling_fell_strike.ron
index 1ae4c603b6..e4d9180491 100644
--- a/assets/common/abilities/sword/crippling_fell_strike.ron
+++ b/assets/common/abilities/sword/crippling_fell_strike.ron
@@ -3,7 +3,7 @@ ComboMelee2(
         (
             melee_constructor: (
                 kind: Slash(
-                    damage: 18,
+                    damage: 20,
                     poise: 5,
                     knockback: 0,
                     energy_regen: 0,
@@ -14,7 +14,7 @@ ComboMelee2(
                     kind: Bleeding,
                     dur_secs: 8.0,
                     strength: DamageFraction(0.25),
-                    chance: 0.25,
+                    chance: 1.0,
                 ))),
             ),
             buildup_duration: 0.05,
@@ -24,5 +24,5 @@ ComboMelee2(
             ori_modifier: 0.6,
         ),
     ],
-    energy_cost_per_strike: 15,
+    energy_cost_per_strike: 5,
 )
\ No newline at end of file
diff --git a/assets/common/abilities/sword/crippling_gouge.ron b/assets/common/abilities/sword/crippling_gouge.ron
index c2eecdab85..d0480a6de6 100644
--- a/assets/common/abilities/sword/crippling_gouge.ron
+++ b/assets/common/abilities/sword/crippling_gouge.ron
@@ -3,7 +3,7 @@ ComboMelee2(
         (
             melee_constructor: (
                 kind: Slash(
-                    damage: 8,
+                    damage: 16,
                     poise: 5,
                     knockback: 0,
                     energy_regen: 0,
@@ -12,8 +12,8 @@ ComboMelee2(
                 angle: 45.0,
                 damage_effect: Some(Buff((
                     kind: Bleeding,
-                    dur_secs: 8.0,
-                    strength: DamageFraction(0.35),
+                    dur_secs: 4.0,
+                    strength: DamageFraction(0.4),
                     chance: 1.0,
                 ))),
             ),
@@ -24,7 +24,7 @@ ComboMelee2(
             ori_modifier: 0.6,
         ),
     ],
-    energy_cost_per_strike: 15,
+    energy_cost_per_strike: 5,
     meta: (
         init_event: Some(EnterStance(Sword(Crippling))),
     ),
diff --git a/assets/common/abilities/sword/crippling_hamstring.ron b/assets/common/abilities/sword/crippling_hamstring.ron
index 031784c8ce..debf08befc 100644
--- a/assets/common/abilities/sword/crippling_hamstring.ron
+++ b/assets/common/abilities/sword/crippling_hamstring.ron
@@ -3,7 +3,7 @@ ComboMelee2(
         (
             melee_constructor: (
                 kind: Slash(
-                    damage: 10,
+                    damage: 16,
                     poise: 5,
                     knockback: 0,
                     energy_regen: 0,
@@ -24,7 +24,7 @@ ComboMelee2(
             ori_modifier: 0.6,
         ),
     ],
-    energy_cost_per_strike: 15,
+    energy_cost_per_strike: 10,
     meta: (
         init_event: Some(EnterStance(Sword(Crippling))),
     ),
diff --git a/assets/common/abilities/sword/crippling_mutilate.ron b/assets/common/abilities/sword/crippling_mutilate.ron
index d18c62d4d8..7973c1f61c 100644
--- a/assets/common/abilities/sword/crippling_mutilate.ron
+++ b/assets/common/abilities/sword/crippling_mutilate.ron
@@ -13,7 +13,7 @@ RapidMelee(
         angle: 15.0,
         damage_effect: Some(BuffsVulnerable(1.0, Bleeding)),
     ),
-    energy_cost: 7.5,
+    energy_cost: 5,
     max_strikes: Some(4),
     move_modifier: 0.7,
     ori_modifier: 0.2,
diff --git a/assets/common/abilities/sword/crippling_skewer.ron b/assets/common/abilities/sword/crippling_skewer.ron
index 15a7b9e419..ec1701ea04 100644
--- a/assets/common/abilities/sword/crippling_skewer.ron
+++ b/assets/common/abilities/sword/crippling_skewer.ron
@@ -3,7 +3,7 @@ ComboMelee2(
         (
             melee_constructor: (
                 kind: Stab(
-                    damage: 14,
+                    damage: 15,
                     poise: 5,
                     knockback: 0,
                     energy_regen: 0,
@@ -14,7 +14,7 @@ ComboMelee2(
                     kind: Bleeding,
                     dur_secs: 8.0,
                     strength: DamageFraction(0.25),
-                    chance: 0.25,
+                    chance: 1.0,
                 ))),
             ),
             buildup_duration: 0.15,
@@ -29,5 +29,5 @@ ComboMelee2(
             ),
         ),
     ],
-    energy_cost_per_strike: 10,
+    energy_cost_per_strike: 5,
 )
\ No newline at end of file
diff --git a/assets/common/abilities/sword/defensive_cascade.ron b/assets/common/abilities/sword/defensive_cascade.ron
index 8b60788d4f..be0e45f303 100644
--- a/assets/common/abilities/sword/defensive_cascade.ron
+++ b/assets/common/abilities/sword/defensive_cascade.ron
@@ -10,18 +10,19 @@ ComboMelee2(
                 ),
                 range: 4.0,
                 angle: 15.0,
+                damage_effect: Some(BuffsVulnerable(0.5, Parried)),
             ),
-            buildup_duration: 0.35,
+            buildup_duration: 0.4,
             swing_duration: 0.1,
             hit_timing: 0.5,
             recover_duration: 0.2,
             ori_modifier: 0.6,
         ),
     ],
-    energy_cost_per_strike: 10,
+    energy_cost_per_strike: 5,
     meta: (
         capabilities: (
-            // When in buildup, attack can get cancelled into parry
+            // The ability will parry melee attacks in the buildup portion
             bits: 0b00100000,
         ),
     ),
diff --git a/assets/common/abilities/sword/defensive_counter.ron b/assets/common/abilities/sword/defensive_counter.ron
index 31eeb4b935..6478d05606 100644
--- a/assets/common/abilities/sword/defensive_counter.ron
+++ b/assets/common/abilities/sword/defensive_counter.ron
@@ -1,5 +1,5 @@
 FinisherMelee(
-    energy_cost: 30,
+    energy_cost: 20,
     buildup_duration: 0.05,
     swing_duration: 0.1,
     recover_duration: 0.6,
diff --git a/assets/common/abilities/sword/defensive_crescent_slash.ron b/assets/common/abilities/sword/defensive_crescent_slash.ron
index 213fb924b8..cd2b1915b2 100644
--- a/assets/common/abilities/sword/defensive_crescent_slash.ron
+++ b/assets/common/abilities/sword/defensive_crescent_slash.ron
@@ -3,13 +3,14 @@ ComboMelee2(
         (
             melee_constructor: (
                 kind: Slash(
-                    damage: 15,
+                    damage: 13,
                     poise: 5,
                     knockback: 0,
                     energy_regen: 0,
                 ),
                 range: 3.0,
                 angle: 60.0,
+                damage_effect: Some(BuffsVulnerable(0.5, Parried)),
             ),
             buildup_duration: 0.1,
             swing_duration: 0.1,
@@ -18,10 +19,10 @@ ComboMelee2(
             ori_modifier: 0.6,
         ),
     ],
-    energy_cost_per_strike: 10,
+    energy_cost_per_strike: 5,
     meta: (
         capabilities: (
-            // When in buildup, attack can get cancelled into parry
+            // The ability will parry melee attacks in the buildup portion
             bits: 0b00100000,
         ),
     ),
diff --git a/assets/common/abilities/sword/defensive_cross_cut.ron b/assets/common/abilities/sword/defensive_cross_cut.ron
index e18ea19827..03670791b4 100644
--- a/assets/common/abilities/sword/defensive_cross_cut.ron
+++ b/assets/common/abilities/sword/defensive_cross_cut.ron
@@ -3,13 +3,14 @@ ComboMelee2(
         (
             melee_constructor: (
                 kind: Slash(
-                    damage: 8,
-                    poise: 3,
+                    damage: 6,
+                    poise: 5,
                     knockback: 0,
                     energy_regen: 0,
                 ),
                 range: 3.5,
-                angle: 50.0,
+                angle: 90.0,
+                damage_effect: Some(BuffsVulnerable(0.5, Parried)),
             ),
             buildup_duration: 0.15,
             swing_duration: 0.1,
@@ -20,13 +21,14 @@ ComboMelee2(
         (
             melee_constructor: (
                 kind: Slash(
-                    damage: 8,
-                    poise: 3,
+                    damage: 9,
+                    poise: 5,
                     knockback: 0,
                     energy_regen: 0,
                 ),
                 range: 3.5,
-                angle: 50.0,
+                angle: 90.0,
+                damage_effect: Some(BuffsVulnerable(0.5, Parried)),
             ),
             buildup_duration: 0.15,
             swing_duration: 0.1,
@@ -35,11 +37,11 @@ ComboMelee2(
             ori_modifier: 0.6,
         ),
     ],
-    energy_cost_per_strike: 7.5,
+    energy_cost_per_strike: 2.5,
     auto_progress: true,
     meta: (
         capabilities: (
-            // When in buildup, attack can get cancelled into parry
+            // The ability will parry melee attacks in the buildup portion
             bits: 0b00100000,
         ),
     ),
diff --git a/assets/common/abilities/sword/defensive_deflect.ron b/assets/common/abilities/sword/defensive_deflect.ron
index 8209a6c042..e122c71c2b 100644
--- a/assets/common/abilities/sword/defensive_deflect.ron
+++ b/assets/common/abilities/sword/defensive_deflect.ron
@@ -7,7 +7,7 @@ BasicBlock(
         buildup: true,
         recover: true,
     ),
-    energy_cost: 10,
+    energy_cost: 0,
     can_hold: false,
     blocked_attacks: (
         melee: true,
diff --git a/assets/common/abilities/sword/defensive_disengage.ron b/assets/common/abilities/sword/defensive_disengage.ron
index bb93b672b4..a8cdfc733a 100644
--- a/assets/common/abilities/sword/defensive_disengage.ron
+++ b/assets/common/abilities/sword/defensive_disengage.ron
@@ -3,7 +3,7 @@ ComboMelee2(
         (
             melee_constructor: (
                 kind: Slash(
-                    damage: 16,
+                    damage: 10,
                     poise: 5,
                     knockback: 0,
                     energy_regen: 0,
@@ -23,7 +23,7 @@ ComboMelee2(
             ori_modifier: 0.6,
         ),
     ],
-    energy_cost_per_strike: 10,
+    energy_cost_per_strike: 0,
     meta: (
         init_event: Some(EnterStance(Sword(Defensive))),
     ),
diff --git a/assets/common/abilities/sword/defensive_double_slash.ron b/assets/common/abilities/sword/defensive_double_slash.ron
index 34a2b954d6..c1238c068e 100644
--- a/assets/common/abilities/sword/defensive_double_slash.ron
+++ b/assets/common/abilities/sword/defensive_double_slash.ron
@@ -20,7 +20,7 @@ ComboMelee2(
         (
             melee_constructor: (
                 kind: Slash(
-                    damage: 8,
+                    damage: 7,
                     poise: 5,
                     knockback: 0,
                     energy_regen: 10,
diff --git a/assets/common/abilities/sword/defensive_fell_strike.ron b/assets/common/abilities/sword/defensive_fell_strike.ron
index f1b3bec5b1..2dff6cc8d1 100644
--- a/assets/common/abilities/sword/defensive_fell_strike.ron
+++ b/assets/common/abilities/sword/defensive_fell_strike.ron
@@ -3,13 +3,14 @@ ComboMelee2(
         (
             melee_constructor: (
                 kind: Slash(
-                    damage: 20,
+                    damage: 18,
                     poise: 5,
                     knockback: 0,
                     energy_regen: 0,
                 ),
                 range: 3.5,
                 angle: 20.0,
+                damage_effect: Some(BuffsVulnerable(0.5, Parried)),
             ),
             buildup_duration: 0.05,
             swing_duration: 0.05,
@@ -18,10 +19,10 @@ ComboMelee2(
             ori_modifier: 0.6,
         ),
     ],
-    energy_cost_per_strike: 15,
+    energy_cost_per_strike: 5,
     meta: (
         capabilities: (
-            // When in buildup, attack can get cancelled into parry
+            // The ability will parry melee attacks in the buildup portion
             bits: 0b00100000,
         ),
     ),
diff --git a/assets/common/abilities/sword/defensive_riposte.ron b/assets/common/abilities/sword/defensive_riposte.ron
index 7a1e7e409d..cd96359902 100644
--- a/assets/common/abilities/sword/defensive_riposte.ron
+++ b/assets/common/abilities/sword/defensive_riposte.ron
@@ -1,11 +1,11 @@
 RiposteMelee(
-    energy_cost: 20,
+    energy_cost: 5,
     buildup_duration: 0.3,
-    swing_duration: 0.2,
-    recover_duration: 0.3,
+    swing_duration: 0.1,
+    recover_duration: 0.2,
     melee_constructor: (
         kind: Slash(
-            damage: 25,
+            damage: 18,
             poise: 5,
             knockback: 0,
             energy_regen: 5,
diff --git a/assets/common/abilities/sword/defensive_skewer.ron b/assets/common/abilities/sword/defensive_skewer.ron
index b3d5a69b7c..e1be1973e4 100644
--- a/assets/common/abilities/sword/defensive_skewer.ron
+++ b/assets/common/abilities/sword/defensive_skewer.ron
@@ -3,13 +3,14 @@ ComboMelee2(
         (
             melee_constructor: (
                 kind: Stab(
-                    damage: 15,
+                    damage: 13,
                     poise: 5,
                     knockback: 0,
                     energy_regen: 0,
                 ),
                 range: 5.0,
                 angle: 5.0,
+                damage_effect: Some(BuffsVulnerable(0.5, Parried)),
             ),
             buildup_duration: 0.15,
             swing_duration: 0.1,
@@ -23,10 +24,10 @@ ComboMelee2(
             ),
         ),
     ],
-    energy_cost_per_strike: 10,
+    energy_cost_per_strike: 5,
     meta: (
         capabilities: (
-            // When in buildup, attack can get cancelled into parry
+            // The ability will parry melee attacks in the buildup portion
             bits: 0b00100000,
         ),
     ),
diff --git a/assets/common/abilities/sword/defensive_stalwart_sword.ron b/assets/common/abilities/sword/defensive_stalwart_sword.ron
index 4e71961134..9f18bdce40 100644
--- a/assets/common/abilities/sword/defensive_stalwart_sword.ron
+++ b/assets/common/abilities/sword/defensive_stalwart_sword.ron
@@ -4,8 +4,8 @@ SelfBuff(
     recover_duration: 0.25,
     buff_kind: ProtectingWard,
     buff_strength: 0.4,
-    buff_duration: Some(30.0),
-    energy_cost: 30,
+    buff_duration: Some(20.0),
+    energy_cost: 20,
     meta: (
         requirements: (stance: Some(Sword(Defensive))),
     ),
diff --git a/assets/common/abilities/sword/heavy_cascade.ron b/assets/common/abilities/sword/heavy_cascade.ron
index fc0f69d857..9537028bed 100644
--- a/assets/common/abilities/sword/heavy_cascade.ron
+++ b/assets/common/abilities/sword/heavy_cascade.ron
@@ -3,7 +3,7 @@ ComboMelee2(
         (
             melee_constructor: (
                 kind: Slash(
-                    damage: 26,
+                    damage: 30,
                     poise: 15,
                     knockback: 0,
                     energy_regen: 0,
@@ -13,11 +13,11 @@ ComboMelee2(
                 damage_effect: Some(StunnedVulnerable(0.5)),
             ),
             buildup_duration: 0.5,
-            swing_duration: 0.1,
+            swing_duration: 0.15,
             hit_timing: 0.5,
-            recover_duration: 0.3,
+            recover_duration: 0.25,
             ori_modifier: 0.6,
         ),
     ],
-    energy_cost_per_strike: 10,
+    energy_cost_per_strike: 5,
 )
\ No newline at end of file
diff --git a/assets/common/abilities/sword/heavy_crescent_slash.ron b/assets/common/abilities/sword/heavy_crescent_slash.ron
index d86087764d..c988f87f3d 100644
--- a/assets/common/abilities/sword/heavy_crescent_slash.ron
+++ b/assets/common/abilities/sword/heavy_crescent_slash.ron
@@ -3,7 +3,7 @@ ComboMelee2(
         (
             melee_constructor: (
                 kind: Slash(
-                    damage: 19,
+                    damage: 23,
                     poise: 15,
                     knockback: 0,
                     energy_regen: 0,
@@ -12,12 +12,12 @@ ComboMelee2(
                 angle: 60.0,
                 damage_effect: Some(StunnedVulnerable(0.5)),
             ),
-            buildup_duration: 0.3,
-            swing_duration: 0.1,
+            buildup_duration: 0.15,
+            swing_duration: 0.15,
             hit_timing: 0.5,
-            recover_duration: 0.2,
+            recover_duration: 0.25,
             ori_modifier: 0.6,
         ),
     ],
-    energy_cost_per_strike: 10,
+    energy_cost_per_strike: 5,
 )
\ No newline at end of file
diff --git a/assets/common/abilities/sword/heavy_cross_cut.ron b/assets/common/abilities/sword/heavy_cross_cut.ron
index 53694ab527..eeb7bfddc0 100644
--- a/assets/common/abilities/sword/heavy_cross_cut.ron
+++ b/assets/common/abilities/sword/heavy_cross_cut.ron
@@ -3,40 +3,40 @@ ComboMelee2(
         (
             melee_constructor: (
                 kind: Slash(
-                    damage: 11,
-                    poise: 3,
+                    damage: 12,
+                    poise: 5,
                     knockback: 0,
                     energy_regen: 0,
                 ),
                 range: 3.5,
-                angle: 50.0,
+                angle: 90.0,
                 damage_effect: Some(StunnedVulnerable(0.5)),
             ),
             buildup_duration: 0.2,
-            swing_duration: 0.1,
+            swing_duration: 0.15,
             hit_timing: 0.5,
-            recover_duration: 0.2,
+            recover_duration: 0.25,
             ori_modifier: 0.6,
         ),
         (
             melee_constructor: (
                 kind: Slash(
-                    damage: 11,
-                    poise: 3,
+                    damage: 18,
+                    poise: 5,
                     knockback: 0,
                     energy_regen: 0,
                 ),
                 range: 3.5,
-                angle: 50.0,
+                angle: 90.0,
                 damage_effect: Some(StunnedVulnerable(0.5)),
             ),
             buildup_duration: 0.2,
-            swing_duration: 0.1,
+            swing_duration: 0.15,
             hit_timing: 0.5,
-            recover_duration: 0.2,
+            recover_duration: 0.15,
             ori_modifier: 0.6,
         ),
     ],
-    energy_cost_per_strike: 7.5,
+    energy_cost_per_strike: 2.5,
     auto_progress: true,
 )
\ No newline at end of file
diff --git a/assets/common/abilities/sword/heavy_double_slash.ron b/assets/common/abilities/sword/heavy_double_slash.ron
index 37e1c7c722..eb93690e82 100644
--- a/assets/common/abilities/sword/heavy_double_slash.ron
+++ b/assets/common/abilities/sword/heavy_double_slash.ron
@@ -3,19 +3,18 @@ ComboMelee2(
         (
             melee_constructor: (
                 kind: Slash(
-                    damage: 6,
+                    damage: 5,
                     poise: 10,
                     knockback: 0,
-                    energy_regen: 10,
+                    energy_regen: 5,
                 ),
                 range: 3.0,
                 angle: 45.0,
-                damage_effect: Some(StunnedVulnerable(0.5)),
             ),
-            buildup_duration: 0.3,
-            swing_duration: 0.05,
+            buildup_duration: 0.2,
+            swing_duration: 0.1,
             hit_timing: 0.5,
-            recover_duration: 0.1,
+            recover_duration: 0.15,
             ori_modifier: 0.6,
         ),
         (
@@ -24,16 +23,15 @@ ComboMelee2(
                     damage: 9,
                     poise: 15,
                     knockback: 0,
-                    energy_regen: 15,
+                    energy_regen: 10,
                 ),
                 range: 3.0,
                 angle: 45.0,
-                damage_effect: Some(StunnedVulnerable(0.5)),
             ),
-            buildup_duration: 0.2,
-            swing_duration: 0.1,
+            buildup_duration: 0.15,
+            swing_duration: 0.15,
             hit_timing: 0.5,
-            recover_duration: 0.2,
+            recover_duration: 0.25,
             ori_modifier: 0.6,
         ),
     ],
diff --git a/assets/common/abilities/sword/heavy_fell_strike.ron b/assets/common/abilities/sword/heavy_fell_strike.ron
index 1da46eb3e9..83988839ac 100644
--- a/assets/common/abilities/sword/heavy_fell_strike.ron
+++ b/assets/common/abilities/sword/heavy_fell_strike.ron
@@ -3,7 +3,7 @@ ComboMelee2(
         (
             melee_constructor: (
                 kind: Slash(
-                    damage: 28,
+                    damage: 30,
                     poise: 15,
                     knockback: 0,
                     energy_regen: 0,
@@ -12,12 +12,12 @@ ComboMelee2(
                 angle: 20.0,
                 damage_effect: Some(StunnedVulnerable(0.5)),
             ),
-            buildup_duration: 0.15,
+            buildup_duration: 0.1,
             swing_duration: 0.1,
             hit_timing: 0.5,
-            recover_duration: 0.9,
+            recover_duration: 0.8,
             ori_modifier: 0.6,
         ),
     ],
-    energy_cost_per_strike: 15,
+    energy_cost_per_strike: 5,
 )
\ No newline at end of file
diff --git a/assets/common/abilities/sword/heavy_fortitude.ron b/assets/common/abilities/sword/heavy_fortitude.ron
index 43a75fbd81..cb6e8f4c7e 100644
--- a/assets/common/abilities/sword/heavy_fortitude.ron
+++ b/assets/common/abilities/sword/heavy_fortitude.ron
@@ -4,8 +4,8 @@ SelfBuff(
     recover_duration: 0.6,
     buff_kind: Fortitude,
     buff_strength: 1.0,
-    buff_duration: Some(30.0),
-    energy_cost: 25,
+    buff_duration: Some(20.0),
+    energy_cost: 15,
     meta: (
         requirements: (stance: Some(Sword(Heavy))),
     ),
diff --git a/assets/common/abilities/sword/heavy_guillotine.ron b/assets/common/abilities/sword/heavy_guillotine.ron
index 0bd08ee13c..331a5ca851 100644
--- a/assets/common/abilities/sword/heavy_guillotine.ron
+++ b/assets/common/abilities/sword/heavy_guillotine.ron
@@ -1,5 +1,5 @@
 FinisherMelee(
-    energy_cost: 30,
+    energy_cost: 20,
     buildup_duration: 0.4,
     swing_duration: 0.1,
     recover_duration: 0.6,
diff --git a/assets/common/abilities/sword/heavy_pillar_thrust.ron b/assets/common/abilities/sword/heavy_pillar_thrust.ron
index 7e06209528..74450363c8 100644
--- a/assets/common/abilities/sword/heavy_pillar_thrust.ron
+++ b/assets/common/abilities/sword/heavy_pillar_thrust.ron
@@ -1,5 +1,5 @@
 DiveMelee(
-    energy_cost: 25,
+    energy_cost: 15,
     vertical_speed: 5,
     buildup_duration: Some(0.1),
     movement_duration: 5,
diff --git a/assets/common/abilities/sword/heavy_pommel_strike.ron b/assets/common/abilities/sword/heavy_pommel_strike.ron
index 6204468262..39a8848e1e 100644
--- a/assets/common/abilities/sword/heavy_pommel_strike.ron
+++ b/assets/common/abilities/sword/heavy_pommel_strike.ron
@@ -4,7 +4,7 @@ ComboMelee2(
             melee_constructor: (
                 kind: Bash(
                     damage: 12,
-                    poise: 60,
+                    poise: 50,
                     knockback: 0,
                     energy_regen: 0,
                 ),
@@ -19,7 +19,7 @@ ComboMelee2(
             ori_modifier: 0.6,
         ),
     ],
-    energy_cost_per_strike: 15,
+    energy_cost_per_strike: 5,
     meta: (
         init_event: Some(EnterStance(Sword(Heavy))),
     ),
diff --git a/assets/common/abilities/sword/heavy_skewer.ron b/assets/common/abilities/sword/heavy_skewer.ron
index 2ac5e3143c..0480811325 100644
--- a/assets/common/abilities/sword/heavy_skewer.ron
+++ b/assets/common/abilities/sword/heavy_skewer.ron
@@ -3,26 +3,25 @@ ComboMelee2(
         (
             melee_constructor: (
                 kind: Stab(
-                    damage: 21,
+                    damage: 23,
                     poise: 15,
                     knockback: 0,
                     energy_regen: 0,
                 ),
                 range: 5.0,
                 angle: 5.0,
-                damage_effect: Some(StunnedVulnerable(0.5)),
             ),
-            buildup_duration: 0.3,
-            swing_duration: 0.1,
+            buildup_duration: 0.2,
+            swing_duration: 0.15,
             hit_timing: 0.5,
             recover_duration: 0.5,
             ori_modifier: 0.6,
             movement: (
-                buildup: Some(Forward(2.0)),
-                swing: Some(Forward(2.0)),
+                buildup: Some(Forward(1.5)),
+                swing: Some(Forward(1.5)),
                 recover: None,
             ),
         ),
     ],
-    energy_cost_per_strike: 10,
+    energy_cost_per_strike: 5,
 )
\ No newline at end of file
diff --git a/assets/common/abilities/sword/heavy_slam.ron b/assets/common/abilities/sword/heavy_slam.ron
index 7493cee327..4cf7d0f1ae 100644
--- a/assets/common/abilities/sword/heavy_slam.ron
+++ b/assets/common/abilities/sword/heavy_slam.ron
@@ -18,8 +18,8 @@ ChargedMelee(
         angle: 10.0,
         damage_effect: Some(StunnedVulnerable(0.5)),
     ),
-    charge_duration: 0.8,
+    charge_duration: 1.0,
     swing_duration: 0.1,
     hit_timing: 0.2,
-    recover_duration: 0.4,
+    recover_duration: 0.5,
 )
diff --git a/assets/common/abilities/sword/heavy_windmill_slash.ron b/assets/common/abilities/sword/heavy_windmill_slash.ron
index f49a3dac77..a74f88454b 100644
--- a/assets/common/abilities/sword/heavy_windmill_slash.ron
+++ b/assets/common/abilities/sword/heavy_windmill_slash.ron
@@ -4,7 +4,7 @@ ComboMelee2(
             melee_constructor: (
                 kind: Slash(
                     damage: 11,
-                    poise: 15,
+                    poise: 20,
                     knockback: 0,
                     energy_regen: 0,
                 ),
@@ -37,7 +37,7 @@ ComboMelee2(
             ori_modifier: 0.6,
         ),
     ],
-    energy_cost_per_strike: 10,
+    energy_cost_per_strike: 5,
     auto_progress: true,
     meta: (
         init_event: Some(EnterStance(Sword(Heavy))),
diff --git a/common/src/comp/ability.rs b/common/src/comp/ability.rs
index a19f6274cb..410da60fee 100644
--- a/common/src/comp/ability.rs
+++ b/common/src/comp/ability.rs
@@ -2904,7 +2904,7 @@ bitflags::bitflags! {
         const POISE_RESISTANT     = 0b00001000;
         // WHen in the ability, an entity only receives half as much knockback
         const KNOCKBACK_RESISTANT = 0b00010000;
-        // The ability will interrupt itself into a parry if hit with melee
+        // The ability will parry melee attacks in the buildup portion
         const BUILDUP_PARRIES     = 0b00100000;
     }
 }
diff --git a/common/src/comp/poise.rs b/common/src/comp/poise.rs
index 8fdc8a9ca6..2b74f5b63d 100644
--- a/common/src/comp/poise.rs
+++ b/common/src/comp/poise.rs
@@ -88,19 +88,27 @@ impl PoiseState {
         let (charstate_parameters, impulse) = match self {
             PoiseState::Normal => (None, None),
             PoiseState::Interrupted => (
-                Some((Duration::from_millis(200), Duration::from_millis(200), 0.8)),
+                Some((Duration::from_millis(250), Duration::from_millis(250), 0.8)),
                 None,
             ),
             PoiseState::Stunned => (
-                Some((Duration::from_millis(400), Duration::from_millis(400), 0.5)),
+                Some((Duration::from_millis(750), Duration::from_millis(750), 0.5)),
                 None,
             ),
             PoiseState::Dazed => (
-                Some((Duration::from_millis(750), Duration::from_millis(450), 0.2)),
+                Some((
+                    Duration::from_millis(1000),
+                    Duration::from_millis(1000),
+                    0.2,
+                )),
                 None,
             ),
             PoiseState::KnockedDown => (
-                Some((Duration::from_millis(1000), Duration::from_millis(600), 0.0)),
+                Some((
+                    Duration::from_millis(2000),
+                    Duration::from_millis(2000),
+                    0.0,
+                )),
                 Some(10.0),
             ),
         };
diff --git a/common/src/states/glide_wield.rs b/common/src/states/glide_wield.rs
index 040842e60c..a47c151084 100644
--- a/common/src/states/glide_wield.rs
+++ b/common/src/states/glide_wield.rs
@@ -40,7 +40,6 @@ impl CharacterBehavior for Data {
     fn behavior(&self, data: &JoinData, output_events: &mut OutputEvents) -> StateUpdate {
         let mut update = StateUpdate::from(data);
 
-        leave_stance(data, output_events);
         handle_orientation(data, &mut update, 1.0, None);
         handle_move(data, &mut update, 1.0);
         handle_jump(data, output_events, &mut update, 1.0);
diff --git a/common/src/states/idle.rs b/common/src/states/idle.rs
index fea197dbab..c89263f2af 100644
--- a/common/src/states/idle.rs
+++ b/common/src/states/idle.rs
@@ -21,7 +21,7 @@ impl CharacterBehavior for Data {
     fn behavior(&self, data: &JoinData, output_events: &mut OutputEvents) -> StateUpdate {
         let mut update = StateUpdate::from(data);
 
-        const LEAVE_STANCE_DELAY: f64 = 5.0;
+        const LEAVE_STANCE_DELAY: f64 = 30.0;
         if (self.time_entered.0 + LEAVE_STANCE_DELAY) < data.time.0 {
             leave_stance(data, output_events);
         }
diff --git a/common/src/states/music.rs b/common/src/states/music.rs
index 6d05d8fd2e..70dfb296f8 100644
--- a/common/src/states/music.rs
+++ b/common/src/states/music.rs
@@ -36,7 +36,6 @@ impl CharacterBehavior for Data {
     fn behavior(&self, data: &JoinData, output_events: &mut OutputEvents) -> StateUpdate {
         let mut update = StateUpdate::from(data);
 
-        leave_stance(data, output_events);
         handle_orientation(data, &mut update, self.static_data.ori_modifier, None);
         handle_move(data, &mut update, 0.7);
         handle_jump(data, output_events, &mut update, 1.0);
diff --git a/common/src/states/skate.rs b/common/src/states/skate.rs
index 341ebee1fd..8d877675ad 100644
--- a/common/src/states/skate.rs
+++ b/common/src/states/skate.rs
@@ -35,7 +35,6 @@ impl CharacterBehavior for Data {
     fn behavior(&self, data: &JoinData, output_events: &mut OutputEvents) -> StateUpdate {
         let mut update = StateUpdate::from(data);
 
-        leave_stance(data, output_events);
         handle_wield(data, &mut update);
         handle_jump(data, output_events, &mut update, 1.0);
 
diff --git a/common/src/states/sprite_interact.rs b/common/src/states/sprite_interact.rs
index b08bc51ac4..4e3d9eb6b5 100644
--- a/common/src/states/sprite_interact.rs
+++ b/common/src/states/sprite_interact.rs
@@ -56,8 +56,6 @@ impl CharacterBehavior for Data {
     fn behavior(&self, data: &JoinData, output_events: &mut OutputEvents) -> StateUpdate {
         let mut update = StateUpdate::from(data);
 
-        leave_stance(data, output_events);
-
         let ori_dir = Dir::from_unnormalized(Vec3::from(
             (self.static_data.sprite_pos.map(|x| x as f32 + 0.5) - data.pos.0).xy(),
         ));
diff --git a/common/src/states/stunned.rs b/common/src/states/stunned.rs
index f3d100121f..1524564d37 100644
--- a/common/src/states/stunned.rs
+++ b/common/src/states/stunned.rs
@@ -37,7 +37,7 @@ impl CharacterBehavior for Data {
 
         if matches!(
             self.static_data.poise_state,
-            PoiseState::Stunned | PoiseState::Dazed | PoiseState::KnockedDown
+            PoiseState::Dazed | PoiseState::KnockedDown
         ) {
             leave_stance(data, output_events);
         }
diff --git a/common/src/states/talk.rs b/common/src/states/talk.rs
index 34c9aa4483..bab5b59f4d 100644
--- a/common/src/states/talk.rs
+++ b/common/src/states/talk.rs
@@ -14,10 +14,9 @@ const TURN_RATE: f32 = 40.0;
 pub struct Data;
 
 impl CharacterBehavior for Data {
-    fn behavior(&self, data: &JoinData, output_events: &mut OutputEvents) -> StateUpdate {
+    fn behavior(&self, data: &JoinData, _output_events: &mut OutputEvents) -> StateUpdate {
         let mut update = StateUpdate::from(data);
 
-        leave_stance(data, output_events);
         handle_wield(data, &mut update);
         handle_orientation(data, &mut update, TURN_RATE, None);
 
diff --git a/common/src/states/use_item.rs b/common/src/states/use_item.rs
index 6f5fc1a635..1f6f666724 100644
--- a/common/src/states/use_item.rs
+++ b/common/src/states/use_item.rs
@@ -52,8 +52,6 @@ impl CharacterBehavior for Data {
     fn behavior(&self, data: &JoinData, output_events: &mut OutputEvents) -> StateUpdate {
         let mut update = StateUpdate::from(data);
 
-        leave_stance(data, output_events);
-
         match self.static_data.item_kind {
             ItemUseKind::Consumable(ConsumableKind::Drink) => {
                 handle_orientation(data, &mut update, 1.0, None);
diff --git a/server/src/events/entity_manipulation.rs b/server/src/events/entity_manipulation.rs
index e47ba762f6..f577a759ce 100644
--- a/server/src/events/entity_manipulation.rs
+++ b/server/src/events/entity_manipulation.rs
@@ -43,7 +43,7 @@ use rand_distr::Distribution;
 use specs::{
     join::Join, saveload::MarkerAllocator, Builder, Entity as EcsEntity, Entity, WorldExt,
 };
-use std::{collections::HashMap, iter, ops::Mul, time::Duration};
+use std::{collections::HashMap, iter, time::Duration};
 use tracing::{debug, error};
 use vek::{Vec2, Vec3};
 
@@ -1274,11 +1274,7 @@ pub fn handle_parry_hook(server: &Server, defender: EcsEntity, attacker: Option<
                 });
                 true
             },
-            char_state => char_state.ability_info().map_or(false, |info| {
-                info.ability_meta
-                    .capabilities
-                    .contains(comp::ability::Capability::BUILDUP_PARRIES)
-            }),
+            _ => false,
         };
         if return_to_wield {
             *char_state =
@@ -1287,39 +1283,30 @@ pub fn handle_parry_hook(server: &Server, defender: EcsEntity, attacker: Option<
     };
 
     if let Some(attacker) = attacker {
-        if let Some(char_state) = ecs.read_storage::<comp::CharacterState>().get(attacker) {
-            // By having a duration twice as long as either the recovery duration or 0.5 s,
-            // causes recover duration to effectively be either doubled or increased by 0.5
-            // s when a buff is applied that halves their attack speed.
-            let duration = char_state
-                .durations()
-                .and_then(|durs| durs.recover)
-                .map_or(0.5, |dur| dur.as_secs_f64())
-                .max(0.5)
-                .mul(2.0);
-            let data = buff::BuffData::new(1.0, Some(Secs(duration)), None);
-            let source = if let Some(uid) = ecs.read_storage::<Uid>().get(defender) {
-                BuffSource::Character { by: *uid }
-            } else {
-                BuffSource::World
-            };
-            let time = ecs.read_resource::<Time>();
-            let stats = ecs.read_storage::<comp::Stats>();
-            let healths = ecs.read_storage::<comp::Health>();
-            let buff = buff::Buff::new(
-                BuffKind::Parried,
-                data,
-                vec![buff::BuffCategory::Physical],
-                source,
-                *time,
-                stats.get(attacker),
-                healths.get(attacker),
-            );
-            server_eventbus.emit_now(ServerEvent::Buff {
-                entity: attacker,
-                buff_change: buff::BuffChange::Add(buff),
-            });
-        }
+        // When attacker is parried, add the parried debuff for 2 seconds, which slows
+        // them
+        let data = buff::BuffData::new(1.0, Some(Secs(2.0)), None);
+        let source = if let Some(uid) = ecs.read_storage::<Uid>().get(defender) {
+            BuffSource::Character { by: *uid }
+        } else {
+            BuffSource::World
+        };
+        let time = ecs.read_resource::<Time>();
+        let stats = ecs.read_storage::<comp::Stats>();
+        let healths = ecs.read_storage::<comp::Health>();
+        let buff = buff::Buff::new(
+            BuffKind::Parried,
+            data,
+            vec![buff::BuffCategory::Physical],
+            source,
+            *time,
+            stats.get(attacker),
+            healths.get(attacker),
+        );
+        server_eventbus.emit_now(ServerEvent::Buff {
+            entity: attacker,
+            buff_change: buff::BuffChange::Add(buff),
+        });
     }
 }