revert pw attack rule

need to refactor this as this cause crashes on android when you cast a
planeswalker
This commit is contained in:
Anthony Calosa
2017-03-01 16:07:12 +08:00
parent 3bf1cca118
commit d761bac85c
11 changed files with 17 additions and 48 deletions
+3 -8
View File
@@ -1862,13 +1862,8 @@ int MTGAttackRule::receiveEvent(WEvent *e)
card->setAttacker(0);
if (card->isAttacker() && !card->has(Constants::VIGILANCE))
card->tap();
if (card->isAttacker() && card->has(Constants::CANTATTACK) && (card->isAttacking && ((Damageable*)card->isAttacking)->type_as_damageable == Damageable::DAMAGEABLE_PLAYER))
if (card->isAttacker() && card->has(Constants::CANTATTACK))
card->toggleAttacker();//if a card has cantattack, then you cant
/*if (card->isAttacker() && card->has(Constants::CANTATTACKPW) && (card->isAttacking && ((Damageable*)card->isAttacking)->type_as_damageable == Damageable::DAMAGEABLE_MTGCARDINSTANCE))
{
if(((MTGCardInstance *)card->isAttacking)->hasType("planeswalker"))
card->toggleAttacker();
}*/
}
return 1;
}
@@ -1920,7 +1915,7 @@ int MTGPlaneswalkerAttackRule::isReactingToClick(MTGCardInstance * card, ManaCos
return 0;
if (card->isAttacker())
return 1;
if (card->canPWAttack() && card->attackPlaneswalkerCost < 1)
if (card->canAttack() && card->attackPlaneswalkerCost < 1)
return 1;
}
return 0;
@@ -1977,7 +1972,7 @@ bool MTGPlaneswalkerAttackRule::select(Target* t)
if (CardView* c = dynamic_cast<CardView*>(t))
{
MTGCardInstance * card = c->getCard();
if (card->canPWAttack() && !card->isPhased)
if (card->canAttack() && !card->isPhased)
return true;
}
return false;