Dynamic

2021-09-14 19:33:17 -04:00
parent 32675f611a
commit 7ed5f622f4
30 changed files with 1833 additions and 2592 deletions
@@ -41,7 +41,6 @@
 		CRASH("/datum/controller/configuration/Load() called more than once!")
 	InitEntries()
 	LoadModes()
-	storyteller_cache = typecacheof(/datum/dynamic_storyteller, TRUE)
 	if(fexists("[directory]/config.txt") && LoadEntries("config.txt") <= 1)
 		var/list/legacy_configs = list("game_options.txt", "dbconfig.txt", "comms.txt")
 		for(var/I in legacy_configs)
@@ -373,52 +372,6 @@ Example config:
 			return new T
 	return new /datum/game_mode/extended()

-/// For dynamic.
-/datum/controller/configuration/proc/pick_storyteller(storyteller_name)
-	for(var/T in storyteller_cache)
-		var/datum/dynamic_storyteller/S = T
-		var/name = initial(S.name)
-		if(name && name == storyteller_name)
-			return T
-	return /datum/dynamic_storyteller/classic
-
-/// Same with this
-/datum/controller/configuration/proc/get_runnable_storytellers()
-	var/list/datum/dynamic_storyteller/runnable_storytellers = new
-	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)
-		if(!config_tag)
-			continue
-		var/probability = (config_tag in probabilities) ? probabilities[config_tag] : initial(S.weight)
-		var/min_players = (config_tag in min_player_counts) ? min_player_counts[config_tag] : initial(S.min_players)
-		if(probability <= 0)
-			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_threat + 50 < min_chaos)
-				continue
-			if(SSpersistence.average_threat + 50 > 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)
-			var/adjustment = 0
-			while(recent_round)
-				adjustment += repeated_mode_adjust[recent_round]
-				recent_round = SSpersistence.saved_modes.Find(name,recent_round+1,0)
-			probability *= max(0,((100-adjustment)/100))
-		runnable_storytellers[S] = probability
-	return runnable_storytellers
-
 /datum/controller/configuration/proc/get_runnable_modes()
 	var/list/datum/game_mode/runnable_modes = new
 	var/list/probabilities = Get(/datum/config_entry/keyed_list/probability)
@@ -5,24 +5,18 @@
 	var/list/saved_modes = list(1,2,3)
 	var/list/saved_chaos = list(5,5,5)
 	var/list/saved_dynamic_rules = list(list(),list(),list())
-	var/list/saved_storytellers = list("foo","bar","baz")
 	var/average_threat = 50
 	var/list/saved_maps

 /datum/controller/subsystem/persistence/SaveServerPersistence()
 	. = ..()
 	CollectRoundtype()
-	if(istype(SSticker.mode, /datum/game_mode/dynamic))
-		var/datum/game_mode/dynamic/mode = SSticker.mode
-		CollectStoryteller(mode)
-		CollectRulesets(mode)
 	RecordMaps()

 /datum/controller/subsystem/persistence/LoadServerPersistence()
 	. = ..()
 	LoadRecentModes()
 	LoadRecentChaos()
-	LoadRecentStorytellers()
 	LoadRecentRulesets()
 	LoadRecentMaps()

@@ -45,30 +39,6 @@
 	fdel(json_file)
 	WRITE_FILE(json_file, json_encode(file_data))

-/datum/controller/subsystem/persistence/proc/CollectStoryteller(var/datum/game_mode/dynamic/mode)
-	saved_storytellers.len = 3
-	saved_storytellers[3] = saved_storytellers[2]
-	saved_storytellers[2] = saved_storytellers[1]
-	saved_storytellers[1] = mode.storyteller.name
-	var/json_file = file("data/RecentStorytellers.json")
-	var/list/file_data = list()
-	file_data["data"] = saved_storytellers
-	fdel(json_file)
-	WRITE_FILE(json_file, json_encode(file_data))
-
-/datum/controller/subsystem/persistence/proc/CollectRulesets(var/datum/game_mode/dynamic/mode)
-	saved_dynamic_rules[3] = saved_dynamic_rules[2]
-	saved_dynamic_rules[2] = saved_dynamic_rules[1]
-	saved_dynamic_rules[1] = list()
-	for(var/r in mode.executed_rules)
-		var/datum/dynamic_ruleset/rule = r
-		saved_dynamic_rules[1] += rule.config_tag
-	var/json_file = file("data/RecentRulesets.json")
-	var/list/file_data = list()
-	file_data["data"] = saved_dynamic_rules
-	fdel(json_file)
-	WRITE_FILE(json_file, json_encode(file_data))
-
 /datum/controller/subsystem/persistence/proc/RecordMaps()
 	saved_maps = saved_maps?.len ? list("[SSmapping.config.map_name]") | saved_maps : list("[SSmapping.config.map_name]")
 	var/json_file = file("data/RecentMaps.json")
@@ -107,15 +77,6 @@
 		return
 	saved_dynamic_rules = json["data"]

-/datum/controller/subsystem/persistence/proc/LoadRecentStorytellers()
-	var/json_file = file("data/RecentStorytellers.json")
-	if(!fexists(json_file))
-		return
-	var/list/json = json_decode(file2text(json_file))
-	if(!json)
-		return
-	saved_storytellers = json["data"]
-
 /datum/controller/subsystem/persistence/proc/LoadRecentMaps()
 	var/json_file = file("data/RecentMaps.json")
 	if(!fexists(json_file))
@@ -354,19 +354,6 @@ SUBSYSTEM_DEF(vote)
 					if(stored_modetier_results[score_name] <= raw_score_numbers[CONFIG_GET(number/dropped_modes)])
 						stored_modetier_results -= score_name
 				stored_modetier_results += "traitor"
-			if("dynamic")
-				if(SSticker.current_state > GAME_STATE_PREGAME)//Don't change the mode if the round already started.
-					return message_admins("A vote has tried to change the gamemode, but the game has already started. Aborting.")
-				var/list/runnable_storytellers = config.get_runnable_storytellers()
-				var/datum/dynamic_storyteller/picked
-				for(var/T in runnable_storytellers)
-					var/datum/dynamic_storyteller/S = T
-					if(stored_gamemode_votes[initial(S.name)] == 1 && CHECK_BITFIELD(initial(S.flags), FORCE_IF_WON))
-						picked = S
-					runnable_storytellers[S] *= round(stored_gamemode_votes[initial(S.name)]*100000,1)
-				if(!picked)
-					picked = pickweight(runnable_storytellers, 0)
-				GLOB.dynamic_storyteller_type = picked
 			if("map")
 				var/datum/map_config/VM = config.maplist[.]
 				message_admins("The map has been voted for and will change to: [VM.map_name]")
@@ -492,15 +479,6 @@ SUBSYSTEM_DEF(vote)
 						modes_to_add -= tag
 				modes_to_add -= "traitor" // makes it so that traitor is always available
 				choices.Add(modes_to_add)
-			if("dynamic")
-				GLOB.master_mode = "dynamic"
-				var/list/probabilities = CONFIG_GET(keyed_list/storyteller_weight)
-				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)
-						choices.Add(initial(S.name))
-						choice_descs.Add(initial(S.desc))
 			if("custom")
 				question = stripped_input(usr,"What is the vote for?")
 				if(!question)