Merge remote-tracking branch 'origin/master' into semi-sync

code/controllers/configuration/configuration.dm

@@ -388,6 +388,8 @@ Example config:
 	var/list/probabilities = Get(/datum/config_entry/keyed_list/storyteller_weight)
 	var/list/repeated_mode_adjust = Get(/datum/config_entry/number_list/repeated_mode_adjust)
 	var/list/min_player_counts = Get(/datum/config_entry/keyed_list/storyteller_min_players)
+	var/list/storyteller_min_chaos = Get(/datum/config_entry/keyed_list/storyteller_min_chaos)
+	var/list/storyteller_max_chaos = Get(/datum/config_entry/keyed_list/storyteller_max_chaos)
 	for(var/T in storyteller_cache)
 		var/datum/dynamic_storyteller/S = T
 		var/config_tag = initial(S.config_tag)
@@ -399,6 +401,13 @@ Example config:
 			continue
 		if(length(GLOB.player_list) < min_players)
 			continue
+		if(!Get(/datum/config_entry/flag/no_storyteller_threat_removal))
+			var/min_chaos = (probabilities in storyteller_min_chaos) ? storyteller_min_chaos[config_tag] : initial(S.min_chaos)
+			var/max_chaos = (probabilities in storyteller_max_chaos) ? storyteller_max_chaos[config_tag] : initial(S.max_chaos)
+			if(SSpersistence.average_dynamic_threat < min_chaos)
+				continue
+			if(SSpersistence.average_dynamic_threat > max_chaos)
+				continue
 		if(SSpersistence.saved_storytellers.len == repeated_mode_adjust.len)
 			var/name = initial(S.name)
 			var/recent_round = min(SSpersistence.saved_storytellers.Find(name),3)

code/controllers/configuration/entries/dynamic.dm

@@ -1,5 +1,7 @@
 /datum/config_entry/flag/dynamic_voting
 
+/datum/config_entry/flag/no_storyteller_threat_removal
+
 /datum/config_entry/number/dynamic_high_pop_limit
 	config_entry_value = 55
 	min_val = 1
@@ -67,6 +69,9 @@
 /datum/config_entry/number/dynamic_third_rule_high_pop_requirement
 	config_entry_value = 70
 
+/datum/config_entry/number/dynamic_threat_baseline
+	config_entry_value = 50
+
 /datum/config_entry/number_list/dynamic_hijack_requirements
 
 /datum/config_entry/number/dynamic_hijack_high_population_requirement
@@ -74,7 +79,7 @@
 
 /datum/config_entry/number/dynamic_hijack_cost
 	config_entry_value = 5
-	
+
 /datum/config_entry/number/dynamic_glorious_death_cost
 	config_entry_value = 5
 
@@ -96,3 +101,11 @@
 /datum/config_entry/keyed_list/storyteller_min_players
 	key_mode = KEY_MODE_TEXT
 	value_mode = VALUE_MODE_NUM
+
+/datum/config_entry/keyed_list/storyteller_min_chaos
+	key_mode = KEY_MODE_TEXT
+	value_mode = VALUE_MODE_NUM
+
+/datum/config_entry/keyed_list/storyteller_max_chaos
+	key_mode = KEY_MODE_TEXT
+	value_mode = VALUE_MODE_NUM

code/controllers/subsystem/input.dm

@@ -98,6 +98,7 @@ SUBSYSTEM_DEF(input)
 		var/client/C = clients[i]
 		C.keyLoop()
 
+#define NONSENSICAL_VERB "NONSENSICAL_VERB_THAT_DOES_NOTHING"
 /// *sigh
 /client/verb/NONSENSICAL_VERB_THAT_DOES_NOTHING()
 	set name = "NONSENSICAL_VERB_THAT_DOES_NOTHING"

code/controllers/subsystem/persistence.dm

@@ -422,7 +422,7 @@ SUBSYSTEM_DEF(persistence)
 	saved_storytellers[3] = saved_storytellers[2]
 	saved_storytellers[2] = saved_storytellers[1]
 	saved_storytellers[1] = mode.storyteller.name
-	average_dynamic_threat = (mode.threat_average + average_dynamic_threat) / 2
+	average_dynamic_threat = (mode.max_threat + average_dynamic_threat) / 2
 	var/json_file = file("data/RecentStorytellers.json")
 	var/list/file_data = list()
 	file_data["data"] = saved_storytellers + average_dynamic_threat

code/controllers/subsystem/vote.dm

@@ -492,7 +492,7 @@ SUBSYSTEM_DEF(vote)
 			if("dynamic")
 				GLOB.master_mode = "dynamic"
 				var/list/probabilities = CONFIG_GET(keyed_list/storyteller_weight)
-				for(var/T in config.storyteller_cache)
+				for(var/T in config.get_runnable_storytellers())
 					var/datum/dynamic_storyteller/S = T
 					var/probability = ((initial(S.config_tag) in probabilities) ? probabilities[initial(S.config_tag)] : initial(S.weight))
 					if(probability > 0)