Delegate buried larva joins to only hive cores/pops when there is a q…

…ueue
cmss13-devs · Sep 25, 2023 · 84d4dc1 · 84d4dc1
1 parent bb0e93f
commit 84d4dc1
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 11 deletions.
diff --git a/code/__HELPERS/game.dm b/code/__HELPERS/game.dm
@@ -294,6 +294,8 @@
 	if(sorted && length(candidates))
 		candidates = sort_list(candidates, GLOBAL_PROC_REF(cmp_obs_larvaqueuetime_asc))
 
+	GLOB.xeno_queue_candidate_count = length(candidates)
+
 	return candidates
 
 /**

diff --git a/code/_globalvars/misc.dm b/code/_globalvars/misc.dm
@@ -27,3 +27,6 @@ GLOBAL_VAR_INIT(time_offset, setup_offset())
 /// Sets the offset 2 lines above.
 /proc/setup_offset()
 	return rand(10 MINUTES, 24 HOURS)
+
+/// The last count of possible candidates in the xeno larva queue (updated via get_alien_candidates)
+GLOBAL_VAR(xeno_queue_candidate_count)
diff --git a/code/game/gamemodes/cm_initialize.dm b/code/game/gamemodes/cm_initialize.dm
@@ -356,17 +356,21 @@ Additional game mode variables.
 		else
 			available_xenos_non_ssd += cur_xeno
 
-	var/datum/hive_status/hive
-	for(var/hivenumber in GLOB.hive_datum)
-		hive = GLOB.hive_datum[hivenumber]
-		if(!hive.hardcore && hive.stored_larva && (hive.hive_location || (world.time < XENO_BURIED_LARVA_TIME_LIMIT + SSticker.round_start_time)))
-			if(SSticker.mode && (SSticker.mode.flags_round_type & MODE_RANDOM_HIVE))
-				available_xenos |= "any buried larva"
-				LAZYADD(available_xenos["any buried larva"], hive)
-			else
-				var/larva_option = "buried larva ([hive])"
-				available_xenos += larva_option
-				available_xenos[larva_option] = list(hive)
+	// Only offer buried larva if there is no queue:
+	// This basically means this block of code will almost never execute, because we are instead relying on the hive cores/larva pops to handle their larva
+	// Technically this should be after a get_alien_candidates() call to be accurate, but we are intentionally trying to not call that proc as much as possible
+	if(GLOB.xeno_queue_candidate_count < 1)
+		var/datum/hive_status/hive
+		for(var/hivenumber in GLOB.hive_datum)
+			hive = GLOB.hive_datum[hivenumber]
+			if(!hive.hardcore && hive.stored_larva && (hive.hive_location || (world.time < XENO_BURIED_LARVA_TIME_LIMIT + SSticker.round_start_time)))
+				if(SSticker.mode && (SSticker.mode.flags_round_type & MODE_RANDOM_HIVE))
+					available_xenos |= "any buried larva"
+					LAZYADD(available_xenos["any buried larva"], hive)
+				else
+					var/larva_option = "buried larva ([hive])"
+					available_xenos += larva_option
+					available_xenos[larva_option] = list(hive)
 
 	if(!available_xenos.len || (instant_join && !available_xenos_non_ssd.len))
 		if(!xeno_candidate.client || !xeno_candidate.client.prefs || !(xeno_candidate.client.prefs.be_special & BE_ALIEN_AFTER_DEATH))