From 607109e0d2cf269d7450f1ae4aef738c8f4935f3 Mon Sep 17 00:00:00 2001 From: Putnam Date: Wed, 1 Jan 2020 12:29:13 -0800 Subject: [PATCH] also added individual ballot gathering --- code/controllers/subsystem/persistence.dm | 1 + code/controllers/subsystem/vote.dm | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/code/controllers/subsystem/persistence.dm b/code/controllers/subsystem/persistence.dm index e2893eea0e..2fe741d39a 100644 --- a/code/controllers/subsystem/persistence.dm +++ b/code/controllers/subsystem/persistence.dm @@ -410,6 +410,7 @@ SUBSYSTEM_DEF(persistence) WRITE_FILE(json_file, json_encode(file_data)) /datum/controller/subsystem/persistence/proc/CollectStoryteller(var/datum/game_mode/dynamic/mode) + saved_storytellers.len = 5 saved_storytellers[5] = saved_storytellers[4] saved_storytellers[4] = saved_storytellers[3] saved_storytellers[3] = saved_storytellers[2] diff --git a/code/controllers/subsystem/vote.dm b/code/controllers/subsystem/vote.dm index 0b1ea5bcf1..ddb0b9d040 100644 --- a/code/controllers/subsystem/vote.dm +++ b/code/controllers/subsystem/vote.dm @@ -142,8 +142,14 @@ SUBSYSTEM_DEF(vote) scores_by_choice[choice] = list() for(var/ckey in voted) var/list/this_vote = voted[ckey] + var/list/pretty_vote = list() for(var/choice in this_vote) sorted_insert(scores_by_choice[choice],this_vote[choice],/proc/cmp_numeric_asc) + // START BALLOT GATHERING + pretty_vote += choice + pretty_vote[choice] = GLOB.vote_score_options[this_vote[choice]] + SSblackbox.record_feedback("associative","voting_ballots",1,pretty_vote) + // END BALLOT GATHERING for(var/score_name in scores_by_choice) var/list/score = scores_by_choice[score_name] for(var/indiv_score in score) @@ -381,7 +387,7 @@ SUBSYSTEM_DEF(vote) for(var/i in SSpersistence.saved_storytellers.len) if(SSpersistence.saved_storytellers[i] == initial(S.name)) recent_rounds++ - if(recent_rounds