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

Fix derps

Browse Source
This commit is contained in:
skizzerz 2015-10-30 13:14:33 -07:00
parent 3761f6d92c
commit dd6f50d7eb
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/gamemodes.py
View File

@ -818,9 +818,9 @@ class SleepyMode(GameMode):
if nickrole == "priest": if nickrole == "priest":
pl = evt.data["pl"] pl = evt.data["pl"]
turn_chance = 3/4 turn_chance = 3/4
seers = [p for p in var.list_players("seer") if p in pl and random.random() < turn_chance] seers = [p for p in var.ROLES["seer"] if p in pl and random.random() < turn_chance]
harlots = [p for p in var.list_players("harlot") if p in pl and random.random() < turn_chance] harlots = [p for p in var.ROLES["harlot"] if p in pl and random.random() < turn_chance]
cultists = [p for p in var.list_players("cultist") if p in pl and random.random() < turn_chance] cultists = [p for p in var.ROLES["cultist"] if p in pl and random.random() < turn_chance]
total = sum(map(len, (seers, harlots, cultists))) total = sum(map(len, (seers, harlots, cultists)))
if total > 0: if total > 0:
cli.msg(botconfig.CHANNEL, ("The sky suddenly darkens as a thunderstorm appears from nowhere. The bell on the newly-abandoned church starts ringing " + cli.msg(botconfig.CHANNEL, ("The sky suddenly darkens as a thunderstorm appears from nowhere. The bell on the newly-abandoned church starts ringing " +

4
src/wolfgame.py
View File

@ -2264,7 +2264,7 @@ def chk_decision(cli, force = ""):
if votee in var.DESPERATE | var.ROLES["dullahan"]: if votee in var.DESPERATE | var.ROLES["dullahan"]:
# Also kill the very last person to vote them, unless they voted themselves last in which case nobody else dies # Also kill the very last person to vote them, unless they voted themselves last in which case nobody else dies
target = voters[-1] target = voters[-1]
if target != votee: if target != votee and target not in var.ROLES["blessed villager"]:
if var.ROLE_REVEAL in ("on", "team") and votee not in var.ROLES["dullahan"]: if var.ROLE_REVEAL in ("on", "team") and votee not in var.ROLES["dullahan"]:
r1 = var.get_reveal_role(target) r1 = var.get_reveal_role(target)
an1 = "n" if r1.startswith(("a", "e", "i", "o", "u")) else "" an1 = "n" if r1.startswith(("a", "e", "i", "o", "u")) else ""
@ -4622,7 +4622,7 @@ def transition_day(cli, gameid=0):
else: else:
message.append(("\u0002{0}\u0002 was attacked by \u0002{1}\u0002's spirit last night, " + message.append(("\u0002{0}\u0002 was attacked by \u0002{1}\u0002's spirit last night, " +
"however their strong spiritual powers drove away the spirit.").format(victim, loser)) "however their strong spiritual powers drove away the spirit.").format(victim, loser))
elif loser is not None: elif loser is not None and loser not in var.ROLES["blessed villager"]:
dead.append(loser) dead.append(loser)
if var.ROLE_REVEAL in ("on", "team") and victim not in var.ROLES["dullahan"]: if var.ROLE_REVEAL in ("on", "team") and victim not in var.ROLES["dullahan"]:
role = var.get_reveal_role(loser) role = var.get_reveal_role(loser)