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

removed a compile error, variables that were unreferenced.

Browse Source 
small add with big impact:
added the useage of castrestriction on triggers and activated abilities. 
this can be used to create such cards as library of alexandria. 
{t}:draw:1 restriction{type(*|myhand)~equalto~7}
and replace instances were we were putting false triggers on the stack from abilities which contained nested aslongas...
meaning cards like epic struggle, won't need to be triggered every turn even if you have no creatures...
for epic struggle here is an example of how to replace it
@each myupkeep restriction{type(creature|mybattlefield)~morethan~19}:wingame controller
any of the current cast and other restrictions can be used. this includes turn:1 <===and various others such as phase based checking.
syntax is 
restriction{ whatever casting/other restriction you want }
a nice quality of life fix for false triggers (which don't mean theyre incorrect, just annoying when they trigger when they will do nothing)
another example would be the triggers on cards like 
skullcage.
auto=@each opponent upkeep:aslongas(*|opponenthand) damage:2 opponent >4
auto=@each opponent upkeep:aslongas(*|opponenthand) damage:2 opponent <3
becomes
auto=@each opponent upkeep restriction{type(*|opponenthand)~morethan~4}:damage:2 opponent
auto=@each opponent upkeep restriction{type(*|opponenthand)~lessthan~3}:damage:2 opponent

now instead of triggering every opponent upkeep even without a resolve...it will only triggers when the restriction requirement is met.

enjoy :)
note:all test pass.
This commit is contained in:
omegablast2002@yahoo.com
2011-09-09 10:34:05 +00:00
parent 4e3a1ff862
commit 1fefc33777
5 changed files with 54 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
projects/mtg/src/MTGAbility.cpp
View File

@@ -761,6 +761,12 @@ MTGAbility * AbilityFactory::parseMagicLine(string s, int id, Spell * spell, MTG
if (splitTrigger.size())
{
TriggeredAbility * trigger = parseTrigger(splitTrigger[1], s, id, spell, card, target);
if (splitTrigger[1].find("restriction{") != string::npos)//using other/cast restrictions for abilities.
{
vector<string> splitRest = parseBetween(s,"restriction{","}");
if (splitRest.size())
trigger->castRestriction = splitRest[1];
}
//Dirty way to remove the trigger text (could get in the way)
if (trigger)
{
@@ -793,7 +799,13 @@ MTGAbility * AbilityFactory::parseMagicLine(string s, int id, Spell * spell, MTG
}
int restrictions = parseRestriction(s);
string castRestriction = "";
if (s.find("restriction{") != string::npos)//using other/cast restrictions for abilities.
{
vector<string> splitRest = parseBetween(s,"restriction{","}");
if (splitRest.size())
castRestriction = splitRest[1];
}
string newName = "";
vector<string> splitName = parseBetween(s, "name(", ")");
if (splitName.size())
@@ -887,6 +899,7 @@ MTGAbility * AbilityFactory::parseMagicLine(string s, int id, Spell * spell, MTG
amp->sideEffect = sideEffect;
amp->usesBeforeSideEffects = usesBeforeSideEffect;
amp->restrictions = restrictions;
amp->castRestriction = castRestriction;
return amp;
}
@@ -905,9 +918,9 @@ MTGAbility * AbilityFactory::parseMagicLine(string s, int id, Spell * spell, MTG
if (tc)
{
tc->belongsToAbility = sWithoutTc;
return NEW GenericTargetAbility(newName,id, card, tc, a, cost, limit,sideEffect,usesBeforeSideEffect, restrictions, dest);
return NEW GenericTargetAbility(newName,castRestriction,id, card, tc, a, cost, limit,sideEffect,usesBeforeSideEffect, restrictions, dest);
}
return NEW GenericActivatedAbility(newName,id, card, a, cost, limit,sideEffect,usesBeforeSideEffect,restrictions, dest);
return NEW GenericActivatedAbility(newName,castRestriction,id, card, a, cost, limit,sideEffect,usesBeforeSideEffect,restrictions, dest);
}
SAFE_DELETE(cost);
}
@@ -963,9 +976,9 @@ MTGAbility * AbilityFactory::parseMagicLine(string s, int id, Spell * spell, MTG
return NULL;
if (tc)
a1 = NEW GenericTargetAbility(newName,id, card, tc, a1);
a1 = NEW GenericTargetAbility(newName,castRestriction,id, card, tc, a1);
else
a1 = NEW GenericActivatedAbility(newName,id, card, a1, NULL);
a1 = NEW GenericActivatedAbility(newName,castRestriction,id, card, a1, NULL);
return NEW MayAbility(id, a1, card,mayMust[i]);
}
}
@@ -1333,7 +1346,7 @@ MTGAbility * AbilityFactory::parseMagicLine(string s, int id, Spell * spell, MTG
DebugTrace("ABILITYFACTORY Error parsing: " << s);
return NULL;
}
a = NEW GenericTargetAbility(newName,id, card, tc, a);
a = NEW GenericTargetAbility(newName,castRestriction,id, card, tc, a);
return NEW MayAbility(id, a, card, true);
}
@@ -3527,8 +3540,8 @@ NestedAbility::NestedAbility(MTGAbility * _ability)
//
ActivatedAbility::ActivatedAbility(int id, MTGCardInstance * card, ManaCost * _cost, int restrictions,string limit,MTGAbility * sideEffect,string usesBeforeSideEffects) :
MTGAbility(id, card), restrictions(restrictions), needsTapping(0),limit(limit),sideEffect(sideEffect),usesBeforeSideEffects(usesBeforeSideEffects)
ActivatedAbility::ActivatedAbility(int id, MTGCardInstance * card, ManaCost * _cost, int restrictions,string limit,MTGAbility * sideEffect,string usesBeforeSideEffects,string castRestriction) :
MTGAbility(id, card), restrictions(restrictions), needsTapping(0),limit(limit),sideEffect(sideEffect),usesBeforeSideEffects(usesBeforeSideEffects),castRestriction(castRestriction)
{
counters = 0;
setCost(_cost);
@@ -3595,6 +3608,13 @@ int ActivatedAbility::isReactingToClick(MTGCardInstance * card, ManaCost * mana)
if (limitPerTurn && counters >= limitPerTurn)
return 0;
}
if(castRestriction.size())
{
AbilityFactory af;
int checkCond = af.parseCastRestrictions(card,card->controller(),castRestriction);
if(!checkCond)
return 0;
}
if (card == source && source->controller() == player && (!needsTapping || (!source->isTapped()
&& !source->hasSummoningSickness())))
{
@@ -3752,14 +3772,14 @@ ostream& ActivatedAbility::toString(ostream& out) const
return MTGAbility::toString(out) << ")";
}
TargetAbility::TargetAbility(int id, MTGCardInstance * card, TargetChooser * _tc, ManaCost * _cost, int _playerturnonly) :
ActivatedAbility(id, card, _cost, _playerturnonly), NestedAbility(NULL)
TargetAbility::TargetAbility(int id, MTGCardInstance * card, TargetChooser * _tc, ManaCost * _cost, int _playerturnonly, string castRestriction) :
ActivatedAbility(id, card, _cost, _playerturnonly, castRestriction), NestedAbility(NULL)
{
tc = _tc;
}
TargetAbility::TargetAbility(int id, MTGCardInstance * card, ManaCost * _cost, int _playerturnonly) :
ActivatedAbility(id, card, _cost, _playerturnonly), NestedAbility(NULL)
TargetAbility::TargetAbility(int id, MTGCardInstance * card, ManaCost * _cost, int _playerturnonly, string castRestriction) :
ActivatedAbility(id, card, _cost, _playerturnonly, castRestriction), NestedAbility(NULL)
{
tc = NULL;
}
@@ -3959,6 +3979,15 @@ int Trigger::triggerOnEvent(WEvent * event) {
if(mOnce && mActiveTrigger)
mActiveTrigger = false;
if(castRestriction.size())
{
if(!source)
return 1;//can't check these restrictions without a source aka:in a rule.txt
AbilityFactory af;
int checkCond = af.parseCastRestrictions(source,source->controller(),castRestriction);
if(!checkCond)
return 0;
}
return 1;
}