diff --git a/modules/wolfgame.py b/modules/wolfgame.py index de38d19..c68c80c 100644 --- a/modules/wolfgame.py +++ b/modules/wolfgame.py @@ -2772,7 +2772,8 @@ def guard(cli, nick, rest): if victim == nick: if role == "bodyguard" or not var.GUARDIAN_ANGEL_CAN_GUARD_SELF: var.GUARDED[nick] = None - del var.LASTGUARDED[nick] + if nick in var.LASTGUARDED: + del var.LASTGUARDED[nick] pm(cli, nick, "You have chosen not to guard anyone tonight.") elif role == "guardian angel": var.GUARDED[nick] = nick diff --git a/settings/wolfgame.py b/settings/wolfgame.py index cfaa3ca..1566084 100644 --- a/settings/wolfgame.py +++ b/settings/wolfgame.py @@ -143,7 +143,7 @@ TRUE_NEUTRAL_ROLES = ["vengeful ghost", "crazed shaman", "fool", "jester", "mons TEMPLATE_RESTRICTIONS = {"cursed villager" : ["wolf", "wolf cub", "werecrow", "seer", "oracle", "augur", "fool", "jester"], "gunner" : ["wolf", "traitor", "werecrow", "hag", "wolf cub", "sorcerer", "minion", "cultist", "fool", "lycan", "jester"], "sharpshooter" : ["wolf", "traitor", "werecrow", "hag", "wolf cub", "sorcerer", "minion", "cultist", "fool", "lycan", "jester"], - "mayor" : ["fool", "jester"], + "mayor" : ["fool", "jester", "monster"], "assassin" : ["seer", "augur", "oracle", "harlot", "detective", "bodyguard", "guardian angel", "village drunk", "hunter", "shaman", "crazed shaman", "fool", "mayor", "wolf", "werecrow", "wolf cub", "traitor", "lycan"], "amnesiac" : ["villager", "cultist", "wolf", "minion", "matchmaker", "village elder", "time lord", "clone", "mad scientist", "vengeful ghost"], "bureaucrat" : [],