Added X to the filters for this() and thisforeach(), for use with {X} costed activated abilities, although it should theoretically work with spells as well if necessary.

This commit is contained in:
salmelo16
2010-04-14 23:42:47 +00:00
parent 73b494c32d
commit 74d2bbf324
7 changed files with 73 additions and 3 deletions
+15
View File
@@ -1813,6 +1813,7 @@ NestedAbility::NestedAbility(MTGAbility * _ability){
ActivatedAbility::ActivatedAbility(int id, MTGCardInstance * card, ManaCost * _cost, int restrictions,int tap):MTGAbility(id,card), restrictions(restrictions), needsTapping(tap){
cost = _cost;
abilityCost = 0;
}
@@ -1856,13 +1857,17 @@ int ActivatedAbility::isReactingToClick(MTGCardInstance * card, ManaCost * mana)
int ActivatedAbility::reactToClick(MTGCardInstance * card){
// if (cost) cost->setExtraCostsAction(this, card);
if (!isReactingToClick(card)) return 0;
Player * player = game->currentlyActing();
if (cost){
if (!cost->isExtraPaymentSet()){
game->waitForExtraPayment = cost->extraCosts;
return 0;
}
ManaCost * previousManaPool = NEW ManaCost(player->getManaPool());
game->currentlyActing()->getManaPool()->pay(cost);
cost->doPayExtra();
abilityCost = previousManaPool->Diff(player->getManaPool());
delete previousManaPool;
}
if (needsTapping && source->isInPlay()) source->tap();
fireAbility();
@@ -1873,14 +1878,18 @@ int ActivatedAbility::reactToClick(MTGCardInstance * card){
int ActivatedAbility::reactToTargetClick(Targetable * object){
if (!isReactingToTargetClick(object)) return 0;
Player * player = game->currentlyActing();
if (cost){
if (object->typeAsTarget() == TARGET_CARD) cost->setExtraCostsAction(this, (MTGCardInstance *) object);
if (!cost->isExtraPaymentSet()){
game->waitForExtraPayment = cost->extraCosts;
return 0;
}
ManaCost * previousManaPool = NEW ManaCost(player->getManaPool());
game->currentlyActing()->getManaPool()->pay(cost);
cost->doPayExtra();
abilityCost = previousManaPool->Diff(player->getManaPool());
delete previousManaPool;
}
if (needsTapping && source->isInPlay()) source->tap();
fireAbility();
@@ -1888,6 +1897,12 @@ int ActivatedAbility::reactToTargetClick(Targetable * object){
}
ActivatedAbility::~ActivatedAbility(){
if (!isClone){
SAFE_DELETE(abilityCost);
}
}
ostream& ActivatedAbility::toString(ostream& out) const
{
out << "ActivatedAbility ::: restrictions : " << restrictions