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-10 01:49:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

make it calm vs chaotic again.

Browse Source
This commit is contained in:
Putnam
2019-11-07 16:41:51 -08:00
parent 1a2d21d897
commit 1df51d29f1
1 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -124,8 +124,7 @@ SUBSYSTEM_DEF(vote)
message_admins(admintext) message_admins(admintext)
return . return .
#define EXTENDED "calm" #define PEACE "calm"
#define PEACE "balanced"
#define CHAOS "chaotic" #define CHAOS "chaotic"
/datum/controller/subsystem/vote/proc/result() /datum/controller/subsystem/vote/proc/result()
@@ -156,13 +155,9 @@ SUBSYSTEM_DEF(vote)
GLOB.master_mode = "dynamic" GLOB.master_mode = "dynamic"
if(voted.len==0) if(voted.len==0)
return message_admins("Nobody voted in the dynamic vote; using default dynamic settings.") return message_admins("Nobody voted in the dynamic vote; using default dynamic settings.")
GLOB.dynamic_forced_extended = choices["extended"]/voted.len > 0.5 var/mean = (choices[PEACE]*-1+choices[CHAOS])/voted.len
if(GLOB.dynamic_forced_extended)
to_chat(world,"<span class='boldannounce'>Dynamic extended has been voted for.</span>")
return message_admins("Dynamic extended has been voted for.")
var/mean = (choices["extended"]*-1+choices[PEACE]*-1+choices[CHAOS])/voted.len
GLOB.dynamic_curve_centre = mean*20 GLOB.dynamic_curve_centre = mean*20
var/magic_curve_constant = (4-(abs((choices[PEACE]+choices["extended"])-choices[CHAOS])/(voted.len)))*4 //magic as hell. var/magic_curve_constant = (4-(abs((choices[PEACE])-choices[CHAOS])/(voted.len)))*4 //magic as hell.
GLOB.dynamic_curve_width = CLAMP(magic_curve_constant,0.5,4) GLOB.dynamic_curve_width = CLAMP(magic_curve_constant,0.5,4)
to_chat(world,"<span class='boldannounce'>Dynamic curve centre set to [GLOB.dynamic_curve_centre] and width set to [GLOB.dynamic_curve_width].</span>") to_chat(world,"<span class='boldannounce'>Dynamic curve centre set to [GLOB.dynamic_curve_centre] and width set to [GLOB.dynamic_curve_width].</span>")
message_admins("Dynamic curve centre set to [GLOB.dynamic_curve_centre] and width set to [GLOB.dynamic_curve_width]") message_admins("Dynamic curve centre set to [GLOB.dynamic_curve_centre] and width set to [GLOB.dynamic_curve_width]")
@@ -245,7 +240,7 @@ SUBSYSTEM_DEF(vote)
if("roundtype") //CIT CHANGE - adds the roundstart secret/extended vote if("roundtype") //CIT CHANGE - adds the roundstart secret/extended vote
choices.Add("secret", "extended") choices.Add("secret", "extended")
if("dynamic") if("dynamic")
choices.Add("extended",PEACE,CHAOS) choices.Add(PEACE,CHAOS)
if("custom") if("custom")
question = stripped_input(usr,"What is the vote for?") question = stripped_input(usr,"What is the vote for?")
if(!question) if(!question)