mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-23 03:57:13 +01:00
Replaces the voting system. It should fix a pretty serious server-crashing exploit and simplify the code a fair bit.
Removed all the voting-related adminverbs. It's all built into ooc vote verb. Admins can now make custom votes for literally anything. If a vote draws it will pick one of the winners at random. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4677 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
elly1989@rocketmail.com
@@ -1,353 +0,0 @@
|
||||
/datum/vote
|
||||
var/voting = 0 // true if currently voting
|
||||
var/nextvotetime = 0 // time at which next vote can be started
|
||||
var/votetime = 60 // time at which voting will end
|
||||
var/mode = 0 // 0 = restart vote, 1 = mode vote
|
||||
// modes which can be voted for
|
||||
var/winner = null // the vote winner
|
||||
|
||||
/datum/vote/New()
|
||||
|
||||
nextvotetime = world.timeofday // + 10*config.vote_delay
|
||||
|
||||
|
||||
/datum/vote/proc/canvote()//marker1
|
||||
var/excess = world.timeofday - vote.nextvotetime
|
||||
|
||||
if(excess < -10000) // handle clock-wrapping problems - very long delay (>20 hrs) if wrapped
|
||||
vote.nextvotetime = world.timeofday
|
||||
return 1
|
||||
return (excess >= 0)
|
||||
|
||||
/datum/vote/proc/nextwait()
|
||||
return timetext( round( (nextvotetime - world.timeofday)/10) )
|
||||
|
||||
/datum/vote/proc/endwait()
|
||||
return timetext( round( (votetime - world.timeofday)/10) )
|
||||
|
||||
/datum/vote/proc/timetext(var/interval)
|
||||
var/minutes = round(interval / 60)
|
||||
var/seconds = round(interval % 60)
|
||||
|
||||
var/tmin = "[minutes>0?num2text(minutes)+"min":null]"
|
||||
var/tsec = "[seconds>0?num2text(seconds)+"sec":null]"
|
||||
|
||||
if(tmin && tsec) // hack to skip inter-space if either field is blank
|
||||
return "[tmin] [tsec]"
|
||||
else
|
||||
if(!tmin && !tsec) // return '0sec' if 0 time left
|
||||
return "0sec"
|
||||
return "[tmin][tsec]"
|
||||
|
||||
/datum/vote/proc/getvotes()
|
||||
var/list/L = list()
|
||||
for(var/mob/M in player_list)
|
||||
if(M.client && M.client.inactivity < 1200) // clients inactive for 2 minutes don't count
|
||||
L[M.client.vote] += 1
|
||||
|
||||
return L
|
||||
|
||||
|
||||
/datum/vote/proc/endvote()
|
||||
|
||||
if(!voting) // means that voting was aborted by an admin
|
||||
return
|
||||
|
||||
world << "\red <B>***Voting has closed.</B>"
|
||||
|
||||
log_vote("Voting closed, result was [winner]")
|
||||
voting = 0
|
||||
nextvotetime = world.timeofday + 10*config.vote_delay
|
||||
|
||||
for(var/mob/M in player_list) // clear vote window from all clients
|
||||
if(M.client)
|
||||
M << browse(null, "window=vote")
|
||||
M.client.showvote = 0
|
||||
|
||||
calcwin()
|
||||
|
||||
if(mode)
|
||||
if(!ticker)
|
||||
if(!going)
|
||||
world << "<B>The game will start soon.</B>"
|
||||
going = 1
|
||||
var/wintext = capitalize(winner)
|
||||
if(winner=="default")
|
||||
world << "Result is \red No change."
|
||||
return
|
||||
|
||||
// otherwise change mode
|
||||
|
||||
|
||||
world << "Result is change to \red [wintext]"
|
||||
world.save_mode(winner)
|
||||
|
||||
if(ticker && ticker.mode)
|
||||
world <<"\red <B>World will reboot in 10 seconds</B>"
|
||||
|
||||
feedback_set_details("end_error","mode vote - [winner]")
|
||||
|
||||
if(blackbox)
|
||||
blackbox.save_all_data_to_sql()
|
||||
|
||||
sleep(100)
|
||||
log_game("Rebooting due to mode vote")
|
||||
world.Reboot()
|
||||
else
|
||||
master_mode = winner
|
||||
|
||||
else
|
||||
|
||||
if(winner=="default")
|
||||
world << "Result is \red No restart."
|
||||
return
|
||||
|
||||
world << "Result is \red Restart round."
|
||||
|
||||
world <<"\red <B>World will reboot in 5 seconds</B>"
|
||||
|
||||
feedback_set_details("end_error","restart vote")
|
||||
|
||||
if(blackbox)
|
||||
blackbox.save_all_data_to_sql()
|
||||
|
||||
sleep(50)
|
||||
log_game("Rebooting due to restart vote")
|
||||
world.Reboot()
|
||||
return
|
||||
|
||||
|
||||
/datum/vote/proc/calcwin()
|
||||
|
||||
var/list/votes = getvotes()
|
||||
|
||||
if(vote.mode)
|
||||
var/best = -1
|
||||
|
||||
for(var/v in votes)
|
||||
if(v=="none")
|
||||
continue
|
||||
if(best < votes[v])
|
||||
best = votes[v]
|
||||
|
||||
|
||||
var/list/winners = list()
|
||||
|
||||
for(var/v in votes)
|
||||
if(votes[v] == best)
|
||||
winners += v
|
||||
|
||||
var/ret = ""
|
||||
|
||||
|
||||
for(var/w in winners)
|
||||
if(lentext(ret) > 0)
|
||||
ret += "/"
|
||||
if(w=="default")
|
||||
winners = list("default")
|
||||
ret = "No change"
|
||||
break
|
||||
else
|
||||
ret += capitalize(w)
|
||||
|
||||
|
||||
|
||||
if(winners.len != 1)
|
||||
ret = "Tie: " + ret
|
||||
|
||||
|
||||
if(winners.len == 0)
|
||||
vote.winner = "default"
|
||||
ret = "No change"
|
||||
else
|
||||
vote.winner = pick(winners)
|
||||
|
||||
return ret
|
||||
else
|
||||
|
||||
if(votes["default"] < votes["restart"])
|
||||
|
||||
vote.winner = "restart"
|
||||
return "Restart"
|
||||
else
|
||||
vote.winner = "default"
|
||||
return "No restart"
|
||||
|
||||
|
||||
/mob/verb/vote()
|
||||
set category = "OOC"
|
||||
set name = "Vote"
|
||||
usr.client.showvote = 1
|
||||
|
||||
|
||||
var/text = "<HTML><HEAD><TITLE>Voting</TITLE></HEAD><BODY scroll=no>"
|
||||
|
||||
var/footer = "<HR><A href='?src=\ref[vote];vclose=1'>Close</A></BODY></HTML>"
|
||||
|
||||
|
||||
if(config.vote_no_dead && usr.stat == 2)
|
||||
text += "Voting while dead has been disallowed."
|
||||
text += footer
|
||||
usr << browse(text, "window=vote")
|
||||
usr.client.showvote = 0
|
||||
usr.client.vote = "none"
|
||||
return
|
||||
|
||||
if(vote.voting)
|
||||
// vote in progress, do the current
|
||||
|
||||
text += "Vote to [vote.mode?"change mode":"restart round"] in progress.<BR>"
|
||||
text += "[vote.endwait()] until voting is closed.<BR>"
|
||||
|
||||
var/list/votes = vote.getvotes()
|
||||
|
||||
if(vote.mode) // true if changing mode
|
||||
|
||||
text += "Current game mode is: <B>[master_mode]</B>.<BR>Select the mode to change to:<UL>"
|
||||
|
||||
for(var/md in config.votable_modes)
|
||||
var/disp = capitalize(md)
|
||||
if(md=="default")
|
||||
disp = "No change"
|
||||
|
||||
//world << "[md]|[disp]|[src.client.vote]|[votes[md]]"
|
||||
|
||||
if(src.client.vote == md)
|
||||
text += "<LI><B>[disp]</B>"
|
||||
else
|
||||
text += "<LI><A href='?src=\ref[vote];vote=[md]'>[disp]</A>"
|
||||
|
||||
text += "[votes[md]>0?" - [votes[md]] vote\s":null]<BR>"
|
||||
|
||||
text += "</UL>"
|
||||
|
||||
text +="<p>Current winner: <B>[vote.calcwin()]</B><BR>"
|
||||
|
||||
text += footer
|
||||
|
||||
usr << browse(text, "window=vote")
|
||||
|
||||
else // voting to restart
|
||||
|
||||
text += "Restart the world?<BR><UL>"
|
||||
|
||||
var/list/VL = list("default","restart")
|
||||
|
||||
for(var/md in VL)
|
||||
var/disp = (md=="default"? "No":"Yes")
|
||||
|
||||
if(src.client.vote == md)
|
||||
text += "<LI><B>[disp]</B>"
|
||||
else
|
||||
text += "<LI><A href='?src=\ref[vote];vote=[md]'>[disp]</A>"
|
||||
|
||||
text += "[votes[md]>0?" - [votes[md]] vote\s":null]<BR>"
|
||||
|
||||
text += "</UL>"
|
||||
|
||||
text +="<p>Current winner: <B>[vote.calcwin()]</B><BR>"
|
||||
|
||||
text += footer
|
||||
|
||||
usr << browse(text, "window=vote")
|
||||
|
||||
|
||||
else //no vote in progress
|
||||
|
||||
if(shuttlecoming == 1)
|
||||
usr << "\blue Cannot start Vote - Shuttle has been called."
|
||||
return
|
||||
|
||||
if(!config.allow_vote_restart && !config.allow_vote_mode)
|
||||
text += "<P>Player voting is disabled.</BODY></HTML>"
|
||||
|
||||
usr << browse(text, "window=vote")
|
||||
usr.client.showvote = 0
|
||||
return
|
||||
|
||||
if(!vote.canvote()) // not time to vote yet
|
||||
if(config.allow_vote_restart) text+="Voting to restart is enabled.<BR>"
|
||||
if(config.allow_vote_mode) text+="Voting to change mode is enabled.<BR>"
|
||||
|
||||
text+="<BR><P>Next vote can begin in [vote.nextwait()]."
|
||||
text+=footer
|
||||
|
||||
usr << browse(text, "window=vote")
|
||||
|
||||
else // voting can begin
|
||||
if(config.allow_vote_restart)
|
||||
text += "<A href='?src=\ref[vote];vmode=1'>Begin restart vote.</A><BR>"
|
||||
if(config.allow_vote_mode)
|
||||
text += "<A href='?src=\ref[vote];vmode=2'>Begin change mode vote.</A><BR>"
|
||||
|
||||
text += footer
|
||||
usr << browse(text, "window=vote")
|
||||
|
||||
spawn(20)
|
||||
if(usr.client && usr.client.showvote)
|
||||
usr.vote()
|
||||
else
|
||||
usr << browse(null, "window=vote")
|
||||
|
||||
return
|
||||
|
||||
|
||||
/datum/vote/Topic(href, href_list)
|
||||
..()
|
||||
//world << "[usr] has activated the vote Topic"
|
||||
|
||||
if(href_list["voter"])
|
||||
world << "[usr.ckey] has attempted to bypass the voting system." //ckey is easy key
|
||||
return
|
||||
|
||||
if(href_list["vclose"])
|
||||
|
||||
if(usr)
|
||||
usr << browse(null, "window=vote")
|
||||
usr.client.showvote = 0
|
||||
return
|
||||
|
||||
if(href_list["vmode"])
|
||||
if(vote.voting)
|
||||
return
|
||||
|
||||
if(!vote.canvote() ) // double check even though this shouldn't happen
|
||||
return
|
||||
|
||||
vote.mode = text2num(href_list["vmode"])-1 // hack to yield 0=restart, 1=changemode
|
||||
if(!ticker && vote.mode == 1)
|
||||
if(going)
|
||||
world << "<B>The game start has been delayed.</B>"
|
||||
going = 0
|
||||
vote.voting = 1 // now voting
|
||||
vote.votetime = world.timeofday + config.vote_period*10 // when the vote will end
|
||||
|
||||
spawn(config.vote_period*10)
|
||||
vote.endvote()
|
||||
|
||||
world << "\red<B>*** A vote to [vote.mode?"change game mode":"restart"] has been initiated by [usr.key].</B>"
|
||||
world << "\red You have [vote.timetext(config.vote_period)] to vote."
|
||||
|
||||
log_vote("Voting to [vote.mode ? "change mode" : "restart round"] started by [usr.name]/[usr.key]")
|
||||
|
||||
for(var/mob/CM in player_list)
|
||||
if(CM.client)
|
||||
if( config.vote_no_default || (config.vote_no_dead && CM.stat == 2) )
|
||||
CM.client.vote = "none"
|
||||
else
|
||||
CM.client.vote = "default"
|
||||
|
||||
if(usr) usr.vote()
|
||||
return
|
||||
|
||||
|
||||
return
|
||||
|
||||
if(href_list["vote"] && vote.voting)
|
||||
if(usr)
|
||||
usr.client.vote = href_list["vote"]
|
||||
|
||||
//world << "Setting client [usr.key]'s vote to: [href_list["vote"]]."
|
||||
|
||||
usr.vote()
|
||||
return
|
||||
Reference in New Issue
Block a user