shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update game_mode.dm

Browse Source
This commit is contained in:
kevinz000
2019-11-06 19:02:27 -07:00
committed by GitHub
parent 58900797ae
commit c8a8e20f42
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/game_mode.dm
+5 -5
View File
@@ -321,13 +321,11 @@
var/additional_tickets = CONFIG_GET(number/max_tickets_per_roll) var/additional_tickets = CONFIG_GET(number/max_tickets_per_roll)
var/list/ckey_to_mind = list() //this is admittedly shitcode but I'm webediting var/list/ckey_to_mind = list() //this is admittedly shitcode but I'm webediting
var/list/prev_tickets = SSpersistence.antag_rep //cache for hyper-speed in theory var/list/prev_tickets = SSpersistence.antag_rep //cache for hyper-speed in theory. how many tickets someone has stored
var/list/curr_tickets = list() var/list/curr_tickets = list() //how many tickets someone has for *this* antag roll, so with the free tickets
var/list/spend_tickets = list()
for(var/datum/mind/M in candidates) for(var/datum/mind/M in candidates)
var/mind_ckey = ckey(M.key) var/mind_ckey = ckey(M.key)
var/can_spend = min(prev_tickets[mind_ckey], additional_tickets) //they can only spend up to config/max_tickets_per_roll var/can_spend = min(prev_tickets[mind_ckey], additional_tickets) //they can only spend up to config/max_tickets_per_roll
spend_tickets[mind_ckey] = can_spend
var/amount = can_spend + free_tickets //but they get config/default_antag_tickets for free var/amount = can_spend + free_tickets //but they get config/default_antag_tickets for free
if(amount <= 0) //if they don't have any if(amount <= 0) //if they don't have any
continue //too bad! continue //too bad!
@@ -338,7 +336,7 @@
var/ckey var/ckey
if(length(curr_tickets)) if(length(curr_tickets))
ckey = pickweight(curr_tickets) ckey = pickweight(curr_tickets)
SSpersistence.antag_rep_change[ckey] = -(spend_tickets[ckey]) //deduct what they spent SSpersistence.antag_rep_change[ckey] = -(curr_tickets[ckey] - free_tickets) //deduct what they spent
var/mind = ckey_to_mind[ckey] //we want their mind var/mind = ckey_to_mind[ckey] //we want their mind
if(!mind) if(!mind)
var/warning = "WARNING: No antagonists were successfully picked by /datum/gamemode/proc/antag_pick()![fail_default_pick? " Defaulting to pick()!":""]" var/warning = "WARNING: No antagonists were successfully picked by /datum/gamemode/proc/antag_pick()![fail_default_pick? " Defaulting to pick()!":""]"
@@ -349,11 +347,13 @@
return mind return mind
else //the far more efficient and proper use of this, to get a list else //the far more efficient and proper use of this, to get a list
var/list/rolled = list() var/list/rolled = list()
var/list/spend_tickets = list()
for(var/i in 1 to return_list) for(var/i in 1 to return_list)
if(!length(curr_tickets)) //ah heck, we're out of candidates.. if(!length(curr_tickets)) //ah heck, we're out of candidates..
break break
var/ckey = pickweight(curr_tickets) //pick var/ckey = pickweight(curr_tickets) //pick
rolled += ckey //add rolled += ckey //add
spend_tickets[ckey] = curr_tickets[ckey] - free_tickets
curr_tickets -= ckey //don't roll them again curr_tickets -= ckey //don't roll them again
if(!length(rolled)) if(!length(rolled))
var/warning = "WARNING: No antagonists were successfully picked by /datum/gamemode/proc/antag_pick()![fail_default_pick? " Defaulting to pick()!":""]" var/warning = "WARNING: No antagonists were successfully picked by /datum/gamemode/proc/antag_pick()![fail_default_pick? " Defaulting to pick()!":""]"