Fixed formatting
This commit is contained in:
@@ -2524,13 +2524,13 @@ public:
|
|||||||
|
|
||||||
ALord(GameObserver* observer, int _id, MTGCardInstance * card, TargetChooser * _tc, int _includeSelf, MTGAbility * a) :
|
ALord(GameObserver* observer, int _id, MTGCardInstance * card, TargetChooser * _tc, int _includeSelf, MTGAbility * a) :
|
||||||
ListMaintainerAbility(observer, _id, card), NestedAbility(a)
|
ListMaintainerAbility(observer, _id, card), NestedAbility(a)
|
||||||
{
|
{
|
||||||
tc = _tc;
|
tc = _tc;
|
||||||
tc->targetter = NULL;
|
tc->targetter = NULL;
|
||||||
includeSelf = _includeSelf;
|
includeSelf = _includeSelf;
|
||||||
if(ability->aType == MTGAbility::STANDARD_PREVENT)
|
if(ability->aType == MTGAbility::STANDARD_PREVENT)
|
||||||
aType = MTGAbility::STANDARD_PREVENT;
|
aType = MTGAbility::STANDARD_PREVENT;
|
||||||
}
|
}
|
||||||
|
|
||||||
//returns true if it is me who created ability a attached to Damageable d
|
//returns true if it is me who created ability a attached to Damageable d
|
||||||
bool isParentOf(Damageable * d, MTGAbility * a)
|
bool isParentOf(Damageable * d, MTGAbility * a)
|
||||||
@@ -2608,7 +2608,8 @@ public:
|
|||||||
|
|
||||||
int removed(MTGCardInstance * card)
|
int removed(MTGCardInstance * card)
|
||||||
{
|
{
|
||||||
if (abilities.find(card) != abilities.end() && !(forceDestroy == -1 && forcedAlive == 1))//only embelms have forcedestroy = -1 and forcedalive = 1
|
if (abilities.find(card) != abilities.end()
|
||||||
|
&& !(forceDestroy == -1 && forcedAlive == 1)) //only embelms have forcedestroy = -1 and forcedalive = 1
|
||||||
{
|
{
|
||||||
game->removeObserver(abilities[card]);
|
game->removeObserver(abilities[card]);
|
||||||
abilities.erase(card);
|
abilities.erase(card);
|
||||||
|
|||||||
@@ -5419,83 +5419,83 @@ AACastCard::AACastCard(GameObserver* observer, int _id, MTGCardInstance * _sourc
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void AACastCard::Update(float dt)
|
void AACastCard::Update(float dt)
|
||||||
|
{
|
||||||
|
MTGAbility::Update(dt);
|
||||||
|
if (processed)
|
||||||
|
return;
|
||||||
|
if(cardNamed.size() && !theNamedCard)
|
||||||
|
{
|
||||||
|
theNamedCard = makeCard();
|
||||||
|
}
|
||||||
|
if (restricted)
|
||||||
{
|
{
|
||||||
MTGAbility::Update(dt);
|
|
||||||
if (processed)
|
|
||||||
return;
|
|
||||||
if(cardNamed.size() && !theNamedCard)
|
|
||||||
{
|
|
||||||
theNamedCard = makeCard();
|
|
||||||
}
|
|
||||||
if (restricted)
|
|
||||||
{
|
|
||||||
MTGCardInstance * toCheck = (MTGCardInstance*)target;
|
|
||||||
if(theNamedCard)
|
|
||||||
toCheck = theNamedCard;
|
|
||||||
if (game->currentActionPlayer->game->playRestrictions->canPutIntoZone(toCheck, source->controller()->game->stack) == PlayRestriction::CANT_PLAY)
|
|
||||||
{
|
|
||||||
processed = true;
|
|
||||||
this->forceDestroy = 1;
|
|
||||||
return ;
|
|
||||||
}
|
|
||||||
if(!allowedToCast(toCheck,source->controller()))
|
|
||||||
{
|
|
||||||
processed = true;
|
|
||||||
this->forceDestroy = 1;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if(!toCheck->hasType(Subtypes::TYPE_INSTANT) && !(game->getCurrentGamePhase() == MTG_PHASE_FIRSTMAIN || game->getCurrentGamePhase() == MTG_PHASE_SECONDMAIN))
|
|
||||||
{
|
|
||||||
processed = true;
|
|
||||||
this->forceDestroy = 1;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
MTGCardInstance * toCheck = (MTGCardInstance*)target;
|
MTGCardInstance * toCheck = (MTGCardInstance*)target;
|
||||||
if(theNamedCard)
|
if(theNamedCard)
|
||||||
toCheck = theNamedCard;
|
toCheck = theNamedCard;
|
||||||
if (Spell * checkSpell = dynamic_cast<Spell*>(target))
|
if (game->currentActionPlayer->game->playRestrictions->canPutIntoZone(toCheck, source->controller()->game->stack) == PlayRestriction::CANT_PLAY)
|
||||||
{
|
{
|
||||||
toCheck = checkSpell->source;
|
processed = true;
|
||||||
|
this->forceDestroy = 1;
|
||||||
|
return ;
|
||||||
}
|
}
|
||||||
if (!game->targetListIsSet(toCheck))
|
if(!allowedToCast(toCheck,source->controller()))
|
||||||
{
|
{
|
||||||
if(game->targetChooser)
|
processed = true;
|
||||||
game->targetChooser->Owner = source->controller();//sources controller is the caster
|
this->forceDestroy = 1;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
resolveSpell();
|
if(!toCheck->hasType(Subtypes::TYPE_INSTANT) && !(game->getCurrentGamePhase() == MTG_PHASE_FIRSTMAIN || game->getCurrentGamePhase() == MTG_PHASE_SECONDMAIN))
|
||||||
this->forceDestroy = 1;
|
{
|
||||||
|
processed = true;
|
||||||
|
this->forceDestroy = 1;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
MTGCardInstance * toCheck = (MTGCardInstance*)target;
|
||||||
|
if(theNamedCard)
|
||||||
|
toCheck = theNamedCard;
|
||||||
|
if (Spell * checkSpell = dynamic_cast<Spell*>(target))
|
||||||
|
{
|
||||||
|
toCheck = checkSpell->source;
|
||||||
|
}
|
||||||
|
if (!game->targetListIsSet(toCheck))
|
||||||
|
{
|
||||||
|
if(game->targetChooser)
|
||||||
|
game->targetChooser->Owner = source->controller();//sources controller is the caster
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
int AACastCard::isReactingToTargetClick(Targetable * card){return 0;}
|
resolveSpell();
|
||||||
int AACastCard::reactToTargetClick(Targetable * object)
|
this->forceDestroy = 1;
|
||||||
{
|
return;
|
||||||
if (MTGCardInstance * cObject = dynamic_cast<MTGCardInstance *>(object))
|
}
|
||||||
return reactToClick(cObject);
|
int AACastCard::isReactingToTargetClick(Targetable * card){return 0;}
|
||||||
|
int AACastCard::reactToTargetClick(Targetable * object)
|
||||||
|
{
|
||||||
|
if (MTGCardInstance * cObject = dynamic_cast<MTGCardInstance *>(object))
|
||||||
|
return reactToClick(cObject);
|
||||||
|
|
||||||
if (waitingForAnswer)
|
if (waitingForAnswer)
|
||||||
|
{
|
||||||
|
if (tc->toggleTarget(object) == TARGET_OK_FULL)
|
||||||
{
|
{
|
||||||
if (tc->toggleTarget(object) == TARGET_OK_FULL)
|
waitingForAnswer = 0;
|
||||||
{
|
game->mLayers->actionLayer()->setCurrentWaitingAction(NULL);
|
||||||
waitingForAnswer = 0;
|
return MTGAbility::reactToClick(source);
|
||||||
game->mLayers->actionLayer()->setCurrentWaitingAction(NULL);
|
|
||||||
return MTGAbility::reactToClick(source);
|
|
||||||
}
|
|
||||||
return 1;
|
|
||||||
}
|
}
|
||||||
return 0;
|
return 1;
|
||||||
}
|
}
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
MTGCardInstance * AACastCard::makeCard()
|
MTGCardInstance * AACastCard::makeCard()
|
||||||
{
|
{
|
||||||
MTGCardInstance * card = NULL;
|
MTGCardInstance * card = NULL;
|
||||||
MTGCard * cardData = MTGCollection()->getCardByName(cardNamed);
|
MTGCard * cardData = MTGCollection()->getCardByName(cardNamed);
|
||||||
card = NEW MTGCardInstance(cardData, source->controller()->game);
|
card = NEW MTGCardInstance(cardData, source->controller()->game);
|
||||||
source->controller()->game->temp->addCard(card);
|
source->controller()->game->temp->addCard(card);
|
||||||
return card;
|
return card;
|
||||||
}
|
}
|
||||||
|
|
||||||
int AACastCard::resolveSpell()
|
int AACastCard::resolveSpell()
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user