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

Allow bodyguard/GA to guard assassin target at night as well. Closes #49

Browse Source
This commit is contained in:
skizzerz 2014-07-24 20:18:03 -05:00
parent 2ab85c4d4d
commit 2c47b5610c
1 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
modules/wolfgame.py
View File

@ -1304,6 +1304,23 @@ def del_player(cli, nick, forced_death = False, devoice = True, end_game = True,
"however {1}'s totem emits a brilliant flash of light, causing the attempt to miss.").format(nick, target) "however {1}'s totem emits a brilliant flash of light, causing the attempt to miss.").format(nick, target)
cli.msg(botconfig.CHANNEL, message) cli.msg(botconfig.CHANNEL, message)
var.LOGGER.logMessage(message.replace("\02", "")) var.LOGGER.logMessage(message.replace("\02", ""))
elif target in var.GUARDED.values() and var.GHOSTPHASE == "night":
for bg in var.ROLES["bodyguard"]:
if bg in var.GUARDED and var.GUARDED[bg] == target:
message = ("Before dying, \u0002{0}\u0002 quickly attempts to slit \u0002{1}\u0002's throat, " +
"however a bodyguard was on duty and able to foil the attempt.").format(nick, target)
cli.msg(botconfig.CHANNEL, message)
var.LOGGER.logMessage(message.replace("\02", ""))
break
else:
for ga in var.ROLES["guardian angel"]:
if ga in var.GUARDED and var.GUARDED[ga] == target:
message = ("Before dying, \u0002{0}\u0002 quickly attempts to slit \u0002{1}\u0002's throat, " +
"however \u0002{2}\u0002, a guardian angel, sacrificed their life to protect them.").format(nick, target, ga)
cli.msg(botconfig.CHANNEL, message)
var.LOGGER.logMessage(message.replace("\02", ""))
del_player(cli, ga, True, end_game = False)
break
else: else:
if var.ROLE_REVEAL: if var.ROLE_REVEAL:
role = var.get_reveal_role(target) role = var.get_reveal_role(target)
@ -2065,12 +2082,13 @@ def transition_day(cli, gameid=0):
message.append(("\u0002{0}\u0002 was attacked last night, but luckily, the bodyguard was on duty.").format(victim)) message.append(("\u0002{0}\u0002 was attacked last night, but luckily, the bodyguard was on duty.").format(victim))
novictmsg = False novictmsg = False
break break
for gangel in var.ROLES["guardian angel"]: else:
if var.GUARDED.get(gangel) == victim: for gangel in var.ROLES["guardian angel"]:
dead.append(gangel) if var.GUARDED.get(gangel) == victim:
message.append(("\u0002{0}\u0002 sacrificed their life to guard that of another.").format(gangel)) dead.append(gangel)
novictmsg = False message.append(("\u0002{0}\u0002 sacrificed their life to guard that of another.").format(gangel))
break novictmsg = False
break
elif victim in var.ROLES["harlot"] and victim in bywolves and var.HVISITED.get(victim): elif victim in var.ROLES["harlot"] and victim in bywolves and var.HVISITED.get(victim):
message.append("The wolves' selected victim was a harlot, who was not at home last night.") message.append("The wolves' selected victim was a harlot, who was not at home last night.")
novictmsg = False novictmsg = False