Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

* Fixed CMC calculation for transformed cards (fixes #1826).

Browse source
This commit is contained in:
LevelX2 2016-04-15 14:59:36 +02:00
parent 1deb4192ba
commit 2b8f73dbcc
132 changed files with 227 additions and 179 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Mage/src/main/java/mage/abilities/dynamicvalue/common/DiscardCostCardConvertedMana.java
View file

@ -20,7 +20,7 @@ public class DiscardCostCardConvertedMana implements DynamicValue {
DiscardCardCost discardCost = (DiscardCardCost) cost;
int cmc = 0;
for (Card card : discardCost.getCards()) {
cmc += card.getManaCost().convertedManaCost();
cmc += card.getConvertedManaCost();
}
return cmc;
}

2
Mage/src/main/java/mage/abilities/dynamicvalue/common/ExileFromHandCostCardConvertedMana.java
View file

@ -51,7 +51,7 @@ public class ExileFromHandCostCardConvertedMana implements DynamicValue {
if (cost.isPaid() && cost instanceof ExileFromHandCost) {
int xValue = 0;
for (Card card : ((ExileFromHandCost) cost).getCards()) {
xValue += card.getManaCost().convertedManaCost();
xValue += card.getConvertedManaCost();
}
return xValue;
}

2
Mage/src/main/java/mage/abilities/dynamicvalue/common/SacrificeCostConvertedMana.java
View file

@ -57,7 +57,7 @@ public class SacrificeCostConvertedMana implements DynamicValue {
SacrificeTargetCost sacrificeCost = (SacrificeTargetCost) cost;
int totalCMC = 0;
for(Permanent permanent : sacrificeCost.getPermanents()) {
totalCMC += permanent.getManaCost().convertedManaCost();
totalCMC += permanent.getConvertedManaCost();
}
return totalCMC;
}

2
Mage/src/main/java/mage/abilities/dynamicvalue/common/TargetConvertedManaCost.java
View file

@ -43,7 +43,7 @@ public class TargetConvertedManaCost implements DynamicValue {
public int calculate(Game game, Ability source, Effect effect) {
Card card = game.getCard(source.getFirstTarget());
if (card != null) {
return card.getManaCost().convertedManaCost();
return card.getConvertedManaCost();
}
return 0;
}