diff --git a/Mage.Sets/src/mage/sets/alarareborn/SingeMindOgre.java b/Mage.Sets/src/mage/sets/alarareborn/SingeMindOgre.java index a2ff1311a59..dd04210041e 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/SingeMindOgre.java +++ b/Mage.Sets/src/mage/sets/alarareborn/SingeMindOgre.java @@ -101,7 +101,7 @@ class SingeMindOgreEffect extends OneShotEffect { Card card = targetPlayer.getHand().getRandom(game); revealed.add(card); targetPlayer.revealCards("Singe-Mind Ogre", revealed, game); - targetPlayer.loseLife(card.getManaCost().convertedManaCost(), game); + targetPlayer.loseLife(card.getConvertedManaCost(), game); return true; } return false; diff --git a/Mage.Sets/src/mage/sets/alarareborn/SpellboundDragon.java b/Mage.Sets/src/mage/sets/alarareborn/SpellboundDragon.java index 0f08da3d14e..45787aabb04 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/SpellboundDragon.java +++ b/Mage.Sets/src/mage/sets/alarareborn/SpellboundDragon.java @@ -104,7 +104,7 @@ class SpellboundDragonEffect extends OneShotEffect { you.choose(Outcome.Discard, target, source.getSourceId(), game); Card card = you.getHand().get(target.getFirstTarget(), game); if (card != null && you.discard(card, source, game)) { - int cmc = card.getManaCost().convertedManaCost(); + int cmc = card.getConvertedManaCost(); if (dragon != null) { game.addEffect(new BoostSourceEffect(cmc, 0, Duration.EndOfTurn), source); return true; diff --git a/Mage.Sets/src/mage/sets/alarareborn/VengefulRebirth.java b/Mage.Sets/src/mage/sets/alarareborn/VengefulRebirth.java index a48753dd86d..b9f8abbf935 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/VengefulRebirth.java +++ b/Mage.Sets/src/mage/sets/alarareborn/VengefulRebirth.java @@ -96,7 +96,7 @@ class VengefulRebirthEffect extends OneShotEffect { if (controller != null && card != null && controller.removeFromGraveyard(card, game)) { controller.moveCards(card, Zone.GRAVEYARD, Zone.HAND, source, game); if (!card.getCardType().contains(CardType.LAND)) { - int damage = card.getManaCost().convertedManaCost(); + int damage = card.getConvertedManaCost(); Permanent permanent = game.getPermanent(source.getTargets().get(1).getFirstTarget()); if (permanent != null) { permanent.damage(damage, source.getSourceId(), game, false, true); diff --git a/Mage.Sets/src/mage/sets/alliances/PhyrexianDevourer.java b/Mage.Sets/src/mage/sets/alliances/PhyrexianDevourer.java index d72f2e8280f..08d68590063 100644 --- a/Mage.Sets/src/mage/sets/alliances/PhyrexianDevourer.java +++ b/Mage.Sets/src/mage/sets/alliances/PhyrexianDevourer.java @@ -135,7 +135,7 @@ class PhyrexianDevourerEffect extends OneShotEffect { } } if (card != null) { - int amount = card.getManaCost().convertedManaCost(); + int amount = card.getConvertedManaCost(); if (amount > 0) { return new AddCountersSourceEffect(CounterType.P1P1.createInstance(amount)).apply(game, source); } diff --git a/Mage.Sets/src/mage/sets/antiquities/TransmuteArtifact.java b/Mage.Sets/src/mage/sets/antiquities/TransmuteArtifact.java index da16ee39f0e..804d4eda12c 100644 --- a/Mage.Sets/src/mage/sets/antiquities/TransmuteArtifact.java +++ b/Mage.Sets/src/mage/sets/antiquities/TransmuteArtifact.java @@ -98,7 +98,7 @@ class TransmuteArtifactEffect extends SearchEffect { if (controller.chooseTarget(Outcome.Sacrifice, targetArtifact, source, game)) { Permanent permanent = game.getPermanent(targetArtifact.getFirstTarget()); if (permanent != null) { - convertedManaCost = permanent.getManaCost().convertedManaCost(); + convertedManaCost = permanent.getConvertedManaCost(); sacrifice = permanent.sacrifice(source.getSourceId(), game); } } else { @@ -111,11 +111,11 @@ class TransmuteArtifactEffect extends SearchEffect { Card card = controller.getLibrary().getCard(cardId, game); if (card != null) { //If that card's converted mana cost is less than or equal to the sacrificed artifact's converted mana cost, put it onto the battlefield. - if (card.getManaCost().convertedManaCost() <= convertedManaCost) { + if (card.getConvertedManaCost() <= convertedManaCost) { controller.moveCards(card, Zone.BATTLEFIELD, source, game); } else { //If it's greater, you may pay {X}, where X is the difference. If you do, put it onto the battlefield. - GenericManaCost cost = new GenericManaCost(card.getManaCost().convertedManaCost() - convertedManaCost); + GenericManaCost cost = new GenericManaCost(card.getConvertedManaCost() - convertedManaCost); if (cost.pay(source, game, source.getSourceId(), source.getControllerId(), false)) { controller.moveCards(card, Zone.BATTLEFIELD, source, game); } else { diff --git a/Mage.Sets/src/mage/sets/apocalypse/LifeDeath.java b/Mage.Sets/src/mage/sets/apocalypse/LifeDeath.java index 2199f9bcabe..d14bb1ad56e 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/LifeDeath.java +++ b/Mage.Sets/src/mage/sets/apocalypse/LifeDeath.java @@ -116,7 +116,7 @@ class DeathEffect extends OneShotEffect { if (game.getState().getZone(creatureCard.getId()).equals(Zone.GRAVEYARD)) { controller.moveCards(creatureCard, Zone.BATTLEFIELD, source, game); } - controller.loseLife(creatureCard.getManaCost().convertedManaCost(), game); + controller.loseLife(creatureCard.getConvertedManaCost(), game); return true; } return false; diff --git a/Mage.Sets/src/mage/sets/apocalypse/OrimsThunder.java b/Mage.Sets/src/mage/sets/apocalypse/OrimsThunder.java index 8ae5cdca401..f02c4a25d64 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/OrimsThunder.java +++ b/Mage.Sets/src/mage/sets/apocalypse/OrimsThunder.java @@ -103,7 +103,7 @@ class OrimsThunderEffect2 extends OneShotEffect { MageObject firstTarget = game.getLastKnownInformation(source.getFirstTarget(), Zone.BATTLEFIELD); Permanent secondTarget = game.getPermanent(source.getTargets().get(1).getFirstTarget()); if (firstTarget != null) { - damage = firstTarget.getManaCost().convertedManaCost(); + damage = firstTarget.getConvertedManaCost(); } boolean kicked = KickedCondition.getInstance().apply(game, source); if (kicked && secondTarget != null) { diff --git a/Mage.Sets/src/mage/sets/arabiannights/Metamorphosis.java b/Mage.Sets/src/mage/sets/arabiannights/Metamorphosis.java index c38c1bbfa1c..2f51c0d3e93 100644 --- a/Mage.Sets/src/mage/sets/arabiannights/Metamorphosis.java +++ b/Mage.Sets/src/mage/sets/arabiannights/Metamorphosis.java @@ -88,7 +88,7 @@ class MetamorphosisEffect extends OneShotEffect { int amount = 0; for (Cost cost: source.getCosts()) { if (cost instanceof SacrificeTargetCost && ((SacrificeTargetCost)cost).getPermanents().size() > 0) { - amount = ((SacrificeTargetCost)cost).getPermanents().get(0).getManaCost().convertedManaCost()+1; + amount = ((SacrificeTargetCost)cost).getPermanents().get(0).getConvertedManaCost()+1; break; } } diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/MarchFromTheTomb.java b/Mage.Sets/src/mage/sets/battleforzendikar/MarchFromTheTomb.java index 39376bb36a1..c1c35532971 100644 --- a/Mage.Sets/src/mage/sets/battleforzendikar/MarchFromTheTomb.java +++ b/Mage.Sets/src/mage/sets/battleforzendikar/MarchFromTheTomb.java @@ -88,14 +88,14 @@ class MarchFromTheTombTarget extends TargetCardInYourGraveyard { for (UUID targetId : this.getTargets()) { Card card = game.getCard(targetId); if (card != null) { - cmcLeft -= card.getManaCost().convertedManaCost(); + cmcLeft -= card.getConvertedManaCost(); } } Set possibleTargets = super.possibleTargets(sourceId, sourceControllerId, game); Set leftPossibleTargets = new HashSet<>(); for (UUID targetId : possibleTargets) { Card card = game.getCard(targetId); - if (card != null && card.getManaCost().convertedManaCost() <= cmcLeft) { + if (card != null && card.getConvertedManaCost() <= cmcLeft) { leftPossibleTargets.add(targetId); } } @@ -110,11 +110,11 @@ class MarchFromTheTombTarget extends TargetCardInYourGraveyard { for (UUID targetId : this.getTargets()) { Card card = game.getCard(targetId); if (card != null) { - cmcLeft -= card.getManaCost().convertedManaCost(); + cmcLeft -= card.getConvertedManaCost(); } } Card card = game.getCard(objectId); - return card != null && card.getManaCost().convertedManaCost() <= cmcLeft; + return card != null && card.getConvertedManaCost() <= cmcLeft; } return false; } diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/VoidWinnower.java b/Mage.Sets/src/mage/sets/battleforzendikar/VoidWinnower.java index 3f3a309b8d7..d77e37851aa 100644 --- a/Mage.Sets/src/mage/sets/battleforzendikar/VoidWinnower.java +++ b/Mage.Sets/src/mage/sets/battleforzendikar/VoidWinnower.java @@ -145,7 +145,7 @@ class VoidWinnowerCantBlockEffect extends RestrictionEffect { public boolean applies(Permanent permanent, Ability source, Game game) { if (game.getOpponents(source.getControllerId()).contains(permanent.getControllerId())) { // the low bit will always be set on an odd number. - return (permanent.getManaCost().convertedManaCost() & 1) == 0; + return (permanent.getConvertedManaCost() & 1) == 0; } return false; } diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/DisruptingShoal.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/DisruptingShoal.java index d7f0f30c95e..98271732cc6 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/DisruptingShoal.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/DisruptingShoal.java @@ -112,13 +112,13 @@ class DisruptingShoalCounterTargetEffect extends OneShotEffect { if (cost.isPaid() && cost instanceof ExileFromHandCost) { for (Card card : ((ExileFromHandCost) cost).getCards()) { if (card instanceof SplitCard) { - if (((SplitCard) card).getLeftHalfCard().getManaCost().convertedManaCost() == amount) { + if (((SplitCard) card).getLeftHalfCard().getConvertedManaCost() == amount) { return true; } - if (((SplitCard) card).getRightHalfCard().getManaCost().convertedManaCost() == amount) { + if (((SplitCard) card).getRightHalfCard().getConvertedManaCost() == amount) { return true; } - } else if (card.getManaCost().convertedManaCost() == amount) { + } else if (card.getConvertedManaCost() == amount) { return true; } } diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/HeedTheMists.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/HeedTheMists.java index 05dde1c91dd..3045e88bdb6 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/HeedTheMists.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/HeedTheMists.java @@ -83,7 +83,7 @@ public class HeedTheMists extends CardImpl { if (controller != null) { Card card = controller.getLibrary().removeFromTop(game); if (card != null) { - int cmc = card.getManaCost().convertedManaCost(); + int cmc = card.getConvertedManaCost(); controller.moveCards(card, Zone.LIBRARY, Zone.GRAVEYARD, source, game); controller.drawCards(cmc, game); } diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/SlumberingTora.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/SlumberingTora.java index c0e2fc17171..a1c1da76e86 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/SlumberingTora.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/SlumberingTora.java @@ -107,7 +107,7 @@ public class SlumberingTora extends CardImpl { int convManaCosts = 0; for (Cost cost: source.getCosts()) { if (cost instanceof DiscardTargetCost && ((DiscardTargetCost)cost).getCards().size() > 0) { - convManaCosts = ((DiscardTargetCost)cost).getCards().get(0).getManaCost().convertedManaCost(); + convManaCosts = ((DiscardTargetCost)cost).getCards().get(0).getConvertedManaCost(); break; } } diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/TerashisGrasp.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/TerashisGrasp.java index 92340a737db..703a3bd0a5f 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/TerashisGrasp.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/TerashisGrasp.java @@ -83,7 +83,7 @@ public class TerashisGrasp extends CardImpl { public boolean apply(Game game, Ability source) { Permanent targetPermanent = game.getPermanentOrLKIBattlefield(getTargetPointer().getFirst(game, source)); if (targetPermanent != null) { - int cost = targetPermanent.getManaCost().convertedManaCost(); + int cost = targetPermanent.getConvertedManaCost(); Player player = game.getPlayer(source.getControllerId()); if (player != null) { player.gainLife(cost, game); diff --git a/Mage.Sets/src/mage/sets/bornofthegods/PainSeer.java b/Mage.Sets/src/mage/sets/bornofthegods/PainSeer.java index 5d7d3fcc69d..06feebb6fd4 100644 --- a/Mage.Sets/src/mage/sets/bornofthegods/PainSeer.java +++ b/Mage.Sets/src/mage/sets/bornofthegods/PainSeer.java @@ -103,7 +103,7 @@ class PainSeerEffect extends OneShotEffect { if (card != null && card.moveToZone(Zone.HAND, source.getSourceId(), game, false)) { - player.loseLife(card.getManaCost().convertedManaCost(), game); + player.loseLife(card.getConvertedManaCost(), game); return true; } } diff --git a/Mage.Sets/src/mage/sets/commander2013/NayaSoulbeast.java b/Mage.Sets/src/mage/sets/commander2013/NayaSoulbeast.java index 7b05e7a236b..1aca51b42a1 100644 --- a/Mage.Sets/src/mage/sets/commander2013/NayaSoulbeast.java +++ b/Mage.Sets/src/mage/sets/commander2013/NayaSoulbeast.java @@ -110,7 +110,7 @@ class NayaSoulbeastCastEffect extends OneShotEffect { if (player != null) { if (player.getLibrary().size() > 0) { Card card = player.getLibrary().getFromTop(game); - cmc += card.getManaCost().convertedManaCost(); + cmc += card.getConvertedManaCost(); player.revealCards(sourceObject.getName() + " " + player.getName() + ")", new CardsImpl(card), game); } } diff --git a/Mage.Sets/src/mage/sets/commander2013/SydriGalvanicGenius.java b/Mage.Sets/src/mage/sets/commander2013/SydriGalvanicGenius.java index 5d1b271f042..6560caf47c1 100644 --- a/Mage.Sets/src/mage/sets/commander2013/SydriGalvanicGenius.java +++ b/Mage.Sets/src/mage/sets/commander2013/SydriGalvanicGenius.java @@ -135,7 +135,7 @@ class SydriGalvanicGeniusEffect extends ContinuousEffectImpl { case PTChangingEffects_7: if (sublayer == SubLayer.SetPT_7b) { - int cmc = artifact.getManaCost().convertedManaCost(); + int cmc = artifact.getConvertedManaCost(); artifact.getPower().setValue(cmc); artifact.getToughness().setValue(cmc); } diff --git a/Mage.Sets/src/mage/sets/commander2015/MerenOfClanNelToth.java b/Mage.Sets/src/mage/sets/commander2015/MerenOfClanNelToth.java index fc4a496309f..6b500a2ee8d 100644 --- a/Mage.Sets/src/mage/sets/commander2015/MerenOfClanNelToth.java +++ b/Mage.Sets/src/mage/sets/commander2015/MerenOfClanNelToth.java @@ -122,7 +122,7 @@ class MerenOfClanNelTothEffect extends OneShotEffect { if (card != null) { Zone targetZone = Zone.HAND; String text = " put into hand of "; - if (card.getManaCost().convertedManaCost() <= amount) { + if (card.getConvertedManaCost() <= amount) { targetZone = Zone.BATTLEFIELD; text = " put onto battlefield for "; } diff --git a/Mage.Sets/src/mage/sets/dissension/CrimePunishment.java b/Mage.Sets/src/mage/sets/dissension/CrimePunishment.java index 3ef272cf3a3..372571de624 100644 --- a/Mage.Sets/src/mage/sets/dissension/CrimePunishment.java +++ b/Mage.Sets/src/mage/sets/dissension/CrimePunishment.java @@ -98,7 +98,7 @@ class PunishmentEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { for (Permanent permanent : game.getBattlefield().getActivePermanents(source.getControllerId(), game)) { if (permanent != null - && permanent.getManaCost().convertedManaCost() == source.getManaCostsToPay().getX() + && permanent.getConvertedManaCost() == source.getManaCostsToPay().getX() && (permanent.getCardType().contains(CardType.ARTIFACT) || permanent.getCardType().contains(CardType.CREATURE) || permanent.getCardType().contains(CardType.ENCHANTMENT))) { diff --git a/Mage.Sets/src/mage/sets/dissension/HellholeRats.java b/Mage.Sets/src/mage/sets/dissension/HellholeRats.java index 6d055f79868..7d920633361 100644 --- a/Mage.Sets/src/mage/sets/dissension/HellholeRats.java +++ b/Mage.Sets/src/mage/sets/dissension/HellholeRats.java @@ -100,7 +100,7 @@ class HellholeRatsEffect extends OneShotEffect { Cards cards = targetPlayer.discard(1, false, source, game); if (!cards.isEmpty()) { for (Card card : cards.getCards(game)) { - damage = card.getManaCost().convertedManaCost(); + damage = card.getConvertedManaCost(); } targetPlayer.damage(damage, source.getSourceId(), game, false, true); } diff --git a/Mage.Sets/src/mage/sets/dissension/HideSeek.java b/Mage.Sets/src/mage/sets/dissension/HideSeek.java index c4911f92ae6..d0a020e4e63 100644 --- a/Mage.Sets/src/mage/sets/dissension/HideSeek.java +++ b/Mage.Sets/src/mage/sets/dissension/HideSeek.java @@ -115,7 +115,7 @@ class SeekEffect extends OneShotEffect { Card card = opponent.getLibrary().remove(targetId, game); if (card != null) { player.moveCardToExileWithInfo(card, null, null, source.getSourceId(), game, Zone.LIBRARY, true); - int cmc = card.getManaCost().convertedManaCost(); + int cmc = card.getConvertedManaCost(); if (cmc > 0) { player.gainLife(cmc, game); } diff --git a/Mage.Sets/src/mage/sets/dissension/HitRun.java b/Mage.Sets/src/mage/sets/dissension/HitRun.java index ae837195c66..5a968777440 100644 --- a/Mage.Sets/src/mage/sets/dissension/HitRun.java +++ b/Mage.Sets/src/mage/sets/dissension/HitRun.java @@ -110,7 +110,7 @@ class HitEffect extends OneShotEffect { Permanent permanent = game.getPermanent(target.getFirstTarget()); if (permanent != null) { permanent.sacrifice(source.getSourceId(), game); - int damage = permanent.getManaCost().convertedManaCost(); + int damage = permanent.getConvertedManaCost(); if (damage > 0) { targetPlayer.damage(damage, source.getSourceId(), game, false, true); } diff --git a/Mage.Sets/src/mage/sets/dissension/ProteanHulk.java b/Mage.Sets/src/mage/sets/dissension/ProteanHulk.java index 7c1d0a288e5..52afefb315c 100644 --- a/Mage.Sets/src/mage/sets/dissension/ProteanHulk.java +++ b/Mage.Sets/src/mage/sets/dissension/ProteanHulk.java @@ -132,7 +132,7 @@ class ProteanHulkEffect extends OneShotEffect { if (librarySearchLimit == 0) { break; } - manaCostLeftToFetch -= card.getManaCost().convertedManaCost(); + manaCostLeftToFetch -= card.getConvertedManaCost(); filter = new FilterCreatureCard("number of creature cards with total converted mana cost 6 or less (" + manaCostLeftToFetch + " CMC left)"); filter.add(new ConvertedManaCostPredicate(ComparisonType.LessThan, manaCostLeftToFetch + 1)); target = new TargetCardInLibrary(0, 1, filter); diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/BlastOfGenius.java b/Mage.Sets/src/mage/sets/dragonsmaze/BlastOfGenius.java index a53aaae5b11..36a812cc0a9 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/BlastOfGenius.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/BlastOfGenius.java @@ -98,7 +98,7 @@ class BlastOfGeniusEffect extends OneShotEffect { Card card = player.getHand().get(target.getFirstTarget(), game); if (card != null) { player.discard(card, source, game); - int damage = card.getManaCost().convertedManaCost(); + int damage = card.getConvertedManaCost(); Permanent creature = game.getPermanent(this.getTargetPointer().getFirst(game, source)); if (creature != null) { creature.damage(damage, source.getSourceId(), game, false, true); diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/GazeOfGranite.java b/Mage.Sets/src/mage/sets/dragonsmaze/GazeOfGranite.java index 8b3aa424d35..92ce484167c 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/GazeOfGranite.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/GazeOfGranite.java @@ -89,7 +89,7 @@ class GazeOfGraniteEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { for (Permanent permanent : game.getBattlefield().getActivePermanents(source.getControllerId(), game)) { - if (!permanent.getCardType().contains(CardType.LAND) && permanent.getManaCost().convertedManaCost() <= source.getManaCostsToPay().getX()) { + if (!permanent.getCardType().contains(CardType.LAND) && permanent.getConvertedManaCost() <= source.getManaCostsToPay().getX()) { permanent.destroy(source.getSourceId(), game, false); } } diff --git a/Mage.Sets/src/mage/sets/dragonsoftarkir/LivingLore.java b/Mage.Sets/src/mage/sets/dragonsoftarkir/LivingLore.java index 0c1ef339149..592d62dda33 100644 --- a/Mage.Sets/src/mage/sets/dragonsoftarkir/LivingLore.java +++ b/Mage.Sets/src/mage/sets/dragonsoftarkir/LivingLore.java @@ -162,7 +162,7 @@ class LivingLoreSetPowerToughnessSourceEffect extends ContinuousEffectImpl { break; } if (exiledCard != null) { - int value = exiledCard.getManaCost().convertedManaCost(); + int value = exiledCard.getConvertedManaCost(); permanent.getPower().setValue(value); permanent.getToughness().setValue(value); } diff --git a/Mage.Sets/src/mage/sets/dragonsoftarkir/VolcanicVision.java b/Mage.Sets/src/mage/sets/dragonsoftarkir/VolcanicVision.java index 9763f1f0ea9..7ef3e668e94 100644 --- a/Mage.Sets/src/mage/sets/dragonsoftarkir/VolcanicVision.java +++ b/Mage.Sets/src/mage/sets/dragonsoftarkir/VolcanicVision.java @@ -106,7 +106,7 @@ class VolcanicVisionReturnToHandTargetEffect extends OneShotEffect { Card card = game.getCard(targetId); if (card != null) { controller.moveCards(card, null, Zone.HAND, source, game); - int damage = card.getManaCost().convertedManaCost(); + int damage = card.getConvertedManaCost(); if (damage > 0) { for (Permanent creature : game.getBattlefield().getActivePermanents(filter, source.getControllerId(), source.getSourceId(), game)) { creature.damage(damage, source.getSourceId(), game, false, true); diff --git a/Mage.Sets/src/mage/sets/fatereforged/FriendlyFire.java b/Mage.Sets/src/mage/sets/fatereforged/FriendlyFire.java index 6bcb80f08c6..ef212e1d0bf 100644 --- a/Mage.Sets/src/mage/sets/fatereforged/FriendlyFire.java +++ b/Mage.Sets/src/mage/sets/fatereforged/FriendlyFire.java @@ -99,7 +99,7 @@ class FriendlyFireEffect extends OneShotEffect { Card card = controllerOfTargetCreature.getHand().getRandom(game); cards.add(card); controllerOfTargetCreature.revealCards(sourceObject.getName(), cards, game); - int damage = card.getManaCost().convertedManaCost(); + int damage = card.getConvertedManaCost(); targetCreature.damage(damage, source.getSourceId(), game, false, true); controllerOfTargetCreature.damage(damage, source.getSourceId(), game, false, true); return true; diff --git a/Mage.Sets/src/mage/sets/fifthdawn/EngineeredExplosives.java b/Mage.Sets/src/mage/sets/fifthdawn/EngineeredExplosives.java index bc54d330d09..e8d7576e5fc 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/EngineeredExplosives.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/EngineeredExplosives.java @@ -101,7 +101,7 @@ class EngineeredExplosivesEffect extends OneShotEffect { if(engineeredExplosives != null && engineeredExplosives instanceof Permanent){ int count = ((Permanent)engineeredExplosives).getCounters().getCount(CounterType.CHARGE); for (Permanent permanent : game.getBattlefield().getActivePermanents(filter, source.getControllerId(), source.getSourceId(), game)) { - if(permanent.getManaCost().convertedManaCost() == count){ + if(permanent.getConvertedManaCost() == count){ permanent.destroy(source.getSourceId(), game, false); } } diff --git a/Mage.Sets/src/mage/sets/fifthedition/Juxtapose.java b/Mage.Sets/src/mage/sets/fifthedition/Juxtapose.java index 815a5bdab55..1c16ec3264c 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/Juxtapose.java +++ b/Mage.Sets/src/mage/sets/fifthedition/Juxtapose.java @@ -180,13 +180,13 @@ class JuxtaposeEffect extends ContinuousEffectImpl { List permanents = game.getBattlefield().getAllActivePermanents(filter, playerId, game); int highestCMC = -1; for (Permanent permanent : permanents) { - if (highestCMC < permanent.getManaCost().convertedManaCost()) { - highestCMC = permanent.getManaCost().convertedManaCost(); + if (highestCMC < permanent.getConvertedManaCost()) { + highestCMC = permanent.getConvertedManaCost(); } } List result = new ArrayList<>(); for (Permanent permanent : permanents) { - if (permanent.getManaCost().convertedManaCost() == highestCMC) { + if (permanent.getConvertedManaCost() == highestCMC) { result.add(permanent); } } diff --git a/Mage.Sets/src/mage/sets/fourthedition/TitaniasSong.java b/Mage.Sets/src/mage/sets/fourthedition/TitaniasSong.java index 39ae51b41e7..4016c3b3c5c 100644 --- a/Mage.Sets/src/mage/sets/fourthedition/TitaniasSong.java +++ b/Mage.Sets/src/mage/sets/fourthedition/TitaniasSong.java @@ -119,7 +119,7 @@ class TitaniasSongEffect extends ContinuousEffectImpl { for (Iterator it = affectedObjectList.iterator(); it.hasNext();) { Permanent permanent = it.next().getPermanent(game); if (permanent != null){ - int manaCost = permanent.getManaCost().convertedManaCost(); + int manaCost = permanent.getConvertedManaCost(); permanent.getPower().setValue(manaCost); permanent.getToughness().setValue(manaCost); } diff --git a/Mage.Sets/src/mage/sets/futuresight/JudgeUnworthy.java b/Mage.Sets/src/mage/sets/futuresight/JudgeUnworthy.java index f233e07da66..8e9880ebfd0 100644 --- a/Mage.Sets/src/mage/sets/futuresight/JudgeUnworthy.java +++ b/Mage.Sets/src/mage/sets/futuresight/JudgeUnworthy.java @@ -97,7 +97,7 @@ class JudgeUnworthyEffect extends OneShotEffect { controller.revealCards(sourceCard.getName(), new CardsImpl(card), game); Permanent targetCreature = game.getPermanent(this.getTargetPointer().getFirst(game, source)); if (targetCreature != null) { - targetCreature.damage(card.getManaCost().convertedManaCost(), source.getSourceId(), game, false, true); + targetCreature.damage(card.getConvertedManaCost(), source.getSourceId(), game, false, true); return true; } } diff --git a/Mage.Sets/src/mage/sets/gatecrash/DuskmantleSeer.java b/Mage.Sets/src/mage/sets/gatecrash/DuskmantleSeer.java index 6d8a98691d0..59fd04e198e 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/DuskmantleSeer.java +++ b/Mage.Sets/src/mage/sets/gatecrash/DuskmantleSeer.java @@ -107,7 +107,7 @@ class DuskmantleSeerEffect extends OneShotEffect { Cards cards = new CardsImpl(); cards.add(card); player.revealCards(sourceCard.getName() + ": Revealed by " + player.getName(), cards, game); - player.loseLife(card.getManaCost().convertedManaCost(), game); + player.loseLife(card.getConvertedManaCost(), game); card.moveToZone(Zone.HAND, source.getSourceId(), game, true); } } diff --git a/Mage.Sets/src/mage/sets/gatecrash/ImmortalServitude.java b/Mage.Sets/src/mage/sets/gatecrash/ImmortalServitude.java index e7fb97263af..557d9489ab7 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/ImmortalServitude.java +++ b/Mage.Sets/src/mage/sets/gatecrash/ImmortalServitude.java @@ -89,7 +89,7 @@ class ImmortalServitudeEffect extends OneShotEffect { int count = source.getManaCostsToPay().getX(); Set cards = you.getGraveyard().getCards(new FilterCreatureCard(), game); for (Card card : cards) { - if (card.getManaCost().convertedManaCost() == count + if (card.getConvertedManaCost() == count && card != null) { card.moveToZone(Zone.BATTLEFIELD, source.getSourceId(), game, false); } diff --git a/Mage.Sets/src/mage/sets/innistrad/HereticsPunishment.java b/Mage.Sets/src/mage/sets/innistrad/HereticsPunishment.java index 9fe20d5374f..764bbbdea46 100644 --- a/Mage.Sets/src/mage/sets/innistrad/HereticsPunishment.java +++ b/Mage.Sets/src/mage/sets/innistrad/HereticsPunishment.java @@ -88,7 +88,7 @@ class HereticsPunishmentEffect extends OneShotEffect { int maxCost = 0; Set cardList = controller.getLibrary().getTopCards(game, 3); for (Card card : cardList) { - int test = card.getManaCost().convertedManaCost(); + int test = card.getConvertedManaCost(); if (test > maxCost) { maxCost = test; } diff --git a/Mage.Sets/src/mage/sets/innistrad/Mindshrieker.java b/Mage.Sets/src/mage/sets/innistrad/Mindshrieker.java index 7fd65a36b37..42b075a38fc 100644 --- a/Mage.Sets/src/mage/sets/innistrad/Mindshrieker.java +++ b/Mage.Sets/src/mage/sets/innistrad/Mindshrieker.java @@ -98,7 +98,7 @@ class MindshriekerEffect extends OneShotEffect { Card card = targetPlayer.getLibrary().removeFromTop(game); if (card != null) { targetPlayer.moveCards(card, Zone.LIBRARY, Zone.GRAVEYARD, source, game); - int amount = card.getManaCost().convertedManaCost(); + int amount = card.getConvertedManaCost(); if (amount > 0) { game.addEffect(new BoostSourceEffect(amount, amount, Duration.EndOfTurn), source); } diff --git a/Mage.Sets/src/mage/sets/invasion/PhyrexianDelver.java b/Mage.Sets/src/mage/sets/invasion/PhyrexianDelver.java index e62f54da9e7..afb061f7cb5 100644 --- a/Mage.Sets/src/mage/sets/invasion/PhyrexianDelver.java +++ b/Mage.Sets/src/mage/sets/invasion/PhyrexianDelver.java @@ -100,7 +100,7 @@ class PhyrexianDelverEffect extends OneShotEffect { if (game.getState().getZone(creatureCard.getId()).equals(Zone.GRAVEYARD)) { result = controller.moveCards(creatureCard, Zone.BATTLEFIELD, source, game);; } - controller.loseLife(creatureCard.getManaCost().convertedManaCost(), game); + controller.loseLife(creatureCard.getConvertedManaCost(), game); return result; } return false; diff --git a/Mage.Sets/src/mage/sets/invasion/Void.java b/Mage.Sets/src/mage/sets/invasion/Void.java index d0817f88752..cd5269bde22 100644 --- a/Mage.Sets/src/mage/sets/invasion/Void.java +++ b/Mage.Sets/src/mage/sets/invasion/Void.java @@ -106,7 +106,7 @@ class VoidEffect extends OneShotEffect { int number = Integer.parseInt(source.getChoices().get(0).getChoice()); for (Permanent permanent : game.getBattlefield().getActivePermanents(source.getControllerId(), game)) { if ((permanent.getCardType().contains(CardType.ARTIFACT) || permanent.getCardType().contains(CardType.CREATURE)) - && permanent.getManaCost().convertedManaCost() == number) { + && permanent.getConvertedManaCost() == number) { permanent.destroy(source.getSourceId(), game, false); } } diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/DiscipleOfDeceit.java b/Mage.Sets/src/mage/sets/journeyintonyx/DiscipleOfDeceit.java index 302eb42aadb..e296d63421a 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/DiscipleOfDeceit.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/DiscipleOfDeceit.java @@ -110,9 +110,9 @@ class DiscipleOfDeceitEffect extends OneShotEffect { if (card == null) { return false; } - String targetName = new StringBuilder("card with converted mana cost of ").append(card.getManaCost().convertedManaCost()).toString(); + String targetName = new StringBuilder("card with converted mana cost of ").append(card.getConvertedManaCost()).toString(); FilterCard filter = new FilterCard(targetName); - filter.add(new ConvertedManaCostPredicate(Filter.ComparisonType.Equal, card.getManaCost().convertedManaCost())); + filter.add(new ConvertedManaCostPredicate(Filter.ComparisonType.Equal, card.getConvertedManaCost())); return new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filter), true, true).apply(game, source); } } diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/InterpretTheSigns.java b/Mage.Sets/src/mage/sets/journeyintonyx/InterpretTheSigns.java index a9fa7049be9..6f7090769c2 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/InterpretTheSigns.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/InterpretTheSigns.java @@ -91,7 +91,7 @@ class InterpretTheSignsEffect extends OneShotEffect { Card card = controller.getLibrary().getFromTop(game); if (card != null) { controller.revealCards(sourceCard.getName(), new CardsImpl(card), game); - controller.drawCards(card.getManaCost().convertedManaCost(), game); + controller.drawCards(card.getConvertedManaCost(), game); } return true; } diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/RiddleOfLightning.java b/Mage.Sets/src/mage/sets/journeyintonyx/RiddleOfLightning.java index 3f01c77359c..502dd9e2c65 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/RiddleOfLightning.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/RiddleOfLightning.java @@ -98,12 +98,12 @@ class RiddleOfLightningEffect extends OneShotEffect { controller.revealCards(sourceCard.getName(), new CardsImpl(card), game); Permanent targetCreature = game.getPermanent(this.getTargetPointer().getFirst(game, source)); if (targetCreature != null) { - targetCreature.damage(card.getManaCost().convertedManaCost(), source.getSourceId(), game, false, true); + targetCreature.damage(card.getConvertedManaCost(), source.getSourceId(), game, false, true); return true; } Player targetPlayer = game.getPlayer(this.getTargetPointer().getFirst(game, source)); if (targetPlayer != null) { - targetPlayer.damage(card.getManaCost().convertedManaCost(), source.getSourceId(), game, false, true); + targetPlayer.damage(card.getConvertedManaCost(), source.getSourceId(), game, false, true); return true; } } diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/StormchaserChimera.java b/Mage.Sets/src/mage/sets/journeyintonyx/StormchaserChimera.java index 2e79fc0f421..e1cb312fb3a 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/StormchaserChimera.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/StormchaserChimera.java @@ -105,7 +105,7 @@ class StormchaserChimeraEffect extends OneShotEffect { player.revealCards(sourcePermanent.getName(), cards, game); if (card != null) { - game.addEffect(new BoostSourceEffect(card.getManaCost().convertedManaCost(), 0, Duration.EndOfTurn), source); + game.addEffect(new BoostSourceEffect(card.getConvertedManaCost(), 0, Duration.EndOfTurn), source); return true; } } diff --git a/Mage.Sets/src/mage/sets/legends/EnergyTap.java b/Mage.Sets/src/mage/sets/legends/EnergyTap.java index 2af7cdcf0b7..f3788ba6c28 100644 --- a/Mage.Sets/src/mage/sets/legends/EnergyTap.java +++ b/Mage.Sets/src/mage/sets/legends/EnergyTap.java @@ -102,7 +102,7 @@ class EnergyTapEffect extends OneShotEffect { if (targetCreature != null) { applied = targetCreature.tap(game); if (applied) { - player.getManaPool().addMana(new Mana(0, 0, 0, 0, 0, 0, 0, targetCreature.getManaCost().convertedManaCost()), game, source); + player.getManaPool().addMana(new Mana(0, 0, 0, 0, 0, 0, 0, targetCreature.getConvertedManaCost()), game, source); } } return applied; diff --git a/Mage.Sets/src/mage/sets/legends/InTheEyeOfChaos.java b/Mage.Sets/src/mage/sets/legends/InTheEyeOfChaos.java index 4850b15bf99..23e0ef8b70e 100644 --- a/Mage.Sets/src/mage/sets/legends/InTheEyeOfChaos.java +++ b/Mage.Sets/src/mage/sets/legends/InTheEyeOfChaos.java @@ -97,7 +97,7 @@ class InTheEyeOfChaosEffect extends OneShotEffect { if (spell != null) { Player player = game.getPlayer(spell.getControllerId()); if (player != null) { - GenericManaCost cost = new GenericManaCost(spell.getManaCost().convertedManaCost()); + GenericManaCost cost = new GenericManaCost(spell.getConvertedManaCost()); if (!cost.pay(source, game, source.getSourceId(), player.getId(), false)) { game.getStack().counter(spell.getId(), source.getSourceId(), game); } diff --git a/Mage.Sets/src/mage/sets/lorwyn/FavorOfTheMighty.java b/Mage.Sets/src/mage/sets/lorwyn/FavorOfTheMighty.java index 9aa3d7e9aa5..a45a9871feb 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/FavorOfTheMighty.java +++ b/Mage.Sets/src/mage/sets/lorwyn/FavorOfTheMighty.java @@ -108,8 +108,8 @@ class FavorOfTheMightyEffect extends ContinuousEffectImpl { public boolean apply(Game game, Ability source) { int maxCMC = Integer.MIN_VALUE; for (Permanent permanent : game.getBattlefield().getActivePermanents(new FilterCreaturePermanent(), source.getControllerId(), game)) { - if (permanent != null && permanent.getManaCost().convertedManaCost() > maxCMC) { - maxCMC = permanent.getManaCost().convertedManaCost(); + if (permanent != null && permanent.getConvertedManaCost() > maxCMC) { + maxCMC = permanent.getConvertedManaCost(); } } FilterPermanent filterMaxCMC = new FilterCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/lorwyn/GaddockTeeg.java b/Mage.Sets/src/mage/sets/lorwyn/GaddockTeeg.java index 3ed0611d2dd..250dc6faa79 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/GaddockTeeg.java +++ b/Mage.Sets/src/mage/sets/lorwyn/GaddockTeeg.java @@ -103,7 +103,7 @@ class GaddockTeegReplacementEffect4 extends ContinuousRuleModifyingEffectImpl { @Override public boolean applies(GameEvent event, Ability source, Game game) { Card card = game.getCard(event.getSourceId()); - if (card != null && !card.getCardType().contains(CardType.CREATURE) && card.getManaCost().convertedManaCost() >= 4) { + if (card != null && !card.getCardType().contains(CardType.CREATURE) && card.getConvertedManaCost() >= 4) { return true; } return false; diff --git a/Mage.Sets/src/mage/sets/lorwyn/SpellstutterSprite.java b/Mage.Sets/src/mage/sets/lorwyn/SpellstutterSprite.java index cd40bb17912..7edf78bdc4f 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/SpellstutterSprite.java +++ b/Mage.Sets/src/mage/sets/lorwyn/SpellstutterSprite.java @@ -127,7 +127,7 @@ class SpellstutterSpriteCounterTargetEffect extends OneShotEffect { */ int numberFaeries = game.getState().getBattlefield().countAll(SpellstutterSprite.filter, source.getControllerId(), game); StackObject stackObject = game.getStack().getStackObject(source.getFirstTarget()); - if (stackObject.getManaCost().convertedManaCost() <= numberFaeries) { + if (stackObject.getConvertedManaCost() <= numberFaeries) { if (game.getStack().counter(source.getFirstTarget(), source.getSourceId(), game)) { return true; } diff --git a/Mage.Sets/src/mage/sets/magic2011/DarkTutelage.java b/Mage.Sets/src/mage/sets/magic2011/DarkTutelage.java index fc7d6d61bdb..6b9f08144b1 100644 --- a/Mage.Sets/src/mage/sets/magic2011/DarkTutelage.java +++ b/Mage.Sets/src/mage/sets/magic2011/DarkTutelage.java @@ -85,7 +85,7 @@ class DarkTutelageEffect extends OneShotEffect { Card card = player.getLibrary().removeFromTop(game); if (card != null) { card.moveToZone(Zone.HAND, source.getSourceId(), game, false); - player.loseLife(card.getManaCost().convertedManaCost(), game); + player.loseLife(card.getConvertedManaCost(), game); Cards cards = new CardsImpl(); cards.add(card); player.revealCards("Dark Tutelage", cards, game); diff --git a/Mage.Sets/src/mage/sets/magic2014/EliteArcanist.java b/Mage.Sets/src/mage/sets/magic2014/EliteArcanist.java index d8101bac8b5..075fb8c0d4e 100644 --- a/Mage.Sets/src/mage/sets/magic2014/EliteArcanist.java +++ b/Mage.Sets/src/mage/sets/magic2014/EliteArcanist.java @@ -84,7 +84,7 @@ public class EliteArcanist extends CardImpl { if (sourcePermanent != null && sourcePermanent.getImprinted() != null && !sourcePermanent.getImprinted().isEmpty()) { Card imprintedInstant = game.getCard(sourcePermanent.getImprinted().get(0)); if (imprintedInstant != null) { - int cmc = imprintedInstant.getManaCost().convertedManaCost(); + int cmc = imprintedInstant.getConvertedManaCost(); if (cmc > 0) { ability.getManaCostsToPay().clear(); ability.getManaCostsToPay().add(new GenericManaCost(cmc)); diff --git a/Mage.Sets/src/mage/sets/magic2015/MasterOfPredicaments.java b/Mage.Sets/src/mage/sets/magic2015/MasterOfPredicaments.java index 3bb3023fbb0..ec1225b6d38 100644 --- a/Mage.Sets/src/mage/sets/magic2015/MasterOfPredicaments.java +++ b/Mage.Sets/src/mage/sets/magic2015/MasterOfPredicaments.java @@ -114,10 +114,10 @@ class MasterOfPredicamentsEffect extends OneShotEffect { boolean guessWrong; if (attackedPlayer.chooseUse(Outcome.Detriment, "Is the chosen card's converted mana cost greater than 4?", source, game)) { game.informPlayers(attackedPlayer.getLogName() + " guessed that the chosen card's converted mana cost is greater than 4"); - guessWrong = cardFromHand.getManaCost().convertedManaCost() <= 4; + guessWrong = cardFromHand.getConvertedManaCost() <= 4; } else { game.informPlayers(attackedPlayer.getLogName() + " guessed that the chosen card's converted mana cost is not greater than 4"); - guessWrong = cardFromHand.getManaCost().convertedManaCost() > 4; + guessWrong = cardFromHand.getConvertedManaCost() > 4; } game.informPlayers(attackedPlayer.getLogName() + " guessed " + (guessWrong ? "wrong" : "right")); if (guessWrong) { diff --git a/Mage.Sets/src/mage/sets/magicorigins/DisplacementWave.java b/Mage.Sets/src/mage/sets/magicorigins/DisplacementWave.java index 651dec85abf..0a6301fb278 100644 --- a/Mage.Sets/src/mage/sets/magicorigins/DisplacementWave.java +++ b/Mage.Sets/src/mage/sets/magicorigins/DisplacementWave.java @@ -82,7 +82,7 @@ class DisplacementWaveEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { for (Permanent permanent : game.getBattlefield().getActivePermanents(source.getControllerId(), game)) { - if (!permanent.getCardType().contains(CardType.LAND) && permanent.getManaCost().convertedManaCost() <= source.getManaCostsToPay().getX()) { + if (!permanent.getCardType().contains(CardType.LAND) && permanent.getConvertedManaCost() <= source.getManaCostsToPay().getX()) { permanent.moveToZone(Zone.HAND, source.getSourceId(), game, true); } } diff --git a/Mage.Sets/src/mage/sets/magicorigins/StarfieldOfNyx.java b/Mage.Sets/src/mage/sets/magicorigins/StarfieldOfNyx.java index 33d8c72673c..9cddbaec3c3 100644 --- a/Mage.Sets/src/mage/sets/magicorigins/StarfieldOfNyx.java +++ b/Mage.Sets/src/mage/sets/magicorigins/StarfieldOfNyx.java @@ -145,7 +145,7 @@ class StarfieldOfNyxEffect extends ContinuousEffectImpl { case PTChangingEffects_7: if (sublayer == SubLayer.SetPT_7b) { - int manaCost = permanent.getManaCost().convertedManaCost(); + int manaCost = permanent.getConvertedManaCost(); permanent.getPower().setValue(manaCost); permanent.getToughness().setValue(manaCost); } diff --git a/Mage.Sets/src/mage/sets/magicplayerrewards/PowderKeg.java b/Mage.Sets/src/mage/sets/magicplayerrewards/PowderKeg.java index 9a667152ace..fa93f70731b 100644 --- a/Mage.Sets/src/mage/sets/magicplayerrewards/PowderKeg.java +++ b/Mage.Sets/src/mage/sets/magicplayerrewards/PowderKeg.java @@ -95,7 +95,7 @@ class PowderKegEffect extends OneShotEffect { int count = p.getCounters().getCount(CounterType.FUSE); for (Permanent perm: game.getBattlefield().getAllActivePermanents()) { - if (perm.getManaCost().convertedManaCost() == count && ((perm.getCardType().contains(CardType.ARTIFACT)) + if (perm.getConvertedManaCost() == count && ((perm.getCardType().contains(CardType.ARTIFACT)) || (perm.getCardType().contains(CardType.CREATURE)))) { perm.destroy(source.getSourceId(), game, false); } diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/Crumble.java b/Mage.Sets/src/mage/sets/masterseditioniv/Crumble.java index 6c6708362da..9d6103b3180 100644 --- a/Mage.Sets/src/mage/sets/masterseditioniv/Crumble.java +++ b/Mage.Sets/src/mage/sets/masterseditioniv/Crumble.java @@ -88,7 +88,7 @@ class CrumbleEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { Permanent permanent = game.getPermanentOrLKIBattlefield(getTargetPointer().getFirst(game, source)); if (permanent != null) { - int cost = permanent.getManaCost().convertedManaCost(); + int cost = permanent.getConvertedManaCost(); Player player = game.getPlayer(permanent.getControllerId()); if (player != null) { player.gainLife(cost, game); diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/XenicPoltergeist.java b/Mage.Sets/src/mage/sets/masterseditioniv/XenicPoltergeist.java index 59490338d59..642045e788c 100644 --- a/Mage.Sets/src/mage/sets/masterseditioniv/XenicPoltergeist.java +++ b/Mage.Sets/src/mage/sets/masterseditioniv/XenicPoltergeist.java @@ -158,7 +158,7 @@ class XenicPoltergeistEffect extends ContinuousEffectImpl { UUID permanentId = targetPointer.getFirst(game, source); Permanent permanent = game.getPermanentOrLKIBattlefield(permanentId); if (permanent != null){ - int manaCost = permanent.getManaCost().convertedManaCost(); + int manaCost = permanent.getConvertedManaCost(); permanent.getPower().setValue(manaCost); permanent.getToughness().setValue(manaCost); } diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/FoodChain.java b/Mage.Sets/src/mage/sets/mercadianmasques/FoodChain.java index fad61434242..5ed1c7f832b 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/FoodChain.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/FoodChain.java @@ -108,7 +108,7 @@ class FoodChainManaEffect extends ManaEffect { for (Cost cost: source.getCosts()) { if (cost.isPaid() && cost instanceof ExileTargetCost) { for (Card card : ((ExileTargetCost) cost).getPermanents()) { - manaCostExiled += card.getManaCost().convertedManaCost(); + manaCostExiled += card.getConvertedManaCost(); } } } diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/ForcedMarch.java b/Mage.Sets/src/mage/sets/mercadianmasques/ForcedMarch.java index 087e7e7b522..c49074d3396 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/ForcedMarch.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/ForcedMarch.java @@ -65,7 +65,7 @@ class ForcedMarchEffect extends OneShotEffect { source.getControllerId(), source.getSourceId(), game)) { - if (permanent.getManaCost().convertedManaCost() <= source.getManaCostsToPay().getX()) { + if (permanent.getConvertedManaCost() <= source.getManaCostsToPay().getX()) { permanent.destroy(source.getSourceId(), game, false); } } diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/MonkeyCage.java b/Mage.Sets/src/mage/sets/mercadianmasques/MonkeyCage.java index 8af3e58fc38..d998934fbf2 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/MonkeyCage.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/MonkeyCage.java @@ -91,7 +91,7 @@ class MonkeyCageEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { Permanent creature = game.getPermanentOrLKIBattlefield(getTargetPointer().getFirst(game, source)); if(creature != null) { - int cmc = creature.getManaCost().convertedManaCost(); + int cmc = creature.getConvertedManaCost(); return new CreateTokenEffect(new ApeToken(), cmc).apply(game, source); } return false; diff --git a/Mage.Sets/src/mage/sets/mirage/GoblinTinkerer.java b/Mage.Sets/src/mage/sets/mirage/GoblinTinkerer.java index ac09f3aee9f..4a6ccd58075 100644 --- a/Mage.Sets/src/mage/sets/mirage/GoblinTinkerer.java +++ b/Mage.Sets/src/mage/sets/mirage/GoblinTinkerer.java @@ -100,7 +100,7 @@ class GoblinTinkererDamageEffect extends OneShotEffect { Permanent targetArtifact = game.getPermanentOrLKIBattlefield(getTargetPointer().getFirst(game, source)); if (controller != null && targetArtifact != null) { Permanent sourceObject = game.getPermanent(source.getSourceId()); - int damage = targetArtifact.getManaCost().convertedManaCost(); + int damage = targetArtifact.getConvertedManaCost(); if (sourceObject != null && damage > 0) { sourceObject.damage(damage, targetArtifact.getId(), game, false, true); } diff --git a/Mage.Sets/src/mage/sets/mirage/Illumination.java b/Mage.Sets/src/mage/sets/mirage/Illumination.java index cbf7f23238c..602691b291f 100644 --- a/Mage.Sets/src/mage/sets/mirage/Illumination.java +++ b/Mage.Sets/src/mage/sets/mirage/Illumination.java @@ -109,7 +109,7 @@ class IlluminationEffect extends OneShotEffect { } if (controller != null) { Spell spell = game.getStack().getSpell(targetPointer.getFirst(game, source)); - int cost = spell.getManaCost().convertedManaCost(); + int cost = spell.getConvertedManaCost(); Player player = game.getPlayer(spell.getControllerId()); if (player != null) { player.gainLife(cost, game); diff --git a/Mage.Sets/src/mage/sets/mirrodin/GlissaSunseeker.java b/Mage.Sets/src/mage/sets/mirrodin/GlissaSunseeker.java index 4e6bc4c5fe6..320277e80a9 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/GlissaSunseeker.java +++ b/Mage.Sets/src/mage/sets/mirrodin/GlissaSunseeker.java @@ -107,7 +107,7 @@ class GlissaSunseekerEffect extends OneShotEffect { int manaPoolTotal = blackMana + whiteMana + blueMana + greenMana + redMana + colorlessMana; Permanent permanent = game.getPermanent(getTargetPointer().getFirst(game, source)); if (controller != null && permanent != null) { - if (permanent.getManaCost().convertedManaCost() == manaPoolTotal) { + if (permanent.getConvertedManaCost() == manaPoolTotal) { return permanent.destroy(source.getSourceId(), game, false); } } diff --git a/Mage.Sets/src/mage/sets/mirrodin/SoulFoundry.java b/Mage.Sets/src/mage/sets/mirrodin/SoulFoundry.java index 494f183a537..c896e9106cc 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/SoulFoundry.java +++ b/Mage.Sets/src/mage/sets/mirrodin/SoulFoundry.java @@ -86,7 +86,7 @@ public class SoulFoundry extends CardImpl { Card imprinted = game.getCard(sourcePermanent.getImprinted().get(0)); if (imprinted != null) { ability.getManaCostsToPay().clear(); - ability.getManaCostsToPay().add(0, new GenericManaCost(imprinted.getManaCost().convertedManaCost())); + ability.getManaCostsToPay().add(0, new GenericManaCost(imprinted.getConvertedManaCost())); } } } diff --git a/Mage.Sets/src/mage/sets/nemesis/StrongholdGambit.java b/Mage.Sets/src/mage/sets/nemesis/StrongholdGambit.java index 578dd045c75..109e2f7b034 100644 --- a/Mage.Sets/src/mage/sets/nemesis/StrongholdGambit.java +++ b/Mage.Sets/src/mage/sets/nemesis/StrongholdGambit.java @@ -109,8 +109,8 @@ class StrongholdGambitEffect extends OneShotEffect { Cards cardsToReveal = new CardsImpl(card); player.revealCards(sourceObject.getIdName() + " (" + player.getName() + ")", cardsToReveal, game); if (card.getCardType().contains(CardType.CREATURE) - && lowestCMC > card.getManaCost().convertedManaCost()) { - lowestCMC = card.getManaCost().convertedManaCost(); + && lowestCMC > card.getConvertedManaCost()) { + lowestCMC = card.getConvertedManaCost(); } } } @@ -123,7 +123,7 @@ class StrongholdGambitEffect extends OneShotEffect { Card card = game.getCard(choosenCard.get(playerId)); if (card != null) { if (card.getCardType().contains(CardType.CREATURE) - && lowestCMC == card.getManaCost().convertedManaCost()) { + && lowestCMC == card.getConvertedManaCost()) { creaturesToBattlefield.add(card); } } diff --git a/Mage.Sets/src/mage/sets/newphyrexia/BirthingPod.java b/Mage.Sets/src/mage/sets/newphyrexia/BirthingPod.java index aa6ed2798cc..4f0d641cc67 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/BirthingPod.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/BirthingPod.java @@ -102,7 +102,7 @@ class BirthingPodEffect extends OneShotEffect { } Player controller = game.getPlayer(source.getControllerId()); if (sacrificedPermanent != null && controller != null) { - int newConvertedCost = sacrificedPermanent.getManaCost().convertedManaCost() + 1; + int newConvertedCost = sacrificedPermanent.getConvertedManaCost() + 1; FilterCard filter = new FilterCard("creature card with converted mana cost " + newConvertedCost); filter.add(new ConvertedManaCostPredicate(Filter.ComparisonType.Equal, newConvertedCost)); filter.add(new CardTypePredicate(CardType.CREATURE)); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/BludgeonBrawl.java b/Mage.Sets/src/mage/sets/newphyrexia/BludgeonBrawl.java index 38a53d6d5c2..96d15473a7a 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/BludgeonBrawl.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/BludgeonBrawl.java @@ -155,7 +155,7 @@ class BludgeonBrawlGainAbilityEffect extends ContinuousEffectImpl { for (UUID permanentId : permanents) { Permanent permanent = game.getPermanent(permanentId); if (permanent != null) { - int convertedManaCost = permanent.getManaCost().convertedManaCost(); + int convertedManaCost = permanent.getConvertedManaCost(); permanent.addAbility(new EquipAbility(Outcome.BoostCreature, new GenericManaCost(convertedManaCost)), game); permanent.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(convertedManaCost, 0)), game); } diff --git a/Mage.Sets/src/mage/sets/oathofthegatewatch/KozilekTheGreatDistortion.java b/Mage.Sets/src/mage/sets/oathofthegatewatch/KozilekTheGreatDistortion.java index 7fb62726ed0..a65a9cbca7b 100644 --- a/Mage.Sets/src/mage/sets/oathofthegatewatch/KozilekTheGreatDistortion.java +++ b/Mage.Sets/src/mage/sets/oathofthegatewatch/KozilekTheGreatDistortion.java @@ -180,7 +180,7 @@ class KozilekDiscardCost extends CostImpl { } Player controller = game.getPlayer(ability.getControllerId()); for (Card card : controller.getHand().getCards(game)) { - if (stackCMC.contains(card.getManaCost().convertedManaCost())) { + if (stackCMC.contains(card.getConvertedManaCost())) { return true; } } diff --git a/Mage.Sets/src/mage/sets/planarchaos/ErraticMutation.java b/Mage.Sets/src/mage/sets/planarchaos/ErraticMutation.java index ac565eae222..ff233846eaf 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/ErraticMutation.java +++ b/Mage.Sets/src/mage/sets/planarchaos/ErraticMutation.java @@ -109,7 +109,7 @@ class ErraticMutationEffect extends OneShotEffect { } // the nonland card if (nonLandCard != null) { - int boostValue = nonLandCard.getManaCost().convertedManaCost(); + int boostValue = nonLandCard.getConvertedManaCost(); // unboost target ContinuousEffect effect = new BoostTargetEffect(boostValue, -boostValue, Duration.EndOfTurn); effect.setTargetPointer(new FixedTarget(this.getTargetPointer().getFirst(game, source))); diff --git a/Mage.Sets/src/mage/sets/planechase2012/ErraticExplosion.java b/Mage.Sets/src/mage/sets/planechase2012/ErraticExplosion.java index 3495a42414b..c8f9550b3b0 100644 --- a/Mage.Sets/src/mage/sets/planechase2012/ErraticExplosion.java +++ b/Mage.Sets/src/mage/sets/planechase2012/ErraticExplosion.java @@ -106,11 +106,11 @@ class ErraticExplosionEffect extends OneShotEffect { if (nonLandCard != null) { Permanent targetCreature = game.getPermanent(this.getTargetPointer().getFirst(game, source)); if (targetCreature != null) { - targetCreature.damage(nonLandCard.getManaCost().convertedManaCost(), source.getSourceId(), game, false, true); + targetCreature.damage(nonLandCard.getConvertedManaCost(), source.getSourceId(), game, false, true); } else { Player targetPlayer = game.getPlayer(this.getTargetPointer().getFirst(game, source)); if (targetPlayer != null) { - targetPlayer.damage(nonLandCard.getManaCost().convertedManaCost(), source.getSourceId(), game, false, true); + targetPlayer.damage(nonLandCard.getConvertedManaCost(), source.getSourceId(), game, false, true); } } } diff --git a/Mage.Sets/src/mage/sets/planeshift/DralnusPet.java b/Mage.Sets/src/mage/sets/planeshift/DralnusPet.java index bf5b2311558..d156e716153 100644 --- a/Mage.Sets/src/mage/sets/planeshift/DralnusPet.java +++ b/Mage.Sets/src/mage/sets/planeshift/DralnusPet.java @@ -119,7 +119,7 @@ class DralnusPetEffect extends OneShotEffect { int cmc = 0; for (Cost cost : spellAbility.getCosts()) { if (cost instanceof DiscardCardCost && ((DiscardCardCost) cost).getCards().size() > 0) { - cmc = ((DiscardCardCost) cost).getCards().get(0).getManaCost().convertedManaCost(); + cmc = ((DiscardCardCost) cost).getCards().get(0).getConvertedManaCost(); } if (cmc > 0) { return new AddCountersSourceEffect(CounterType.P1P1.createInstance(cmc), true).apply(game, source); diff --git a/Mage.Sets/src/mage/sets/planeshift/PlaneswalkersFavor.java b/Mage.Sets/src/mage/sets/planeshift/PlaneswalkersFavor.java index 7fc8f0b20f1..5a39e6e08fd 100644 --- a/Mage.Sets/src/mage/sets/planeshift/PlaneswalkersFavor.java +++ b/Mage.Sets/src/mage/sets/planeshift/PlaneswalkersFavor.java @@ -98,7 +98,7 @@ class PlaneswalkersFavorEffect extends OneShotEffect { Card card = opponent.getHand().getRandom(game); if (card != null) { revealed.add(card); - int boostValue = card.getManaCost().convertedManaCost(); + int boostValue = card.getConvertedManaCost(); opponent.revealCards("Planeswalker's Favor", revealed, game); ContinuousEffect effect = new BoostTargetEffect(boostValue, boostValue, Duration.EndOfTurn); effect.setTargetPointer(new FixedTarget(source.getTargets().get(1).getFirstTarget())); diff --git a/Mage.Sets/src/mage/sets/planeshift/PlaneswalkersFury.java b/Mage.Sets/src/mage/sets/planeshift/PlaneswalkersFury.java index c95d3ae35d1..f3474be799b 100644 --- a/Mage.Sets/src/mage/sets/planeshift/PlaneswalkersFury.java +++ b/Mage.Sets/src/mage/sets/planeshift/PlaneswalkersFury.java @@ -90,7 +90,7 @@ class PlaneswalkersFuryEffect extends OneShotEffect { if (card != null) { revealed.add(card); opponent.revealCards("Planeswalker's Fury", revealed, game); - opponent.damage(card.getManaCost().convertedManaCost(), source.getSourceId(), game, false, true); + opponent.damage(card.getConvertedManaCost(), source.getSourceId(), game, false, true); } return true; } diff --git a/Mage.Sets/src/mage/sets/planeshift/PlaneswalkersMirth.java b/Mage.Sets/src/mage/sets/planeshift/PlaneswalkersMirth.java index c468a5f7988..e0bed8000b7 100644 --- a/Mage.Sets/src/mage/sets/planeshift/PlaneswalkersMirth.java +++ b/Mage.Sets/src/mage/sets/planeshift/PlaneswalkersMirth.java @@ -91,7 +91,7 @@ class PlaneswalkersMirthEffect extends OneShotEffect { if (card != null) { revealed.add(card); opponent.revealCards("Planeswalker's Mirth", revealed, game); - player.gainLife(card.getManaCost().convertedManaCost(), game); + player.gainLife(card.getConvertedManaCost(), game); } return true; } diff --git a/Mage.Sets/src/mage/sets/planeshift/PlaneswalkersScorn.java b/Mage.Sets/src/mage/sets/planeshift/PlaneswalkersScorn.java index d1b42fbd758..24dc5372083 100644 --- a/Mage.Sets/src/mage/sets/planeshift/PlaneswalkersScorn.java +++ b/Mage.Sets/src/mage/sets/planeshift/PlaneswalkersScorn.java @@ -98,7 +98,7 @@ class PlaneswalkersScornEffect extends OneShotEffect { Card card = opponent.getHand().getRandom(game); if (card != null) { revealed.add(card); - int boostValue = -1 * card.getManaCost().convertedManaCost(); + int boostValue = -1 * card.getConvertedManaCost(); opponent.revealCards("Planeswalker's Scorn", revealed, game); ContinuousEffect effect = new BoostTargetEffect(boostValue, boostValue, Duration.EndOfTurn); effect.setTargetPointer(new FixedTarget(source.getTargets().get(1).getFirstTarget())); diff --git a/Mage.Sets/src/mage/sets/prophecy/InfernalGenesis.java b/Mage.Sets/src/mage/sets/prophecy/InfernalGenesis.java index 3ddf91fbf22..95317bbc1d4 100644 --- a/Mage.Sets/src/mage/sets/prophecy/InfernalGenesis.java +++ b/Mage.Sets/src/mage/sets/prophecy/InfernalGenesis.java @@ -82,7 +82,7 @@ class InfernalGenesisEffect extends OneShotEffect { Card card = player.getLibrary().getFromTop(game); if (card != null) { if (player.moveCards(card, Zone.GRAVEYARD, source, game)) { - int cmc = card.getManaCost().convertedManaCost(); + int cmc = card.getConvertedManaCost(); MinionToken token = new MinionToken(); token.putOntoBattlefield(cmc, game, source.getSourceId(), player.getId()); } diff --git a/Mage.Sets/src/mage/sets/prophecy/Rethink.java b/Mage.Sets/src/mage/sets/prophecy/Rethink.java index 0b35a6b139e..94375d0ed6f 100644 --- a/Mage.Sets/src/mage/sets/prophecy/Rethink.java +++ b/Mage.Sets/src/mage/sets/prophecy/Rethink.java @@ -87,7 +87,7 @@ class RethinkEffect extends OneShotEffect { if (spell != null) { Player player = game.getPlayer(spell.getControllerId()); if (player != null) { - GenericManaCost cost = new GenericManaCost(spell.getManaCost().convertedManaCost()); + GenericManaCost cost = new GenericManaCost(spell.getConvertedManaCost()); if (!cost.pay(source, game, source.getSourceId(), player.getId(), false)) { game.getStack().counter(spell.getId(), source.getSourceId(), game); } diff --git a/Mage.Sets/src/mage/sets/ravnica/DarkConfidant.java b/Mage.Sets/src/mage/sets/ravnica/DarkConfidant.java index d854cd20cd3..ee178e3becf 100644 --- a/Mage.Sets/src/mage/sets/ravnica/DarkConfidant.java +++ b/Mage.Sets/src/mage/sets/ravnica/DarkConfidant.java @@ -96,7 +96,7 @@ class DarkConfidantEffect extends OneShotEffect { Cards cards = new CardsImpl(card); controller.revealCards(sourcePermanent.getIdName(), cards, game); controller.moveCards(card, Zone.HAND, source, game); - controller.loseLife(card.getManaCost().convertedManaCost(), game); + controller.loseLife(card.getConvertedManaCost(), game); } return true; diff --git a/Mage.Sets/src/mage/sets/ravnica/InduceParanoia.java b/Mage.Sets/src/mage/sets/ravnica/InduceParanoia.java index 487b4661b5d..f8be502b68f 100644 --- a/Mage.Sets/src/mage/sets/ravnica/InduceParanoia.java +++ b/Mage.Sets/src/mage/sets/ravnica/InduceParanoia.java @@ -95,7 +95,7 @@ class InduceParanoiaEffect extends OneShotEffect { StackObject spell = game.getStack().getStackObject(targetPointer.getFirst(game, source)); if (spell != null) { game.getStack().counter(spell.getId(), source.getSourceId(), game); - int spellCMC = spell.getManaCost().convertedManaCost(); + int spellCMC = spell.getConvertedManaCost(); Player player = game.getPlayer(spell.getControllerId()); if (player != null) { player.moveCards(player.getLibrary().getTopCards(game, spellCMC), Zone.GRAVEYARD, source, game); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/SoulTithe.java b/Mage.Sets/src/mage/sets/returntoravnica/SoulTithe.java index a48c8791dfb..65d5e38d13e 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/SoulTithe.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/SoulTithe.java @@ -108,7 +108,7 @@ class SoulTitheEffect extends OneShotEffect { if(permanent != null) { Player player = game.getPlayer(permanent.getControllerId()); if(player != null) { - int cmc = permanent.getManaCost().convertedManaCost(); + int cmc = permanent.getConvertedManaCost(); if (player.chooseUse(Outcome.Benefit, "Pay {" + cmc + "} for " + permanent.getName() + "? (otherwise you sacrifice it)", source, game)) { Cost cost = new GenericManaCost(cmc); if (cost.pay(source, game, source.getSourceId(), player.getId(), false, null)) { diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/BanefulOmen.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/BanefulOmen.java index 265b8535f11..225b0fcd9fe 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/BanefulOmen.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/BanefulOmen.java @@ -123,7 +123,7 @@ public class BanefulOmen extends CardImpl { player.revealCards("Baneful Omen", cards, game); if (card != null) { - int loseLife = card.getManaCost().convertedManaCost(); + int loseLife = card.getConvertedManaCost(); Set opponents = game.getOpponents(source.getControllerId()); for (UUID opponentUuid : opponents) { Player opponent = game.getPlayer(opponentUuid); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/ExplosiveRevelation.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/ExplosiveRevelation.java index 7d79631e820..8524fec8512 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/ExplosiveRevelation.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/ExplosiveRevelation.java @@ -104,7 +104,7 @@ class ExplosiveRevelationEffect extends OneShotEffect { player.revealCards("Explosive Revelation", cards, game); } // the nonland card - int damage = card.getManaCost().convertedManaCost(); + int damage = card.getConvertedManaCost(); // assign damage to target for (UUID targetId: targetPointer.getTargets(game, source)) { Permanent targetedCreature = game.getPermanent(targetId); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/HedronMatrix.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/HedronMatrix.java index 32fad901f72..92998768d2e 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/HedronMatrix.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/HedronMatrix.java @@ -93,8 +93,8 @@ class HedronMatrixEffect extends ContinuousEffectImpl { if (equipment != null && equipment.getAttachedTo() != null) { Permanent creature = game.getPermanent(equipment.getAttachedTo()); if (creature != null) { - creature.addPower(creature.getManaCost().convertedManaCost()); - creature.addToughness(creature.getManaCost().convertedManaCost()); + creature.addPower(creature.getConvertedManaCost()); + creature.addToughness(creature.getConvertedManaCost()); } } return true; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SarkhanTheMad.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SarkhanTheMad.java index 757c9663587..0960be10a4e 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SarkhanTheMad.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SarkhanTheMad.java @@ -110,7 +110,7 @@ class SarkhanTheMadRevealAndDrawEffect extends OneShotEffect { if (card != null) { controller.moveCards(card, Zone.HAND, source, game); if (sourcePermanent != null) { - sourcePermanent.damage(card.getManaCost().convertedManaCost(), source.getSourceId(), game, false, false); + sourcePermanent.damage(card.getConvertedManaCost(), source.getSourceId(), game, false, false); } controller.revealCards(sourceObject.getIdName(), new CardsImpl(card), game); } diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/InfernalKirin.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/InfernalKirin.java index e3d1b8697c3..5f14a37ddf2 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/InfernalKirin.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/InfernalKirin.java @@ -114,7 +114,7 @@ class InfernalKirinEffect extends OneShotEffect { targetPlayer.revealCards("Infernal Kirin", targetPlayer.getHand(), game); for (UUID uuid: targetPlayer.getHand().copy()) { Card card = game.getCard(uuid); - if (card != null && card.getManaCost().convertedManaCost() == cmc) { + if (card != null && card.getConvertedManaCost() == cmc) { targetPlayer.discard(card, source, game); } } diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/RendingVines.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/RendingVines.java index 07cfecb1ed6..89c29c93029 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/RendingVines.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/RendingVines.java @@ -91,7 +91,7 @@ class RendingVinesEffect extends OneShotEffect { Player controller = game.getPlayer(source.getControllerId()); Permanent permanent = game.getPermanent(getTargetPointer().getFirst(game, source)); if (controller != null) { - if (permanent.getManaCost().convertedManaCost() <= controller.getHand().size()) { + if (permanent.getConvertedManaCost() <= controller.getHand().size()) { return permanent.destroy(source.getSourceId(), game, false); } } diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/UndyingFlames.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/UndyingFlames.java index ff2ec9cd8c1..6e1189cce50 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/UndyingFlames.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/UndyingFlames.java @@ -96,7 +96,7 @@ class UndyingFlamesEffect extends OneShotEffect { if (card != null) { you.moveCardToExileWithInfo(card, null, null, source.getSourceId(), game, Zone.LIBRARY, true); if (!card.getCardType().contains(CardType.LAND)) { - int damage = card.getManaCost().convertedManaCost(); + int damage = card.getConvertedManaCost(); if (damage > 0) { Permanent creature = game.getPermanent(this.getTargetPointer().getFirst(game, source)); if (creature != null) { @@ -107,7 +107,7 @@ class UndyingFlamesEffect extends OneShotEffect { } Player player = game.getPlayer(this.getTargetPointer().getFirst(game, source)); if (player != null) { - player.damage(card.getManaCost().convertedManaCost(), source.getSourceId(), game, false, true); + player.damage(card.getConvertedManaCost(), source.getSourceId(), game, false, true); game.informPlayers(new StringBuilder(sourceCard.getName()).append(" deals ").append(damage).append(" damage to ").append(player.getLogName()).toString()); applied = true; break; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/CerebralEruption.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/CerebralEruption.java index 404279a7b39..c10b8d363a7 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/CerebralEruption.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/CerebralEruption.java @@ -93,7 +93,7 @@ class CerebralEruptionEffect extends OneShotEffect { Cards cards = new CardsImpl(card); player.revealCards(sourceObject.getIdName(), cards, game); game.getState().setValue(source.getSourceId().toString(), card); - int damage = card.getManaCost().convertedManaCost(); + int damage = card.getConvertedManaCost(); player.damage(damage, source.getSourceId(), game, false, true); for (Permanent perm : game.getBattlefield().getAllActivePermanents(filter, player.getId(), game)) { perm.damage(damage, source.getSourceId(), game, false, true); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/GethLordOfTheVault.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/GethLordOfTheVault.java index 79ab856802e..e32b2e2d975 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/GethLordOfTheVault.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/GethLordOfTheVault.java @@ -124,7 +124,7 @@ class GethLordOfTheVaultEffect extends OneShotEffect { controller.moveCards(card, Zone.BATTLEFIELD, source, game, true, false, false, null); Player player = game.getPlayer(card.getOwnerId()); if (player != null) { - player.moveCards(player.getLibrary().getTopCards(game, card.getManaCost().convertedManaCost()), Zone.GRAVEYARD, source, game); + player.moveCards(player.getLibrary().getTopCards(game, card.getConvertedManaCost()), Zone.GRAVEYARD, source, game); } } return true; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/HoardSmelterDragon.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/HoardSmelterDragon.java index e9d06266d3c..614db7853fe 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/HoardSmelterDragon.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/HoardSmelterDragon.java @@ -108,7 +108,7 @@ class HoardSmelterEffect extends ContinuousEffectImpl { public void init(Ability source, Game game) { Card targeted = game.getCard(source.getFirstTarget()); if (targeted != null) { - costValue = targeted.getManaCost().convertedManaCost(); + costValue = targeted.getConvertedManaCost(); } } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/PrototypePortal.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/PrototypePortal.java index 89708c94b72..768f6f20ea4 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/PrototypePortal.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/PrototypePortal.java @@ -82,7 +82,7 @@ public class PrototypePortal extends CardImpl { if (card.getImprinted().size() > 0) { Card imprinted = game.getCard(card.getImprinted().get(0)); if (imprinted != null) { - ability.getManaCostsToPay().add(0, new GenericManaCost(imprinted.getManaCost().convertedManaCost())); + ability.getManaCostsToPay().add(0, new GenericManaCost(imprinted.getConvertedManaCost())); } } } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/RatchetBomb.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/RatchetBomb.java index f563a921f30..a5b43eea934 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/RatchetBomb.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/RatchetBomb.java @@ -96,7 +96,7 @@ public class RatchetBomb extends CardImpl { int count = p.getCounters().getCount(CounterType.CHARGE); for (Permanent perm: game.getBattlefield().getAllActivePermanents()) { - if (perm.getManaCost().convertedManaCost() == count && !(perm.getCardType().contains(CardType.LAND))) { + if (perm.getConvertedManaCost() == count && !(perm.getCardType().contains(CardType.LAND))) { perm.destroy(source.getSourceId(), game, false); } } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/RazorHippogriff.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/RazorHippogriff.java index 515b036cb02..ee831e7136b 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/RazorHippogriff.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/RazorHippogriff.java @@ -106,7 +106,7 @@ public class RazorHippogriff extends CardImpl { card = (Card)game.getLastKnownInformation(source.getFirstTarget(), Zone.GRAVEYARD); } if (card != null) { - player.gainLife(card.getManaCost().convertedManaCost(), game); + player.gainLife(card.getConvertedManaCost(), game); } } return true; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/SteelHellkite.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/SteelHellkite.java index e1ca893e173..25401c87ed3 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/SteelHellkite.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/SteelHellkite.java @@ -99,7 +99,7 @@ class SteelHellkiteDestroyEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { int xValue = source.getManaCostsToPay().getX(); for (Permanent permanent: game.getBattlefield().getActivePermanents(new FilterNonlandPermanent(), source.getControllerId(), source.getSourceId(), game)) { - if (permanent.getManaCost().convertedManaCost() == xValue) { + if (permanent.getConvertedManaCost() == xValue) { PlayerDamagedBySourceWatcher watcher = (PlayerDamagedBySourceWatcher) game.getState().getWatchers().get("PlayerDamagedBySource", permanent.getControllerId()); if (watcher != null && watcher.hasSourceDoneDamage(source.getSourceId(), game)) { permanent.destroy(source.getSourceId(), game, false); diff --git a/Mage.Sets/src/mage/sets/scourge/AncientOoze.java b/Mage.Sets/src/mage/sets/scourge/AncientOoze.java index bd78001c538..5e4aaf4fb79 100644 --- a/Mage.Sets/src/mage/sets/scourge/AncientOoze.java +++ b/Mage.Sets/src/mage/sets/scourge/AncientOoze.java @@ -81,7 +81,7 @@ class AncientOozePowerToughnessValue implements DynamicValue { int value = 0; for(Permanent creature : game.getBattlefield().getActivePermanents(new FilterControlledCreaturePermanent(), sourceAbility.getControllerId(), game)){ if(creature != null && !sourceAbility.getSourceId().equals(creature.getId())){ - value += creature.getManaCost().convertedManaCost(); + value += creature.getConvertedManaCost(); } } return value; diff --git a/Mage.Sets/src/mage/sets/shadowmoor/AuguryAdept.java b/Mage.Sets/src/mage/sets/shadowmoor/AuguryAdept.java index 149f162b2d6..f074b4fb51b 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/AuguryAdept.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/AuguryAdept.java @@ -102,7 +102,7 @@ class AuguryAdeptEffect extends OneShotEffect { if (card != null) { card.moveToZone(Zone.HAND, source.getSourceId(), game, true); - int cmc = card.getManaCost().convertedManaCost(); + int cmc = card.getConvertedManaCost(); if (cmc > 0) { controller.gainLife(cmc, game); } diff --git a/Mage.Sets/src/mage/sets/shadowmoor/BeseechTheQueen.java b/Mage.Sets/src/mage/sets/shadowmoor/BeseechTheQueen.java index a9c72fa3aaf..104639c4196 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/BeseechTheQueen.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/BeseechTheQueen.java @@ -75,7 +75,7 @@ class BeseechTheQueenPredicate implements Predicate { @Override public final boolean apply(Card input, Game game) { - if(input.getManaCost().convertedManaCost() <= game.getBattlefield().getAllActivePermanents(new FilterControlledLandPermanent(), input.getOwnerId(), game).size()){ + if(input.getConvertedManaCost() <= game.getBattlefield().getAllActivePermanents(new FilterControlledLandPermanent(), input.getOwnerId(), game).size()){ return true; } return false; diff --git a/Mage.Sets/src/mage/sets/shadowmoor/PucasMischief.java b/Mage.Sets/src/mage/sets/shadowmoor/PucasMischief.java index f9ccc63e3af..fb344cd7515 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/PucasMischief.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/PucasMischief.java @@ -135,7 +135,7 @@ class PucasMischiefSecondTarget extends TargetPermanent { Permanent target1 = game.getPermanent(source.getFirstTarget()); Permanent opponentPermanent = game.getPermanent(id); if (target1 != null && opponentPermanent != null) { - return target1.getManaCost().convertedManaCost() >= opponentPermanent.getManaCost().convertedManaCost(); + return target1.getConvertedManaCost() >= opponentPermanent.getConvertedManaCost(); } } return false; @@ -148,7 +148,7 @@ class PucasMischiefSecondTarget extends TargetPermanent { MageObject targetSource = game.getObject(sourceId); for (Permanent permanent : game.getBattlefield().getActivePermanents(filter, sourceControllerId, sourceId, game)) { if (!targets.containsKey(permanent.getId()) && permanent.canBeTargetedBy(targetSource, sourceControllerId, game)) { - if (firstTarget.getManaCost().convertedManaCost() >= permanent.getManaCost().convertedManaCost()) { + if (firstTarget.getConvertedManaCost() >= permanent.getConvertedManaCost()) { possibleTargets.add(permanent.getId()); } } diff --git a/Mage.Sets/src/mage/sets/shadowsoverinnistrad/SeasonsPast.java b/Mage.Sets/src/mage/sets/shadowsoverinnistrad/SeasonsPast.java index 30e922d5b62..5c39c049014 100644 --- a/Mage.Sets/src/mage/sets/shadowsoverinnistrad/SeasonsPast.java +++ b/Mage.Sets/src/mage/sets/shadowsoverinnistrad/SeasonsPast.java @@ -114,14 +114,14 @@ class SeasonsPastTarget extends TargetCardInYourGraveyard { for (UUID targetId : this.getTargets()) { Card card = game.getCard(targetId); if (card != null) { - usedCMC.add(card.getManaCost().convertedManaCost()); + usedCMC.add(card.getConvertedManaCost()); } } Set possibleTargets = super.possibleTargets(sourceId, sourceControllerId, game); Set leftPossibleTargets = new HashSet<>(); for (UUID targetId : possibleTargets) { Card card = game.getCard(targetId); - if (card != null && !usedCMC.contains(card.getManaCost().convertedManaCost())) { + if (card != null && !usedCMC.contains(card.getConvertedManaCost())) { leftPossibleTargets.add(targetId); } } @@ -135,11 +135,11 @@ class SeasonsPastTarget extends TargetCardInYourGraveyard { for (UUID targetId : this.getTargets()) { Card card = game.getCard(targetId); if (card != null) { - usedCMC.add(card.getManaCost().convertedManaCost()); + usedCMC.add(card.getConvertedManaCost()); } } Card card = game.getCard(objectId); - return card != null && !usedCMC.contains(card.getManaCost().convertedManaCost()); + return card != null && !usedCMC.contains(card.getConvertedManaCost()); } return false; } diff --git a/Mage.Sets/src/mage/sets/shadowsoverinnistrad/SinProdder.java b/Mage.Sets/src/mage/sets/shadowsoverinnistrad/SinProdder.java index 883466ef326..fe52f190b77 100644 --- a/Mage.Sets/src/mage/sets/shadowsoverinnistrad/SinProdder.java +++ b/Mage.Sets/src/mage/sets/shadowsoverinnistrad/SinProdder.java @@ -113,7 +113,7 @@ class SinProdderEffect extends OneShotEffect { Player opponent = game.getPlayer(opponentUuid); if (opponent != null && !putInGraveyard && opponent.chooseUse(Outcome.Damage, sb.toString(), source, game)) { putInGraveyard = true; - opponent.damage(card.getManaCost().convertedManaCost(), source.getSourceId(), game, false, true); + opponent.damage(card.getConvertedManaCost(), source.getSourceId(), game, false, true); } } if (putInGraveyard) { diff --git a/Mage.Sets/src/mage/sets/shadowsoverinnistrad/SorinGrimNemesis.java b/Mage.Sets/src/mage/sets/shadowsoverinnistrad/SorinGrimNemesis.java index 5dcf9c09972..22364850569 100644 --- a/Mage.Sets/src/mage/sets/shadowsoverinnistrad/SorinGrimNemesis.java +++ b/Mage.Sets/src/mage/sets/shadowsoverinnistrad/SorinGrimNemesis.java @@ -123,10 +123,10 @@ class SorinGrimNemesisRevealEffect extends OneShotEffect { if (card != null && card.moveToZone(Zone.HAND, source.getSourceId(), game, false)) { for (UUID playerId : game.getOpponents(source.getControllerId())) { - if (card.getManaCost().convertedManaCost() > 0) { + if (card.getConvertedManaCost() > 0) { Player opponent = game.getPlayer(playerId); if (opponent != null) { - opponent.loseLife(card.getManaCost().convertedManaCost(), game); + opponent.loseLife(card.getConvertedManaCost(), game); } } } diff --git a/Mage.Sets/src/mage/sets/shadowsoverinnistrad/WolfOfDevilsBreach.java b/Mage.Sets/src/mage/sets/shadowsoverinnistrad/WolfOfDevilsBreach.java index 1a226328c49..40fefb593cc 100644 --- a/Mage.Sets/src/mage/sets/shadowsoverinnistrad/WolfOfDevilsBreach.java +++ b/Mage.Sets/src/mage/sets/shadowsoverinnistrad/WolfOfDevilsBreach.java @@ -98,7 +98,7 @@ class WolfOfDevilsBreachDiscardCostCardConvertedMana implements DynamicValue { DiscardCardCost discardCost = (DiscardCardCost) cost; int cmc = 0; for (Card card : discardCost.getCards()) { - cmc += card.getManaCost().convertedManaCost(); + cmc += card.getConvertedManaCost(); } return cmc; } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/AdNauseam.java b/Mage.Sets/src/mage/sets/shardsofalara/AdNauseam.java index b54e071bd06..c9f45d050a5 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/AdNauseam.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/AdNauseam.java @@ -92,7 +92,7 @@ class AdNauseamEffect extends OneShotEffect { Card card = controller.getLibrary().removeFromTop(game); if (card != null) { controller.moveCards(card, null, Zone.HAND, source, game); - int cmc = card.getManaCost().convertedManaCost(); + int cmc = card.getConvertedManaCost(); if (cmc > 0) { controller.loseLife(cmc, game); } diff --git a/Mage.Sets/src/mage/sets/tempest/Aluren.java b/Mage.Sets/src/mage/sets/tempest/Aluren.java index 9efde7bc409..df4a1caeca5 100644 --- a/Mage.Sets/src/mage/sets/tempest/Aluren.java +++ b/Mage.Sets/src/mage/sets/tempest/Aluren.java @@ -169,7 +169,7 @@ class AlurenRuleEffect extends ContinuousEffectImpl { // Card sourceCard = game.getCard(abilityToModify.getSourceId()); // StackObject stackObject = game.getStack().getStackObject(abilityToModify.getSourceId()); // if (stackObject != null && stackObject instanceof Spell) { -// if (sourceCard != null && sourceCard.getCardType().contains(CardType.CREATURE) && sourceCard.getManaCost().convertedManaCost() <= 3) { +// if (sourceCard != null && sourceCard.getCardType().contains(CardType.CREATURE) && sourceCard.getConvertedManaCost() <= 3) { // Player player = game.getPlayer(stackObject.getControllerId()); // String message = "Cast " + sourceCard.getName() + " without paying its mana costs?"; // if (player != null && diff --git a/Mage.Sets/src/mage/sets/tenthedition/MarchOfTheMachines.java b/Mage.Sets/src/mage/sets/tenthedition/MarchOfTheMachines.java index d234d092249..40ccfab1f59 100644 --- a/Mage.Sets/src/mage/sets/tenthedition/MarchOfTheMachines.java +++ b/Mage.Sets/src/mage/sets/tenthedition/MarchOfTheMachines.java @@ -107,7 +107,7 @@ class MarchOfTheMachinesEffect extends ContinuousEffectImpl { for (Iterator it = affectedObjectList.iterator(); it.hasNext();) { Permanent permanent = it.next().getPermanent(game); if (permanent != null){ - int manaCost = permanent.getManaCost().convertedManaCost(); + int manaCost = permanent.getConvertedManaCost(); permanent.getPower().setValue(manaCost); permanent.getToughness().setValue(manaCost); } diff --git a/Mage.Sets/src/mage/sets/theros/DaxosOfMeletis.java b/Mage.Sets/src/mage/sets/theros/DaxosOfMeletis.java index c75389dca45..64d679c2683 100644 --- a/Mage.Sets/src/mage/sets/theros/DaxosOfMeletis.java +++ b/Mage.Sets/src/mage/sets/theros/DaxosOfMeletis.java @@ -125,7 +125,7 @@ class DaxosOfMeletisEffect extends OneShotEffect { // move card to exile controller.moveCardToExileWithInfo(card, exileId, sourceObject.getIdName(), source.getSourceId(), game, Zone.LIBRARY, true); // player gains life - int cmc = card.getManaCost().convertedManaCost(); + int cmc = card.getConvertedManaCost(); if (cmc > 0) { controller.gainLife(cmc, game); } diff --git a/Mage.Sets/src/mage/sets/timespiral/IgniteMemories.java b/Mage.Sets/src/mage/sets/timespiral/IgniteMemories.java index 099d28eeab8..446222bbe7a 100644 --- a/Mage.Sets/src/mage/sets/timespiral/IgniteMemories.java +++ b/Mage.Sets/src/mage/sets/timespiral/IgniteMemories.java @@ -91,7 +91,7 @@ class IgniteMemoriesEffect extends OneShotEffect { Card card = player.getHand().getRandom(game); revealed.add(card); player.revealCards("Ignite Memories", revealed, game); - player.damage(card.getManaCost().convertedManaCost(), id, game, false, true); + player.damage(card.getConvertedManaCost(), id, game, false, true); return true; } return false; diff --git a/Mage.Sets/src/mage/sets/urzasdestiny/Opalescence.java b/Mage.Sets/src/mage/sets/urzasdestiny/Opalescence.java index 32b44a5f8ea..fbc731d13bb 100644 --- a/Mage.Sets/src/mage/sets/urzasdestiny/Opalescence.java +++ b/Mage.Sets/src/mage/sets/urzasdestiny/Opalescence.java @@ -119,7 +119,7 @@ class OpalescenceEffect extends ContinuousEffectImpl { case PTChangingEffects_7: if (sublayer == SubLayer.SetPT_7b) { - int manaCost = permanent.getManaCost().convertedManaCost(); + int manaCost = permanent.getConvertedManaCost(); permanent.getPower().setValue(manaCost); permanent.getToughness().setValue(manaCost); } diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/ViashinoHeretic.java b/Mage.Sets/src/mage/sets/urzaslegacy/ViashinoHeretic.java index dc603948e84..092cb1ce78f 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/ViashinoHeretic.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/ViashinoHeretic.java @@ -99,7 +99,7 @@ class ViashinoHereticEffect extends OneShotEffect { Permanent permanent = game.getPermanent(source.getFirstTarget()); if(permanent != null) { - int couvertedManaCost = permanent.getManaCost().convertedManaCost(); + int couvertedManaCost = permanent.getConvertedManaCost(); Player player = game.getPlayer(permanent.getControllerId()); permanent.destroy(source.getSourceId(), game, false); if(player != null){ diff --git a/Mage.Sets/src/mage/sets/urzassaga/KarnSilverGolem.java b/Mage.Sets/src/mage/sets/urzassaga/KarnSilverGolem.java index b24db464dc4..8015b753f70 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/KarnSilverGolem.java +++ b/Mage.Sets/src/mage/sets/urzassaga/KarnSilverGolem.java @@ -124,7 +124,7 @@ class KarnSilverGolemEffect extends ContinuousEffectImpl { case PTChangingEffects_7: if (sublayer == SubLayer.SetPT_7b) { - int cmc = artifact.getManaCost().convertedManaCost(); + int cmc = artifact.getConvertedManaCost(); artifact.getPower().setValue(cmc); artifact.getToughness().setValue(cmc); } diff --git a/Mage.Sets/src/mage/sets/urzassaga/Meltdown.java b/Mage.Sets/src/mage/sets/urzassaga/Meltdown.java index 4d7e5938ee9..877648eeae4 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/Meltdown.java +++ b/Mage.Sets/src/mage/sets/urzassaga/Meltdown.java @@ -81,7 +81,7 @@ class MeltdownEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { for (Permanent permanent : game.getBattlefield().getActivePermanents(source.getControllerId(), game)) { - if (permanent != null && permanent.getCardType().contains(CardType.ARTIFACT) && permanent.getManaCost().convertedManaCost() <= source.getManaCostsToPay().getX()) { + if (permanent != null && permanent.getCardType().contains(CardType.ARTIFACT) && permanent.getConvertedManaCost() <= source.getManaCostsToPay().getX()) { permanent.destroy(source.getSourceId(), game, false); } } diff --git a/Mage.Sets/src/mage/sets/weatherlight/Tariff.java b/Mage.Sets/src/mage/sets/weatherlight/Tariff.java index 12aa0150277..07d3a9e9a40 100644 --- a/Mage.Sets/src/mage/sets/weatherlight/Tariff.java +++ b/Mage.Sets/src/mage/sets/weatherlight/Tariff.java @@ -135,13 +135,13 @@ class TariffEffect extends OneShotEffect { List permanents = game.getBattlefield().getAllActivePermanents(filter, playerId, game); int highestCMC = -1; for (Permanent permanent : permanents) { - if (highestCMC < permanent.getManaCost().convertedManaCost()) { - highestCMC = permanent.getManaCost().convertedManaCost(); + if (highestCMC < permanent.getConvertedManaCost()) { + highestCMC = permanent.getConvertedManaCost(); } } List result = new ArrayList<>(); for (Permanent permanent : permanents) { - if (permanent.getManaCost().convertedManaCost() == highestCMC) { + if (permanent.getConvertedManaCost() == highestCMC) { result.add(permanent); } } diff --git a/Mage.Sets/src/mage/sets/worldwake/AgadeemOccultist.java b/Mage.Sets/src/mage/sets/worldwake/AgadeemOccultist.java index 3230153e0fb..1991164395b 100644 --- a/Mage.Sets/src/mage/sets/worldwake/AgadeemOccultist.java +++ b/Mage.Sets/src/mage/sets/worldwake/AgadeemOccultist.java @@ -112,7 +112,7 @@ class AgadeemOccultistEffect extends OneShotEffect { if (!target.getTargets().isEmpty()) { Card card = game.getCard(target.getFirstTarget()); if (card != null) { - if (card.getManaCost().convertedManaCost() <= allycount) { + if (card.getConvertedManaCost() <= allycount) { return controller.moveCards(card, Zone.BATTLEFIELD, source, game); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/planeswalker/UginTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/planeswalker/UginTest.java index ade5bf2f637..d4631910d38 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/planeswalker/UginTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/planeswalker/UginTest.java @@ -68,20 +68,19 @@ public class UginTest extends CardTestPlayerBase { block(3, playerB, "Ashaya, the Awoken World", "Silvercoat Lion"); activateAbility(3, PhaseStep.POSTCOMBAT_MAIN, playerA, "-X: Exile each permanent with converted mana cost X or less that's one or more colors"); - setChoice(playerA, "X=0"); + setChoice(playerA, "X=3"); setStopAt(3, PhaseStep.END_TURN); execute(); assertPermanentCount(playerA, "Ugin, the Spirit Dragon", 1); - assertCounterCount("Ugin, the Spirit Dragon", CounterType.LOYALTY, 9); // 7 + 2 - 0 + assertCounterCount("Ugin, the Spirit Dragon", CounterType.LOYALTY, 6); // 7 + 2 - 3 assertGraveyardCount(playerA, "Silvercoat Lion", 1); assertPermanentCount(playerB, "Ashaya, the Awoken World", 0); assertExileCount("Nissa, Vastwood Seer", 1); - - assertCounterCount("Quest for the Gravelord", CounterType.QUEST, 1); + assertExileCount("Quest for the Gravelord", 1); assertLife(playerA, 20); assertLife(playerB, 17); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/soi/NightSideCMCTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/soi/NightSideCMCTest.java index 9d0db011825..3957299a0eb 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/soi/NightSideCMCTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/soi/NightSideCMCTest.java @@ -11,32 +11,38 @@ import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; /** - * New SOI mechanics change requires the night-side CMC to be equal to the day-side CMC + * New SOI mechanics change requires the night-side CMC to be equal to the + * day-side CMC + * * @author escplan9 (Derek Monturo - dmontur1 at gmail dot com) */ public class NightSideCMCTest extends CardTestPlayerBase { - + /** - * - **/ + * + * + */ @Test public void insectileAbberationRepealXis1Test() { - - addCard(Zone.BATTLEFIELD, playerA, "Insectile Aberration"); // night-side of Delver of Secrets {U} + // At the beginning of your upkeep, look at the top card of your library. You may reveal that card. If an instant or sorcery card is revealed this way, transform Delver of Secrets. + addCard(Zone.BATTLEFIELD, playerA, "Delver of Secrets"); // night-side of Delver of Secrets {U} + + addCard(Zone.LIBRARY, playerA, "Lightning Bolt"); // to transform Delver of Secrets + skipInitShuffling(); // Instant - {X}{U} // Return target nonland permanent with converted mana cost X to its owner's hand. Draw a card. addCard(Zone.HAND, playerB, "Repeal"); addCard(Zone.BATTLEFIELD, playerB, "Island", 2); - - castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerB, "Repeal"); + + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerB, "Repeal"); setChoice(playerB, "X=1"); addTarget(playerB, "Insectile Aberration"); - + setStopAt(1, PhaseStep.BEGIN_COMBAT); - execute(); - - assertGraveyardCount(playerB, "Repeal", 1); - assertPermanentCount(playerA, "Insectile Aberration", 0); + execute(); + + assertGraveyardCount(playerB, "Repeal", 1); + assertPermanentCount(playerA, "Insectile Aberration", 0); assertHandCount(playerA, "Delver of Secrets", 1); // day-side of Insectile Abberation returned to hand } } diff --git a/Mage/src/main/java/mage/MageObject.java b/Mage/src/main/java/mage/MageObject.java index 02eeb04c587..f65a6e2a39d 100644 --- a/Mage/src/main/java/mage/MageObject.java +++ b/Mage/src/main/java/mage/MageObject.java @@ -13,45 +13,63 @@ import mage.game.Game; public interface MageObject extends MageItem, Serializable { String getName(); + String getIdName(); + String getLogName(); + String getImageName(); + void setName(String name); List getCardType(); + List getSubtype(); + boolean hasSubtype(String subtype); + List getSupertype(); Abilities getAbilities(); + boolean hasAbility(UUID abilityId, Game game); ObjectColor getColor(Game game); + ManaCosts getManaCost(); + int getConvertedManaCost(); + MageInt getPower(); + MageInt getToughness(); void adjustChoices(Ability ability, Game game); + void adjustCosts(Ability ability, Game game); + void adjustTargets(Ability ability, Game game); MageObject copy(); /** * Defines that MageObject is a copy of another object + * * @param isCopy */ void setCopy(boolean isCopy); /** * Checks if current MageObject is a copy of another object + * * @return */ boolean isCopy(); - + int getZoneChangeCounter(Game game); + void updateZoneChangeCounter(Game game); + void setZoneChangeCounter(int value, Game game); } diff --git a/Mage/src/main/java/mage/MageObjectImpl.java b/Mage/src/main/java/mage/MageObjectImpl.java index 6feab985cd8..ff6fd515573 100644 --- a/Mage/src/main/java/mage/MageObjectImpl.java +++ b/Mage/src/main/java/mage/MageObjectImpl.java @@ -165,6 +165,14 @@ public abstract class MageObjectImpl implements MageObject { return manaCost; } + @Override + public int getConvertedManaCost() { + if (manaCost != null) { + return manaCost.convertedManaCost(); + } + return 0; + } + @Override public void adjustChoices(Ability ability, Game game) { } diff --git a/Mage/src/main/java/mage/abilities/costs/common/ExileFromHandCost.java b/Mage/src/main/java/mage/abilities/costs/common/ExileFromHandCost.java index 20e83fc42f6..5f5a17d43e7 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/ExileFromHandCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/ExileFromHandCost.java @@ -86,7 +86,7 @@ public class ExileFromHandCost extends CostImpl { if (card == null) { return false; } - cmc += card.getManaCost().convertedManaCost(); + cmc += card.getConvertedManaCost(); this.cards.add(card); } Cards cardsToExile = new CardsImpl(); diff --git a/Mage/src/main/java/mage/abilities/costs/common/RevealTargetFromHandCost.java b/Mage/src/main/java/mage/abilities/costs/common/RevealTargetFromHandCost.java index 2be5cdc07e5..c7459245910 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/RevealTargetFromHandCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/RevealTargetFromHandCost.java @@ -72,7 +72,7 @@ public class RevealTargetFromHandCost extends CostImpl { for (UUID targetId : targets.get(0).getTargets()) { Card card = player.getHand().get(targetId, game); if (card != null) { - convertedManaCosts += card.getManaCost().convertedManaCost(); + convertedManaCosts += card.getConvertedManaCost(); numberCardsRevealed++; cards.add(card); revealedCards.add(card); diff --git a/Mage/src/main/java/mage/abilities/dynamicvalue/common/DiscardCostCardConvertedMana.java b/Mage/src/main/java/mage/abilities/dynamicvalue/common/DiscardCostCardConvertedMana.java index 0d9586da6a1..6309f6776f1 100644 --- a/Mage/src/main/java/mage/abilities/dynamicvalue/common/DiscardCostCardConvertedMana.java +++ b/Mage/src/main/java/mage/abilities/dynamicvalue/common/DiscardCostCardConvertedMana.java @@ -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; } diff --git a/Mage/src/main/java/mage/abilities/dynamicvalue/common/ExileFromHandCostCardConvertedMana.java b/Mage/src/main/java/mage/abilities/dynamicvalue/common/ExileFromHandCostCardConvertedMana.java index b089fe7a077..cf4b56b274c 100644 --- a/Mage/src/main/java/mage/abilities/dynamicvalue/common/ExileFromHandCostCardConvertedMana.java +++ b/Mage/src/main/java/mage/abilities/dynamicvalue/common/ExileFromHandCostCardConvertedMana.java @@ -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; } diff --git a/Mage/src/main/java/mage/abilities/dynamicvalue/common/SacrificeCostConvertedMana.java b/Mage/src/main/java/mage/abilities/dynamicvalue/common/SacrificeCostConvertedMana.java index 5de2bff16dc..f5b390e444d 100644 --- a/Mage/src/main/java/mage/abilities/dynamicvalue/common/SacrificeCostConvertedMana.java +++ b/Mage/src/main/java/mage/abilities/dynamicvalue/common/SacrificeCostConvertedMana.java @@ -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; } diff --git a/Mage/src/main/java/mage/abilities/dynamicvalue/common/TargetConvertedManaCost.java b/Mage/src/main/java/mage/abilities/dynamicvalue/common/TargetConvertedManaCost.java index cd243de9b1c..6a1746bbe78 100644 --- a/Mage/src/main/java/mage/abilities/dynamicvalue/common/TargetConvertedManaCost.java +++ b/Mage/src/main/java/mage/abilities/dynamicvalue/common/TargetConvertedManaCost.java @@ -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; } diff --git a/Mage/src/main/java/mage/abilities/effects/common/ClashEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ClashEffect.java index 0602e2adb44..780ba36a976 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/ClashEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/ClashEffect.java @@ -133,7 +133,7 @@ public class ClashEffect extends OneShotEffect implements MageSingleton { cardController = controller.getLibrary().getFromTop(game); cards.add(cardController); controller.revealCards(sourceObject.getIdName() + ": Clash card of " + controller.getName(), cards, game); - cmcController = cardController.getManaCost().convertedManaCost(); + cmcController = cardController.getConvertedManaCost(); message.append(" (").append(cmcController).append(")"); } else { message.append(" no card"); @@ -144,7 +144,7 @@ public class ClashEffect extends OneShotEffect implements MageSingleton { cardOpponent = opponent.getLibrary().getFromTop(game); cards.add(cardOpponent); opponent.revealCards(sourceObject.getIdName() + ": Clash card of " + opponent.getName(), cards, game); - cmcOpponent = cardOpponent.getManaCost().convertedManaCost(); + cmcOpponent = cardOpponent.getConvertedManaCost(); message.append(" (").append(cmcOpponent).append(")"); } else { message.append(" no card"); diff --git a/Mage/src/main/java/mage/abilities/effects/common/ReturnSourceFromGraveyardToHandEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ReturnSourceFromGraveyardToHandEffect.java index e669693c00a..f9753343865 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/ReturnSourceFromGraveyardToHandEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/ReturnSourceFromGraveyardToHandEffect.java @@ -60,7 +60,7 @@ public class ReturnSourceFromGraveyardToHandEffect extends OneShotEffect { Player controller = game.getPlayer(source.getControllerId()); Card card = controller.getGraveyard().get(source.getSourceId(), game); if (card != null) { - return controller.moveCards(card, null, Zone.HAND, source, game); + return controller.moveCards(card, Zone.HAND, source, game); } return false; } diff --git a/Mage/src/main/java/mage/abilities/keyword/CascadeAbility.java b/Mage/src/main/java/mage/abilities/keyword/CascadeAbility.java index 68e593baa24..4076c112dd9 100644 --- a/Mage/src/main/java/mage/abilities/keyword/CascadeAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/CascadeAbility.java @@ -112,14 +112,14 @@ class CascadeEffect extends OneShotEffect { return false; } ExileZone exile = game.getExile().createZone(source.getSourceId(), player.getName() + " Cascade"); - int sourceCost = game.getCard(source.getSourceId()).getManaCost().convertedManaCost(); + int sourceCost = game.getCard(source.getSourceId()).getConvertedManaCost(); do { card = player.getLibrary().getFromTop(game); if (card == null) { break; } player.moveCardsToExile(card, source, game, true, exile.getId(), exile.getName()); - } while (player.isInGame() && card.getCardType().contains(CardType.LAND) || card.getManaCost().convertedManaCost() >= sourceCost); + } while (player.isInGame() && card.getCardType().contains(CardType.LAND) || card.getConvertedManaCost() >= sourceCost); player.getLibrary().reset(); if (card != null) { diff --git a/Mage/src/main/java/mage/abilities/keyword/TransmuteAbility.java b/Mage/src/main/java/mage/abilities/keyword/TransmuteAbility.java index a423937b24c..8ed7e284468 100644 --- a/Mage/src/main/java/mage/abilities/keyword/TransmuteAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/TransmuteAbility.java @@ -78,8 +78,8 @@ class TransmuteEffect extends OneShotEffect { Player controller = game.getPlayer(source.getControllerId()); MageObject sourceObject = game.getObject(source.getSourceId()); if (sourceObject != null && controller != null) { - FilterCard filter = new FilterCard("card with converted mana cost " + sourceObject.getManaCost().convertedManaCost()); - filter.add(new ConvertedManaCostPredicate(Filter.ComparisonType.Equal, sourceObject.getManaCost().convertedManaCost())); + FilterCard filter = new FilterCard("card with converted mana cost " + sourceObject.getConvertedManaCost()); + filter.add(new ConvertedManaCostPredicate(Filter.ComparisonType.Equal, sourceObject.getConvertedManaCost())); TargetCardInLibrary target = new TargetCardInLibrary(1, filter); if (controller.searchLibrary(target, game)) { if (target.getTargets().size() > 0) { diff --git a/Mage/src/main/java/mage/cards/repository/CardInfo.java b/Mage/src/main/java/mage/cards/repository/CardInfo.java index 717220c2538..1174e5056de 100644 --- a/Mage/src/main/java/mage/cards/repository/CardInfo.java +++ b/Mage/src/main/java/mage/cards/repository/CardInfo.java @@ -118,7 +118,7 @@ public class CardInfo { this.className = card.getClass().getCanonicalName(); this.power = card.getPower().toString(); this.toughness = card.getToughness().toString(); - this.convertedManaCost = card.getManaCost().convertedManaCost(); + this.convertedManaCost = card.getConvertedManaCost(); this.rarity = card.getRarity(); this.splitCard = card.isSplitCard(); diff --git a/Mage/src/main/java/mage/filter/predicate/mageobject/ConvertedManaCostPredicate.java b/Mage/src/main/java/mage/filter/predicate/mageobject/ConvertedManaCostPredicate.java index f165e57d7e5..3524d26dedf 100644 --- a/Mage/src/main/java/mage/filter/predicate/mageobject/ConvertedManaCostPredicate.java +++ b/Mage/src/main/java/mage/filter/predicate/mageobject/ConvertedManaCostPredicate.java @@ -30,7 +30,6 @@ package mage.filter.predicate.mageobject; import mage.MageObject; import mage.filter.Filter; import mage.filter.predicate.IntComparePredicate; -import mage.game.stack.StackObject; /** * @@ -44,11 +43,7 @@ public class ConvertedManaCostPredicate extends IntComparePredicate @Override protected int getInputValue(MageObject input) { - if (input instanceof StackObject) { - return ((StackObject) input).getConvertedManaCost(); - } else{ - return input.getManaCost().convertedManaCost(); - } + return input.getConvertedManaCost(); } @Override diff --git a/Mage/src/main/java/mage/game/command/Commander.java b/Mage/src/main/java/mage/game/command/Commander.java index 10f1d71e570..77560f1901c 100644 --- a/Mage/src/main/java/mage/game/command/Commander.java +++ b/Mage/src/main/java/mage/game/command/Commander.java @@ -150,6 +150,11 @@ public class Commander implements CommandObject { return card.getManaCost(); } + @Override + public int getConvertedManaCost() { + return card.getConvertedManaCost(); + } + @Override public MageInt getPower() { return card.getPower(); diff --git a/Mage/src/main/java/mage/game/command/Emblem.java b/Mage/src/main/java/mage/game/command/Emblem.java index f2a35f54256..b9d5cf6e931 100644 --- a/Mage/src/main/java/mage/game/command/Emblem.java +++ b/Mage/src/main/java/mage/game/command/Emblem.java @@ -159,6 +159,11 @@ public class Emblem implements CommandObject { return emptyCost; } + @Override + public int getConvertedManaCost() { + return 0; + } + @Override public MageInt getPower() { return MageInt.EmptyMageInt; diff --git a/Mage/src/main/java/mage/game/permanent/PermanentCard.java b/Mage/src/main/java/mage/game/permanent/PermanentCard.java index 0dacd6f63b9..c4249c66334 100644 --- a/Mage/src/main/java/mage/game/permanent/PermanentCard.java +++ b/Mage/src/main/java/mage/game/permanent/PermanentCard.java @@ -263,6 +263,19 @@ public class PermanentCard extends PermanentImpl { return super.getManaCost(); } + @Override + public int getConvertedManaCost() { + if (isTransformed()) { + // 711.4b While a double-faced permanent’s back face is up, it has only the characteristics of its back face. + // However, its converted mana cost is calculated using the mana cost of its front face. This is a change from previous rules. + // If a permanent is copying the back face of a double-faced card (even if the card representing that copy + // is itself a double-faced card), the converted mana cost of that permanent is 0. + return getCard().getConvertedManaCost(); + } + return super.getConvertedManaCost(); + + } + @Override public int getZoneChangeCounter(Game game) { // permanent value of zone change counter stays always the same without exception of update during the process of putting the permanent onto the battlefield diff --git a/Mage/src/main/java/mage/game/stack/StackObject.java b/Mage/src/main/java/mage/game/stack/StackObject.java index 0e973e879e7..0d94ac6f99c 100644 --- a/Mage/src/main/java/mage/game/stack/StackObject.java +++ b/Mage/src/main/java/mage/game/stack/StackObject.java @@ -48,8 +48,7 @@ public interface StackObject extends MageObject, Controllable { Ability getStackAbility(); - int getConvertedManaCost(); - +// int getConvertedManaCost(); boolean chooseNewTargets(Game game, UUID playerId, boolean forceChange, boolean onlyOneTarget, FilterPermanent filterNewTarget); @Override diff --git a/Mage/src/main/java/mage/util/CardUtil.java b/Mage/src/main/java/mage/util/CardUtil.java index 7e13ad6eece..aa1f9751fa7 100644 --- a/Mage/src/main/java/mage/util/CardUtil.java +++ b/Mage/src/main/java/mage/util/CardUtil.java @@ -598,10 +598,10 @@ public class CardUtil { Card card = (Card) object; if (card instanceof SplitCard) { SplitCard splitCard = (SplitCard) card; - cmcObject.add(splitCard.getLeftHalfCard().getManaCost().convertedManaCost()); - cmcObject.add(splitCard.getRightHalfCard().getManaCost().convertedManaCost()); + cmcObject.add(splitCard.getLeftHalfCard().getConvertedManaCost()); + cmcObject.add(splitCard.getRightHalfCard().getConvertedManaCost()); } else { - cmcObject.add(card.getManaCost().convertedManaCost()); + cmcObject.add(card.getConvertedManaCost()); } } return cmcObject;