From 798258798ccda18b6b64bbf298eb2127af7b633d Mon Sep 17 00:00:00 2001 From: "omegablast2002@yahoo.com" Date: Thu, 24 Jan 2013 21:04:23 +0000 Subject: [PATCH] corrected an issue where ai was able to ignore lure ability --- projects/mtg/src/MTGCardInstance.cpp | 3 ++- projects/mtg/src/MTGRules.cpp | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/projects/mtg/src/MTGCardInstance.cpp b/projects/mtg/src/MTGCardInstance.cpp index b7d795483..a50a1dab8 100644 --- a/projects/mtg/src/MTGCardInstance.cpp +++ b/projects/mtg/src/MTGCardInstance.cpp @@ -619,7 +619,8 @@ int MTGCardInstance::canBlock(MTGCardInstance * opponent) return 0; if (opponent->basicAbilities[(int)Constants::FEAR] && !(this->hasType(Subtypes::TYPE_ARTIFACT) || this->hasColor(Constants::MTG_COLOR_BLACK))) return 0; - + if (opponent->controller()->game->battlefield->hasAbility(Constants::LURE) && !opponent->has(Constants::LURE)) + return 0; //intimidate if (opponent->basicAbilities[(int)Constants::INTIMIDATE] && !(this->hasType(Subtypes::TYPE_ARTIFACT))) { diff --git a/projects/mtg/src/MTGRules.cpp b/projects/mtg/src/MTGRules.cpp index c9f35f83b..8c07ef649 100644 --- a/projects/mtg/src/MTGRules.cpp +++ b/projects/mtg/src/MTGRules.cpp @@ -1563,7 +1563,7 @@ int MTGBlockRule::reactToClick(MTGCardInstance * card) currentOpponent = game->currentPlayer->game->inPlay->getNextAttacker(currentOpponent); if(lured && currentOpponent && !currentOpponent->has(Constants::LURE)) - currentOpponent = game->currentPlayer->game->inPlay->getNextAttacker(currentOpponent); + currentOpponent = game->currentPlayer->game->inPlay->getNextLurer(currentOpponent); canDefend = card->toggleDefenser(currentOpponent); DebugTrace("Defenser Toggle: " << card->getName() << endl