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

fix for emblems not sticking, and phasealter not testDestroying.

Browse Source
This commit is contained in:
omegablast2002@yahoo.com
2012-05-02 12:58:39 +00:00
parent ec7a8d219f
commit e67e2e669c
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/mtg/include/AllAbilities.h
+3 -1
View File
@@ -2378,7 +2378,7 @@ public:
int removed(MTGCardInstance * card) int removed(MTGCardInstance * card)
{ {
if (abilities.find(card) != abilities.end()) 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);
@@ -5095,6 +5095,8 @@ public:
{ {
if(forceDestroy != -1) if(forceDestroy != -1)
return 1; return 1;
if(!(source->hasType(Subtypes::TYPE_INSTANT)||source->hasType(Subtypes::TYPE_INSTANT)) && !source->isInPlay(game))
return 1;
return 0; return 0;
} }
projects/mtg/src/MTGAbility.cpp
+1 -1
View File
@@ -1318,7 +1318,7 @@ MTGAbility * AbilityFactory::parseMagicLine(string s, int id, Spell * spell, MTG
if (!a1) if (!a1)
return NULL; return NULL;
return NEW GenericAbilityMod(observer, 1, card,spell?spell->getNextDamageableTarget():(Damageable *) target, a1);; return NEW GenericAbilityMod(observer, 1, card->controller()->getObserver()->ExtraRules,card->controller()->getObserver()->ExtraRules, a1);
} }
//choose a color //choose a color
projects/mtg/src/Rules.cpp
+1
View File
@@ -147,6 +147,7 @@ void Rules::addExtraRules(GameObserver* g)
//Trick so that the abilities don't die; //Trick so that the abilities don't die;
g->ExtraRules[i].currentZone = p->game->inPlay; g->ExtraRules[i].currentZone = p->game->inPlay;
g->ExtraRules[i].lastController = p; g->ExtraRules[i].lastController = p;
g->ExtraRules[i].owner = p;
for (size_t j = 0; j < initState.playerData[i].extraRules.size(); ++j) for (size_t j = 0; j < initState.playerData[i].extraRules.size(); ++j)
{ {
AbilityFactory af(g); AbilityFactory af(g);