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

Fixes

Browse Source
This commit is contained in:
skizzerz 2017-12-13 16:32:51 -06:00
parent 4fde6f9bae
commit efe4f538bb
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gamemodes.py
View File

@ -215,7 +215,7 @@ class VillagergameMode(GameMode):
evt.data["transition_day"] = lambda cli, gameid=0: self.prolong_night(cli, var, gameid, transition_day) evt.data["transition_day"] = lambda cli, gameid=0: self.prolong_night(cli, var, gameid, transition_day)
def prolong_night(self, cli, var, gameid, transition_day): def prolong_night(self, cli, var, gameid, transition_day):
nspecials = len(get_players(("seer", "harlot", "shaman", "crazed shaman"))) nspecials = len(get_all_players(("seer", "harlot", "shaman", "crazed shaman")))
rand = random.gauss(5, 1.5) rand = random.gauss(5, 1.5)
if rand <= 0 and nspecials > 0: if rand <= 0 and nspecials > 0:
transition_day(cli, gameid=gameid) transition_day(cli, gameid=gameid)

2
src/roles/shaman.py
View File

@ -587,7 +587,7 @@ def on_assassinate(evt, var, killer, target, prot):
@event_listener("succubus_visit") @event_listener("succubus_visit")
def on_succubus_visit(evt, cli, var, nick, victim): def on_succubus_visit(evt, cli, var, nick, victim):
if (users._get(SHAMANS.get(victim, (None, None))[1]) in var.ROLES["succubus"] and # FIXME (psst Vgr: this probably breaks now if the shaman didn't give out totems when succ visits) if (users._get(SHAMANS.get(victim, (None, None))[1], allow_none=True) in var.ROLES["succubus"] and
(get_role(victim) == "crazed shaman" or TOTEMS[victim] not in var.BENEFICIAL_TOTEMS)): (get_role(victim) == "crazed shaman" or TOTEMS[victim] not in var.BENEFICIAL_TOTEMS)):
pm(cli, victim, messages["retract_totem_succubus"].format(SHAMANS[victim])) pm(cli, victim, messages["retract_totem_succubus"].format(SHAMANS[victim]))
del SHAMANS[victim] del SHAMANS[victim]