From 63112c2f492ff1880413123d31fddede039d5ec4 Mon Sep 17 00:00:00 2001
From: Putnam <putnam3145@gmail.com>
Date: Wed, 25 Dec 2019 18:30:25 -0800
Subject: [PATCH] while we're at it let's make it work for all of 'em

---
 code/__DEFINES/citadel_defines.dm                   | 1 -
 code/controllers/subsystem/persistence.dm           | 2 +-
 code/controllers/subsystem/vote.dm                  | 9 ++++-----
 code/game/gamemodes/dynamic/dynamic_storytellers.dm | 9 ++++++---
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/code/__DEFINES/citadel_defines.dm b/code/__DEFINES/citadel_defines.dm
index a1763ccd6f..4ad6acb4e3 100644
--- a/code/__DEFINES/citadel_defines.dm
+++ b/code/__DEFINES/citadel_defines.dm
@@ -127,4 +127,3 @@
 
 // Dynamic storyteller stuff (see above, move later)
 #define NO_ASSASSIN		(1<<0)
-#define EXTREME_ROUND	(1<<1)
diff --git a/code/controllers/subsystem/persistence.dm b/code/controllers/subsystem/persistence.dm
index dca2dfe581..330f17eba4 100644
--- a/code/controllers/subsystem/persistence.dm
+++ b/code/controllers/subsystem/persistence.dm
@@ -13,7 +13,7 @@ SUBSYSTEM_DEF(persistence)
 	var/list/saved_messages = list()
 	var/list/saved_modes = list(1,2,3)
 	var/list/saved_dynamic_rules = list(list(),list(),list())
-	var/list/saved_storytellers = list("extended","chaotic","secret")
+	var/list/saved_storytellers = list("foo","bar","baz")
 	var/list/saved_maps
 	var/list/saved_trophies = list()
 	var/list/spawned_objects = list()
diff --git a/code/controllers/subsystem/vote.dm b/code/controllers/subsystem/vote.dm
index 29962d5f29..0828c3b196 100644
--- a/code/controllers/subsystem/vote.dm
+++ b/code/controllers/subsystem/vote.dm
@@ -329,11 +329,10 @@ SUBSYSTEM_DEF(vote)
 				for(var/T in config.storyteller_cache)
 					var/datum/dynamic_storyteller/S = T
 					var/recent_rounds = 0
-					if(initial(S.flags) & EXTREME_ROUND)
-						for(var/i in 1 to 3)
-							if(SSpersistence.saved_storytellers[i] == initial(S.name))
-								recent_rounds++
-					if(recent_rounds<2)
+					for(var/i in 1 to 3)
+						if(SSpersistence.saved_storytellers[i] == initial(S.name))
+							recent_rounds++
+					if(recent_rounds<initial(S.weight))
 						choices.Add(initial(S.name))
 						choice_descs.Add(initial(S.desc))
 				choices.Add("Secret")
diff --git a/code/game/gamemodes/dynamic/dynamic_storytellers.dm b/code/game/gamemodes/dynamic/dynamic_storytellers.dm
index d97fdecd89..03cd81428d 100644
--- a/code/game/gamemodes/dynamic/dynamic_storytellers.dm
+++ b/code/game/gamemodes/dynamic/dynamic_storytellers.dm
@@ -6,6 +6,7 @@
 	var/curve_width = 1.8
 	var/forced_threat_level = -1
 	var/flags = 0
+	var/weight = 3 // how many rounds need to have been recently played for this storyteller to be left out of the vote
 	var/datum/game_mode/dynamic/mode = null
 
 /**
@@ -155,8 +156,8 @@ Property weights are:
 	name = "Chaotic"
 	curve_centre = 10
 	desc = "Chaos: high. Variation: high. Likely antags: clock cult, revs, wizard."
-	flags = EXTREME_ROUND
 	property_weights = list("extended" = -1, "chaos" = 10)
+	weight = 1
 	var/refund_cooldown
 	
 /datum/dynamic_storyteller/cowabunga/get_midround_cooldown()
@@ -176,6 +177,7 @@ Property weights are:
 	desc = "Chaos: high. Variation: low. Likely antags: nukies, clockwork cult, wizard, blob, xenomorph."
 	curve_centre = 2
 	curve_width = 1.5
+	weight = 2
 	property_weights = list("valid" = 3, "trust" = 5)
 
 /datum/dynamic_storyteller/team/get_injection_chance()
@@ -204,13 +206,14 @@ Property weights are:
 	curve_centre = -5
 	curve_width = 0.5
 	flags = NO_ASSASSIN
-	property_weights = list("extended" = 5, "chaos" = -1, "valid" = -1, "story_potential" = 1, "conversion" = -10)
+	weight = 2
+	property_weights = list("extended" = 1, "chaos" = -1, "valid" = -1, "story_potential" = 1, "conversion" = -10)
 
 /datum/dynamic_storyteller/extended
 	name = "Extended"
 	desc = "Chaos: none. Variation: none. Likely antags: none."
 	curve_centre = -20
-	flags = EXTREME_ROUND
+	weight = 1
 	curve_width = 0.5
 
 /datum/dynamic_storyteller/extended/on_start()