Merge pull request #9459 from variableundefined/NPCPoolPort

SS Port: NPCAI & NPCPool

code/controllers/Processes/npcai.dm

@@ -2,7 +2,6 @@ var/global/datum/controller/process/npcai/npcai_master
 
 /datum/controller/process/npcai
 	var/current_cycle
-	var/saved_voice = 0
 
 /datum/controller/process/npcai/setup()
 	name = "npc ai"
@@ -36,25 +35,6 @@ var/global/datum/controller/process/npcai/npcai_master
 			catchBadType(M)
 			simple_animal_list -= M
 
-	if(ticker.current_state == GAME_STATE_FINISHED && !saved_voice)
-		var/mob/living/carbon/human/interactive/M = safepick(snpc_list)
-		if(M)
-			M.saveVoice()
-			saved_voice = 1
-
-	for(last_object in snpc_list)
-		var/mob/living/carbon/human/interactive/M = last_object
-		if(istype(M) && !QDELETED(M))
-			try
-				if(!M.alternateProcessing || M.forceProcess)
-					M.doProcess()
-			catch(var/exception/e)
-				catchException(e, M)
-			SCHECK
-		else
-			catchBadType(M)
-			snpc_list -= M
-
 	current_cycle++
 
 

code/controllers/Processes/npcpool.dm

@@ -1,119 +0,0 @@
-var/global/datum/controller/process/npcpool/npc_master
-
-/datum/controller/process/npcpool
-	var/list/canBeUsed = list()
-	var/list/canBeUsed_non = list()
-	var/list/needsDelegate = list()
-	var/list/needsAssistant = list()
-	var/list/needsHelp_non = list()
-	var/list/botPool_l = list() //list of all npcs using the pool
-	var/list/botPool_l_non = list() //list of all non SNPC mobs using the pool
-
-/datum/controller/process/npcpool/setup()
-	name = "npc pool"
-	schedule_interval = 100
-	start_delay = 17
-	log_startup_progress("NPC pool ticker starting up.")
-
-/datum/controller/process/npcpool/copyStateFrom(var/datum/controller/process/npcpool/target)
-	canBeUsed = target.canBeUsed
-	canBeUsed_non = target.canBeUsed_non
-	needsDelegate = target.needsDelegate
-	needsAssistant = target.needsAssistant
-	needsHelp_non = target.needsHelp_non
-	botPool_l = target.botPool_l
-	botPool_l_non = target.botPool_l_non
-
-
-DECLARE_GLOBAL_CONTROLLER(npcpool, npc_master)
-
-/datum/controller/process/npcpool/proc/insertBot(toInsert)
-	if(istype(toInsert, /mob/living/carbon/human/interactive))
-		botPool_l |= toInsert
-
-/datum/controller/process/npcpool/proc/removeBot(toRemove)
-	botPool_l -= toRemove
-
-/datum/controller/process/npcpool/statProcess()
-	..()
-	stat(null, "T [botPool_l.len + botPool_l_non.len] | D [needsDelegate.len] | A [needsAssistant.len + needsHelp_non.len] | U [canBeUsed.len + canBeUsed_non.len]")
-
-/datum/controller/process/npcpool/doWork()
-	//bot delegation and coordination systems
-	//General checklist/Tasks for delegating a task or coordinating it (for SNPCs)
-	// 1. Bot proximity to task target: if too far, delegate, if close, coordinate
-	// 2. Bot Health/status: check health with bots in local area, if their health is higher, delegate task to them, else coordinate
-	// 3. Process delegation: if a bot (or bots) has been delegated, assign them to the task.
-	// 4. Process coordination: if a bot(or bots) has been asked to coordinate, assign them to help.
-	// 5. Do all assignments: goes through the delegated/coordianted bots and assigns the right variables/tasks to them.
-
-	listclearnulls(canBeUsed)
-
-	//SNPC handling
-	for(var/mob/living/carbon/human/interactive/check in botPool_l)
-		if(!check)
-			botPool_l -= check
-			continue
-		var/checkInRange = view(SNPC_MAX_RANGE_FIND, check)
-		if(!(locate(check.TARGET) in checkInRange))
-			needsDelegate |= check
-
-		else if(check.IsDeadOrIncap(0))
-			needsDelegate |= check
-
-		else if(check.doing & SNPC_FIGHTING)
-			needsAssistant |= check
-
-		else
-			canBeUsed |= check
-		SCHECK
-
-	if(needsDelegate.len)
-		needsDelegate -= pick(needsDelegate) // cheapo way to make sure stuff doesn't pingpong around in the pool forever. delegation runs seperately to each loop so it will work much smoother
-
-		for(var/mob/living/carbon/human/interactive/check in needsDelegate)
-			if(!check)
-				needsDelegate -= check
-				continue
-			if(canBeUsed.len)
-				var/mob/living/carbon/human/interactive/candidate = pick(canBeUsed)
-				var/facCount = 0
-				var/helpProb = 0
-				for(var/C in check.faction)
-					for(var/D in candidate.faction)
-						if(D == C)
-							helpProb = min(100, helpProb + 25)
-						facCount++
-				if(facCount == 1 && helpProb > 0)
-					helpProb = 100
-				if(prob(helpProb))
-					if(candidate.takeDelegate(check))
-						needsDelegate -= check
-						canBeUsed -= candidate
-						candidate.change_eye_color(255, 0, 0)
-			SCHECK
-
-	if(needsAssistant.len)
-		needsAssistant -= pick(needsAssistant)
-
-		for(var/mob/living/carbon/human/interactive/check in needsAssistant)
-			if(!check)
-				needsAssistant -= check
-				continue
-			if(canBeUsed.len)
-				var/mob/living/carbon/human/interactive/candidate = pick(canBeUsed)
-				var/facCount = 0
-				var/helpProb = 0
-				for(var/C in check.faction)
-					for(var/D in candidate.faction)
-						if(D == C)
-							helpProb = min(100, helpProb + 25)
-						facCount++
-				if(facCount == 1 && helpProb > 0)
-					helpProb = 100
-				if(prob(helpProb))
-					if(candidate.takeDelegate(check, 0))
-						needsAssistant -= check
-						canBeUsed -= candidate
-						candidate.change_eye_color(255, 255, 0)
-			SCHECK

code/controllers/subsystem/npcai.dm

@@ -0,0 +1,24 @@
+SUBSYSTEM_DEF(npcai)
+    name = "NPC AI" // Simple AI controller, isolated from the SNPC one (NPCPool).
+    flags = SS_POST_FIRE_TIMING|SS_NO_INIT|SS_BACKGROUND
+    priority = FIRE_PRIORITY_NPC
+    runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME
+    var/list/simple_animal_list = list()
+
+/datum/controller/subsystem/npcai/stat_entry()
+	..("SimAnimals:[simple_animal_list.len]")
+
+/datum/controller/subsystem/npcai/fire(resumed = FALSE)
+    if(!resumed)
+        src.simple_animal_list = simple_animal_list.Copy()
+    for(var/mob/living/simple_animal/M in simple_animal_list)
+        if(istype(M) && !QDELETED(M))
+            if(!M.client && M.stat == CONSCIOUS)
+                M.process_ai() 
+            if(MC_TICK_CHECK)
+                return
+        else
+            simple_animal_list -= M
+
+/datum/controller/subsystem/npcai/Recover()
+    simple_animal_list = SSnpcai.simple_animal_list

code/controllers/subsystem/npcpool.dm

@@ -0,0 +1,127 @@
+#define PROCESSING_NPCS 0
+#define PROCESSING_DELEGATES 1
+#define PROCESSING_ASSISTANTS 2
+
+SUBSYSTEM_DEF(npcpool)
+	name = "NPC Pool"
+	flags = SS_POST_FIRE_TIMING|SS_NO_INIT|SS_BACKGROUND
+	priority = FIRE_PRIORITY_NPC
+	runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME
+
+	var/list/canBeUsed = list()
+	var/list/needsDelegate = list()
+	var/list/needsAssistant = list()
+	
+	var/list/processing = list()
+	var/list/currentrun = list()
+	var/stage
+
+/datum/controller/subsystem/npcpool/stat_entry()
+	..("NPCS:[processing.len]|D:[needsDelegate.len]|A:[needsAssistant.len]|U:[canBeUsed.len]")
+
+/datum/controller/subsystem/npcpool/proc/stop_processing(mob/living/carbon/human/interactive/I)
+	processing -= I
+	currentrun -= I
+	needsDelegate -= I
+	canBeUsed -= I
+	needsAssistant -= I
+
+/datum/controller/subsystem/npcpool/fire(resumed = FALSE)
+	//bot delegation and coordination systems
+	//General checklist/Tasks for delegating a task or coordinating it (for SNPCs)
+	// 1. Bot proximity to task target: if too far, delegate, if close, coordinate
+	// 2. Bot Health/status: check health with bots in local area, if their health is higher, delegate task to them, else coordinate
+	// 3. Process delegation: if a bot (or bots) has been delegated, assign them to the task.
+	// 4. Process coordination: if a bot(or bots) has been asked to coordinate, assign them to help.
+	// 5. Do all assignments: goes through the delegated/coordianted bots and assigns the right variables/tasks to them.
+
+	if (!resumed)
+		currentrun = processing.Copy()
+		stage = PROCESSING_NPCS
+	//cache for sanic speed (lists are references anyways)
+	var/list/cachecurrentrun = currentrun
+	var/list/cachecanBeUsed = canBeUsed
+
+	if(stage == PROCESSING_NPCS)
+		while(cachecurrentrun.len)
+			var/mob/living/carbon/human/interactive/thing = cachecurrentrun[cachecurrentrun.len]
+			--cachecurrentrun.len
+
+			thing.InteractiveProcess()
+
+			var/checkInRange = view(SNPC_MAX_RANGE_FIND,thing)
+			if(thing.IsDeadOrIncap(FALSE) || !(locate(thing.TARGET) in checkInRange))
+				needsDelegate += thing
+			else if(thing.doing & SNPC_FIGHTING)
+				needsAssistant += thing
+			else
+				cachecanBeUsed += thing
+
+			if (MC_TICK_CHECK)
+				return
+		stage = PROCESSING_DELEGATES
+		cachecurrentrun = needsDelegate	//localcache
+		currentrun = cachecurrentrun
+
+	if(stage == PROCESSING_DELEGATES)
+		while(cachecurrentrun.len && cachecanBeUsed.len)
+			var/mob/living/carbon/human/interactive/check = cachecurrentrun[cachecurrentrun.len]
+			var/mob/living/carbon/human/interactive/candidate = cachecanBeUsed[cachecanBeUsed.len]
+			--cachecurrentrun.len
+
+			var/helpProb = 0
+			var/list/chfac = check.faction
+			var/list/canfac = candidate.faction
+			var/facCount = LAZYLEN(chfac) * LAZYLEN(canfac)
+
+			for(var/C in chfac)
+				if(C in canfac)
+					helpProb = min(100,helpProb + 25)
+					if(helpProb >= 100)
+						break
+
+			if(facCount == 1 && helpProb)
+				helpProb = 100
+
+			if(prob(helpProb) && candidate.takeDelegate(check))
+				--cachecanBeUsed.len
+				candidate.change_eye_color(255, 0, 0)
+				candidate.update_icons()
+
+			if(MC_TICK_CHECK)
+				return
+		stage = PROCESSING_ASSISTANTS
+		cachecurrentrun = needsAssistant	//localcache
+		currentrun = cachecurrentrun
+
+	//no need for the stage check
+
+	while(cachecurrentrun.len && cachecanBeUsed.len)
+		var/mob/living/carbon/human/interactive/check = cachecurrentrun[cachecurrentrun.len]
+		var/mob/living/carbon/human/interactive/candidate = cachecanBeUsed[cachecanBeUsed.len]
+		--cachecurrentrun.len
+
+		var/helpProb = 0
+		var/list/chfac = check.faction
+		var/list/canfac = candidate.faction
+		var/facCount = LAZYLEN(chfac) * LAZYLEN(canfac)
+
+		for(var/C in chfac)
+			if(C in canfac)
+				helpProb = min(100,helpProb + 25)
+				if(helpProb >= 100)
+					break
+
+		if(facCount == 1 && helpProb)
+			helpProb = 100
+	
+		if(prob(helpProb) && candidate.takeDelegate(check,FALSE))
+			--cachecanBeUsed.len
+			candidate.change_eye_color(255, 255, 0)
+			candidate.update_icons()
+			
+		if(!cachecurrentrun.len || MC_TICK_CHECK)	//don't change SS state if it isn't necessary
+			return
+
+/datum/controller/subsystem/npcpool/Recover()
+	processing = SSnpcpool.processing

code/controllers/verbs.dm

@@ -85,7 +85,7 @@
 			debug_variables(SSmobs)
 			feedback_add_details("admin_verb","DMob")
 		if("NPC AI")
-			debug_variables(npcai_master)
+			debug_variables(SSnpcai)
 			feedback_add_details("admin_verb","DNPCAI")
 		if("Shuttle")
 			debug_variables(SSshuttle)

code/modules/admin/admin_verbs.dm

@@ -212,7 +212,6 @@ var/list/admin_verbs_proccall = list(
 )
 var/list/admin_verbs_snpc = list(
 	/client/proc/resetSNPC,
-	/client/proc/toggleSNPC,
 	/client/proc/customiseSNPC,
 	/client/proc/hide_snpc_verbs
 )

code/modules/mob/living/carbon/human/interactive/interactive.dm

@@ -67,14 +67,13 @@
 	//modules
 	var/list/functions = list("nearbyscan","combat","shitcurity","chatter")
 	var/restrictedJob = 0
-	var/shouldUseDynamicProc = 0 // switch to make the AI control it's own proccessing
-	var/alternateProcessing = 0
 	var/forceProcess = 0
-	var/processTime = 10
 	var/speak_file = "npc_chatter.json"
 	var/debugexamine = FALSE //If we show debug info in our examine
 	var/showexaminetext = TRUE	//If we show our telltale examine text
 
+	var/voice_saved = FALSE
+
 	var/list/knownStrings = list()
 
 	//snpc traitor variables
@@ -95,6 +94,8 @@
 		knownStrings = list()
 
 /mob/living/carbon/human/interactive/proc/saveVoice()
+	if(voice_saved)
+		return
 	var/savefile/S = new /savefile("data/npc_saves/snpc.sav")
 	S["knownStrings"] << knownStrings
 
@@ -142,7 +143,7 @@
 	doing = 0
 	inactivity_period = 0
 
-/client/proc/resetSNPC(mob/living/carbon/human/interactive/T in npc_master.botPool_l)
+/client/proc/resetSNPC(mob/living/carbon/human/interactive/T in SSnpcpool.processing)
 	set name = "Reset SNPC"
 	set desc = "Reset the SNPC"
 	set category = "Debug"
@@ -153,20 +154,7 @@
 	if(istype(T))
 		T.reset()
 
-/client/proc/toggleSNPC(mob/living/carbon/human/interactive/T in npc_master.botPool_l)
-	set name = "Toggle SNPC Proccessing Mode"
-	set desc = "Toggle SNPC Proccessing Mode"
-	set category = "Debug"
-
-	if(!holder)
-		return
-
-	if(istype(T))
-		T.alternateProcessing = !T.alternateProcessing
-		T.forceProcess = 1
-		to_chat(usr, "[T]'s processing has been switched to [T.alternateProcessing ? "High Profile" : "Low Profile"]")
-
-/client/proc/customiseSNPC(mob/living/carbon/human/interactive/T in npc_master.botPool_l)
+/client/proc/customiseSNPC(mob/living/carbon/human/interactive/T in SSnpcpool.processing)
 	set name = "Customize SNPC"
 	set desc = "Customize the SNPC"
 	set category = "Debug"
@@ -191,8 +179,12 @@
 		T.myjob = cjob
 		T.job = cjob.title
 		T.mind.assigned_role = cjob.title
-		for(var/obj/item/W in T)
-			qdel(W)
+		for(var/obj/item/I in T)
+			if(istype(I, /obj/item/implant))
+				continue
+			if(istype(I, /obj/item/organ))
+				continue
+			qdel(I)
 		T.myjob.equip(T)
 		T.doSetup(alt_title)
 
@@ -316,6 +308,12 @@
 	if(TRAITS & TRAIT_THIEVING)
 		slyness = 75
 
+/mob/living/carbon/human/interactive/proc/InteractiveProcess()
+	if(ticker.current_state == GAME_STATE_FINISHED)
+		saveVoice()
+		voice_saved = TRUE
+	doProcess()
+
 /mob/living/carbon/human/interactive/proc/setup_job(thejob)
 	switch(thejob)
 		if("Civilian")
@@ -419,7 +417,7 @@
 	sync_mind()
 	random()
 	doSetup()
-	npc_master.insertBot(src)
+	START_PROCESSING(SSnpcpool, src)
 	loadVoice()
 	hear_radio_list += src
 
@@ -432,9 +430,7 @@
 	doProcess()
 
 /mob/living/carbon/human/interactive/Destroy()
-	hear_radio_list -= src
-	snpc_list -= src
-	npc_master.removeBot(src)
+	SSnpcpool.stop_processing(src)
 	return ..()
 
 /mob/living/carbon/human/interactive/proc/retalTarget(mob/living/target)
@@ -595,17 +591,7 @@
 	..()
 
 /mob/living/carbon/human/interactive/proc/doProcess()
-	forceProcess = 0
-
-	if(shouldUseDynamicProc)
-		var/isSeen = 0
-		for(var/mob/living/carbon/human/A in orange(12, src))
-			if(A.client)
-				isSeen = 1
-		alternateProcessing = isSeen
-		if(alternateProcessing)
-			forceProcess = 1
-
+	set waitfor = FALSE
 	if(IsDeadOrIncap())
 		reset()
 		return
@@ -633,10 +619,13 @@
 							if(istype(D,/obj/machinery/door/airlock))
 								var/obj/machinery/door/airlock/AL = D
 								if(!AL.CanAStarPass(RPID)) // only crack open doors we can't get through
+									inactivity_period = 20
 									AL.panel_open = 1
 									AL.update_icon()
 									AL.shock(src, mistake_chance)
 									sleep(5)
+									if(QDELETED(AL))
+										return
 									AL.unlock()
 									if(prob(mistake_chance))
 										if(!AL.wires.IsIndexCut(AIRLOCK_WIRE_DOOR_BOLTS))
@@ -653,6 +642,8 @@
 									if(prob(mistake_chance) && !AL.wires.IsIndexCut(AIRLOCK_WIRE_ELECTRIFY))
 										AL.wires.CutWireIndex(AIRLOCK_WIRE_ELECTRIFY)
 									sleep(5)
+									if(QDELETED(AL))
+										return
 									AL.panel_open = 0
 									AL.update_icon()
 							D.open()
@@ -686,7 +677,7 @@
 	//proc functions
 	for(var/Proc in functions)
 		if(!IsDeadOrIncap())
-			callfunction(Proc)
+			INVOKE_ASYNC(src, Proc)
 
 
 	//target interaction stays hardcoded
@@ -700,8 +691,8 @@
 		if(istype(TARGET, /obj/machinery/door))
 			var/obj/machinery/door/D = TARGET
 			if(D.check_access(MYID) && !istype(D,/obj/machinery/door/poddoor))
+				inactivity_period = 10
 				D.open()
-				sleep(15)
 				var/turf/T = get_step(get_step(D.loc, dir), dir) //recursion yo
 				tryWalk(T)
 		//THIEVING SKILLS
@@ -725,15 +716,8 @@
 					insert_into_backpack()
 		//---------FASHION
 		if(istype(TARGET, /obj/item/clothing))
-			var/obj/item/clothing/C = TARGET
 			drop_item()
-			spawn(5)
-				take_to_slot(C,1)
-				if(!equip_to_appropriate_slot(C))
-					var/obj/item/I = get_item_by_slot(C)
-					unEquip(I)
-					spawn(5)
-						equip_to_appropriate_slot(C)
+			dressup(TARGET)
 			update_hands = 1
 			if(MYPDA in loc)
 				equip_to_appropriate_slot(MYPDA)
@@ -790,9 +774,19 @@
 			TARGET = traitorTarget
 		tryWalk(TARGET)
 	LAST_TARGET = TARGET
-	if(alternateProcessing)
-		spawn(processTime)
-			doProcess()
+
+/mob/living/carbon/human/interactive/proc/dressup(obj/item/clothing/C)
+	set waitfor = FALSE
+	inactivity_period = 12
+	sleep(5)
+	if(!QDELETED(C) && !QDELETED(src))
+		take_to_slot(C,1)
+		if(!equip_to_appropriate_slot(C))
+			var/obj/item/I = get_item_by_slot(C)
+			unEquip(I)
+			sleep(5)
+			if(!QDELETED(src) && !QDELETED(C))
+				equip_to_appropriate_slot(C)
 
 /mob/living/carbon/human/interactive/proc/favouredObjIn(list/inList)
 	var/list/outList = list()
@@ -804,10 +798,6 @@
 		outList = inList
 	return outList
 
-/mob/living/carbon/human/interactive/proc/callfunction(Proc)
-	spawn(0)
-		call(src, Proc)(src)
-
 /mob/living/carbon/human/interactive/proc/tryWalk(turf/inTarget)
 	if(restrictedJob) // we're a job that has to stay in our home
 		if(!(get_turf(inTarget) in get_area_turfs(job2area(myjob))))

paradise.dme

@@ -195,7 +195,6 @@
 #include "code\controllers\Processes\fast_process.dm"
 #include "code\controllers\Processes\lighting.dm"
 #include "code\controllers\Processes\npcai.dm"
-#include "code\controllers\Processes\npcpool.dm"
 #include "code\controllers\Processes\obj.dm"
 #include "code\controllers\Processes\ticker.dm"
 #include "code\controllers\ProcessScheduler\core\process.dm"
@@ -209,6 +208,8 @@
 #include "code\controllers\subsystem\nano_mob_hunter.dm"
 #include "code\controllers\subsystem\nanoui.dm"
 #include "code\controllers\subsystem\nightshift.dm"
+#include "code\controllers\subsystem\npcai.dm"
+#include "code\controllers\subsystem\npcpool.dm"
 #include "code\controllers\subsystem\shuttles.dm"
 #include "code\controllers\subsystem\spacedrift.dm"
 #include "code\controllers\subsystem\sun.dm"