Removes a pick() that occurred after the antag candidate lists were carefully ordered. (#10619)

This commit is contained in:
mikomyazaki
2020-11-22 10:56:31 +01:00
committed by GitHub
parent 3094546f8e
commit 7b43c0d991
3 changed files with 44 additions and 2 deletions
+2 -2
View File
@@ -172,9 +172,9 @@
if(!candidates.len)
return 0
//Grab candidates randomly until we have enough.
//Grab candidates until we have enough.
while(candidates.len && pending_antagonists.len < spawn_target)
var/datum/mind/player = pick(candidates)
var/datum/mind/player = candidates[1]
candidates -= player
draft_antagonist(player)
+1
View File
@@ -252,6 +252,7 @@ var/global/list/additional_antag_types = list()
for(var/candidate in all_candidates)
valid_templates_per_candidate[candidate]++
valid_templates_per_candidate = shuffle(valid_templates_per_candidate) // shuffle before sorting so that candidates with the same number of templates will be in random order
sortTim(valid_templates_per_candidate, /proc/cmp_numeric_asc, TRUE)
for(var/datum/antagonist/antag in antag_templates)
@@ -0,0 +1,41 @@
################################
# Example Changelog File
#
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
#
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
# When it is, any changes listed below will disappear.
#
# Valid Prefixes:
# bugfix
# wip (For works in progress)
# tweak
# soundadd
# sounddel
# rscadd (general adding of nice things)
# rscdel (general deleting of nice things)
# imageadd
# imagedel
# maptweak
# spellcheck (typo fixes)
# experiment
# balance
# admin
# backend
# security
# refactor
#################################
# Your name.
author: mikomyazaki
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True
# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
changes:
- tweak: "Improved multi-mode antagonist selection logic."