cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-11 18:33:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

try recent round removal again

Browse Source
This commit is contained in:
Putnam
2020-01-01 00:26:55 -08:00
parent 42347fd5ea
commit 6bbdd5d576
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/controllers/subsystem/persistence.dm
View File

@@ -13,7 +13,7 @@ SUBSYSTEM_DEF(persistence)
var/list/saved_messages = list() var/list/saved_messages = list()
var/list/saved_modes = list(1,2,3) var/list/saved_modes = list(1,2,3)
var/list/saved_dynamic_rules = list(list(),list(),list()) var/list/saved_dynamic_rules = list(list(),list(),list())
var/list/saved_storytellers = list("foo","bar","baz") var/list/saved_storytellers = list("foo","bar","baz","foo again")
var/list/saved_maps var/list/saved_maps
var/list/saved_trophies = list() var/list/saved_trophies = list()
var/list/spawned_objects = list() var/list/spawned_objects = list()
@@ -410,6 +410,7 @@ SUBSYSTEM_DEF(persistence)
WRITE_FILE(json_file, json_encode(file_data)) WRITE_FILE(json_file, json_encode(file_data))
/datum/controller/subsystem/persistence/proc/CollectStoryteller(var/datum/game_mode/dynamic/mode) /datum/controller/subsystem/persistence/proc/CollectStoryteller(var/datum/game_mode/dynamic/mode)
saved_storytellers[4] = saved_storytellers[3]
saved_storytellers[3] = saved_storytellers[2] saved_storytellers[3] = saved_storytellers[2]
saved_storytellers[2] = saved_storytellers[1] saved_storytellers[2] = saved_storytellers[1]
saved_storytellers[1] = mode.storyteller.name saved_storytellers[1] = mode.storyteller.name

9
code/controllers/subsystem/vote.dm
View File

@@ -377,8 +377,13 @@ SUBSYSTEM_DEF(vote)
if("dynamic") if("dynamic")
for(var/T in config.storyteller_cache) for(var/T in config.storyteller_cache)
var/datum/dynamic_storyteller/S = T var/datum/dynamic_storyteller/S = T
choices.Add(initial(S.name)) var/recent_rounds = 0
choice_descs.Add(initial(S.desc)) for(var/i in SSpersistence.saved_storytellers.len)
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") choices.Add("Secret")
choice_descs.Add("Standard secret. Switches mode if it wins.") choice_descs.Add("Standard secret. Switches mode if it wins.")
if("custom") if("custom")