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

Don't add people unable to act to the chk_nightdone listeners

Browse Source 
Checked all the other roles, they were already correct. Basically, when
a user is silenced they are removed from nightroles, which means if we
add people unable to actually act, we may prematurely end night.
This commit is contained in:
skizzerz 2018-05-25 08:41:37 -05:00
parent c0a96d181d
commit a7ffdedf64
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/roles/assassin.py
View File

@ -14,11 +14,12 @@ from src.messages import messages
from src.events import Event from src.events import Event
TARGETED = UserDict() # type: Dict[users.User, users.User] TARGETED = UserDict() # type: Dict[users.User, users.User]
PREV_ACTED = UserSet()
@command("target", chan=False, pm=True, playing=True, silenced=True, phases=("night",), roles=("assassin",)) @command("target", chan=False, pm=True, playing=True, silenced=True, phases=("night",), roles=("assassin",))
def target(var, wrapper, message): def target(var, wrapper, message):
"""Pick a player as your target, killing them if you die.""" """Pick a player as your target, killing them if you die."""
if wrapper.source in TARGETED: if wrapper.source in PREV_ACTED:
wrapper.send(messages["assassin_already_targeted"]) wrapper.send(messages["assassin_already_targeted"])
return return
@ -39,8 +40,8 @@ def target(var, wrapper, message):
@event_listener("chk_nightdone") @event_listener("chk_nightdone")
def on_chk_nightdone(evt, var): def on_chk_nightdone(evt, var):
evt.data["nightroles"].extend(get_all_players(("assassin",))) evt.data["nightroles"].extend(get_all_players(("assassin",)) - PREV_ACTED)
evt.data["actedcount"] += len(TARGETED) evt.data["actedcount"] += len(TARGETED) - len(PREV_ACTED)
@event_listener("transition_day", priority=8) @event_listener("transition_day", priority=8)
def on_transition_day_resolve(evt, var): def on_transition_day_resolve(evt, var):
@ -57,6 +58,7 @@ def on_transition_day_resolve(evt, var):
target = random.choice(ps) target = random.choice(ps)
TARGETED[ass] = target TARGETED[ass] = target
ass.send(messages["assassin_random"].format(target)) ass.send(messages["assassin_random"].format(target))
PREV_ACTED.update(TARGETED.keys())
@event_listener("transition_night_end") @event_listener("transition_night_end")
def on_transition_night_end(evt, var): def on_transition_night_end(evt, var):
@ -70,6 +72,7 @@ def on_transition_night_end(evt, var):
if ass in get_all_players(("village drunk",)): # FIXME: Make into an event when village drunk is split if ass in get_all_players(("village drunk",)): # FIXME: Make into an event when village drunk is split
TARGETED[ass] = random.choice(pl) TARGETED[ass] = random.choice(pl)
PREV_ACTED.add(ass)
message = messages["drunken_assassin_notification"].format(TARGETED[ass]) message = messages["drunken_assassin_notification"].format(TARGETED[ass])
if not ass.prefers_simple(): if not ass.prefers_simple():
message += messages["assassin_info"] message += messages["assassin_info"]
@ -88,10 +91,12 @@ def on_del_player(evt, var, player, mainrole, allroles, death_triggers):
for x, y in list(TARGETED.items()): for x, y in list(TARGETED.items()):
if y is player: if y is player:
del TARGETED[x] del TARGETED[x]
PREV_ACTED.discard(x)
if death_triggers and "assassin" in allroles and player in TARGETED: if death_triggers and "assassin" in allroles and player in TARGETED:
target = TARGETED[player] target = TARGETED[player]
del TARGETED[player] del TARGETED[player]
PREV_ACTED.discard(player)
if target in evt.data["pl"]: if target in evt.data["pl"]:
prots = deque(var.ACTIVE_PROTECTIONS[target.nick]) prots = deque(var.ACTIVE_PROTECTIONS[target.nick])
aevt = Event("assassinate", {"pl": evt.data["pl"], "target": target}, aevt = Event("assassinate", {"pl": evt.data["pl"], "target": target},

1
src/roles/matchmaker.py
View File

@ -195,6 +195,7 @@ def on_player_win(evt, var, player, role, winner, survived):
@event_listener("chk_nightdone") @event_listener("chk_nightdone")
def on_chk_nightdone(evt, var): def on_chk_nightdone(evt, var):
if var.FIRST_NIGHT:
evt.data["actedcount"] += len(MATCHMAKERS) evt.data["actedcount"] += len(MATCHMAKERS)
evt.data["nightroles"].extend(get_all_players(("matchmaker",))) evt.data["nightroles"].extend(get_all_players(("matchmaker",)))