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

Actually pass users through to _get_targets

Browse Source
This commit is contained in:
Vgr E. Barry 2017-09-18 17:12:19 -04:00
parent 262990653d
commit 02eba3e267
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/roles/madscientist.py
View File

@ -153,7 +153,7 @@ def on_del_player(evt, var, user, mainrole, allroles, death_triggers):
@event_listener("transition_night_end", priority=2) @event_listener("transition_night_end", priority=2)
def on_transition_night_end(evt, var): def on_transition_night_end(evt, var):
for ms in get_all_players(("mad scientist",)): for ms in get_all_players(("mad scientist",)):
pl = list_players() pl = get_players()
target1, target2 = _get_targets(var, pl, ms) target1, target2 = _get_targets(var, pl, ms)
to_send = "mad_scientist_notify" to_send = "mad_scientist_notify"
@ -164,14 +164,14 @@ def on_transition_night_end(evt, var):
@event_listener("myrole") @event_listener("myrole")
def on_myrole(evt, var, user): def on_myrole(evt, var, user):
if user.nick in var.ROLES["mad scientist"]: if user.nick in var.ROLES["mad scientist"]:
pl = list_players() pl = get_players()
target1, target2 = _get_targets(var, pl, user) target1, target2 = _get_targets(var, pl, user)
evt.data["messages"].append(messages["mad_scientist_myrole_targets"].format(target1, target2)) evt.data["messages"].append(messages["mad_scientist_myrole_targets"].format(target1, target2))
@event_listener("revealroles_role") @event_listener("revealroles_role")
def on_revealroles(evt, var, wrapper, nickname, role): def on_revealroles(evt, var, wrapper, nickname, role):
if role == "mad scientist": if role == "mad scientist":
pl = list_players() pl = get_players()
target1, target2 = _get_targets(var, pl, users._get(nickname)) # FIXME target1, target2 = _get_targets(var, pl, users._get(nickname)) # FIXME
evt.data["special_case"].append(messages["mad_scientist_revealroles_targets"].format(target1, target2)) evt.data["special_case"].append(messages["mad_scientist_revealroles_targets"].format(target1, target2))