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
This commit is contained in:
@@ -4074,6 +4074,8 @@ TriggeredAbility::TriggeredAbility(int id, MTGCardInstance * card) :
|
|||||||
}
|
}
|
||||||
|
|
||||||
int TriggeredAbility::receiveEvent(WEvent * e)
|
int TriggeredAbility::receiveEvent(WEvent * e)
|
||||||
|
{
|
||||||
|
if (triggerOnEvent(e))
|
||||||
{
|
{
|
||||||
if(dynamic_cast<WEventTarget*>(e))
|
if(dynamic_cast<WEventTarget*>(e))
|
||||||
{
|
{
|
||||||
@@ -4082,8 +4084,6 @@ int TriggeredAbility::receiveEvent(WEvent * e)
|
|||||||
resolve();
|
resolve();
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
if (triggerOnEvent(e))
|
|
||||||
{
|
|
||||||
fireAbility();
|
fireAbility();
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -875,10 +875,11 @@ int MTGCardInstance::toggleDefenser(MTGCardInstance * opponent)
|
|||||||
{
|
{
|
||||||
setDefenser(opponent);
|
setDefenser(opponent);
|
||||||
didblocked = 1;
|
didblocked = 1;
|
||||||
if (opponent && opponent->controller()->isAI())
|
if (opponent && opponent->controller()->isAI() && opponent->controller()->playMode != Player::MODE_TEST_SUITE)
|
||||||
{
|
{
|
||||||
if(opponent->view != NULL)
|
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->actZ += .8f;
|
||||||
opponent->view->actT -= .2f;
|
opponent->view->actT -= .2f;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user