diff --git a/assets/common/abilities/adlet/elder/dash.ron b/assets/common/abilities/adlet/elder/dash.ron
index 1134111589..f81c934b63 100644
--- a/assets/common/abilities/adlet/elder/dash.ron
+++ b/assets/common/abilities/adlet/elder/dash.ron
@@ -7,12 +7,13 @@ DashMelee(
             knockback: 8.0,
             energy_regen: 0.0,
         ),
-        scaled: Some(Stab(
-            damage: 16.0,
-            poise: 0.0,
-            knockback: 7.0,
-            energy_regen: 0.0,
-        )),
+        scaled: Some((
+            kind: Stab(
+                damage: 16.0,
+                poise: 0.0,
+                knockback: 7.0,
+                energy_regen: 0.0,
+            ))),
         range: 5.0,
         angle: 45.0,
     ),
diff --git a/assets/common/abilities/axe/cleave.ron b/assets/common/abilities/axe/cleave.ron
index d5d4f12893..73cadff3f0 100644
--- a/assets/common/abilities/axe/cleave.ron
+++ b/assets/common/abilities/axe/cleave.ron
@@ -8,12 +8,13 @@ ChargedMelee(
             knockback: 0,
             energy_regen: 0,
         ),
-        scaled: Some(Slash(
-            damage: 20,
-            poise: 5,
-            knockback: 0,
-            energy_regen: 15,
-        )),
+        scaled: Some((
+            kind: Slash(
+                damage: 20,
+                poise: 5,
+                knockback: 0,
+                energy_regen: 15,
+            ))),
         range: 4.5,
         angle: 10.0,
     ),
@@ -22,4 +23,4 @@ ChargedMelee(
     hit_timing: 0.2,
     recover_duration: 0.2,
     additional_combo: 4,
-)
\ No newline at end of file
+)
diff --git a/assets/common/abilities/axe/keelhaul.ron b/assets/common/abilities/axe/keelhaul.ron
index 836c8e7ffc..83c7558af7 100644
--- a/assets/common/abilities/axe/keelhaul.ron
+++ b/assets/common/abilities/axe/keelhaul.ron
@@ -9,11 +9,12 @@ FinisherMelee(
             poise: 0,
             pull: 0,
         ),
-        scaled: Some(Hook(
-            damage: 2,
-            poise: 3,
-            pull: 1,
-        )),
+        scaled: Some((
+            kind: Hook(
+                damage: 2,
+                poise: 3,
+                pull: 1,
+            ))),
         range: 6.0,
         angle: 30.0,
     ),
@@ -24,4 +25,4 @@ FinisherMelee(
         max_factor: 20,
     )),
     combo_consumption: Half,
-)
\ No newline at end of file
+)
diff --git a/assets/common/abilities/custom/arthropods/antlion/charge.ron b/assets/common/abilities/custom/arthropods/antlion/charge.ron
index dc65d3cc23..3f851fcaf5 100644
--- a/assets/common/abilities/custom/arthropods/antlion/charge.ron
+++ b/assets/common/abilities/custom/arthropods/antlion/charge.ron
@@ -7,12 +7,13 @@ DashMelee(
             knockback: 10.0,
             energy_regen: 0.0,
         ),
-        scaled: Some(Stab(
-            damage: 120.0,
-            poise: 45.0,
-            knockback: 25.0,
-            energy_regen: 0.0,
-        )),
+        scaled: Some((
+            kind: Stab(
+                damage: 120.0,
+                poise: 45.0,
+                knockback: 25.0,
+                energy_regen: 0.0,
+            ))),
         range: 5.0,
         angle: 90.0,
     ),
diff --git a/assets/common/abilities/custom/basilisk/dash.ron b/assets/common/abilities/custom/basilisk/dash.ron
index b1a64c8f43..aa44de03b6 100644
--- a/assets/common/abilities/custom/basilisk/dash.ron
+++ b/assets/common/abilities/custom/basilisk/dash.ron
@@ -7,12 +7,13 @@ DashMelee(
             knockback: 4.0,
             energy_regen: 0.0,
         ),
-        scaled: Some(Bash(
-            damage: 36.0,
-            poise: 0.0,
-            knockback: 17.0,
-            energy_regen: 0.0,
-        )),
+        scaled: Some((
+            kind: Bash(
+                damage: 36.0,
+                poise: 0.0,
+                knockback: 17.0,
+                energy_regen: 0.0,
+            ))),
         range: 2.5,
         angle: 45.0,
     ),
diff --git a/assets/common/abilities/custom/birdlargebasic/dash.ron b/assets/common/abilities/custom/birdlargebasic/dash.ron
index f2323cbc38..1aad7f9385 100644
--- a/assets/common/abilities/custom/birdlargebasic/dash.ron
+++ b/assets/common/abilities/custom/birdlargebasic/dash.ron
@@ -7,12 +7,13 @@ DashMelee(
             knockback: 6.0,
             energy_regen: 0.0,
         ),
-        scaled: Some(Bash(
-            damage: 30.0,
-            poise: 100.0,
-            knockback: 12.0,
-            energy_regen: 0.0,
-        )),
+        scaled: Some((
+            kind: Bash(
+                damage: 30.0,
+                poise: 100.0,
+                knockback: 12.0,
+                energy_regen: 0.0,
+            ))),
         range: 2.0,
         angle: 20.0,
     ),
diff --git a/assets/common/abilities/custom/boreal_warrior/hammer/dash.ron b/assets/common/abilities/custom/boreal_warrior/hammer/dash.ron
index 14adbbd4f8..f56050f02f 100644
--- a/assets/common/abilities/custom/boreal_warrior/hammer/dash.ron
+++ b/assets/common/abilities/custom/boreal_warrior/hammer/dash.ron
@@ -7,12 +7,13 @@ DashMelee(
             knockback: 16.0,
             energy_regen: 0.0,
         ),
-        scaled: Some(Bash(
-            damage: 10.0,
-            poise: 0.0,
-            knockback: 20.0,
-            energy_regen: 0.0,
-        )),
+        scaled: Some((
+            kind: Bash(
+                damage: 10.0,
+                poise: 0.0,
+                knockback: 20.0,
+                energy_regen: 0.0,
+            ))),
         range: 5.0,
         angle: 45.0,
         damage_effect: Some(Buff((
diff --git a/assets/common/abilities/custom/bushly/dash.ron b/assets/common/abilities/custom/bushly/dash.ron
index 0ec3fc8110..296c972763 100644
--- a/assets/common/abilities/custom/bushly/dash.ron
+++ b/assets/common/abilities/custom/bushly/dash.ron
@@ -7,12 +7,13 @@ DashMelee(
             knockback: 4.0,
             energy_regen: 0.0,
         ),
-        scaled: Some(Bash(
-            damage: 6.0,
-            poise: 20.0,
-            knockback: 6.0,
-            energy_regen: 0.0,
-        )),
+        scaled: Some((
+            kind: Bash(
+                damage: 6.0,
+                poise: 20.0,
+                knockback: 6.0,
+                energy_regen: 0.0,
+            ))),
         range: 4,
         angle: 45.0,
     ),
diff --git a/assets/common/abilities/custom/cyclops/dash.ron b/assets/common/abilities/custom/cyclops/dash.ron
index 95d3d8f853..aaf21b8501 100644
--- a/assets/common/abilities/custom/cyclops/dash.ron
+++ b/assets/common/abilities/custom/cyclops/dash.ron
@@ -7,12 +7,13 @@ DashMelee(
             knockback: 2.0,
             energy_regen: 0.0,
         ),
-        scaled: Some(Bash(
-            damage: 36.0,
-            poise: 60.0,
-            knockback: 5.0,
-            energy_regen: 0.0,
-        )),
+        scaled: Some((
+            kind: Bash(
+                damage: 36.0,
+                poise: 60.0,
+                knockback: 5.0,
+                energy_regen: 0.0,
+            ))),
         range: 6.0,
         angle: 90.0,
         multi_target: Some(Normal),
diff --git a/assets/common/abilities/custom/deadwood/dash.ron b/assets/common/abilities/custom/deadwood/dash.ron
index 470b455782..3c44cf19ba 100644
--- a/assets/common/abilities/custom/deadwood/dash.ron
+++ b/assets/common/abilities/custom/deadwood/dash.ron
@@ -7,12 +7,13 @@ DashMelee(
             knockback: 4.0,
             energy_regen: 0.0,
         ),
-        scaled: Some(Bash(
-            damage: 30.0,
-            poise: 0.0,
-            knockback: 17.0,
-            energy_regen: 0.0,
-        )),
+        scaled: Some((
+            kind: Bash(
+                damage: 30.0,
+                poise: 0.0,
+                knockback: 17.0,
+                energy_regen: 0.0,
+            ))),
         range: 4,
         angle: 45.0,
     ),
diff --git a/assets/common/abilities/custom/dullahan/dash.ron b/assets/common/abilities/custom/dullahan/dash.ron
index fbbc225ef7..8dd4871d57 100644
--- a/assets/common/abilities/custom/dullahan/dash.ron
+++ b/assets/common/abilities/custom/dullahan/dash.ron
@@ -7,12 +7,13 @@ DashMelee(
             knockback: 2.0,
             energy_regen: 0.0,
         ),
-        scaled: Some(Bash(
-            damage: 36.0,
-            poise: 38.6,
-            knockback: 3.0,
-            energy_regen: 0.0,
-        )),
+        scaled: Some((
+            kind: Bash(
+                damage: 36.0,
+                poise: 38.6,
+                knockback: 3.0,
+                energy_regen: 0.0,
+            ))),
         range: 5.0,
         angle: 90.0,
         multi_target: Some(Normal),
diff --git a/assets/common/abilities/custom/dwarves/hermit_alligator/tail.ron b/assets/common/abilities/custom/dwarves/hermit_alligator/tail.ron
index db85bc1381..5a31e8accb 100644
--- a/assets/common/abilities/custom/dwarves/hermit_alligator/tail.ron
+++ b/assets/common/abilities/custom/dwarves/hermit_alligator/tail.ron
@@ -8,12 +8,13 @@ ChargedMelee(
             knockback: 10.0,
             energy_regen: 0.0,
         ),
-        scaled: Some(Bash(
-            damage: 40.0,
-            poise: 80.0,
-            knockback: 20.0,
-            energy_regen: 0.0,
-        )),
+        scaled: Some((
+            kind: Bash(
+                damage: 40.0,
+                poise: 80.0,
+                knockback: 20.0,
+                energy_regen: 0.0,
+            ))),
         range: 6.0,
         angle: 90.0,
         multi_target: Some(Normal),
diff --git a/assets/common/abilities/custom/husk_brute/chargedmelee.ron b/assets/common/abilities/custom/husk_brute/chargedmelee.ron
index 5d664c2217..ee2fc7c79b 100644
--- a/assets/common/abilities/custom/husk_brute/chargedmelee.ron
+++ b/assets/common/abilities/custom/husk_brute/chargedmelee.ron
@@ -8,12 +8,13 @@ ChargedMelee(
             knockback: 0.0,
             energy_regen: 0.0,
         ),
-        scaled: Some(Bash(
-            damage: 90.0,
-            poise: 150.0,
-            knockback: 0.0,
-            energy_regen: 0.0,
-        )),
+        scaled: Some((
+            kind: Bash(
+                damage: 90.0,
+                poise: 150.0,
+                knockback: 0.0,
+                energy_regen: 0.0,
+            ))),
         range: 3.5,
         angle: 45.0,
     ),
diff --git a/assets/common/abilities/custom/minotaur/charge.ron b/assets/common/abilities/custom/minotaur/charge.ron
index da93e8318c..04e182c12c 100644
--- a/assets/common/abilities/custom/minotaur/charge.ron
+++ b/assets/common/abilities/custom/minotaur/charge.ron
@@ -7,12 +7,13 @@ DashMelee(
             knockback: 10.0,
             energy_regen: 0.0,
         ),
-        scaled: Some(Stab(
-            damage: 90.0,
-            poise: 100.0,
-            knockback: 30.0,
-            energy_regen: 0.0,
-        )),
+        scaled: Some((
+            kind: Stab(
+                damage: 90.0,
+                poise: 100.0,
+                knockback: 30.0,
+                energy_regen: 0.0,
+            ))),
         range: 5.0,
         angle: 90.0,
         damage_effect: Some(Buff((
diff --git a/assets/common/abilities/custom/minotaur/cleave.ron b/assets/common/abilities/custom/minotaur/cleave.ron
index 75151617aa..e4a2129434 100644
--- a/assets/common/abilities/custom/minotaur/cleave.ron
+++ b/assets/common/abilities/custom/minotaur/cleave.ron
@@ -8,12 +8,13 @@ ChargedMelee(
             knockback: 0.0,
             energy_regen: 0.0,
         ),
-        scaled: Some(Slash(
-            damage: 45.0,
-            poise: 105.0,
-            knockback: 0.0,
-            energy_regen: 0.0,
-        )),
+        scaled: Some((
+            kind: Slash(
+                damage: 45.0,
+                poise: 105.0,
+                knockback: 0.0,
+                energy_regen: 0.0,
+            ))),
         range: 5.0,
         angle: 45.0,
         multi_target: Some(Normal),
diff --git a/assets/common/abilities/custom/oni/dash.ron b/assets/common/abilities/custom/oni/dash.ron
index 9e9529d22d..37b7b4e90d 100644
--- a/assets/common/abilities/custom/oni/dash.ron
+++ b/assets/common/abilities/custom/oni/dash.ron
@@ -7,12 +7,13 @@ DashMelee(
             knockback: 8.0,
             energy_regen: 0.0,
         ),
-        scaled: Some(Slash(
-            damage: 32.0,
-            poise: 0.0,
-            knockback: 7.0,
-            energy_regen: 0.0,
-        )),
+        scaled: Some((
+            kind: Slash(
+                damage: 32.0,
+                poise: 0.0,
+                knockback: 7.0,
+                energy_regen: 0.0,
+            ))),
         range: 2.0,
         angle: 15.0,
     ),
diff --git a/assets/common/abilities/custom/quadlowbreathe/dash.ron b/assets/common/abilities/custom/quadlowbreathe/dash.ron
index 3d30873341..59338016d0 100644
--- a/assets/common/abilities/custom/quadlowbreathe/dash.ron
+++ b/assets/common/abilities/custom/quadlowbreathe/dash.ron
@@ -7,12 +7,13 @@ DashMelee(
             knockback: 4.0,
             energy_regen: 0.0,
         ),
-        scaled: Some(Bash(
-            damage: 30.0,
-            poise: 0.0,
-            knockback: 17.0,
-            energy_regen: 0.0,
-        )),
+        scaled: Some((
+            kind: Bash(
+                damage: 30.0,
+                poise: 0.0,
+                knockback: 17.0,
+                energy_regen: 0.0,
+            ))),
         range: 2.5,
         angle: 45.0,
     ),
diff --git a/assets/common/abilities/custom/quadlowquick/dash.ron b/assets/common/abilities/custom/quadlowquick/dash.ron
index f4d7a28c2a..832e8201c6 100644
--- a/assets/common/abilities/custom/quadlowquick/dash.ron
+++ b/assets/common/abilities/custom/quadlowquick/dash.ron
@@ -7,12 +7,13 @@ DashMelee(
             knockback: 2.0,
             energy_regen: 0.0,
         ),
-        scaled: Some(Bash(
-            damage: 16.0,
-            poise: 0.0,
-            knockback: 7.0,
-            energy_regen: 0.0,
-        )),
+        scaled: Some((
+            kind: Bash(
+                damage: 16.0,
+                poise: 0.0,
+                knockback: 7.0,
+                energy_regen: 0.0,
+            ))),
         range: 2.0,
         angle: 45.0,
     ),
diff --git a/assets/common/abilities/custom/quadlowtail/charged.ron b/assets/common/abilities/custom/quadlowtail/charged.ron
index 0eaa47ca0a..6d2169566b 100644
--- a/assets/common/abilities/custom/quadlowtail/charged.ron
+++ b/assets/common/abilities/custom/quadlowtail/charged.ron
@@ -8,12 +8,13 @@ ChargedMelee(
             knockback: 10.0,
             energy_regen: 0.0,
         ),
-        scaled: Some(Bash(
-            damage: 40.0,
-            poise: 80.0,
-            knockback: 20.0,
-            energy_regen: 0.0,
-        )),
+        scaled: Some((
+            kind: Bash(
+                damage: 40.0,
+                poise: 80.0,
+                knockback: 20.0,
+                energy_regen: 0.0,
+            ))),
         range: 6.0,
         angle: 90.0,
         multi_target: Some(Normal),
diff --git a/assets/common/abilities/custom/quadmedcharge/dash.ron b/assets/common/abilities/custom/quadmedcharge/dash.ron
index 542a0bb6ae..e2923a3c8c 100644
--- a/assets/common/abilities/custom/quadmedcharge/dash.ron
+++ b/assets/common/abilities/custom/quadmedcharge/dash.ron
@@ -7,12 +7,13 @@ DashMelee(
             knockback: 8.0,
             energy_regen: 0.0,
         ),
-        scaled: Some(Bash(
-            damage: 65.0,
-            poise: 35.0,
-            knockback: 14.0,
-            energy_regen: 0.0,
-        )),
+        scaled: Some((
+            kind: Bash(
+                damage: 65.0,
+                poise: 35.0,
+                knockback: 14.0,
+                energy_regen: 0.0,
+            ))),
         range: 2.5,
         angle: 45.0,
     ),
diff --git a/assets/common/abilities/custom/quadmedquick/dash.ron b/assets/common/abilities/custom/quadmedquick/dash.ron
index 9ea4a7f014..8850d8e9df 100644
--- a/assets/common/abilities/custom/quadmedquick/dash.ron
+++ b/assets/common/abilities/custom/quadmedquick/dash.ron
@@ -7,12 +7,13 @@ DashMelee(
             knockback: 3.0,
             energy_regen: 0.0,
         ),
-        scaled: Some(Bash(
-            damage: 4.0,
-            poise: 28.0,
-            knockback: 7.0,
-            energy_regen: 0.0,
-        )),
+        scaled: Some((
+            kind: Bash(
+                damage: 4.0,
+                poise: 28.0,
+                knockback: 7.0,
+                energy_regen: 0.0,
+            ))),
         range: 2.0,
         angle: 45.0,
     ),
diff --git a/assets/common/abilities/custom/roshwalr/slowcharge.ron b/assets/common/abilities/custom/roshwalr/slowcharge.ron
index ac862cb06a..4bb3e2ad0e 100644
--- a/assets/common/abilities/custom/roshwalr/slowcharge.ron
+++ b/assets/common/abilities/custom/roshwalr/slowcharge.ron
@@ -7,12 +7,13 @@ DashMelee(
             knockback: 8.0,
             energy_regen: 0.0,
         ),
-        scaled: Some(Bash(
-            damage: 65.0,
-            poise: 35.0,
-            knockback: 14.0,
-            energy_regen: 0.0,
-        )),
+        scaled: Some((
+            kind: Bash(
+                damage: 65.0,
+                poise: 35.0,
+                knockback: 14.0,
+                energy_regen: 0.0,
+            ))),
         range: 2.5,
         angle: 45.0,
     ),
@@ -24,4 +25,4 @@ DashMelee(
     recover_duration: 2.2,
     ori_modifier: 0.3,
     charge_through: false,
-)
\ No newline at end of file
+)
diff --git a/assets/common/abilities/custom/theropodbasic/dash.ron b/assets/common/abilities/custom/theropodbasic/dash.ron
index ddac485650..b173d08c8a 100644
--- a/assets/common/abilities/custom/theropodbasic/dash.ron
+++ b/assets/common/abilities/custom/theropodbasic/dash.ron
@@ -7,12 +7,13 @@ DashMelee(
             knockback: 8.0,
             energy_regen: 0.0,
         ),
-        scaled: Some(Bash(
-            damage: 25.0,
-            poise: 0.0,
-            knockback: 17.0,
-            energy_regen: 0.0,
-        )),
+        scaled: Some((
+            kind: Bash(
+                damage: 25.0,
+                poise: 0.0,
+                knockback: 17.0,
+                energy_regen: 0.0,
+            ))),
         range: 4.0,
         angle: 45.0,
     ),
diff --git a/assets/common/abilities/custom/tidalwarrior/scuttle.ron b/assets/common/abilities/custom/tidalwarrior/scuttle.ron
index 53c1c75bf7..9c4380cf9c 100644
--- a/assets/common/abilities/custom/tidalwarrior/scuttle.ron
+++ b/assets/common/abilities/custom/tidalwarrior/scuttle.ron
@@ -7,12 +7,13 @@ DashMelee(
             knockback: 10.0,
             energy_regen: 0.0,
         ),
-        scaled: Some(Bash(
-            damage: 12.5,
-            poise: 40.0,
-            knockback: 30.0,
-            energy_regen: 0.0,
-        )),
+        scaled: Some((
+            kind: Bash(
+                damage: 12.5,
+                poise: 40.0,
+                knockback: 30.0,
+                energy_regen: 0.0,
+            ))),
         range: 5.0,
         angle: 90.0,
         multi_target: Some(Normal),
diff --git a/assets/common/abilities/custom/tursus/tusk_stab.ron b/assets/common/abilities/custom/tursus/tusk_stab.ron
index be8e46ac7b..d9ce9de2f5 100644
--- a/assets/common/abilities/custom/tursus/tusk_stab.ron
+++ b/assets/common/abilities/custom/tursus/tusk_stab.ron
@@ -8,12 +8,13 @@ ChargedMelee(
             knockback: 0.0,
             energy_regen: 0.0,
         ),
-        scaled: Some(Stab(
-            damage: 90.0,
-            poise: 150.0,
-            knockback: 0.0,
-            energy_regen: 0.0,
-        )),
+        scaled: Some((
+            kind: Stab(
+                damage: 90.0,
+                poise: 150.0,
+                knockback: 0.0,
+                energy_regen: 0.0,
+            ))),
         range: 3.5,
         angle: 45.0,
     ),
diff --git a/assets/common/abilities/hammer/charged.ron b/assets/common/abilities/hammer/charged.ron
index 6b8de0494e..d5486f5084 100644
--- a/assets/common/abilities/hammer/charged.ron
+++ b/assets/common/abilities/hammer/charged.ron
@@ -8,12 +8,13 @@ ChargedMelee(
             knockback: 5.0,
             energy_regen: 0.0,
         ),
-        scaled: Some(Bash(
-            damage: 20.0,
-            poise: 30.0,
-            knockback: 20.0,
-            energy_regen: 0.0,
-        )),
+        scaled: Some((
+            kind: Bash(
+                damage: 20.0,
+                poise: 30.0,
+                knockback: 20.0,
+                energy_regen: 0.0,
+            ))),
         range: 3.5,
         angle: 30.0,
         multi_target: Some(Normal),
diff --git a/assets/common/abilities/spear/dash.ron b/assets/common/abilities/spear/dash.ron
index dbd5317f39..36a92674cd 100644
--- a/assets/common/abilities/spear/dash.ron
+++ b/assets/common/abilities/spear/dash.ron
@@ -7,12 +7,13 @@ DashMelee(
             knockback: 8.0,
             energy_regen: 0.0,
         ),
-        scaled: Some(Stab(
-            damage: 9.0,
-            poise: 25.0,
-            knockback: 7.0,
-            energy_regen: 0.0,
-        )),
+        scaled: Some((
+            kind: Stab(
+                damage: 9.0,
+                poise: 25.0,
+                knockback: 7.0,
+                energy_regen: 0.0,
+            ))),
         range: 3.0,
         angle: 20.0,
     ),
diff --git a/assets/common/abilities/sword/basic_thrust.ron b/assets/common/abilities/sword/basic_thrust.ron
index 6811c9d64c..44ccf7e1b0 100644
--- a/assets/common/abilities/sword/basic_thrust.ron
+++ b/assets/common/abilities/sword/basic_thrust.ron
@@ -8,12 +8,13 @@ ChargedMelee(
             knockback: 0,
             energy_regen: 0,
         ),
-        scaled: Some(Stab(
-            damage: 15,
-            poise: 5,
-            knockback: 0,
-            energy_regen: 15,
-        )),
+        scaled: Some((
+            kind: Stab(
+                damage: 15,
+                poise: 5,
+                knockback: 0,
+                energy_regen: 15,
+            ))),
         range: 4.5,
         angle: 10.0,
     ),
diff --git a/assets/common/abilities/sword/cleaving_dual_spiral_slash.ron b/assets/common/abilities/sword/cleaving_dual_spiral_slash.ron
index ba0850c410..664fadcfab 100644
--- a/assets/common/abilities/sword/cleaving_dual_spiral_slash.ron
+++ b/assets/common/abilities/sword/cleaving_dual_spiral_slash.ron
@@ -8,12 +8,13 @@ ChargedMelee(
             knockback: 0,
             energy_regen: 0,
         ),
-        scaled: Some(Slash(
-            damage: 7,
-            poise: 10,
-            knockback: 0,
-            energy_regen: 10,
-        )),
+        scaled: Some((
+            kind: Slash(
+                damage: 7,
+                poise: 10,
+                knockback: 0,
+                energy_regen: 10,
+            ))),
         range: 3.0,
         angle: 360.0,
         multi_target: Some(Normal),
@@ -23,4 +24,4 @@ ChargedMelee(
     swing_duration: 0.2,
     hit_timing: 0.2,
     recover_duration: 0.3,
-)
\ No newline at end of file
+)
diff --git a/assets/common/abilities/sword/cleaving_earth_splitter.ron b/assets/common/abilities/sword/cleaving_earth_splitter.ron
index 5d7957b0dc..e172a69bb9 100644
--- a/assets/common/abilities/sword/cleaving_earth_splitter.ron
+++ b/assets/common/abilities/sword/cleaving_earth_splitter.ron
@@ -12,13 +12,16 @@ DiveMelee(
             knockback: 0,
             energy_regen: 0,
         ),
-        scaled: Some(Slash(
-            damage: 15,
-            poise: 10,
-            knockback: 0,
-            energy_regen: 0,
+        scaled: Some((
+            kind: Slash(
+                damage: 4,
+                poise: 5,
+                knockback: 4,
+                energy_regen: 0,
+            ),
+            range: 1.0,
         )),
-        range: 4.0,
+        range: 2.0,
         angle: 360.0,
         multi_target: Some(Normal),
     ),
diff --git a/assets/common/abilities/sword/cleaving_spiral_slash.ron b/assets/common/abilities/sword/cleaving_spiral_slash.ron
index 413bac773f..f12c5fad1a 100644
--- a/assets/common/abilities/sword/cleaving_spiral_slash.ron
+++ b/assets/common/abilities/sword/cleaving_spiral_slash.ron
@@ -8,12 +8,13 @@ ChargedMelee(
             knockback: 0,
             energy_regen: 0,
         ),
-        scaled: Some(Slash(
-            damage: 10,
-            poise: 10,
-            knockback: 0,
-            energy_regen: 10,
-        )),
+        scaled: Some((
+            kind: Slash(
+                damage: 10,
+                poise: 10,
+                knockback: 0,
+                energy_regen: 10,
+            ))),
         range: 3.0,
         angle: 360.0,
         multi_target: Some(Normal),
@@ -22,4 +23,4 @@ ChargedMelee(
     swing_duration: 0.2,
     hit_timing: 0.2,
     recover_duration: 0.3,
-)
\ 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 a0593015a0..0e397b98c5 100644
--- a/assets/common/abilities/sword/crippling_deep_rend.ron
+++ b/assets/common/abilities/sword/crippling_deep_rend.ron
@@ -8,12 +8,13 @@ ChargedMelee(
             knockback: 0,
             energy_regen: 0,
         ),
-        scaled: Some(Slash(
-            damage: 15,
-            poise: 5,
-            knockback: 0,
-            energy_regen: 10,
-        )),
+        scaled: Some((
+            kind: Slash(
+                damage: 15,
+                poise: 5,
+                knockback: 0,
+                energy_regen: 10,
+            ))),
         damage_effect: Some(BuffsVulnerable(0.5, Bleeding)),
         range: 4.5,
         angle: 10.0,
diff --git a/assets/common/abilities/sword/defensive_vital_jab.ron b/assets/common/abilities/sword/defensive_vital_jab.ron
index f970e2096d..efe8adc232 100644
--- a/assets/common/abilities/sword/defensive_vital_jab.ron
+++ b/assets/common/abilities/sword/defensive_vital_jab.ron
@@ -8,12 +8,13 @@ ChargedMelee(
             knockback: 0,
             energy_regen: 0,
         ),
-        scaled: Some(Stab(
-            damage: 12,
-            poise: 5,
-            knockback: 0,
-            energy_regen: 15,
-        )),
+        scaled: Some((
+            kind: Stab(
+                damage: 12,
+                poise: 5,
+                knockback: 0,
+                energy_regen: 15,
+            ))),
         range: 4.5,
         angle: 10.0,
         damage_effect: Some(BuffsVulnerable(0.75, Parried)),
diff --git a/assets/common/abilities/sword/heavy_pillar_thrust.ron b/assets/common/abilities/sword/heavy_pillar_thrust.ron
index 1737675f89..ab6a72c945 100644
--- a/assets/common/abilities/sword/heavy_pillar_thrust.ron
+++ b/assets/common/abilities/sword/heavy_pillar_thrust.ron
@@ -12,12 +12,13 @@ DiveMelee(
             knockback: 0,
             energy_regen: 0,
         ),
-        scaled: Some(Slash(
-            damage: 10,
-            poise: 10,
-            knockback: 0,
-            energy_regen: 0,
-        )),
+        scaled: Some((
+            kind: Slash(
+                damage: 10,
+                poise: 10,
+                knockback: 0,
+                energy_regen: 0,
+            ))),
         range: 2.0,
         angle: 45.0,
         multi_target: Some(Normal),
diff --git a/assets/common/abilities/sword/heavy_slam.ron b/assets/common/abilities/sword/heavy_slam.ron
index 4cf7d0f1ae..0736f29a1a 100644
--- a/assets/common/abilities/sword/heavy_slam.ron
+++ b/assets/common/abilities/sword/heavy_slam.ron
@@ -8,12 +8,13 @@ ChargedMelee(
             knockback: 0,
             energy_regen: 0,
         ),
-        scaled: Some(Slash(
-            damage: 20,
-            poise: 30,
-            knockback: 0,
-            energy_regen: 30,
-        )),
+        scaled: Some((
+            kind: Slash(
+                damage: 20,
+                poise: 30,
+                knockback: 0,
+                energy_regen: 30,
+            ))),
         range: 4.5,
         angle: 10.0,
         damage_effect: Some(StunnedVulnerable(0.5)),
diff --git a/assets/common/abilities/swordsimple/dash.ron b/assets/common/abilities/swordsimple/dash.ron
index 1134111589..f81c934b63 100644
--- a/assets/common/abilities/swordsimple/dash.ron
+++ b/assets/common/abilities/swordsimple/dash.ron
@@ -7,12 +7,13 @@ DashMelee(
             knockback: 8.0,
             energy_regen: 0.0,
         ),
-        scaled: Some(Stab(
-            damage: 16.0,
-            poise: 0.0,
-            knockback: 7.0,
-            energy_regen: 0.0,
-        )),
+        scaled: Some((
+            kind: Stab(
+                damage: 16.0,
+                poise: 0.0,
+                knockback: 7.0,
+                energy_regen: 0.0,
+            ))),
         range: 5.0,
         angle: 45.0,
     ),
diff --git a/assets/common/abilities/tool/golf_club/charged.ron b/assets/common/abilities/tool/golf_club/charged.ron
index ca1a5f16a8..8cc4abb1d8 100644
--- a/assets/common/abilities/tool/golf_club/charged.ron
+++ b/assets/common/abilities/tool/golf_club/charged.ron
@@ -8,12 +8,13 @@ ChargedMelee(
             knockback: 30.0,
             energy_regen: 0.0,
         ),
-        scaled: Some(Bash(
-            damage: 0.1,
-            poise: 1.0,
-            knockback: 60.0,
-            energy_regen: 0.0,
-        )),
+        scaled: Some((
+            kind: Bash(
+                damage: 0.1,
+                poise: 1.0,
+                knockback: 60.0,
+                energy_regen: 0.0,
+            ))),
         range: 5.0,
         angle: 30.0,
     ),
diff --git a/common/src/comp/ability.rs b/common/src/comp/ability.rs
index 20560ef8de..4df2698bd8 100644
--- a/common/src/comp/ability.rs
+++ b/common/src/comp/ability.rs
@@ -1917,7 +1917,7 @@ impl CharacterAbility {
                     ref mut damage,
                     ref mut knockback,
                     ..
-                }) = melee_constructor.scaled
+                }) = melee_constructor.scaled.as_mut().map(|scaled| scaled.kind)
                 {
                     if let Ok(level) = skillset.skill_level(Hammer(CDamage)) {
                         *damage *= modifiers.scaled_damage.powi(level.into());
diff --git a/common/src/comp/melee.rs b/common/src/comp/melee.rs
index ac7e77d981..f3f589efea 100644
--- a/common/src/comp/melee.rs
+++ b/common/src/comp/melee.rs
@@ -53,6 +53,15 @@ impl Component for Melee {
 fn default_simultaneous_hits() -> u32 { 1 }
 fn default_combo_gain() -> i32 { 1 }
 
+#[derive(Copy, Clone, Debug, PartialEq, Serialize, Deserialize)]
+pub struct Scaled {
+    pub kind: MeleeConstructorKind,
+    #[serde(default)]
+    pub range: f32,
+    #[serde(default)]
+    pub angle: f32,
+}
+
 #[derive(Copy, Clone, Debug, PartialEq, Serialize, Deserialize)]
 #[serde(deny_unknown_fields)]
 pub struct MeleeConstructor {
@@ -60,7 +69,7 @@ pub struct MeleeConstructor {
     /// This multiplied by a fraction is added to what is specified in `kind`.
     ///
     /// Note, that this must be the same variant as what is specified in `kind`.
-    pub scaled: Option<MeleeConstructorKind>,
+    pub scaled: Option<Scaled>,
     pub range: f32,
     pub angle: f32,
     pub multi_target: Option<MultiTarget>,
@@ -371,7 +380,7 @@ impl MeleeConstructor {
 
         if let Some(max_scale) = self.scaled {
             use MeleeConstructorKind::*;
-            let scaled = match (self.kind, max_scale) {
+            let scaled = match (self.kind, max_scale.kind) {
                 (
                     Slash {
                         damage: a_damage,
@@ -486,6 +495,8 @@ impl MeleeConstructor {
                 },
             };
             self.kind = scaled;
+            self.range = scale_values(self.range, max_scale.range);
+            self.angle = scale_values(self.angle, max_scale.angle);
             self.scaled = None;
         } else {
             dev_panic!("Attempted to scale on a melee attack that had no provided scaling value.")
@@ -498,7 +509,8 @@ impl MeleeConstructor {
         self.range *= stats.range;
         self.kind = self.kind.adjusted_by_stats(stats);
         if let Some(ref mut scaled) = &mut self.scaled {
-            *scaled = scaled.adjusted_by_stats(stats);
+            scaled.kind = scaled.kind.adjusted_by_stats(stats);
+            scaled.range *= stats.range;
         }
         self.damage_effect = self.damage_effect.map(|de| de.adjusted_by_stats(stats));
         self