From b0b114a7f81dc25f07c38da6d8752184d0b2e7a2 Mon Sep 17 00:00:00 2001 From: Sam Date: Fri, 26 Mar 2021 12:48:25 -0400 Subject: [PATCH] Balance tweaks --- .../abilities/unique/mindflayer/cursedflames.ron | 4 ++-- .../abilities/unique/mindflayer/necroticvortex.ron | 4 ++-- .../abilities/unique/mindflayer/summonminions.ron | 2 +- server/src/sys/agent.rs | 12 +++++++----- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/assets/common/abilities/unique/mindflayer/cursedflames.ron b/assets/common/abilities/unique/mindflayer/cursedflames.ron index e21bb2df3e..e98d16a0c8 100644 --- a/assets/common/abilities/unique/mindflayer/cursedflames.ron +++ b/assets/common/abilities/unique/mindflayer/cursedflames.ron @@ -1,10 +1,10 @@ BasicBeam( - buildup_duration: 0.50, + buildup_duration: 0.40, recover_duration: 0.50, beam_duration: 1.0, damage: 350, tick_rate: 0.9, - range: 20.0, + range: 22.0, max_angle: 15.0, damage_effect: Some(Buff(( kind: Cursed, diff --git a/assets/common/abilities/unique/mindflayer/necroticvortex.ron b/assets/common/abilities/unique/mindflayer/necroticvortex.ron index c17a9ea1d5..6587188b25 100644 --- a/assets/common/abilities/unique/mindflayer/necroticvortex.ron +++ b/assets/common/abilities/unique/mindflayer/necroticvortex.ron @@ -1,11 +1,11 @@ SpinMelee( - buildup_duration: 0.6, + buildup_duration: 0.5, swing_duration: 0.2, recover_duration: 0.6, base_damage: 70.0, base_poise_damage: 0.0, knockback: ( strength: 8.0, direction: Towards), - range: 15.0, + range: 17.5, damage_effect: Some(Lifesteal(1.0)), energy_cost: 0.0, is_infinite: true, diff --git a/assets/common/abilities/unique/mindflayer/summonminions.ron b/assets/common/abilities/unique/mindflayer/summonminions.ron index 1fa5d704e5..d26ecb51a4 100644 --- a/assets/common/abilities/unique/mindflayer/summonminions.ron +++ b/assets/common/abilities/unique/mindflayer/summonminions.ron @@ -9,7 +9,7 @@ BasicSummon( body_type: Male, )), scale: None, - health_scaling: 30, + health_scaling: 80, loadout_config: Some(Husk), skillset_config: None, ), diff --git a/server/src/sys/agent.rs b/server/src/sys/agent.rs index 7f701516cb..47c84f8624 100644 --- a/server/src/sys/agent.rs +++ b/server/src/sys/agent.rs @@ -2202,12 +2202,14 @@ impl<'a> AgentData<'a> { } }, Tactic::Mindflayer => { - const MINDFLAYER_ATTACK_DIST: f32 = 15.0; - const MINION_SUMMON_THRESHOLD: f32 = 0.25; + const MINDFLAYER_ATTACK_DIST: f32 = 17.5; + const MINION_SUMMON_THRESHOLD: f32 = 0.20; let health_fraction = self.health.map_or(0.5, |h| h.fraction()); - // Extreme hack to set action_timer to 1 at start of combat - if agent.action_timer < 0.01 && health_fraction > 0.5 { - agent.action_timer = 1.0 - MINION_SUMMON_THRESHOLD; + // Extreme hack to set action_timer at start of combat + if agent.action_timer < MINION_SUMMON_THRESHOLD + && health_fraction > MINION_SUMMON_THRESHOLD + { + agent.action_timer = health_fraction - MINION_SUMMON_THRESHOLD; } let mindflayer_is_far = dist_sqrd > MINDFLAYER_ATTACK_DIST.powi(2); if agent.action_timer > health_fraction {