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

Added / fixed primitives from NEO set, updated missing cards by sets list, improved "removesinglecountertype" ability (added "all" option to remove a specific amount of each kind of counter on a target).

Browse Source
This commit is contained in:
Vittorio Alfieri
2023-06-21 18:31:50 +02:00
parent 1458b4a872
commit 797514521e
8 changed files with 725 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/mtg/src/AllAbilities.cpp
+21 -10
View File
@@ -2913,6 +2913,7 @@ AARemoveSingleCounter::AARemoveSingleCounter(GameObserver* observer, int id, MTG
ActivatedAbility(observer, id, source, cost, 0), nb(nb)
{
this->GetId();
allcounters = false;
}
int AARemoveSingleCounter::resolve()
@@ -2949,15 +2950,25 @@ int AARemoveSingleCounter::resolve()
for(size_t i = 0; i < counters->counters.size(); ++i)
{
Counter * counter = counters->counters[i];
MTGAbility * a = NEW AACounter(game, game->mLayers->actionLayer()->getMaxId(), source, cTarget,"", counter->name.c_str(), counter->power, counter->toughness, -nb, 0);
MTGAbility * a = NEW AACounter(game, game->mLayers->actionLayer()->getMaxId(), source, cTarget, "", counter->name.c_str(), counter->power, counter->toughness, -nb, 0);
a->oneShot = true;
pcounters.push_back(a);
}
}
if(pcounters.size())
{
MTGAbility * a = NEW MenuAbility(game, this->GetId(), target, source, true, pcounters);
a->resolve();
if(allcounters)
{
for(size_t j = 0; j < pcounters.size(); j++)
{
pcounters[j]->resolve();
}
}
else
{
MTGAbility * a = NEW MenuAbility(game, this->GetId(), target, source, true, pcounters);
a->resolve();
}
}
return 1;
@@ -3034,9 +3045,9 @@ int AADuplicateCounters::resolve()
Counter * counter = counters->counters[i];
MTGAbility * a = NULL;
if(single)
a = NEW AACounter(game, game->mLayers->actionLayer()->getMaxId(), source, cTarget,"", counter->name.c_str(), counter->power, counter->toughness, 1, 0);
a = NEW AACounter(game, game->mLayers->actionLayer()->getMaxId(), source, cTarget, "", counter->name.c_str(), counter->power, counter->toughness, 1, 0);
else
a = NEW AACounter(game, game->mLayers->actionLayer()->getMaxId(), source, cTarget,"", counter->name.c_str(), counter->power, counter->toughness, counter->nb, 0);
a = NEW AACounter(game, game->mLayers->actionLayer()->getMaxId(), source, cTarget, "", counter->name.c_str(), counter->power, counter->toughness, counter->nb, 0);
a->oneShot = true;
pcounters.push_back(a);
}
@@ -3045,10 +3056,10 @@ int AADuplicateCounters::resolve()
{
if(allcounters)
{
for(size_t j = 0; j < pcounters.size(); j++)
{
pcounters[j]->resolve();
}
for(size_t j = 0; j < pcounters.size(); j++)
{
pcounters[j]->resolve();
}
}
else
{
@@ -3119,7 +3130,7 @@ int AAProliferate::resolve()
for(size_t i = 0; i < counters->counters.size(); ++i)
{
Counter * counter = counters->counters[i];
MTGAbility * a = NEW AACounter(game, game->mLayers->actionLayer()->getMaxId(), source, cTarget,"", counter->name.c_str(), counter->power, counter->toughness, 1, 0);
MTGAbility * a = NEW AACounter(game, game->mLayers->actionLayer()->getMaxId(), source, cTarget, "", counter->name.c_str(), counter->power, counter->toughness, 1, 0);
a->oneShot = true;
pcounters.push_back(a);
}
projects/mtg/src/MTGAbility.cpp
+13 -1
View File
@@ -4851,12 +4851,24 @@ MTGAbility * AbilityFactory::parseMagicLine(string s, int id, Spell * spell, MTG
if (splitRemoveSpecificCounters.size())
{
int nb = 0;
WParsedInt* parser = NEW WParsedInt(splitRemoveSpecificCounters[1], card);
bool allcounters = false;
string counterString = splitRemoveSpecificCounters[1];
if(counterString.find("all") != string::npos){
allcounters = true;
size_t pos = counterString.find(",all");
if(pos != string::npos)
counterString.replace(pos, 4, "");
pos = counterString.find("all,");
if(pos != string::npos)
counterString.replace(pos, 4, "");
}
WParsedInt* parser = NEW WParsedInt(counterString, card);
if(parser){
nb = parser->intValue;
SAFE_DELETE(parser);
}
MTGAbility * a = NEW AARemoveSingleCounter(observer, id, card, target, NULL, nb);
((AARemoveSingleCounter*)a)->allcounters = allcounters;
a->oneShot = 1;
a->canBeInterrupted = false;
return a;