From 7e7bfa00e4d6feb449e491896744e4ca63b90e24 Mon Sep 17 00:00:00 2001
From: uniior <uniior73141@protonmail.com>
Date: Fri, 16 Feb 2024 22:27:33 -0300
Subject: [PATCH] Further tweaks from testing

---
 .../abilities/custom/quadlowbasic/triplestrike.ron     |  2 +-
 assets/common/abilities/custom/quadmedquick/dash.ron   |  2 +-
 .../abilities/custom/quadmedquick/triplestrike.ron     |  4 ++--
 .../abilities/custom/theropodbasic/singlestrike.ron    |  4 ++--
 .../abilities/custom/theropodbasic/triplestrike.ron    | 10 +++++-----
 .../abilities/custom/treant_sapling/shockwave.ron      |  6 +++---
 common/src/comp/body.rs                                | 10 ++++++++--
 7 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/assets/common/abilities/custom/quadlowbasic/triplestrike.ron b/assets/common/abilities/custom/quadlowbasic/triplestrike.ron
index cd51e687ac..5743aeed47 100644
--- a/assets/common/abilities/custom/quadlowbasic/triplestrike.ron
+++ b/assets/common/abilities/custom/quadlowbasic/triplestrike.ron
@@ -44,7 +44,7 @@ ComboMelee2(
             melee_constructor: (
                 kind: Bash(
                     damage: 28,
-                    poise: 28,
+                    poise: 36,
                     knockback: 3,
                     energy_regen: 0,
                 ),
diff --git a/assets/common/abilities/custom/quadmedquick/dash.ron b/assets/common/abilities/custom/quadmedquick/dash.ron
index f321a029a6..72621d3e24 100644
--- a/assets/common/abilities/custom/quadmedquick/dash.ron
+++ b/assets/common/abilities/custom/quadmedquick/dash.ron
@@ -2,7 +2,7 @@ DashMelee(
     energy_cost: 0,
     melee_constructor: (
         kind: Bash(
-            damage: 11.0,
+            damage: 10.0,
             poise: 20.0,
             knockback: 3.0,
             energy_regen: 0.0,
diff --git a/assets/common/abilities/custom/quadmedquick/triplestrike.ron b/assets/common/abilities/custom/quadmedquick/triplestrike.ron
index d272cfbd7a..dd5a8e0d60 100644
--- a/assets/common/abilities/custom/quadmedquick/triplestrike.ron
+++ b/assets/common/abilities/custom/quadmedquick/triplestrike.ron
@@ -3,7 +3,7 @@ ComboMelee2(
         (
             melee_constructor: (
                 kind: Bash(
-                    damage: 14,
+                    damage: 12,
                     poise: 12,
                     knockback: 5,
                     energy_regen: 0,
@@ -23,7 +23,7 @@ ComboMelee2(
         (
             melee_constructor: (
                 kind: Bash(
-                    damage: 14,
+                    damage: 12,
                     poise: 12,
                     knockback: 5,
                     energy_regen: 0,
diff --git a/assets/common/abilities/custom/theropodbasic/singlestrike.ron b/assets/common/abilities/custom/theropodbasic/singlestrike.ron
index 359b06a123..3ef22732b1 100644
--- a/assets/common/abilities/custom/theropodbasic/singlestrike.ron
+++ b/assets/common/abilities/custom/theropodbasic/singlestrike.ron
@@ -11,10 +11,10 @@ ComboMelee2(
                 range: 5.5,
                 angle: 60.0,
             ),
-            buildup_duration: 0.7,
+            buildup_duration: 0.6,
             swing_duration: 0.2,
             hit_timing: 0.5,
-            recover_duration: 0.5,
+            recover_duration: 0.4,
             movement: (
                 swing: Some(Forward(0.25)),
             ),
diff --git a/assets/common/abilities/custom/theropodbasic/triplestrike.ron b/assets/common/abilities/custom/theropodbasic/triplestrike.ron
index 23ae53e49d..ebde387580 100644
--- a/assets/common/abilities/custom/theropodbasic/triplestrike.ron
+++ b/assets/common/abilities/custom/theropodbasic/triplestrike.ron
@@ -11,10 +11,10 @@ ComboMelee2(
                 range: 5.0,
                 angle: 45.0,
             ),
-            buildup_duration: 0.8,
+            buildup_duration: 0.9,
             swing_duration: 0.15,
             hit_timing: 0.5,
-            recover_duration: 0.1,
+            recover_duration: 0.3,
             movement: (
                 swing: Some(Forward(0.2)),
             ),
@@ -31,10 +31,10 @@ ComboMelee2(
                 range: 5.0,
                 angle: 45.0,
             ),
-            buildup_duration: 0.25,
+            buildup_duration: 0.6,
             swing_duration: 0.2,
             hit_timing: 0.5,
-            recover_duration: 0.3,
+            recover_duration: 0.4,
             movement: (
                 swing: Some(Forward(0.3)),
             ),
@@ -51,7 +51,7 @@ ComboMelee2(
                 range: 5.5,
                 angle: 30.0,
             ),
-            buildup_duration: 0.65,
+            buildup_duration: 0.7,
             swing_duration: 0.25,
             hit_timing: 0.5,
             recover_duration: 1.1,
diff --git a/assets/common/abilities/custom/treant_sapling/shockwave.ron b/assets/common/abilities/custom/treant_sapling/shockwave.ron
index fc24a584a2..899a073ff1 100644
--- a/assets/common/abilities/custom/treant_sapling/shockwave.ron
+++ b/assets/common/abilities/custom/treant_sapling/shockwave.ron
@@ -1,6 +1,6 @@
 Shockwave(
     energy_cost: 0.0,
-    buildup_duration: 2.3,
+    buildup_duration: 1.6,
     swing_duration: 0.1,
     recover_duration: 2.3,
     damage: 8.0,
@@ -8,8 +8,8 @@ Shockwave(
     knockback: ( strength: 5.0, direction: Away),
     shockwave_angle: 360.0,
     shockwave_vertical_angle: 90.0,
-    shockwave_speed: 32.5,
-    shockwave_duration: 0.4,
+    shockwave_speed: 10,
+    shockwave_duration: 1.3,
     dodgeable: Jump,
     move_efficiency: 0.1,
     damage_kind: Crushing,
diff --git a/common/src/comp/body.rs b/common/src/comp/body.rs
index a5296d5dd7..cc8e5ed7ce 100644
--- a/common/src/comp/body.rs
+++ b/common/src/comp/body.rs
@@ -1208,8 +1208,14 @@ impl Body {
                 quadruped_small::Species::Axolotl | quadruped_small::Species::Gecko => 0.6,
                 _ => 1.0,
             },
-            Body::FishMedium(_) => 0.6,
-            Body::FishSmall(_) => 0.6,
+            Body::FishMedium(b) => match b.species {
+                fish_medium::Species::Marlin | fish_medium::Species::Icepike => 0.6,
+                _ => 1.0,
+            },
+            Body::FishSmall(b) => match b.species {
+                fish_small::Species::Clownfish | fish_small::Species::Piranha => 0.6,
+                _ => 1.0,
+            },
             #[allow(unreachable_patterns)] // TODO: Remove when more crustacean species are added
             Body::Crustacean(b) => match b.species {
                 crustacean::Species::Crab => 0.6,