From f27d66020f0affa6b745b647d04ee987c8450b4f Mon Sep 17 00:00:00 2001 From: Ben10Omintrix <138636438+Ben10Omintrix@users.noreply.github.com> Date: Tue, 23 Apr 2024 05:20:30 +0200 Subject: [PATCH] fixes brimdemon AI (and some other mobs) (#82831) ## About The Pull Request i noticed brimdemons werent attacking when i tried investigating the problem i saw it extends to other mobs ## Why It's Good For The Game brimdemons, as well as other mobs, will behave normally ## Changelog :cl: fix: brimdemons (and other mobs) will act normally /:cl: --- code/__DEFINES/ai/ai.dm | 2 +- .../ai/basic_mobs/basic_subtrees/attack_adjacent_target.dm | 2 +- .../modules/mob/living/basic/lavaland/brimdemon/brimdemon_ai.dm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/__DEFINES/ai/ai.dm b/code/__DEFINES/ai/ai.dm index b558da5ce07..2f567be2d57 100644 --- a/code/__DEFINES/ai/ai.dm +++ b/code/__DEFINES/ai/ai.dm @@ -31,7 +31,7 @@ ///Finish the behavior successfully #define AI_BEHAVIOR_SUCCEEDED (1<<1) ///Finish the behavior unsuccessfully -#define AI_BEHAVIOR_FAILED (1<<1) +#define AI_BEHAVIOR_FAILED (1<<2) #define AI_BEHAVIOR_INSTANT (NONE) diff --git a/code/datums/ai/basic_mobs/basic_subtrees/attack_adjacent_target.dm b/code/datums/ai/basic_mobs/basic_subtrees/attack_adjacent_target.dm index 2558fadcc0a..8effc7a0fa7 100644 --- a/code/datums/ai/basic_mobs/basic_subtrees/attack_adjacent_target.dm +++ b/code/datums/ai/basic_mobs/basic_subtrees/attack_adjacent_target.dm @@ -29,4 +29,4 @@ if(!atom_pawn.CanReach(controller.blackboard[target_key])) return AI_BEHAVIOR_INSTANT | AI_BEHAVIOR_SUCCEEDED . = ..() - return . | AI_BEHAVIOR_DELAY | AI_BEHAVIOR_SUCCEEDED + return AI_BEHAVIOR_DELAY | AI_BEHAVIOR_SUCCEEDED diff --git a/code/modules/mob/living/basic/lavaland/brimdemon/brimdemon_ai.dm b/code/modules/mob/living/basic/lavaland/brimdemon/brimdemon_ai.dm index 382ed9d780e..98025373b41 100644 --- a/code/modules/mob/living/basic/lavaland/brimdemon/brimdemon_ai.dm +++ b/code/modules/mob/living/basic/lavaland/brimdemon/brimdemon_ai.dm @@ -43,5 +43,5 @@ /datum/ai_behavior/targeted_mob_ability/brimbeam/perform(seconds_per_tick, datum/ai_controller/controller, ability_key, target_key) var/mob/living/target = controller.blackboard[target_key] if (QDELETED(target) || !(get_dir(controller.pawn, target) in GLOB.cardinals) || get_dist(controller.pawn, target) > max_target_distance) - return AI_BEHAVIOR_INSTANT | AI_BEHAVIOR_FAILED + return AI_BEHAVIOR_DELAY | AI_BEHAVIOR_FAILED return ..()