Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
omegablast2002@yahoo.com
2011-01-23 17:57:37 +00:00
parent ee29fbc237
commit 48fd6a1bc1
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
projects/mtg/src/MTGAbility.cpp
View File

@@ -4075,6 +4075,8 @@ TriggeredAbility::TriggeredAbility(int id, MTGCardInstance * card) :
int TriggeredAbility::receiveEvent(WEvent * e)
{
if (triggerOnEvent(e))
{
if(dynamic_cast<WEventTarget*>(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;
}

3
projects/mtg/src/MTGCardInstance.cpp
View File

@@ -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;
}