OK this time for sure

cmss13-devs · Oct 28, 2023 · 21a2468 · 21a2468
1 parent 089b8b6
commit 21a2468
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 19 deletions.
diff --git a/code/__DEFINES/dcs/signals/atom/mob/living/signals_xeno.dm b/code/__DEFINES/dcs/signals/atom/mob/living/signals_xeno.dm
@@ -66,5 +66,8 @@
 /// From /mob/living/carbon/xenomorph/proc/handle_crit()
 #define COMSIG_XENO_HANDLE_CRIT "xeno_handle_crit"
 
+/// From /datum/action/xeno_action/activable/pounce/use_ability()
+#define COMSIG_XENO_USED_POUNCE "xeno_used_pounce"
+
 /// From /mob/living/carbon/xenomorph/proc/handle_ai_shot()
 #define COMSIG_XENO_HANDLE_AI_SHOT "xeno_handle_ai_shot"
diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/general_powers.dm b/code/modules/mob/living/carbon/xenomorph/abilities/general_powers.dm
@@ -448,6 +448,8 @@
 
 	X.launch_towards(LM)
 
+	SEND_SIGNAL(owner, COMSIG_XENO_USED_POUNCE, A)
+
 	X.update_icons()
 
 	additional_effects_always()

diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/lurker/lurker_abilities.dm b/code/modules/mob/living/carbon/xenomorph/abilities/lurker/lurker_abilities.dm
@@ -30,10 +30,6 @@
 			if (istype(lurker_invis))
 				lurker_invis.invisibility_off()
 
-		var/datum/xeno_ai_movement/linger/lurking/AI = xeno.ai_movement_handler
-		if (AI && istype(AI))
-			AI.stop_lurking()
-
 /datum/action/xeno_action/activable/pounce/lurker/additional_effects(mob/living/L)
 	var/mob/living/carbon/xenomorph/X = owner
 	if (!istype(X))

diff --git a/code/modules/mob/living/carbon/xenomorph/ai/movement/lurking.dm b/code/modules/mob/living/carbon/xenomorph/ai/movement/lurking.dm
@@ -27,6 +27,8 @@
 
 	RegisterSignal(parent, COMSIG_XENO_HANDLE_AI_SHOT, PROC_REF(stop_lurking))
 	RegisterSignal(parent, COMSIG_XENO_HANDLE_CRIT, PROC_REF(stop_lurking))
+	RegisterSignal(parent, COMSIG_XENO_USED_POUNCE, PROC_REF(stop_lurking))
+
 	addtimer(CALLBACK(src, PROC_REF(check_annoyance)), AI_CHECK_ANNOYANCE_COOLDOWN, TIMER_UNIQUE|TIMER_LOOP|TIMER_DELETE_ME)
 
 #undef AI_CHECK_ANNOYANCE_COOLDOWN
@@ -176,14 +178,14 @@
 #undef LURKER_BAITS_BEFORE_AMBUSH
 
 /datum/xeno_ai_movement/linger/lurking/proc/interact_random(mob/living/carbon/xenomorph/X)
-	for(var/obj/O in orange(1, X))
-		if(istype(O, /obj/structure/window_frame))
+	for(var/obj/potential_interaction in orange(1, X))
+		if(istype(potential_interaction, /obj/structure/window_frame))
 			continue
-		if(istype(O, /obj/structure/pipes))
+		if(istype(potential_interaction, /obj/structure/pipes))
 			continue
-		if(istype(O, /obj/structure/sign))
+		if(istype(potential_interaction, /obj/structure/sign))
 			continue
-		if(!O.xeno_ai_act(X))
+		if(!potential_interaction.xeno_ai_act(X))
 			continue
 		return TRUE
 	return FALSE
@@ -199,6 +201,8 @@
 	register_turf_signals()
 	ai_lurking = TRUE
 
+	RegisterSignal(parent, COMSIG_MOVABLE_MOVED, PROC_REF(lurking_parent_moved))
+
 	var/datum/action/xeno_action/activable/pounce/lurker/LPA = get_xeno_action_by_type(lurking_xeno, /datum/action/xeno_action/activable/pounce/lurker)
 	if(LPA && istype(LPA))
 		LPA.knockdown = TRUE
@@ -215,13 +219,19 @@
 	unregister_turf_signals()
 	ai_lurking = FALSE
 
+	UnregisterSignal(parent, COMSIG_MOVABLE_MOVED)
+
 	INVOKE_ASYNC(lurking_xeno, TYPE_PROC_REF(/mob, stop_pulling))
 
 /datum/xeno_ai_movement/linger/lurking/proc/register_turf_signals()
-	for(var/turf/open/cycled_open_turf in view(5, parent))
+	for(var/turf/open/cycled_open_turf in view(world.view, parent))
 		RegisterSignal(cycled_open_turf, COMSIG_TURF_ENTERED, PROC_REF(set_target))
 		registered_turfs += cycled_open_turf
 
+		var/mob/living/carbon/human/possible_target = locate() in cycled_open_turf
+		if(possible_target)
+			parent.current_target = possible_target
+
 /datum/xeno_ai_movement/linger/lurking/proc/unregister_turf_signals()
 	for(var/turf/open/cycled_open_turf in registered_turfs)
 		UnregisterSignal(cycled_open_turf, COMSIG_TURF_ENTERED)
@@ -235,3 +245,9 @@
 		return
 
 	lurking_xeno.current_target = entering_atom
+
+/datum/xeno_ai_movement/linger/lurking/proc/lurking_parent_moved(atom/movable/moving_atom, atom/oldloc, direction, Forced)
+	SIGNAL_HANDLER
+
+	unregister_turf_signals()
+	register_turf_signals()
diff --git a/code/modules/mob/living/carbon/xenomorph/ai/xeno_ai.dm b/code/modules/mob/living/carbon/xenomorph/ai/xeno_ai.dm
@@ -37,11 +37,11 @@ GLOBAL_LIST_INIT(ai_target_limbs, list(
 	return new /datum/xeno_ai_movement(src)
 
 /mob/living/carbon/xenomorph/proc/handle_ai_shot(obj/projectile/P)
+	SEND_SIGNAL(src, COMSIG_XENO_HANDLE_AI_SHOT, P)
+
 	if(current_target || !P.firer)
 		return
 
-	SEND_SIGNAL(src, COMSIG_XENO_HANDLE_AI_SHOT, P)
-
 	var/distance = get_dist(src, P.firer)
 	if(distance > max_travel_distance)
 		return

diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Lurker.dm b/code/modules/mob/living/carbon/xenomorph/castes/Lurker.dm
@@ -77,12 +77,6 @@
 /mob/living/carbon/xenomorph/lurker/init_movement_handler()
 	return new /datum/xeno_ai_movement/linger/lurking(src)
 
-/mob/living/carbon/xenomorph/lurker/handle_ai_shot(obj/projectile/P)
-	if(prob(LURKING_IGNORE_SHOT_CHANCE))
-		return
-
-	. = ..()
-
 /mob/living/carbon/xenomorph/lurker/ai_move_target(delta_time)
 	if(throwing)
 		return

diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm
@@ -1025,7 +1025,8 @@
 
 	bullet_message(P) //Message us about the bullet, since damage was inflicted.
 
-
+	if(mob_flags & AI_CONTROLLED)
+		handle_ai_shot(P)
 
 	if(SEND_SIGNAL(src, COMSIG_XENO_BULLET_ACT, damage_result, ammo_flags, P) & COMPONENT_CANCEL_BULLET_ACT)
 		return