From 52df1ad963f2ea6ab5ebd711b1e175e4128d7158 Mon Sep 17 00:00:00 2001 From: zethfoxster Date: Thu, 28 Jul 2016 18:48:47 -0400 Subject: [PATCH] the fix for the sacrifice trigger was a ton easier than expected. treat it like a spell. the card after contains all the info we need to determine if it should trigger. --- projects/mtg/include/AllAbilities.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/projects/mtg/include/AllAbilities.h b/projects/mtg/include/AllAbilities.h index 86c152ff4..17498f0fc 100644 --- a/projects/mtg/include/AllAbilities.h +++ b/projects/mtg/include/AllAbilities.h @@ -1370,12 +1370,11 @@ public: { WEventCardSacrifice * e = dynamic_cast (event); if (!e) return 0; - if (e->istoken) - tc->setAllZones(); MTGCardInstance * check = e->cardAfter; MTGGameZone * oldZone = e->cardAfter->currentZone; + MTGGameZone * currZone = check->currentZone; check->currentZone = check->previousZone; - if (check->next && check->next->currentZone) + if (check->next && (check->next->currentZone|| check->isToken)) { check = e->cardAfter->next; oldZone = e->cardAfter->next->currentZone;