From e052c7b51631db959d6ff69a767dbc1ab11575eb Mon Sep 17 00:00:00 2001
From: Sam <samuelkeiffer@gmail.com>
Date: Fri, 16 Apr 2021 14:54:46 -0400
Subject: [PATCH] Cleave functional

---
 .../abilities/custom/minotaur/charge.ron      |  6 ++--
 .../abilities/custom/minotaur/cleave.ron      | 30 +++++++++----------
 .../custom/minotaur/cripplingstrike.ron       |  2 +-
 3 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/assets/common/abilities/custom/minotaur/charge.ron b/assets/common/abilities/custom/minotaur/charge.ron
index 6563de650a..1d0836bfed 100644
--- a/assets/common/abilities/custom/minotaur/charge.ron
+++ b/assets/common/abilities/custom/minotaur/charge.ron
@@ -1,12 +1,12 @@
 DashMelee(
     energy_cost: 0,
-    base_damage: 500,
-    scaled_damage: 2000,
+    base_damage: 300,
+    scaled_damage: 1200,
     base_poise_damage: 25,
     scaled_poise_damage: 100,
     base_knockback: 10.0,
     scaled_knockback: 30.0,
-    range: 7.5,
+    range: 5.0,
     angle: 90.0,
     energy_drain: 0,
     forward_speed: 5.0,
diff --git a/assets/common/abilities/custom/minotaur/cleave.ron b/assets/common/abilities/custom/minotaur/cleave.ron
index 6563de650a..486ffed3fb 100644
--- a/assets/common/abilities/custom/minotaur/cleave.ron
+++ b/assets/common/abilities/custom/minotaur/cleave.ron
@@ -1,19 +1,17 @@
-DashMelee(
+ChargedMelee(
     energy_cost: 0,
-    base_damage: 500,
-    scaled_damage: 2000,
-    base_poise_damage: 25,
-    scaled_poise_damage: 100,
-    base_knockback: 10.0,
-    scaled_knockback: 30.0,
-    range: 7.5,
-    angle: 90.0,
     energy_drain: 0,
-    forward_speed: 5.0,
-    buildup_duration: 0.4,
-    charge_duration: 4.0,
-    swing_duration: 0.1,
+    initial_damage: 200,
+    scaled_damage: 800,
+    initial_poise_damage: 50,
+    scaled_poise_damage: 150,
+    initial_knockback: 0.0,
+    scaled_knockback: 0.0,
+    range: 5.0,
+    max_angle: 45.0,
+    speed: 1.0,
+    charge_duration: 2.0,
+    swing_duration: 0.2,
+    hit_timing: 0.8,
     recover_duration: 0.5,
-    infinite_charge: false,
-    is_interruptible: false,
-)
\ No newline at end of file
+)
diff --git a/assets/common/abilities/custom/minotaur/cripplingstrike.ron b/assets/common/abilities/custom/minotaur/cripplingstrike.ron
index fbc946b9ed..8376a1f147 100644
--- a/assets/common/abilities/custom/minotaur/cripplingstrike.ron
+++ b/assets/common/abilities/custom/minotaur/cripplingstrike.ron
@@ -5,7 +5,7 @@ BasicMelee(
     recover_duration: 0.6,
     base_damage: 250.0,
     base_poise_damage: 60.0,
-    knockback: 25.0,
+    knockback: 15.0,
     range: 5.0,
     max_angle: 90.0,
     damage_effect: Some(Buff((