diff --git a/code/controllers/Processes/vote.dm b/code/controllers/Processes/vote.dm deleted file mode 100644 index 47cf079eeba..00000000000 --- a/code/controllers/Processes/vote.dm +++ /dev/null @@ -1,7 +0,0 @@ -/datum/controller/process/vote/setup() - name = "vote" - schedule_interval = 10 // every second - log_startup_progress("Voting ticker starting up.") - -/datum/controller/process/vote/doWork() - vote.process() diff --git a/code/controllers/voting.dm b/code/controllers/voting.dm index 842de2e2a03..5b152b8a4db 100644 --- a/code/controllers/voting.dm +++ b/code/controllers/voting.dm @@ -19,14 +19,17 @@ var/global/list/round_voters = list() //Keeps track of the individuals voting fo if(istype(vote)) qdel(vote) vote = src + spawn(0) + while(TRUE) + process() + sleep(10) -/datum/controller/vote/proc/process() //called by master_controller +/datum/controller/vote/proc/process() if(mode) // No more change mode votes after the game has started. - // 3 is GAME_STATE_PLAYING, but that #define is undefined for some reason - if(mode == "gamemode" && ticker.current_state >= 2) + if(mode == "gamemode" && ticker.current_state >= GAME_STATE_SETTING_UP) to_chat(world, "Voting aborted due to game start.") - src.reset() + reset() return // Calculate how much time is remaining by comparing current time, to time of vote start, @@ -37,14 +40,10 @@ var/global/list/round_voters = list() //Keeps track of the individuals voting fo result() for(var/client/C in voting) if(C) - C << browse(null,"window=vote;can_close=0") + C << browse(null,"window=vote") reset() else - for(var/client/C in voting) - if(C) - C << browse(vote.interface(C),"window=vote;can_close=0") - - voting.Cut() + update_panel() /datum/controller/vote/proc/autotransfer() initiate_vote("crew_transfer","the server") @@ -68,14 +67,26 @@ var/global/list/round_voters = list() //Keeps track of the individuals voting fo /datum/controller/vote/proc/get_result() - //get the highest number of votes var/greatest_votes = 0 var/total_votes = 0 - for(var/option in choices) - var/votes = choices[option] - total_votes += votes - if(votes > greatest_votes) - greatest_votes = votes + var/list/sorted_choices = list() + var/sorted_highest + var/sorted_votes = -1 + //get the highest number of votes, while also sorting the list + while(choices.len) + // This is a very inefficient sorting method, but that's okay + for(var/option in choices) + var/votes = choices[option] + if(sorted_votes < votes) + sorted_highest = option + sorted_votes = votes + if(votes > greatest_votes) + greatest_votes = votes + sorted_votes = -1 + total_votes += choices[sorted_highest] + sorted_choices[sorted_highest] = choices[sorted_highest] || 0 + choices -= sorted_highest + choices = sorted_choices //default-vote for everyone who didn't vote if(!config.vote_no_default && choices.len) var/non_voters = (clients.len - total_votes) @@ -129,11 +140,18 @@ var/global/list/round_voters = list() //Keeps track of the individuals voting fo for(var/key in current_votes) if(choices[current_votes[key]] == .) round_voters += key // Keep track of who voted for the winning round. - if((mode == "gamemode" && . == "extended") || ticker.hide_mode == 0) // Announce Extended gamemode, but not other gamemodes - text += "Vote Result: [.]" + if(mode == "gamemode" && (. == "extended" || ticker.hide_mode == 0)) // Announce Extended gamemode, but not other gamemodes + text += "Vote Result: [.] ([choices[.]] vote\s)" else - if(mode != "gamemode") - text += "Vote Result: [.]" + if(mode == "custom") + // Completely replace text to show all results in custom votes + text = "[question]\n" + for(var/option in winners) + text += "\t[option]: [choices[option]] vote\s\n" + for(var/option in (choices-winners)) + text += "\t[option]: [choices[option]] vote\s\n" + else if(mode != "gamemode") + text += "Vote Result: [.] ([choices[.]] vote\s)" else text += "The vote has ended." // What will be shown if it is a gamemode vote that isn't extended @@ -217,7 +235,8 @@ var/global/list/round_voters = list() //Keeps track of the individuals voting fo var/option = capitalize(html_encode(input(usr,"Please enter an option or hit cancel to finish") as text|null)) if(!option || mode || !usr.client) break choices.Add(option) - else return 0 + else + return 0 mode = vote_type initiator = initiator_key started_time = world.time @@ -226,7 +245,9 @@ var/global/list/round_voters = list() //Keeps track of the individuals voting fo text += "\n[question]" log_vote(text) - to_chat(world, "[text]\nType vote to place your votes.\nYou have [config.vote_period/10] seconds to vote.") + to_chat(world, {"[text] + Click here or type vote to place your vote. + You have [config.vote_period/10] seconds to vote."}) switch(vote_type) if("crew_transfer") world << sound('sound/ambience/alarm4.ogg') @@ -256,74 +277,92 @@ var/global/list/round_voters = list() //Keeps track of the individuals voting fo log_admin("OOC was toggled automatically due to custom vote.") message_admins("OOC has been toggled off automatically.") - - - time_remaining = round(config.vote_period/10) return 1 return 0 -/datum/controller/vote/proc/interface(var/client/C) - if(!C) return - var/admin = check_rights(R_ADMIN,0) +/datum/controller/vote/proc/browse_to(var/client/C) + if(!C) + return + var/admin = check_rights(R_ADMIN, 0, user = C.mob) voting |= C - . = "Voting Panel" + var/dat = {""} if(mode) - if(question) . += "

Vote: '[question]'

" - else . += "

Vote: [capitalize(mode)]

" - . += "Time Left: [time_remaining] s
" + dat += "
[vote_html(C)]
" if(admin) - . += "(Cancel Vote) " + dat += "(Cancel Vote) " else - . += "

Start a vote:

" + var/datum/browser/popup = new(C.mob, "vote", "Voting Panel", nref=src) + popup.set_content(dat) + popup.open() + +/datum/controller/vote/proc/update_panel(var/client/client) + for(var/client/C in (client ? list(client) : voting)) + C << output(url_encode(vote_html(C)), "vote.browser:update_vote_div") + +/datum/controller/vote/proc/vote_html(var/client/C) + . = "" + if(question) + . += "

Vote: '[question]'

" + else + . += "

Vote: [capitalize(mode)]

" + . += "Time Left: [time_remaining] s
" /datum/controller/vote/Topic(href,href_list[],hsrc) if(!usr || !usr.client) return //not necessary but meh...just in-case somebody does something stupid var/admin = check_rights(R_ADMIN,0) + if(href_list["close"]) + voting -= usr.client + return switch(href_list["vote"]) - if("close") - voting -= usr.client - usr << browse(null, "window=vote") - return + if("open") + // vote proc will automatically get called after this switch ends if("cancel") if(admin) reset() @@ -347,6 +386,8 @@ var/global/list/round_voters = list() //Keeps track of the individuals voting fo initiate_vote("custom",usr.key) else submit_vote(usr.ckey, round(text2num(href_list["vote"]))) + update_panel(usr.client) + return usr.vote() @@ -355,4 +396,4 @@ var/global/list/round_voters = list() //Keeps track of the individuals voting fo set name = "Vote" if(vote) - src << browse(vote.interface(client),"window=vote;can_close=0") + vote.browse_to(client) diff --git a/code/game/gamemodes/gameticker.dm b/code/game/gamemodes/gameticker.dm index 35d17607709..7d6ea9b4e7d 100644 --- a/code/game/gamemodes/gameticker.dm +++ b/code/game/gamemodes/gameticker.dm @@ -48,9 +48,7 @@ var/round_start_time = 0 to_chat(world, "Welcome to the pre-game lobby!") to_chat(world, "Please, setup your character and select ready. Game will start in [pregame_timeleft] seconds") while(current_state == GAME_STATE_PREGAME) - for(var/i=0, i<10, i++) - sleep(1) - vote.process() + sleep(10) if(going) pregame_timeleft-- diff --git a/paradise.dme b/paradise.dme index 4f7fa9adeb9..8792226ca0f 100644 --- a/paradise.dme +++ b/paradise.dme @@ -180,7 +180,6 @@ #include "code\controllers\Processes\sun.dm" #include "code\controllers\Processes\ticker.dm" #include "code\controllers\Processes\timer.dm" -#include "code\controllers\Processes\vote.dm" #include "code\controllers\Processes\weather.dm" #include "code\controllers\ProcessScheduler\core\process.dm" #include "code\controllers\ProcessScheduler\core\processScheduler.dm"