Skip to content

Commit

Permalink
Fix maelstrom error on game start
Browse files Browse the repository at this point in the history
var._original_roles won't be initialized yet on game start. Avoid using it until later nights after it's been initialized.
  • Loading branch information
jacob1 committed Jan 4, 2024
1 parent e16a8de commit 90f5ef4
Showing 1 changed file with 12 additions and 11 deletions.
23 changes: 12 additions & 11 deletions src/gamemodes/maelstrom.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,26 +54,27 @@ def transition_night_begin(self, evt: Event, var: GameState):
for x in selected:
villagers.remove(x)
new_evt.data["role"] = role
new_evt.dispatch(var, x, var._original_main_roles[x])
new_evt.dispatch(var, x, var.original_main_roles[x])
var.roles[new_evt.data["role"]].add(x)

# for end of game stats to show what everyone ended up as on game end
for role, pl in var.roles.items():
if role in self.SECONDARY_ROLES:
continue
for p in pl:
# discard them from all non-secondary roles, we don't have a reliable
# means of tracking their previous role (due to traitor turning, exchange
# totem, etc.), so we need to iterate through everything.
# also this touches the underlying _original_[main_]roles mappings... shh
for r in var.original_roles:
if r in self.SECONDARY_ROLES:
continue
var._original_roles[r].discard(p)
var._original_roles[role].add(p)
if var.setup_completed:
# discard them from all non-secondary roles, we don't have a reliable
# means of tracking their previous role (due to traitor turning, exchange
# totem, etc.), so we need to iterate through everything.
# also this touches the underlying _original_[main_]roles mappings... shh
for r in var.original_roles:
if r in self.SECONDARY_ROLES:
continue
var._original_roles[r].discard(p)
var._original_roles[role].add(p)
var._original_main_roles[p] = role
var.final_roles[p] = role
var.main_roles[p] = role
var._original_main_roles[p] = role

def _role_attribution(self, var, villagers, do_templates):
lpl = len(villagers)
Expand Down

0 comments on commit 90f5ef4

Please sign in to comment.