From 48fd6a1bc1d7c1bb170a68f84bd19c3203cdef06 Mon Sep 17 00:00:00 2001 From: "omegablast2002@yahoo.com" Date: Sun, 23 Jan 2011 17:57:37 +0000 Subject: [PATCH] 2 changes wrapped my last commit incorrectly, the fix for @targeted...and i added a conditional to keep the "combat bump" hint out of test suite, i found out it slowed test suite down considerably --- projects/mtg/src/MTGAbility.cpp | 4 ++-- projects/mtg/src/MTGCardInstance.cpp | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/projects/mtg/src/MTGAbility.cpp b/projects/mtg/src/MTGAbility.cpp index 673515264..4ea99de7f 100644 --- a/projects/mtg/src/MTGAbility.cpp +++ b/projects/mtg/src/MTGAbility.cpp @@ -4075,6 +4075,8 @@ TriggeredAbility::TriggeredAbility(int id, MTGCardInstance * card) : int TriggeredAbility::receiveEvent(WEvent * e) { + if (triggerOnEvent(e)) + { if(dynamic_cast(e)) { //@targetted trigger as per mtg rules is a state based trigger @@ -4082,8 +4084,6 @@ int TriggeredAbility::receiveEvent(WEvent * e) resolve(); return 1; } - if (triggerOnEvent(e)) - { fireAbility(); return 1; } diff --git a/projects/mtg/src/MTGCardInstance.cpp b/projects/mtg/src/MTGCardInstance.cpp index 2f482bc7e..adb4bd9e9 100644 --- a/projects/mtg/src/MTGCardInstance.cpp +++ b/projects/mtg/src/MTGCardInstance.cpp @@ -875,10 +875,11 @@ int MTGCardInstance::toggleDefenser(MTGCardInstance * opponent) { setDefenser(opponent); didblocked = 1; - if (opponent && opponent->controller()->isAI()) + if (opponent && opponent->controller()->isAI() && opponent->controller()->playMode != Player::MODE_TEST_SUITE) { if(opponent->view != NULL) { + //todo: qoute wololo "change this into a cool blinking effects when opposing creature has cursor focus." opponent->view->actZ += .8f; opponent->view->actT -= .2f; }