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

as requested by doc, added a tag for lords to allow an over-ride for effect so theyre not removed from the game by GameObserver until the lords remove it themselves.

Browse Source 
ie:
Card Name:
Quick Sliver
Mana Cost:
Converted Mana Cost:2
Types:Creature — Sliver
Card Text:Flash
Any player may cast Sliver cards as though they had flash.

without an over-ride testdestroy removes the observer before it can be any use to us.

i only enabled this for the lords/this'es....
This commit is contained in:
omegablast2002@yahoo.com
2011-06-02 23:46:44 +00:00
parent 2b512f1f92
commit cb9e5f2e95
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/mtg/include/MTGAbility.h
+1
View File
@@ -109,6 +109,7 @@ public:
int allowedToAltCast(MTGCardInstance* card, Player* player); int allowedToAltCast(MTGCardInstance* card, Player* player);
int oneShot; int oneShot;
int forceDestroy; int forceDestroy;
int forcedAlive;
bool canBeInterrupted; bool canBeInterrupted;
ManaCost* cost; ManaCost* cost;
ManaCost* alternative; ManaCost* alternative;
projects/mtg/src/MTGAbility.cpp
+13 -2
View File
@@ -701,7 +701,6 @@ MTGAbility * AbilityFactory::parseMagicLine(string s, int id, Spell * spell, MTG
{ {
size_t found; size_t found;
trim(s); trim(s);
//TODO This block redundant with calling function //TODO This block redundant with calling function
if (!card && spell) if (!card && spell)
card = spell->source; card = spell->source;
@@ -1017,6 +1016,13 @@ MTGAbility * AbilityFactory::parseMagicLine(string s, int id, Spell * spell, MTG
return multi; return multi;
} }
int forcedalive = 0;
//force an ability to ignore destroy while source is still valid.
//allow the lords to remove the ability instead of gameobserver checks.
found = s.find("forcedalive");
if (found != string::npos)
forcedalive = 1;
//rather dirty way to stop thises and lords from conflicting with each other. //rather dirty way to stop thises and lords from conflicting with each other.
size_t lord = string::npos; size_t lord = string::npos;
for (size_t j = 0; j < kLordKeywordsCount; ++j) for (size_t j = 0; j < kLordKeywordsCount; ++j)
@@ -1105,6 +1111,7 @@ MTGAbility * AbilityFactory::parseMagicLine(string s, int id, Spell * spell, MTG
if (result) if (result)
{ {
result->oneShot = oneShot; result->oneShot = oneShot;
a->forcedAlive = forcedalive;
} }
return result; return result;
} }
@@ -1238,7 +1245,10 @@ MTGAbility * AbilityFactory::parseMagicLine(string s, int id, Spell * spell, MTG
result = NULL; result = NULL;
} }
if (result) if (result)
{
result->oneShot = oneShot; result->oneShot = oneShot;
a->forcedAlive = forcedalive;
}
return result; return result;
} }
return NULL; return NULL;
@@ -1650,7 +1660,6 @@ MTGAbility * AbilityFactory::parseMagicLine(string s, int id, Spell * spell, MTG
found = s.find("forever"); found = s.find("forever");
if (found != string::npos) if (found != string::npos)
forceFOREVER = 1; forceFOREVER = 1;
//Prevent Damage //Prevent Damage
const string preventDamageKeywords[] = { "preventallcombatdamage", "preventallnoncombatdamage", "preventalldamage", "fog" }; const string preventDamageKeywords[] = { "preventallcombatdamage", "preventallnoncombatdamage", "preventalldamage", "fog" };
const int preventDamageTypes[] = {0, 2, 1, 0}; //TODO enum ? const int preventDamageTypes[] = {0, 2, 1, 0}; //TODO enum ?
@@ -3314,6 +3323,8 @@ GameObserver * g=g->GetInstance();
return 0; return 0;
if(source->exileEffects && game->isInExile(source)) if(source->exileEffects && game->isInExile(source))
return 0; return 0;
if(this->forcedAlive == 1)
return 0;
if (!game->isInPlay(source)) if (!game->isInPlay(source))
return 1; return 1;
if (target && !game->isInPlay((MTGCardInstance *) target)) if (target && !game->isInPlay((MTGCardInstance *) target))