From 53288d0b224ba667a780448fe7735b1526b64c67 Mon Sep 17 00:00:00 2001
From: flo <sunflowerstarfishmail@gmail.com>
Date: Sat, 3 Jun 2023 14:04:10 +0000
Subject: [PATCH] npc_attack_tweaks

---
 .../common/abilities/custom/cardinal/summondagonites.ron  | 2 +-
 assets/common/abilities/custom/cyclops/reinforce.ron      | 4 ++--
 assets/common/abilities/custom/dagon/steamheal.ron        | 2 +-
 assets/common/abilities/custom/dullahan/knife_rain.ron    | 2 +-
 server/agent/src/attack.rs                                | 8 ++++++--
 5 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/assets/common/abilities/custom/cardinal/summondagonites.ron b/assets/common/abilities/custom/cardinal/summondagonites.ron
index be27b5f88f..0ee53972b0 100644
--- a/assets/common/abilities/custom/cardinal/summondagonites.ron
+++ b/assets/common/abilities/custom/cardinal/summondagonites.ron
@@ -2,7 +2,7 @@ BasicSummon(
     buildup_duration: 0.2,
     cast_duration: 0.3,
     recover_duration: 0.3,
-    summon_amount: 1,
+    summon_amount: 2,
     summon_distance: (4, 4),
     summon_info: (
         body: Arthropod((
diff --git a/assets/common/abilities/custom/cyclops/reinforce.ron b/assets/common/abilities/custom/cyclops/reinforce.ron
index 110363697e..ae0a710608 100644
--- a/assets/common/abilities/custom/cyclops/reinforce.ron
+++ b/assets/common/abilities/custom/cyclops/reinforce.ron
@@ -3,7 +3,7 @@ SelfBuff(
     cast_duration: 0.8,
     recover_duration: 0.3,
     buff_kind: ProtectingWard,
-    buff_strength: 2.0,
-    buff_duration: Some(300.0),
+    buff_strength: 0.7,
+    buff_duration: Some(25.0),
     energy_cost: 0,
 )
\ No newline at end of file
diff --git a/assets/common/abilities/custom/dagon/steamheal.ron b/assets/common/abilities/custom/dagon/steamheal.ron
index ab485cae77..efdec29b4f 100644
--- a/assets/common/abilities/custom/dagon/steamheal.ron
+++ b/assets/common/abilities/custom/dagon/steamheal.ron
@@ -6,7 +6,7 @@ BasicAura(
     auras: [
         (
             kind: Regeneration,
-            strength: 10.0,
+            strength: 18.0,
             duration: Some(5),
             category: Magical,
         ),
diff --git a/assets/common/abilities/custom/dullahan/knife_rain.ron b/assets/common/abilities/custom/dullahan/knife_rain.ron
index 8ecba1eb09..e1400df253 100644
--- a/assets/common/abilities/custom/dullahan/knife_rain.ron
+++ b/assets/common/abilities/custom/dullahan/knife_rain.ron
@@ -11,7 +11,7 @@ BasicRanged(
     ),
     projectile_body: Object(SpectralSwordSmall),
     projectile_speed: 20.0,
-    num_projectiles: 36,
+    num_projectiles: 12,
     projectile_spread: 0.4,
     move_efficiency: 0.3,
 )
\ No newline at end of file
diff --git a/server/agent/src/attack.rs b/server/agent/src/attack.rs
index a3a37c9cc6..6803d4eaba 100644
--- a/server/agent/src/attack.rs
+++ b/server/agent/src/attack.rs
@@ -4287,8 +4287,12 @@ impl<'a> AgentData<'a> {
                 controller.push_basic_input(InputKind::Ability(1));
             }
         } else if attack_data.dist_sqrd > (4.0 * attack_data.min_attack_dist).powi(2) {
-            // if enemy is far, heal
-            controller.push_basic_input(InputKind::Ability(2));
+            // if enemy is far, heal and shoot bombs
+            if agent.action_state.timers[ActionStateTimers::TimerDagon as usize] > 2.0 {
+                controller.push_basic_input(InputKind::Primary);
+            } else {
+                controller.push_basic_input(InputKind::Ability(2));
+            }
             agent.action_state.timers[ActionStateTimers::TimerDagon as usize] += read_data.dt.0;
         } else if entities_have_line_of_sight(
             self.pos,