From 770d95ce8316314c7845a21a9e2eb042897b34ff Mon Sep 17 00:00:00 2001 From: Putnam Date: Sun, 20 Oct 2019 19:05:24 -0700 Subject: [PATCH] rename indifferent to balanced also, remember ur spaces --- code/controllers/subsystem/vote.dm | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/code/controllers/subsystem/vote.dm b/code/controllers/subsystem/vote.dm index 23d4d3f134..937889ca2c 100644 --- a/code/controllers/subsystem/vote.dm +++ b/code/controllers/subsystem/vote.dm @@ -126,8 +126,8 @@ SUBSYSTEM_DEF(vote) #define PEACE2 "Very calm" #define PEACE1 "Somewhat calm" -#define INDIFFERENT "Balanced" -#define CHAOS1"Somewhat chaotic" +#define BALANCED "Balanced" +#define CHAOS1 "Somewhat chaotic" #define CHAOS2 "Very chaotic" /datum/controller/subsystem/vote/proc/result() @@ -159,7 +159,7 @@ SUBSYSTEM_DEF(vote) if(GLOB.dynamic_forced_extended) return message_admins("Dynamic extended has been voted for.") var/mean = (choices["extended"]*-2+choices[PEACE2]*-2+choices[PEACE1]*-1+choices[CHAOS1]*1+choices[CHAOS2]*2)/voted.len - var/variance=(((-2-mean)**2)*choices["extended"]+((-2-mean)**2)*choices[PEACE2]+((-1-mean)**2)*choices[PEACE1]+((0-mean)**2)*choices[INDIFFERENT]+((1-mean)**2)*choices[CHAOS1]+((2-mean)**2)*choices[CHAOS2])/voted.len //Sorry. Im sorry. Im trying to remove it + var/variance=(((-2-mean)**2)*choices["extended"]+((-2-mean)**2)*choices[PEACE2]+((-1-mean)**2)*choices[PEACE1]+((0-mean)**2)*choices[BALANCED]+((1-mean)**2)*choices[CHAOS1]+((2-mean)**2)*choices[CHAOS2])/voted.len //Sorry. Im sorry. Im trying to remove it GLOB.dynamic_curve_centre = mean*(5/2) GLOB.dynamic_curve_width = max(variance,0.5) message_admins("Dynamic curve centre set to [GLOB.dynamic_curve_centre] and width set to [GLOB.dynamic_curve_width]") @@ -231,7 +231,7 @@ SUBSYSTEM_DEF(vote) if("roundtype") //CIT CHANGE - adds the roundstart secret/extended vote choices.Add("secret", "extended") if("dynamic") - choices.Add("extended",PEACE2,PEACE1,INDIFFERENT,CHAOS1,CHAOS2) + choices.Add("extended",PEACE2,PEACE1,BALANCED,CHAOS1,CHAOS2) if("custom") question = stripped_input(usr,"What is the vote for?") if(!question) @@ -389,3 +389,9 @@ SUBSYSTEM_DEF(vote) var/datum/player_details/P = GLOB.player_details[owner.ckey] if(P) P.player_actions -= src + +#undef PEACE2 +#undef PEACE1 +#undef BALANCED +#undef CHAOS1 +#undef CHAOS2