notnull/banned
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix lingering entries in var.ORIGINAL_ROLES due to roleswaps in maelstrom

Browse Source
This commit is contained in:
skizzerz 2016-01-27 21:45:19 -06:00
parent 29e5873104
commit 587b03a970
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/gamemodes.py
View File

@ -1070,13 +1070,6 @@ class MaelstromMode(GameMode):
def transition_night_begin(self, evt, cli, var): def transition_night_begin(self, evt, cli, var):
# don't do this n1 # don't do this n1
if var.FIRST_NIGHT: if var.FIRST_NIGHT:
# except we still need to fill var.FINAL_ROLES during n1
# since we use that to track what role someone was previously
for role, pl in var.ROLES.items():
if role in var.TEMPLATE_RESTRICTIONS.keys():
continue
for p in pl:
var.FINAL_ROLES[p] = role
return return
villagers = var.list_players() villagers = var.list_players()
lpl = len(villagers) lpl = len(villagers)
@ -1098,8 +1091,13 @@ class MaelstromMode(GameMode):
if role in var.TEMPLATE_RESTRICTIONS.keys(): if role in var.TEMPLATE_RESTRICTIONS.keys():
continue continue
for p in pl: for p in pl:
prevrole = var.FINAL_ROLES[p] # discard them from all non-template roles, we don't have a reliable
var.ORIGINAL_ROLES[prevrole].discard(p) # means of tracking their previous role (due to traitor turning, exchange
# totem, etc.), so we need to iterate through everything.
for r in var.ORIGINAL_ROLES.keys():
if r in var.TEMPLATE_RESTRICTIONS.keys():
continue
var.ORIGINAL_ROLES[r].discard(p)
var.ORIGINAL_ROLES[role].add(p) var.ORIGINAL_ROLES[role].add(p)
var.FINAL_ROLES[p] = role var.FINAL_ROLES[p] = role