Expanding mob controller handler-directing logic.

Author: MistakeNot4892

code/datums/ai/_ai.dm

@@ -2,7 +2,7 @@
  *
  * 1. AI should not implement any bespoke mob logic within the proc it uses
  *    to trigger or respond to game events. It should share entrypoints with
- *    action performed by players and should respect the same intents, etc.
+ *    actions performed by players and should respect the same intents, etc.
  *    that players have to manage, through the same procs players use. This
  *    should mean that players can be slotted into the pilot seat of any mob,
  *    suspending AI behavior, and should then be able to freely use any of the
@@ -79,6 +79,9 @@
 	/// How long minimum between scans.
 	var/target_scan_delay = 1 SECOND
 
+	/// Last mob to attempt to handle this mob.
+	var/weakref/last_handler
+
 /datum/mob_controller/New(var/mob/living/target_body)
 	body = target_body
 	if(expected_type && !istype(body, expected_type))
@@ -215,4 +218,21 @@
 	if(!scary_grabber)
 		return
 	if(spooked_by_grab && !is_friend(scary_grabber))
-		retaliate(scary_grabber)
+		retaliate(scary_grabber)
+
+// General stubs for when another mob has directed this mob to attack.
+/datum/mob_controller/proc/check_handler_can_order(mob/handler, atom/target, intent_flags)
+	return is_friend(handler)
+
+/datum/mob_controller/proc/process_handler_target(mob/handler, atom/target, intent_flags)
+	if(!check_handler_can_order(handler, target, intent_flags))
+		return process_handler_failure(handler, target)
+	last_handler = weakref(handler)
+	return TRUE
+
+/datum/mob_controller/proc/process_handler_failure(mob/handler, atom/target)
+	return FALSE
+
+/datum/mob_controller/proc/process_holder_interaction(mob/handler)
+	last_handler = weakref(handler)
+	return body?.attack_hand_with_interaction_checks(handler)

code/datums/ai/hunter.dm

@@ -36,51 +36,55 @@
 /datum/mob_controller/passive/hunter/get_target(atom/new_target)
 	if(isnull(hunt_target))
 		return null
-	var/mob/living/prey = hunt_target.resolve()
+	var/atom/prey = hunt_target.resolve()
 	if(!istype(prey) || QDELETED(prey))
 		set_target(null)
 		return null
 	return prey
 
 /datum/mob_controller/passive/hunter/set_target(atom/new_target)
-	if(isnull(new_target) || isliving(new_target))
-		hunt_target = new_target ? weakref(new_target) : null
-		return TRUE
-	return FALSE
+	hunt_target = new_target ? weakref(new_target) : null
+	return TRUE
 
 /datum/mob_controller/passive/hunter/do_process(time_elapsed)
-
 	if(!(. = ..()))
 		return
-
 	if(body.incapacitated() || body.current_posture?.prone || body.buckled || flee_target || !get_target())
 		return
+	process_hunting(get_target())
+
+/datum/mob_controller/passive/hunter/proc/process_hunting(atom/target)
 
-	var/mob/living/target = get_target()
 	if(!istype(target) || QDELETED(target) || !(target in view(body)))
 		set_target(null)
 		resume_wandering()
-		return
+		return FALSE
 
 	// Find or pursue the target.
 	if(!body.Adjacent(target))
 		stop_wandering()
 		body.start_automove(target)
-		return
+		return FALSE
 
-	// Hunt/consume the target.
-	if(target.stat != DEAD)
-		try_attack_prey(target)
+	if(!ismob(target))
+		return TRUE // Indicates a valid target that this base proc does not handle.
 
-	if(QDELETED(target))
+	// Hunt/consume the target.
+	. = FALSE // we handle mobs already
+	var/mob/prey = target
+	if(prey.stat != DEAD && (!is_friend(prey) || !handle_friend_hunting(prey)))
+		try_attack_prey(prey)
+	if(QDELETED(prey))
 		set_target(null)
 		resume_wandering()
 		return
-
-	if(target.stat != DEAD)
+	if(prey.stat != DEAD)
 		return
-
 	// Eat the mob.
 	set_target(null)
 	resume_wandering()
-	consume_prey(target)
+	consume_prey(prey)
+
+// Stub for hawks to return to their handler and dock with the mothership.
+/datum/mob_controller/passive/hunter/proc/handle_friend_hunting(mob/friend)
+	return FALSE

code/modules/mob/grab/simple/simple_control.dm

@@ -38,13 +38,13 @@
 
 // Override these for mobs that will respond to instructions from a rider.
 /mob/living/proc/handle_rider_harm_order(mob/user, atom/target, proximity)
-	return FALSE
+	return istype(ai) ? ai.process_handler_target(user, target, I_FLAG_HARM) : FALSE
 
 /mob/living/proc/handle_rider_grab_order(mob/user, atom/target, proximity)
-	return FALSE
+	return istype(ai) ? ai.process_handler_target(user, target, I_FLAG_GRAB) : FALSE
 
 /mob/living/proc/handle_rider_disarm_order(mob/user, atom/target, proximity)
-	return FALSE
+	return istype(ai) ? ai.process_handler_target(user, target, I_FLAG_DISARM) : FALSE
 
 /mob/living/proc/handle_rider_help_order(mob/user, atom/target, proximity)
-	return FALSE
+	return istype(ai) ? ai.process_handler_target(user, target, I_FLAG_HELP) : FALSE

code/modules/mob/living/simple_animal/hostile/slug.dm

@@ -35,10 +35,11 @@
 /mob/living/simple_animal/hostile/slug/proc/check_friendly_species(var/mob/living/M)
 	return istype(M) && M.faction == faction
 
-/mob/living/simple_animal/hostile/slug/get_scooped(var/mob/living/target, var/mob/living/initiator)
+/mob/living/simple_animal/hostile/slug/get_scooped(mob/living/target, mob/living/initiator, silent = FALSE)
 	if(target == initiator || check_friendly_species(initiator))
 		return ..()
-	to_chat(initiator, SPAN_WARNING("\The [src] wriggles out of your hands before you can pick it up!"))
+	if(!silent)
+		to_chat(initiator, SPAN_WARNING("\The [src] wriggles out of your hands before you can pick it up!"))
 
 /mob/living/simple_animal/hostile/slug/proc/attach(var/mob/living/human/H)
 	var/obj/item/clothing/suit/space/S = H.get_covering_equipped_item_by_zone(BP_CHEST)

code/modules/mob/skills/skillset.dm

@@ -37,7 +37,7 @@ var/global/list/all_skill_verbs
 	for(var/datum/skill_buff/SB in skill_buffs)
 		. += SB.buffs[skill_path]
 
-/datum/skillset/proc/obtain_from_mob(mob/mob)
+/datum/skillset/proc/obtain_from_mob(mob/living/mob)
 	if(!istype(mob) || !skills_transferable || !mob.skillset.skills_transferable)
 		return
 	skill_list = mob.skillset.skill_list

code/modules/mob_holder/holder_mobs.dm

@@ -11,7 +11,7 @@
 	return species.get_holder_color(src)
 
 //Mob procs for scooping up
-/mob/living/proc/get_scooped(var/mob/living/target, var/mob/living/initiator)
+/mob/living/proc/get_scooped(mob/living/target, mob/living/initiator, silent = FALSE)
 
 	if(!holder_type || buckled || LAZYLEN(pinned))
 		return FALSE
@@ -23,20 +23,24 @@
 	H.w_class = get_object_size()
 	if(initiator == src)
 		if(!target.equip_to_slot_if_possible(H, slot_back_str, del_on_fail=0, disable_warning=1))
-			to_chat(initiator, SPAN_WARNING("You can't climb onto [target]!"))
+			if(!silent)
+				to_chat(initiator, SPAN_WARNING("You can't climb onto [target]!"))
 			return FALSE
-		to_chat(target, SPAN_NOTICE("\The [src] clambers onto you!"))
-		to_chat(initiator, SPAN_NOTICE("You climb up onto \the [target]!"))
+		if(!silent)
+			to_chat(target, SPAN_NOTICE("\The [src] clambers onto you!"))
+			to_chat(initiator, SPAN_NOTICE("You climb up onto \the [target]!"))
 	else
 		if(!ai?.scooped_by(initiator))
 			return FALSE // The AI canceled the scooping.
 
 		if(!target.put_in_hands(H))
-			to_chat(initiator, SPAN_WARNING("Your hands are full!"))
+			if(!silent)
+				to_chat(initiator, SPAN_WARNING("Your hands are full!"))
 			return FALSE
 
-		to_chat(initiator, SPAN_NOTICE("You scoop up \the [src]!"))
-		to_chat(src, SPAN_NOTICE("\The [initiator] scoops you up!"))
+		if(!silent)
+			to_chat(initiator, SPAN_NOTICE("You scoop up \the [src]!"))
+			to_chat(src, SPAN_NOTICE("\The [initiator] scoops you up!"))
 
 	forceMove(H)
 	reset_offsets(0)