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

Fizzle unless pay x (thanks to excessum)

Browse Source 
- saves source card in storedSourceCard for ATransform
- adds support for WParsedInt in pay as "pay[[{value:WParsedInt}]]":

name=Spell Rupture
target=*|stack
auto=if cantargetcard(*|opponentstack) then transforms((,newability[pay[[{value:power:highest:creature:opponentbattlefield}]] name(pay {value} mana) donothing?fizzle])) forever
text=Counter target spell unless its controller pays {X}, where X is the greatest power among creatures you control.
mana={1}{U}
type=Instant

- adds support for {x} in *some* “pay” abilities (Syncopate):

name=Syncopate
target=*|stack
auto=transforms((,newability[pay[[{x}]] name(pay {value} mana) donothing?fizzleto(exile)])) forever
text=Counter target spell unless its controller pays {X}. If that spell is countered this way, exile it instead of putting it into  its owner's graveyard.
mana={X}{U}
type=Instant

- support of "name(pay {value} mana)" in pay abilities to show actual number to pay (see example above)
This commit is contained in:
Dmitry Panin
2013-10-22 20:29:06 +04:00
parent b8b6153cc5
commit cf50b7d403
5 changed files with 72 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
projects/mtg/bin/Res/sets/primitives/mtg.txt
View File

@@ -83702,6 +83702,14 @@ mana={U}
type=Instant type=Instant
[/card] [/card]
[card] [card]
name=Spell Rupture
target=*|stack
auto=if cantargetcard(*|opponentstack) then transforms((,newability[pay[[{value:power:highest:creature:opponentbattlefield}]] name(pay {value} mana) donothing?fizzle])) forever else transforms((,newability[pay[[{value:power:highest:creature:mybattlefield.}]] name(pay {value} mana) donothing?fizzle])) forever
text=Counter target spell unless its controller pays {X}, where X is the greatest power among creatures you control.
mana={1}{U}
type=Instant
[/card]
[card]
name=Spell Snare name=Spell Snare
target=*[manacost=2]|stack target=*[manacost=2]|stack
auto=fizzle auto=fizzle
@@ -88470,6 +88478,14 @@ power=3
toughness=3 toughness=3
[/card] [/card]
[card] [card]
name=Syncopate
target=*|stack
auto=transforms((,newability[pay[[{x}]] name(pay {value} mana) donothing?fizzleto(exile)])) forever
text=Counter target spell unless its controller pays {X}. If that spell is countered this way, exile it instead of putting it into its owner's graveyard.
mana={X}{U}
type=Instant
[/card]
[card]
name=Syndic of Tithes name=Syndic of Tithes
auto=@movedto(*|mystack):pay({WB}) life:-1 opponent && life:1 controller auto=@movedto(*|mystack):pay({WB}) life:-1 opponent && life:1 controller
text=Extort (Whenever you cast a spell, you may pay {WB}. If you do, each opponent loses 1 life and you gain that much life.) text=Extort (Whenever you cast a spell, you may pay {WB}. If you do, each opponent loses 1 life and you gain that much life.)

1
projects/mtg/bin/Res/test/_tests.txt
View File

@@ -238,6 +238,7 @@ counterspell.txt
counterspell2.txt counterspell2.txt
counterspell3.txt counterspell3.txt
counterspell4.txt counterspell4.txt
counter_unless_pay.txt
Covetous_Dragon_ASLONGAS_3.txt Covetous_Dragon_ASLONGAS_3.txt
Covetous_Dragon_ASLONGAS_4.txt Covetous_Dragon_ASLONGAS_4.txt
cranial_plating.txt cranial_plating.txt

66
projects/mtg/src/AllAbilities.cpp
View File

@@ -1110,9 +1110,12 @@ AASetCoin * AASetCoin::clone() const
AASetCoin::~AASetCoin() AASetCoin::~AASetCoin()
{ {
} }
//paying for an ability as an effect but as a cost //paying for an ability as an effect but as a cost
GenericPaidAbility::GenericPaidAbility(GameObserver* observer, int id, MTGCardInstance * source, Targetable * target,string _newName,string _castRestriction,string mayCost,string _toAdd,ManaCost * cost) : GenericPaidAbility::GenericPaidAbility(GameObserver* observer, int id, MTGCardInstance * source,
ActivatedAbility(observer, id, source, cost, 0),newName(_newName),restrictions(_castRestriction),baseCost(mayCost), baseAbilityStr(_toAdd) Targetable * target, string _newName, string _castRestriction, string mayCost, string _toAdd, ManaCost * cost) :
ActivatedAbility(observer, id, source, cost, 0),
newName(_newName), restrictions(_castRestriction), baseCost(mayCost), baseAbilityStr(_toAdd)
{ {
this->GetId(); this->GetId();
baseAbility = NULL; baseAbility = NULL;
@@ -1124,8 +1127,7 @@ int GenericPaidAbility::resolve()
if (!target) if (!target)
return 0; return 0;
if (restrictions.size())
if(restrictions.size())
{ {
AbilityFactory af(game); AbilityFactory af(game);
int checkCond = af.parseCastRestrictions(source,source->controller(),restrictions); int checkCond = af.parseCastRestrictions(source,source->controller(),restrictions);
@@ -1136,21 +1138,35 @@ int GenericPaidAbility::resolve()
} }
AbilityFactory Af(game); AbilityFactory Af(game);
vector<string> baseAbilityStrSplit = split(baseAbilityStr,'?'); vector<string> baseAbilityStrSplit = split(baseAbilityStr,'?');
vector<MTGAbility*>selection; vector<MTGAbility*> selection;
if(baseAbilityStrSplit.size() > 1) if (baseAbilityStrSplit.size() > 1)
{ {
baseAbility = Af.parseMagicLine(baseAbilityStrSplit[0], this->GetId(), NULL, source); baseAbility = Af.parseMagicLine(baseAbilityStrSplit[0], this->GetId(), NULL, source);
baseAbility->target = target; baseAbility->target = target;
optionalCost = ManaCost::parseManaCost(baseCost, NULL, source); optionalCost = ManaCost::parseManaCost(baseCost, NULL, source);
MTGAbility * set = baseAbility->clone(); if (optionalCost->hasX()) {
set->oneShot = true; optionalCost->add(Constants::MTG_COLOR_ARTIFACT, source->storedSourceCard->X);
selection.push_back(set); }
SAFE_DELETE(baseAbility);
baseAbility = Af.parseMagicLine(baseAbilityStrSplit[1], this->GetId(), NULL, source); // hacky way to produce better MenuText
baseAbility->target = target; AAFakeAbility* isFake = dynamic_cast< AAFakeAbility* >( baseAbility );
set = baseAbility->clone(); size_t findPayN = isFake->named.find(" {value} mana");
set->oneShot = true; if (isFake && findPayN != string::npos) {
selection.push_back(set); stringstream parseN;
parseN << optionalCost->getCost(Constants::MTG_COLOR_ARTIFACT);
isFake->named.replace(findPayN + 1, 7, parseN.str());
}
MTGAbility * set = baseAbility->clone();
set->oneShot = true;
selection.push_back(set);
SAFE_DELETE(baseAbility);
baseAbility = Af.parseMagicLine(baseAbilityStrSplit[1], this->GetId(), NULL, source);
baseAbility->target = target;
set = baseAbility->clone();
set->oneShot = true;
selection.push_back(set);
} }
else else
{ {
@@ -1162,20 +1178,20 @@ int GenericPaidAbility::resolve()
selection.push_back(set); selection.push_back(set);
} }
if(selection.size()) if (selection.size())
{ {
MTGAbility * a1 = NEW MenuAbility(game, this->GetId(), target, source,baseAbilityStrSplit.size() >1?true:false,selection,NULL,newName); bool must = baseAbilityStrSplit.size() > 1 ? true : false;
dynamic_cast<MenuAbility*>(a1)->optionalCosts.push_back(NEW ManaCost(optionalCost)); MenuAbility * a1 = NEW MenuAbility(game, this->GetId(), target, source, must, selection, NULL, newName);
a1->optionalCosts.push_back(NEW ManaCost(optionalCost));
game->mLayers->actionLayer()->currentActionCard = (MTGCardInstance *)target; game->mLayers->actionLayer()->currentActionCard = (MTGCardInstance *)target;
a1->resolve(); a1->resolve();
} }
return 1; return 1;
} }
const char* GenericPaidAbility::getMenuText() const char* GenericPaidAbility::getMenuText()
{ {
if( newName.size()) if (newName.size())
return newName.c_str(); return newName.c_str();
return "Pay For Effect"; return "Pay For Effect";
} }
@@ -3922,6 +3938,10 @@ ATransformer::ATransformer(GameObserver* observer, int id, MTGCardInstance * sou
MTGAbility(observer, id, source, target),newpower(newpower),newpowerfound(newpowerfound),newtoughness(newtoughness),newtoughnessfound(newtoughnessfound),newAbilitiesList(newAbilitiesList),newAbilityFound(newAbilityFound),aForever(aForever),UYNT(aUntilNext),menutext(_menu) MTGAbility(observer, id, source, target),newpower(newpower),newpowerfound(newpowerfound),newtoughness(newtoughness),newtoughnessfound(newtoughnessfound),newAbilitiesList(newAbilitiesList),newAbilityFound(newAbilityFound),aForever(aForever),UYNT(aUntilNext),menutext(_menu)
{ {
if (target != source) {
target->storedSourceCard = source;
}
PopulateAbilityIndexVector(abilities, sabilities); PopulateAbilityIndexVector(abilities, sabilities);
PopulateColorIndexVector(colors, sabilities); PopulateColorIndexVector(colors, sabilities);
if(sabilities.find("chosencolor") != string::npos) if(sabilities.find("chosencolor") != string::npos)

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

@@ -1961,9 +1961,10 @@ MTGAbility * AbilityFactory::parseMagicLine(string s, int id, Spell * spell, MTG
a->canBeInterrupted = false; a->canBeInterrupted = false;
return a; return a;
} }
//may pay ability
//may pay ability
vector<string> splitMayPaysub = parseBetween(s, "pay[[","]]", true); vector<string> splitMayPaysub = parseBetween(s, "pay[[","]]", true);
if(splitMayPaysub.size()) if (splitMayPaysub.size())
{ {
GenericPaidAbility * a = NEW GenericPaidAbility(observer, id, card, target,newName,castRestriction,splitMayPaysub[1],storedPayString); GenericPaidAbility * a = NEW GenericPaidAbility(observer, id, card, target,newName,castRestriction,splitMayPaysub[1],storedPayString);
a->oneShot = 1; a->oneShot = 1;

9
projects/mtg/src/ManaCost.cpp
View File

@@ -7,6 +7,7 @@
#include "Player.h" #include "Player.h"
#include "WEvent.h" #include "WEvent.h"
#include "MTGAbility.h" #include "MTGAbility.h"
#include "AllAbilities.h"
#include "iterator" #include "iterator"
SUPPORT_OBJECT_ANALYTICS(ManaCost) SUPPORT_OBJECT_ANALYTICS(ManaCost)
@@ -119,6 +120,14 @@ ManaCost * ManaCost::parseManaCost(string s, ManaCost * _manaCost, MTGCardInstan
} }
} }
break; break;
case 'v':
if (value.find("value:") != string::npos) {
vector<string> splitParsedVar = parseBetween(value, "value:", " ", false);
WParsedInt* res = NEW WParsedInt(splitParsedVar[1], NULL, c);
manaCost->add(Constants::MTG_COLOR_ARTIFACT, res->getValue());
SAFE_DELETE(res);
}
break;
case 't': //Tap case 't': //Tap
if (value == "t") if (value == "t")
{ {