From eb8ffb9f6800ca8a5b6240e60ddd3f61ed972a35 Mon Sep 17 00:00:00 2001 From: skizzerz Date: Wed, 26 Nov 2014 23:45:13 -0600 Subject: [PATCH] Make GA guard also go away in the event of exchange totem firing --- modules/wolfgame.py | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/modules/wolfgame.py b/modules/wolfgame.py index 1df4365..047920f 100644 --- a/modules/wolfgame.py +++ b/modules/wolfgame.py @@ -2964,11 +2964,8 @@ def check_exchange(cli, actor, nick): var.PASSED.remove(actor) elif actor_role in ("bodyguard", "guardian angel"): if actor in var.GUARDED: - if actor_role == "bodyguard": - pm(cli, var.GUARDED[actor], "Your bodyguard seems to have disappeared...") - del var.GUARDED[actor] - else: - var.ACTED_EXTRA += 1 + pm(cli, var.GUARDED[actor], "Your protector seems to have disappeared...") + del var.GUARDED[actor] if actor in var.LASTGUARDED: del var.LASTGUARDED[actor] elif actor_role in ("werecrow", "sorcerer"): @@ -3013,11 +3010,8 @@ def check_exchange(cli, actor, nick): var.PASSED.remove(nick) elif nick_role in ("bodyguard", "guardian angel"): if nick in var.GUARDED: - if nick_role == "bodyguard": - pm(cli, var.GUARDED[nick], "Your bodyguard seems to have disappeared...") - del var.GUARDED[nick] - else: - var.ACTED_EXTRA += 1 + pm(cli, var.GUARDED[nick], "Your protector seems to have disappeared...") + del var.GUARDED[nick] if nick in var.LASTGUARDED: del var.LASTGUARDED[nick] elif nick_role in ("werecrow", "sorcerer"):