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

Fixed cost reduction issue for card with X in their cost.

Browse Source
This commit is contained in:
Vittorio Alfieri
2021-02-08 23:10:01 +01:00
parent eb8da4d4b2
commit cf9f6ed474
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/mtg/src/MTGRules.cpp
+8 -2
View File
@@ -419,11 +419,11 @@ int MTGPutInPlayRule::reactToClick(MTGCardInstance * card)
else else
colorlessx -= costcx; colorlessx -= costcx;
int options = cost->hasSpecificX() ? amountx + 1 +colorlessx : (playerMana->getConvertedCost() - cost->getConvertedCost()) + 1; int options = cost->hasSpecificX() ? amountx + 1 +colorlessx : (playerMana->getConvertedCost() - cost->getConvertedCost()) + 1;
options += card->getReducedManaCost()->getConvertedCost();//Try to Apply cost reduction to X.
//you can set up to 20 for specific X, if you cant afford it, it cancels. I couldnt think of a equation that would //you can set up to 20 for specific X, if you cant afford it, it cancels. I couldnt think of a equation that would
//give me the correct amount sorry. //give me the correct amount sorry.
for (int i = 0; i < options; ++i) for (int i = 0; i < options; ++i)
{ {
MTGAbility * setX = NEW AAWhatsX(game, game->mLayers->actionLayer()->getMaxId(), card, card, i, this); MTGAbility * setX = NEW AAWhatsX(game, game->mLayers->actionLayer()->getMaxId(), card, card, i, this);
MTGAbility * setCardX = setX->clone(); MTGAbility * setCardX = setX->clone();
setCardX->oneShot = true; setCardX->oneShot = true;
@@ -456,6 +456,8 @@ int MTGPutInPlayRule::reactToClick(MTGCardInstance * card)
Xcost->copy(cost); Xcost->copy(cost);
Xcost->add(Constants::MTG_COLOR_ARTIFACT, card->setX); Xcost->add(Constants::MTG_COLOR_ARTIFACT, card->setX);
Xcost->remove(7, 1); Xcost->remove(7, 1);
if(card->getReducedManaCost()->getConvertedCost() > 0)//Try to Apply cost reduction to X.
Xcost->remove(Constants::MTG_COLOR_ARTIFACT, card->getReducedManaCost()->getConvertedCost());
if (playerMana->canAfford(Xcost,card->has(Constants::ANYTYPEOFMANA))) if (playerMana->canAfford(Xcost,card->has(Constants::ANYTYPEOFMANA)))
{ {
cost->copy(Xcost); cost->copy(Xcost);
@@ -568,6 +570,8 @@ int MTGPutInPlayRule::reactToClick(MTGCardInstance * card)
if (!card->has(Constants::STORM)) if (!card->has(Constants::STORM))
{ {
copy->X = spell->computeX(copy); copy->X = spell->computeX(copy);
if(card->setX > -1 && (card->getReducedManaCost()->getConvertedCost() > 0 || card->getIncreasedManaCost()->getConvertedCost() > 0)) //Try to Apply cost reduction/increasement to X.
copy->X = card->setX;
copy->castX = copy->X; copy->castX = copy->X;
} }
} }
@@ -889,11 +893,11 @@ int MTGAlternativeCostRule::reactToClick(MTGCardInstance * card, ManaCost *alter
{ {
vector<MTGAbility*>selection; vector<MTGAbility*>selection;
int options = alternateCost->hasSpecificX()? 20 : (playerMana->getConvertedCost() - alternateCost->getConvertedCost()) + 1; int options = alternateCost->hasSpecificX()? 20 : (playerMana->getConvertedCost() - alternateCost->getConvertedCost()) + 1;
options += card->getReducedManaCost()->getConvertedCost();//Try to Apply cost reduction to X.
//you can set up to 20 for specific X, if you cant afford it, it cancels. I couldnt think of a equation that would //you can set up to 20 for specific X, if you cant afford it, it cancels. I couldnt think of a equation that would
//give me the correct amount sorry. //give me the correct amount sorry.
for (int i = 0; i < options; ++i) for (int i = 0; i < options; ++i)
{ {
MTGAbility * setX = NEW AAWhatsX(game, game->mLayers->actionLayer()->getMaxId(), card, card, i, this); MTGAbility * setX = NEW AAWhatsX(game, game->mLayers->actionLayer()->getMaxId(), card, card, i, this);
MTGAbility * setCardX = setX->clone(); MTGAbility * setCardX = setX->clone();
setCardX->oneShot = true; setCardX->oneShot = true;
@@ -927,6 +931,8 @@ int MTGAlternativeCostRule::reactToClick(MTGCardInstance * card, ManaCost *alter
Xcost->add(Constants::MTG_COLOR_ARTIFACT, card->setX); Xcost->add(Constants::MTG_COLOR_ARTIFACT, card->setX);
card->X = card->setX; // Fix to don't loose X value on alternative cast card->X = card->setX; // Fix to don't loose X value on alternative cast
Xcost->remove(7, 1);//remove the X Xcost->remove(7, 1);//remove the X
if(card->getReducedManaCost()->getConvertedCost() > 0)//Try to Apply cost reduction to X.
Xcost->remove(Constants::MTG_COLOR_ARTIFACT, card->getReducedManaCost()->getConvertedCost());
if (playerMana->canAfford(Xcost,card->has(Constants::ANYTYPEOFMANA))) if (playerMana->canAfford(Xcost,card->has(Constants::ANYTYPEOFMANA)))
{ {
alternateCost->copy(Xcost); alternateCost->copy(Xcost);