diff --git a/Mage.Client/src/main/java/mage/client/cards/CardGrid.java b/Mage.Client/src/main/java/mage/client/cards/CardGrid.java index 8a50bbadf41..5bd6a93a060 100644 --- a/Mage.Client/src/main/java/mage/client/cards/CardGrid.java +++ b/Mage.Client/src/main/java/mage/client/cards/CardGrid.java @@ -363,7 +363,7 @@ @Override public int compare(MageCard o1, MageCard o2) { - int val = Integer.compare(o1.getOriginal().getConvertedManaCost(), o2.getOriginal().getConvertedManaCost()); + int val = Integer.compare(o1.getOriginal().getManaValue(), o2.getOriginal().getManaValue()); if (val == 0) { return o1.getOriginal().getName().compareTo(o2.getOriginal().getName()); } else { diff --git a/Mage.Client/src/main/java/mage/client/cards/DragCardGrid.java b/Mage.Client/src/main/java/mage/client/cards/DragCardGrid.java index 29fdc8336e9..2e7e155a34f 100644 --- a/Mage.Client/src/main/java/mage/client/cards/DragCardGrid.java +++ b/Mage.Client/src/main/java/mage/client/cards/DragCardGrid.java @@ -435,7 +435,7 @@ public class DragCardGrid extends JPanel implements DragCardSource, DragCardTarg public enum Sort { NONE("No Sort", new CardViewNoneComparator()), CARD_TYPE("Card Type", new CardViewCardTypeComparator()), - CMC("Converted Mana Cost", new CardViewCostComparator()), + CMC("Mana Value", new CardViewCostComparator()), COLOR("Color", new CardViewColorComparator()), COLOR_IDENTITY("Color Identity", new CardViewColorIdentityComparator()), RARITY("Rarity", new CardViewRarityComparator()), @@ -1475,7 +1475,7 @@ public class DragCardGrid extends JPanel implements DragCardSource, DragCardTarg mc = mc.replaceAll("#2\\/", "#"); mc = mc.replaceAll("p}", "}"); mc = mc.toLowerCase(Locale.ENGLISH); - int cmc = card.getConvertedManaCost(); + int cmc = card.getManaValue(); // Do colorless mana pips Pattern regex = Pattern.compile("#([0-9]+)}"); diff --git a/Mage.Client/src/main/java/mage/client/deck/generator/DeckGenerator.java b/Mage.Client/src/main/java/mage/client/deck/generator/DeckGenerator.java index 523d235ce69..1375095d5d1 100644 --- a/Mage.Client/src/main/java/mage/client/deck/generator/DeckGenerator.java +++ b/Mage.Client/src/main/java/mage/client/deck/generator/DeckGenerator.java @@ -191,7 +191,7 @@ public final class DeckGenerator { while (count < spellCount) { Card card = cardPool.get(RandomUtil.nextInt(retrievedCount)).getMockCard(); if (genPool.isValidSpellCard(card)) { - int cardCMC = card.getConvertedManaCost(); + int cardCMC = card.getManaValue(); for (DeckGeneratorCMC.CMC deckCMC : deckCMCs) { if (cardCMC >= deckCMC.min && cardCMC <= deckCMC.max) { int currentAmount = deckCMC.getAmount(); diff --git a/Mage.Client/src/main/java/mage/client/deckeditor/table/MageCardComparator.java b/Mage.Client/src/main/java/mage/client/deckeditor/table/MageCardComparator.java index 83185db8d8b..1775689bfd7 100644 --- a/Mage.Client/src/main/java/mage/client/deckeditor/table/MageCardComparator.java +++ b/Mage.Client/src/main/java/mage/client/deckeditor/table/MageCardComparator.java @@ -44,8 +44,8 @@ public class MageCardComparator implements CardViewComparator { break; // Cost case 2: - aCom = a.getConvertedManaCost(); - bCom = b.getConvertedManaCost(); + aCom = a.getManaValue(); + bCom = b.getManaValue(); break; // Color case 3: diff --git a/Mage.Client/src/main/java/mage/client/util/comparators/CardViewCostComparator.java b/Mage.Client/src/main/java/mage/client/util/comparators/CardViewCostComparator.java index 4fdf0dc01f8..a7ec40bec6c 100644 --- a/Mage.Client/src/main/java/mage/client/util/comparators/CardViewCostComparator.java +++ b/Mage.Client/src/main/java/mage/client/util/comparators/CardViewCostComparator.java @@ -9,11 +9,11 @@ public class CardViewCostComparator implements CardViewComparator { @Override public int compare(CardView o1, CardView o2) { - return Integer.compare(o1.getConvertedManaCost(), o2.getConvertedManaCost()); + return Integer.compare(o1.getManaValue(), o2.getManaValue()); } @Override public String getCategoryName(CardView sample) { - return "CMC: " + sample.getConvertedManaCost(); + return "CMC: " + sample.getManaValue(); } } diff --git a/Mage.Common/src/main/java/mage/remote/ActionData.java b/Mage.Common/src/main/java/mage/remote/ActionData.java index c546ba2d240..ce79520cba2 100644 --- a/Mage.Common/src/main/java/mage/remote/ActionData.java +++ b/Mage.Common/src/main/java/mage/remote/ActionData.java @@ -67,7 +67,7 @@ public class ActionData { "paid", "hand", "stack", - "convertedManaCost", + "manaValue", "gameId", "canPlayInHand", "gameView", diff --git a/Mage.Common/src/main/java/mage/utils/DeckBuilder.java b/Mage.Common/src/main/java/mage/utils/DeckBuilder.java index e0eebb9b2d1..8e18829c227 100644 --- a/Mage.Common/src/main/java/mage/utils/DeckBuilder.java +++ b/Mage.Common/src/main/java/mage/utils/DeckBuilder.java @@ -238,7 +238,7 @@ public final class DeckBuilder { } private int getManaCostScore(Card card, List allowedColors) { - int converted = card.getConvertedManaCost(); + int converted = card.getManaValue(); final Map singleCount = new HashMap<>(); int maxSingleCount = 0; int multicolor = 0; @@ -276,7 +276,7 @@ public final class DeckBuilder { } public int getConvertedCost() { - return this.card.getConvertedManaCost(); + return this.card.getManaValue(); } public Card getCard() { diff --git a/Mage.Common/src/main/java/mage/view/CardView.java b/Mage.Common/src/main/java/mage/view/CardView.java index 088d3adc614..f648dfa0d6d 100644 --- a/Mage.Common/src/main/java/mage/view/CardView.java +++ b/Mage.Common/src/main/java/mage/view/CardView.java @@ -66,7 +66,7 @@ public class CardView extends SimpleCardView { // can combine multiple costs for MockCard from deck editor or db (left/right, card/adventure) protected String manaCostLeftStr; protected String manaCostRightStr; - protected int convertedManaCost; + protected int manaValue; protected Rarity rarity; protected MageObjectType mageObjectType = MageObjectType.NULL; @@ -174,7 +174,7 @@ public class CardView extends SimpleCardView { this.frameStyle = cardView.frameStyle; this.manaCostLeftStr = cardView.manaCostLeftStr; this.manaCostRightStr = cardView.manaCostRightStr; - this.convertedManaCost = cardView.convertedManaCost; + this.manaValue = cardView.manaValue; this.rarity = cardView.rarity; this.mageObjectType = cardView.mageObjectType; @@ -389,7 +389,7 @@ public class CardView extends SimpleCardView { } else { this.rules = card.getRules(game); } - this.convertedManaCost = card.getConvertedManaCost(); + this.manaValue = card.getManaValue(); if (card instanceof Permanent) { this.mageObjectType = MageObjectType.PERMANENT; @@ -565,7 +565,7 @@ public class CardView extends SimpleCardView { this.color = object.getColor(game); this.manaCostLeftStr = String.join("", object.getManaCostSymbols()); this.manaCostRightStr = ""; - this.convertedManaCost = object.getManaCost().convertedManaCost(); + this.manaValue = object.getManaCost().manaValue(); if (object instanceof PermanentToken) { this.mageObjectType = MageObjectType.TOKEN; PermanentToken permanentToken = (PermanentToken) object; @@ -686,7 +686,7 @@ public class CardView extends SimpleCardView { this.frameStyle = FrameStyle.M15_NORMAL; this.manaCostLeftStr = ""; this.manaCostRightStr = ""; - this.convertedManaCost = 0; + this.manaValue = 0; // the controller can see more information (e.g. enlarged image) than other players for face down cards (e.g. Morph played face down) if (!controlled) { @@ -848,8 +848,8 @@ public class CardView extends SimpleCardView { return CardUtil.concatManaSymbols(CardInfo.SPLIT_MANA_SEPARATOR_FULL, this.manaCostLeftStr, this.manaCostRightStr); } - public int getConvertedManaCost() { - return convertedManaCost; + public int getManaValue() { + return manaValue; } public Rarity getRarity() { diff --git a/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/TinyLeaders.java b/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/TinyLeaders.java index 76b6a9e7f8d..444b837f159 100644 --- a/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/TinyLeaders.java +++ b/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/TinyLeaders.java @@ -130,7 +130,7 @@ public class TinyLeaders extends Constructed { * would be legal independently. */ - if (commander == null || commander.getConvertedManaCost() > 3) { + if (commander == null || commander.getManaValue() > 3) { if (commander == null) { if (deck.getName() == null) { addError(DeckValidatorErrorType.PRIMARY, "Leader", "You have to save your deck with the leader card name entered to the DECK NAME field of the DECK EDITOR (top left) so that XMage knows your leader." @@ -141,8 +141,8 @@ public class TinyLeaders extends Constructed { } } - if (commander != null && commander.getConvertedManaCost() > 3) { - addError(DeckValidatorErrorType.PRIMARY, "Leader", "Commanders converted mana cost is greater than 3"); + if (commander != null && commander.getManaValue() > 3) { + addError(DeckValidatorErrorType.PRIMARY, "Leader", "Commanders mana value is greater than 3"); } return false; } @@ -201,13 +201,13 @@ public class TinyLeaders extends Constructed { // as zero for this purpose. Split cards are legal only if both of their halves would be legal independently. List costs = new ArrayList<>(); if (card instanceof SplitCard) { - costs.add(((SplitCard) card).getLeftHalfCard().getConvertedManaCost()); - costs.add(((SplitCard) card).getRightHalfCard().getConvertedManaCost()); + costs.add(((SplitCard) card).getLeftHalfCard().getManaValue()); + costs.add(((SplitCard) card).getRightHalfCard().getManaValue()); } else if (card instanceof ModalDoubleFacesCard) { - costs.add(((ModalDoubleFacesCard) card).getLeftHalfCard().getConvertedManaCost()); - costs.add(((ModalDoubleFacesCard) card).getRightHalfCard().getConvertedManaCost()); + costs.add(((ModalDoubleFacesCard) card).getLeftHalfCard().getManaValue()); + costs.add(((ModalDoubleFacesCard) card).getRightHalfCard().getManaValue()); } else { - costs.add(card.getConvertedManaCost()); + costs.add(card.getManaValue()); } return costs.stream().allMatch(cost -> { diff --git a/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/ComputerPlayer7.java b/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/ComputerPlayer7.java index 5f03d178230..dd8ee09aa40 100644 --- a/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/ComputerPlayer7.java +++ b/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/ComputerPlayer7.java @@ -118,7 +118,7 @@ public class ComputerPlayer7 extends ComputerPlayer6 { boolean doThis = true; if (root.abilities.size() == 1) { for (Ability ability : root.abilities) { - if (ability.getManaCosts().convertedManaCost() == 0 + if (ability.getManaCosts().manaValue() == 0 && ability.getCosts().isEmpty()) { if (actionCache.contains(ability.getRule() + '_' + ability.getSourceId())) { doThis = false; // don't do it again diff --git a/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/SimulatedPlayer2.java b/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/SimulatedPlayer2.java index 833c18210f0..3f7f2205420 100644 --- a/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/SimulatedPlayer2.java +++ b/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/SimulatedPlayer2.java @@ -117,7 +117,7 @@ public class SimulatedPlayer2 extends ComputerPlayer { @Override protected void addVariableXOptions(List options, Ability ability, int targetNum, Game game) { // calculate the mana that can be used for the x part - int numAvailable = getAvailableManaProducers(game).size() - ability.getManaCosts().convertedManaCost(); + int numAvailable = getAvailableManaProducers(game).size() - ability.getManaCosts().manaValue(); Card card = game.getCard(ability.getSourceId()); if (card != null && numAvailable > 0) { diff --git a/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/ma/ArtificialScoringSystem.java b/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/ma/ArtificialScoringSystem.java index 355688cbb83..8954f642cac 100644 --- a/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/ma/ArtificialScoringSystem.java +++ b/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/ma/ArtificialScoringSystem.java @@ -39,7 +39,7 @@ public final class ArtificialScoringSystem { return score; } - final int score = value * 100 - card.getManaCost().convertedManaCost() * 20; + final int score = value * 100 - card.getManaCost().manaValue() * 20; if (card.getCardType().contains(CardType.CREATURE)) { return score + (card.getPower().getValue() + card.getToughness().getValue()) * 10; } else { diff --git a/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/ComputerPlayer.java b/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/ComputerPlayer.java index 183f47bb76f..4ccf02ddfe7 100644 --- a/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/ComputerPlayer.java +++ b/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/ComputerPlayer.java @@ -1719,7 +1719,7 @@ public class ComputerPlayer extends PlayerImpl implements Player { //TODO: improve this int xMin = min * multiplier; int xMax = (max == Integer.MAX_VALUE ? max : max * multiplier); - int numAvailable = getAvailableManaProducers(game).size() - ability.getManaCosts().convertedManaCost(); + int numAvailable = getAvailableManaProducers(game).size() - ability.getManaCosts().manaValue(); if (numAvailable < 0) { numAvailable = 0; } else { diff --git a/Mage.Server.Plugins/Mage.Player.AIMCTS/src/mage/player/ai/MCTSPlayer.java b/Mage.Server.Plugins/Mage.Player.AIMCTS/src/mage/player/ai/MCTSPlayer.java index 36cec441e62..743809b8a6d 100644 --- a/Mage.Server.Plugins/Mage.Player.AIMCTS/src/mage/player/ai/MCTSPlayer.java +++ b/Mage.Server.Plugins/Mage.Player.AIMCTS/src/mage/player/ai/MCTSPlayer.java @@ -80,7 +80,7 @@ public class MCTSPlayer extends ComputerPlayer { } protected void simulateVariableCosts(Ability ability, List options, Game game) { - int numAvailable = getAvailableManaProducers(game).size() - ability.getManaCosts().convertedManaCost(); + int numAvailable = getAvailableManaProducers(game).size() - ability.getManaCosts().manaValue(); int start = 0; if (!(ability instanceof SpellAbility)) { //only use x=0 on spell abilities diff --git a/Mage.Server.Plugins/Mage.Player.AIMCTS/src/mage/player/ai/SimulatedPlayerMCTS.java b/Mage.Server.Plugins/Mage.Player.AIMCTS/src/mage/player/ai/SimulatedPlayerMCTS.java index 31b8ed4bacb..dee2778f883 100644 --- a/Mage.Server.Plugins/Mage.Player.AIMCTS/src/mage/player/ai/SimulatedPlayerMCTS.java +++ b/Mage.Server.Plugins/Mage.Player.AIMCTS/src/mage/player/ai/SimulatedPlayerMCTS.java @@ -90,7 +90,7 @@ public class SimulatedPlayerMCTS extends MCTSPlayer { } } if (!ability.getManaCosts().getVariableCosts().isEmpty()) { - int amount = getAvailableManaProducers(game).size() - ability.getManaCosts().convertedManaCost(); + int amount = getAvailableManaProducers(game).size() - ability.getManaCosts().manaValue(); if (amount > 0) { ability = ability.copy(); ability.getManaCostsToPay().add(new GenericManaCost(RandomUtil.nextInt(amount))); diff --git a/Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/GameStateEvaluator.java b/Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/GameStateEvaluator.java index 20db31c084b..64a522c954d 100644 --- a/Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/GameStateEvaluator.java +++ b/Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/GameStateEvaluator.java @@ -96,7 +96,7 @@ public final class GameStateEvaluator { } value += permanent.getAbilities().getStaticAbilities(Zone.BATTLEFIELD).size(); value += permanent.getAbilities().getTriggeredAbilities(Zone.BATTLEFIELD).size(); - value += permanent.getManaCost().convertedManaCost(); + value += permanent.getManaCost().manaValue(); //TODO: add a difficulty to calculation to ManaCost - sort permanents by difficulty for casting when evaluating game states return value; } diff --git a/Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/SimulatedPlayer.java b/Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/SimulatedPlayer.java index 06063ae92ec..f0f11fb19d5 100644 --- a/Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/SimulatedPlayer.java +++ b/Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/SimulatedPlayer.java @@ -105,7 +105,7 @@ public class SimulatedPlayer extends ComputerPlayer { //add a generic mana cost for each amount possible protected void simulateVariableCosts(Ability ability, Game game) { - int numAvailable = getAvailableManaProducers(game).size() - ability.getManaCosts().convertedManaCost(); + int numAvailable = getAvailableManaProducers(game).size() - ability.getManaCosts().manaValue(); int start = 0; if (!(ability instanceof SpellAbility)) { //only use x=0 on spell abilities diff --git a/Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java b/Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java index 593f23d2e4b..9ff3a57443f 100644 --- a/Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java +++ b/Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java @@ -2118,7 +2118,7 @@ public class HumanPlayer extends PlayerImpl { // hide on alternative cost activated if (!getCastSourceIdWithAlternateMana().contains(ability.getSourceId()) - && ability.getManaCostsToPay().convertedManaCost() > 0) { + && ability.getManaCostsToPay().manaValue() > 0) { return true; } diff --git a/Mage.Sets/src/mage/cards/a/AbruptDecay.java b/Mage.Sets/src/mage/cards/a/AbruptDecay.java index 4c1e7f3ebf3..5e10f06f22c 100644 --- a/Mage.Sets/src/mage/cards/a/AbruptDecay.java +++ b/Mage.Sets/src/mage/cards/a/AbruptDecay.java @@ -13,7 +13,7 @@ import mage.constants.CardType; import mage.constants.ComparisonType; import mage.constants.Zone; import mage.filter.common.FilterNonlandPermanent; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.target.common.TargetNonlandPermanent; /** @@ -22,10 +22,10 @@ import mage.target.common.TargetNonlandPermanent; */ public final class AbruptDecay extends CardImpl { - private static final FilterNonlandPermanent filter = new FilterNonlandPermanent("nonland permanent with converted mana cost 3 or less"); + private static final FilterNonlandPermanent filter = new FilterNonlandPermanent("nonland permanent with mana value 3 or less"); static { - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 4)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 4)); } public AbruptDecay(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/AcceleratedMutation.java b/Mage.Sets/src/mage/cards/a/AcceleratedMutation.java index 593f149d3e0..cea4ac18742 100644 --- a/Mage.Sets/src/mage/cards/a/AcceleratedMutation.java +++ b/Mage.Sets/src/mage/cards/a/AcceleratedMutation.java @@ -3,7 +3,7 @@ package mage.cards.a; import java.util.UUID; import mage.abilities.dynamicvalue.DynamicValue; -import mage.abilities.dynamicvalue.common.HighestConvertedManaCostValue; +import mage.abilities.dynamicvalue.common.HighestManaValueCount; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -21,7 +21,7 @@ public final class AcceleratedMutation extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{3}{G}{G}"); // Target creature gets +X/+X until end of turn, where X is the highest converted mana cost among permanents you control. - DynamicValue amount = new HighestConvertedManaCostValue(); + DynamicValue amount = new HighestManaValueCount(); this.getSpellAbility().addEffect(new BoostTargetEffect(amount, amount, Duration.EndOfTurn, true)); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } diff --git a/Mage.Sets/src/mage/cards/a/AdNauseam.java b/Mage.Sets/src/mage/cards/a/AdNauseam.java index b6f6c3886c8..b9bb000fd86 100644 --- a/Mage.Sets/src/mage/cards/a/AdNauseam.java +++ b/Mage.Sets/src/mage/cards/a/AdNauseam.java @@ -40,7 +40,7 @@ class AdNauseamEffect extends OneShotEffect { public AdNauseamEffect() { super(Outcome.DrawCard); - this.staticText = "Reveal the top card of your library and put that card into your hand. You lose life equal to its converted mana cost. You may repeat this process any number of times"; + this.staticText = "Reveal the top card of your library and put that card into your hand. You lose life equal to its mana value. You may repeat this process any number of times"; } public AdNauseamEffect(final AdNauseamEffect effect) { @@ -54,7 +54,7 @@ class AdNauseamEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - String message = "Reveal the top card of your library and put that card into your hand? You lose life equal to its converted mana cost."; + String message = "Reveal the top card of your library and put that card into your hand? You lose life equal to its mana value."; Card sourceCard = game.getCard(source.getSourceId()); Player controller = game.getPlayer(source.getControllerId()); if (controller == null || sourceCard == null) { @@ -66,7 +66,7 @@ class AdNauseamEffect extends OneShotEffect { break; } controller.moveCards(card, Zone.HAND, source, game); - int cmc = card.getConvertedManaCost(); + int cmc = card.getManaValue(); if (cmc > 0) { controller.loseLife(cmc, game, source, false); } diff --git a/Mage.Sets/src/mage/cards/a/AetherMutation.java b/Mage.Sets/src/mage/cards/a/AetherMutation.java index af8a59c3be3..e0a53ae9dbe 100644 --- a/Mage.Sets/src/mage/cards/a/AetherMutation.java +++ b/Mage.Sets/src/mage/cards/a/AetherMutation.java @@ -2,7 +2,7 @@ package mage.cards.a; import java.util.UUID; -import mage.abilities.dynamicvalue.common.TargetConvertedManaCost; +import mage.abilities.dynamicvalue.common.TargetManaValue; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.cards.CardImpl; @@ -25,7 +25,7 @@ public final class AetherMutation extends CardImpl { this.getSpellAbility().addEffect(new ReturnToHandTargetEffect()); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); // create X 1/1 green Saproling creature tokens, where X is that creature's converted mana cost. - this.getSpellAbility().addEffect(new CreateTokenEffect(new SaprolingToken(), TargetConvertedManaCost.instance)); + this.getSpellAbility().addEffect(new CreateTokenEffect(new SaprolingToken(), TargetManaValue.instance)); } private AetherMutation(final AetherMutation card) { diff --git a/Mage.Sets/src/mage/cards/a/AetherVial.java b/Mage.Sets/src/mage/cards/a/AetherVial.java index 3a4ce2c02fb..b5a9f24d614 100644 --- a/Mage.Sets/src/mage/cards/a/AetherVial.java +++ b/Mage.Sets/src/mage/cards/a/AetherVial.java @@ -18,7 +18,7 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterCreatureCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -53,7 +53,7 @@ class AetherVialEffect extends OneShotEffect { public AetherVialEffect() { super(Outcome.PutCreatureInPlay); - this.staticText = "You may put a creature card with converted mana cost equal to the number of charge counters on {this} from your hand onto the battlefield"; + this.staticText = "You may put a creature card with mana value equal to the number of charge counters on {this} from your hand onto the battlefield"; } public AetherVialEffect(final AetherVialEffect effect) { @@ -76,8 +76,8 @@ class AetherVialEffect extends OneShotEffect { } int count = permanent.getCounters(game).getCount(CounterType.CHARGE); - FilterCreatureCard filter = new FilterCreatureCard("creature card with converted mana cost equal to " + count); - filter.add(new ConvertedManaCostPredicate(ComparisonType.EQUAL_TO, count)); + FilterCreatureCard filter = new FilterCreatureCard("creature card with mana value equal to " + count); + filter.add(new ManaValuePredicate(ComparisonType.EQUAL_TO, count)); String choiceText = "Put a " + filter.getMessage() + " from your hand onto the battlefield?"; Player controller = game.getPlayer(source.getControllerId()); diff --git a/Mage.Sets/src/mage/cards/a/AgadeemOccultist.java b/Mage.Sets/src/mage/cards/a/AgadeemOccultist.java index 359eedf26d7..99b3654a0e5 100644 --- a/Mage.Sets/src/mage/cards/a/AgadeemOccultist.java +++ b/Mage.Sets/src/mage/cards/a/AgadeemOccultist.java @@ -55,7 +55,7 @@ class AgadeemOccultistEffect extends OneShotEffect { public AgadeemOccultistEffect() { super(Outcome.GainControl); - this.staticText = "Put target creature card from an opponent's graveyard onto the battlefield under your control if its converted mana cost is less than or equal to the number of Allies you control"; + this.staticText = "Put target creature card from an opponent's graveyard onto the battlefield under your control if its mana value is less than or equal to the number of Allies you control"; } public AgadeemOccultistEffect(final AgadeemOccultistEffect effect) { @@ -86,7 +86,7 @@ class AgadeemOccultistEffect extends OneShotEffect { if (!target.getTargets().isEmpty()) { Card card = game.getCard(target.getFirstTarget()); if (card != null) { - if (card.getConvertedManaCost() <= allycount) { + if (card.getManaValue() <= allycount) { return controller.moveCards(card, Zone.BATTLEFIELD, source, game); } } diff --git a/Mage.Sets/src/mage/cards/a/AgadeemsAwakening.java b/Mage.Sets/src/mage/cards/a/AgadeemsAwakening.java index 40a3c19d78f..eb16de9bef9 100644 --- a/Mage.Sets/src/mage/cards/a/AgadeemsAwakening.java +++ b/Mage.Sets/src/mage/cards/a/AgadeemsAwakening.java @@ -40,7 +40,7 @@ public final class AgadeemsAwakening extends ModalDoubleFacesCard { // Return from your graveyard to the battlefield any number of target creature cards that each have a different converted mana cost X or less. this.getLeftHalfCard().getSpellAbility().addEffect(new ReturnFromGraveyardToBattlefieldTargetEffect().setText( "return from your graveyard to the battlefield any number of target creature cards " + - "that each have a different converted mana cost X or less" + "that each have a different mana value X or less" )); this.getLeftHalfCard().getSpellAbility().setTargetAdjuster(AgadeemsAwakeningAdjuster.instance); @@ -81,7 +81,7 @@ enum AgadeemsAwakeningAdjuster implements TargetAdjuster { class AgadeemsAwakeningTarget extends TargetCardInYourGraveyard { private static final FilterCard filter - = new FilterCreatureCard("creature cards that each have a different converted mana cost X or less"); + = new FilterCreatureCard("creature cards that each have a different mana value X or less"); private final int xValue; AgadeemsAwakeningTarget(int xValue) { @@ -105,11 +105,11 @@ class AgadeemsAwakeningTarget extends TargetCardInYourGraveyard { Set cmcs = this.getTargets() .stream() .map(game::getCard) - .map(MageObject::getConvertedManaCost) + .map(MageObject::getManaValue) .collect(Collectors.toSet()); possibleTargets.removeIf(uuid -> { Card card = game.getCard(uuid); - return card != null && (cmcs.contains(card.getConvertedManaCost()) || card.getConvertedManaCost() > xValue); + return card != null && (cmcs.contains(card.getManaValue()) || card.getManaValue() > xValue); }); return possibleTargets; } diff --git a/Mage.Sets/src/mage/cards/a/AjaniAdversaryOfTyrants.java b/Mage.Sets/src/mage/cards/a/AjaniAdversaryOfTyrants.java index ad0dac5417b..c6efc37d169 100644 --- a/Mage.Sets/src/mage/cards/a/AjaniAdversaryOfTyrants.java +++ b/Mage.Sets/src/mage/cards/a/AjaniAdversaryOfTyrants.java @@ -15,7 +15,7 @@ import mage.constants.CardType; import mage.constants.ComparisonType; import mage.counters.CounterType; import mage.filter.common.FilterCreatureCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.command.emblems.AjaniAdversaryOfTyrantsEmblem; import mage.target.common.TargetCardInYourGraveyard; import mage.target.common.TargetCreaturePermanent; @@ -27,10 +27,10 @@ import mage.target.common.TargetCreaturePermanent; public final class AjaniAdversaryOfTyrants extends CardImpl { private static final FilterCreatureCard filter - = new FilterCreatureCard("creature card with converted mana cost 2 or less from your graveyard"); + = new FilterCreatureCard("creature card with mana value 2 or less from your graveyard"); static { - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 3)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 3)); } public AjaniAdversaryOfTyrants(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/Aluren.java b/Mage.Sets/src/mage/cards/a/Aluren.java index c97a71d0afe..7256af5a5ff 100644 --- a/Mage.Sets/src/mage/cards/a/Aluren.java +++ b/Mage.Sets/src/mage/cards/a/Aluren.java @@ -11,7 +11,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreatureCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.players.Player; @@ -32,10 +32,10 @@ import java.util.UUID; */ public final class Aluren extends CardImpl { - private static final FilterCreatureCard filter = new FilterCreatureCard("creature cards with converted mana cost 3 or less"); + private static final FilterCreatureCard filter = new FilterCreatureCard("creature cards with mana value 3 or less"); static { - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 4)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 4)); } public Aluren(UUID ownerId, CardSetInfo setInfo) { @@ -64,17 +64,17 @@ public final class Aluren extends CardImpl { class AlurenRuleEffect extends ContinuousEffectImpl { - private static final FilterCreatureCard filter = new FilterCreatureCard("creature cards with converted mana cost 3 or less"); + private static final FilterCreatureCard filter = new FilterCreatureCard("creature cards with mana value 3 or less"); static { - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 4)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 4)); } private final AlternativeCostSourceAbility alternativeCastingCostAbility = new AlternativeCostSourceAbility(null, SourceIsSpellCondition.instance, null, filter, true); public AlurenRuleEffect() { super(Duration.WhileOnBattlefield, Outcome.Detriment); - staticText = "Any player may cast creature cards with converted mana cost 3 or less without paying their mana cost"; + staticText = "Any player may cast creature cards with mana value 3 or less without paying their mana cost"; } public AlurenRuleEffect(final AlurenRuleEffect effect) { diff --git a/Mage.Sets/src/mage/cards/a/AmrouScout.java b/Mage.Sets/src/mage/cards/a/AmrouScout.java index 49b1c178094..1d6280703bb 100644 --- a/Mage.Sets/src/mage/cards/a/AmrouScout.java +++ b/Mage.Sets/src/mage/cards/a/AmrouScout.java @@ -14,7 +14,7 @@ import mage.constants.ComparisonType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterPermanentCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.target.common.TargetCardInLibrary; /** @@ -23,10 +23,10 @@ import mage.target.common.TargetCardInLibrary; */ public final class AmrouScout extends CardImpl { - private static final FilterPermanentCard filter = new FilterPermanentCard("Rebel permanent card with converted mana cost 3 or less"); + private static final FilterPermanentCard filter = new FilterPermanentCard("Rebel permanent card with mana value 3 or less"); static { filter.add(SubType.REBEL.getPredicate()); - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 4)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 4)); } public AmrouScout(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/AncientOoze.java b/Mage.Sets/src/mage/cards/a/AncientOoze.java index cf37db0ab72..9e720aac5d6 100644 --- a/Mage.Sets/src/mage/cards/a/AncientOoze.java +++ b/Mage.Sets/src/mage/cards/a/AncientOoze.java @@ -33,7 +33,7 @@ public final class AncientOoze extends CardImpl { // Ancient Ooze's power and toughness are each equal to the total converted mana cost of other creatures you control. this.addAbility(new SimpleStaticAbility(Zone.ALL, new SetPowerToughnessSourceEffect(new AncientOozePowerToughnessValue(), Duration.EndOfGame) - .setText("{this}'s power and toughness are each equal to the total converted mana cost of other creatures you control.") + .setText("{this}'s power and toughness are each equal to the total mana value of other creatures you control.") )); } @@ -54,7 +54,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.getConvertedManaCost(); + value += creature.getManaValue(); } } return value; @@ -72,6 +72,6 @@ class AncientOozePowerToughnessValue implements DynamicValue { @Override public String getMessage() { - return "total converted mana cost of other creatures you control"; + return "total mana value of other creatures you control"; } } diff --git a/Mage.Sets/src/mage/cards/a/AngrathTheFlameChained.java b/Mage.Sets/src/mage/cards/a/AngrathTheFlameChained.java index fd35c3a5410..294fdd7e7aa 100644 --- a/Mage.Sets/src/mage/cards/a/AngrathTheFlameChained.java +++ b/Mage.Sets/src/mage/cards/a/AngrathTheFlameChained.java @@ -103,7 +103,7 @@ class AngrathTheFlameCreateDelayedTriggerEffect extends OneShotEffect { public AngrathTheFlameCreateDelayedTriggerEffect() { super(Outcome.Sacrifice); - staticText = "Sacrifice it at the beginning of the next end step if it has converted mana cost 3 or less"; + staticText = "Sacrifice it at the beginning of the next end step if it has mana value 3 or less"; } public AngrathTheFlameCreateDelayedTriggerEffect(final AngrathTheFlameCreateDelayedTriggerEffect effect) { @@ -149,7 +149,7 @@ class AngrathTheFlameChainedDelayedTriggeredAbility extends DelayedTriggeredAbil Permanent permanent = game.getPermanent(((FixedTarget) getEffects().get(0).getTargetPointer()).getTarget()); return permanent != null && permanent.getZoneChangeCounter(game) == ((FixedTarget) getEffects().get(0).getTargetPointer()).getZoneChangeCounter() - && permanent.getConvertedManaCost() <= 3; + && permanent.getManaValue() <= 3; } @Override @@ -159,6 +159,6 @@ class AngrathTheFlameChainedDelayedTriggeredAbility extends DelayedTriggeredAbil @Override public String getRule() { - return "Sacrifice it at the beginning of the next end step if it has converted mana cost 3 or less."; + return "Sacrifice it at the beginning of the next end step if it has mana value 3 or less."; } } diff --git a/Mage.Sets/src/mage/cards/a/AnimateArtifact.java b/Mage.Sets/src/mage/cards/a/AnimateArtifact.java index 35a13f4b817..4a93d6f179b 100644 --- a/Mage.Sets/src/mage/cards/a/AnimateArtifact.java +++ b/Mage.Sets/src/mage/cards/a/AnimateArtifact.java @@ -59,7 +59,7 @@ class AnimateArtifactContinuousEffect extends ContinuousEffectImpl { public AnimateArtifactContinuousEffect(Duration duration) { super(duration, Outcome.Benefit); - staticText = "As long as enchanted artifact isn't a creature, it's an artifact creature with power and toughness each equal to its converted mana cost"; + staticText = "As long as enchanted artifact isn't a creature, it's an artifact creature with power and toughness each equal to its mana value"; } public AnimateArtifactContinuousEffect(final AnimateArtifactContinuousEffect effect) { @@ -80,8 +80,8 @@ class AnimateArtifactContinuousEffect extends ContinuousEffectImpl { if (permanent != null && !permanent.isCreature()) { if (sublayer == SubLayer.NA) { permanent.addCardType(CardType.CREATURE); - permanent.getPower().setValue(permanent.getConvertedManaCost()); - permanent.getToughness().setValue(permanent.getConvertedManaCost()); + permanent.getPower().setValue(permanent.getManaValue()); + permanent.getToughness().setValue(permanent.getManaValue()); } } return true; diff --git a/Mage.Sets/src/mage/cards/a/AppetiteForBrains.java b/Mage.Sets/src/mage/cards/a/AppetiteForBrains.java index 8e19b550ab8..a2f8d8964ef 100644 --- a/Mage.Sets/src/mage/cards/a/AppetiteForBrains.java +++ b/Mage.Sets/src/mage/cards/a/AppetiteForBrains.java @@ -8,7 +8,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.ComparisonType; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.target.common.TargetOpponent; /** @@ -17,10 +17,10 @@ import mage.target.common.TargetOpponent; */ public final class AppetiteForBrains extends CardImpl { - private static final FilterCard filter = new FilterCard("a card from it with converted mana cost 4 or greater"); + private static final FilterCard filter = new FilterCard("a card from it with mana value 4 or greater"); static { - filter.add(new ConvertedManaCostPredicate(ComparisonType.MORE_THAN, 3)); + filter.add(new ManaValuePredicate(ComparisonType.MORE_THAN, 3)); } public AppetiteForBrains(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/ArchmagesCharm.java b/Mage.Sets/src/mage/cards/a/ArchmagesCharm.java index 20905a9a299..d74e8e6f61a 100644 --- a/Mage.Sets/src/mage/cards/a/ArchmagesCharm.java +++ b/Mage.Sets/src/mage/cards/a/ArchmagesCharm.java @@ -11,7 +11,7 @@ import mage.constants.ComparisonType; import mage.constants.Duration; import mage.filter.FilterPermanent; import mage.filter.common.FilterNonlandPermanent; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.target.TargetPermanent; import mage.target.TargetPlayer; import mage.target.TargetSpell; @@ -24,10 +24,10 @@ import java.util.UUID; public final class ArchmagesCharm extends CardImpl { private static final FilterPermanent filter - = new FilterNonlandPermanent("nonland permanent with converted mana cost 1 or less"); + = new FilterNonlandPermanent("nonland permanent with mana value 1 or less"); static { - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 2)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 2)); } public ArchmagesCharm(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/ArtifactMutation.java b/Mage.Sets/src/mage/cards/a/ArtifactMutation.java index eb213386fea..278d8763dee 100644 --- a/Mage.Sets/src/mage/cards/a/ArtifactMutation.java +++ b/Mage.Sets/src/mage/cards/a/ArtifactMutation.java @@ -1,6 +1,6 @@ package mage.cards.a; -import mage.abilities.dynamicvalue.common.TargetConvertedManaCost; +import mage.abilities.dynamicvalue.common.TargetManaValue; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; @@ -24,7 +24,7 @@ public final class ArtifactMutation extends CardImpl { this.getSpellAbility().addTarget(new TargetArtifactPermanent()); // create X 1/1 green Saproling creature tokens, where X is that artifact's converted mana cost. - this.getSpellAbility().addEffect(new CreateTokenEffect(new SaprolingToken(), TargetConvertedManaCost.instance).setText("create X 1/1 green Saproling creature tokens, where X is that artifact's converted mana cost")); + this.getSpellAbility().addEffect(new CreateTokenEffect(new SaprolingToken(), TargetManaValue.instance).setText("create X 1/1 green Saproling creature tokens, where X is that artifact's mana value")); } private ArtifactMutation(final ArtifactMutation card) { diff --git a/Mage.Sets/src/mage/cards/a/ArtificersIntuition.java b/Mage.Sets/src/mage/cards/a/ArtificersIntuition.java index a2a44968fd8..4324859274c 100644 --- a/Mage.Sets/src/mage/cards/a/ArtificersIntuition.java +++ b/Mage.Sets/src/mage/cards/a/ArtificersIntuition.java @@ -13,7 +13,7 @@ import mage.constants.CardType; import mage.constants.ComparisonType; import mage.constants.Zone; import mage.filter.common.FilterArtifactCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.target.common.TargetCardInLibrary; /** @@ -22,9 +22,9 @@ import mage.target.common.TargetCardInLibrary; */ public final class ArtificersIntuition extends CardImpl { - private static final FilterArtifactCard filter = new FilterArtifactCard("artifact card with converted mana cost 1 or less"); + private static final FilterArtifactCard filter = new FilterArtifactCard("artifact card with mana value 1 or less"); static { - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 2)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 2)); } public ArtificersIntuition(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{U}"); diff --git a/Mage.Sets/src/mage/cards/a/AsForetold.java b/Mage.Sets/src/mage/cards/a/AsForetold.java index daac6857456..b07ad120830 100644 --- a/Mage.Sets/src/mage/cards/a/AsForetold.java +++ b/Mage.Sets/src/mage/cards/a/AsForetold.java @@ -72,7 +72,7 @@ class SpellWithManaCostLessThanOrEqualToCondition implements Condition { MageObject object = game.getObject(source.getSourceId()); return object != null && !object.isLand() - && object.getConvertedManaCost() <= counters; + && object.getManaValue() <= counters; } } @@ -128,7 +128,7 @@ class AsForetoldAddAltCostEffect extends ContinuousEffectImpl { public AsForetoldAddAltCostEffect() { super(Duration.WhileOnBattlefield, Outcome.Benefit); - staticText = "Once each turn, you may pay {0} rather than pay the mana cost for a spell you cast with converted mana cost X or less, where X is the number of time counters on {this}."; + staticText = "Once each turn, you may pay {0} rather than pay the mana cost for a spell you cast with mana value X or less, where X is the number of time counters on {this}."; } public AsForetoldAddAltCostEffect(final AsForetoldAddAltCostEffect effect) { diff --git a/Mage.Sets/src/mage/cards/a/AshiokNightmareWeaver.java b/Mage.Sets/src/mage/cards/a/AshiokNightmareWeaver.java index f0486159584..e52d6911130 100644 --- a/Mage.Sets/src/mage/cards/a/AshiokNightmareWeaver.java +++ b/Mage.Sets/src/mage/cards/a/AshiokNightmareWeaver.java @@ -13,7 +13,7 @@ import mage.cards.*; import mage.constants.*; import mage.filter.FilterCard; import mage.filter.common.FilterCreatureCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -96,7 +96,7 @@ class AshiokNightmareWeaverPutIntoPlayEffect extends OneShotEffect { public AshiokNightmareWeaverPutIntoPlayEffect() { super(Outcome.PutCreatureInPlay); - this.staticText = "Put a creature card with converted mana cost X exiled with {this} onto the battlefield under your control. That creature is a Nightmare in addition to its other types"; + this.staticText = "Put a creature card with mana value X exiled with {this} onto the battlefield under your control. That creature is a Nightmare in addition to its other types"; } public AshiokNightmareWeaverPutIntoPlayEffect(final AshiokNightmareWeaverPutIntoPlayEffect effect) { @@ -123,8 +123,8 @@ class AshiokNightmareWeaverPutIntoPlayEffect extends OneShotEffect { } } - FilterCard filter = new FilterCreatureCard("creature card with converted mana cost {" + cmc + "} exiled with " + sourceObject.getIdName()); - filter.add(new ConvertedManaCostPredicate(ComparisonType.EQUAL_TO, cmc)); + FilterCard filter = new FilterCreatureCard("creature card with mana value {" + cmc + "} exiled with " + sourceObject.getIdName()); + filter.add(new ManaValuePredicate(ComparisonType.EQUAL_TO, cmc)); Target target = new TargetCardInExile(filter, CardUtil.getExileZoneId(game, source.getSourceId(), source.getSourceObjectZoneChangeCounter())); diff --git a/Mage.Sets/src/mage/cards/a/AshlingsPrerogative.java b/Mage.Sets/src/mage/cards/a/AshlingsPrerogative.java index 5c666f6640b..4e65e0558d7 100644 --- a/Mage.Sets/src/mage/cards/a/AshlingsPrerogative.java +++ b/Mage.Sets/src/mage/cards/a/AshlingsPrerogative.java @@ -53,12 +53,12 @@ public final class AshlingsPrerogative extends CardImpl { class AshlingsPrerogativeIncorrectOddityEffect extends PermanentsEnterBattlefieldTappedEffect { - private static final FilterCreaturePermanent creaturefilter = new FilterCreaturePermanent("Each creature without converted mana cost of the chosen value"); + private static final FilterCreaturePermanent creaturefilter = new FilterCreaturePermanent("Each creature without mana value of the chosen value"); private static final ModeChoiceSourceCondition oddCondition = new ModeChoiceSourceCondition("Odd"); public AshlingsPrerogativeIncorrectOddityEffect() { super(creaturefilter); - staticText = "Each creature without converted mana cost of the chosen value enters the battlefield tapped."; + staticText = "Each creature without mana value of the chosen value enters the battlefield tapped."; } public AshlingsPrerogativeIncorrectOddityEffect(final AshlingsPrerogativeIncorrectOddityEffect effect) { @@ -77,7 +77,7 @@ class AshlingsPrerogativeIncorrectOddityEffect extends PermanentsEnterBattlefiel Permanent permanent = ((EntersTheBattlefieldEvent) event).getTarget(); - return permanent != null && creaturefilter.match(permanent, game) && permanent.getConvertedManaCost() % 2 == incorrectModResult; + return permanent != null && creaturefilter.match(permanent, game) && permanent.getManaValue() % 2 == incorrectModResult; } @Override @@ -88,12 +88,12 @@ class AshlingsPrerogativeIncorrectOddityEffect extends PermanentsEnterBattlefiel class AshlingsPrerogativeCorrectOddityEffect extends GainAbilityAllEffect { - private static final FilterCreaturePermanent creaturefilter = new FilterCreaturePermanent("Each creature with converted mana cost of the chosen value"); + private static final FilterCreaturePermanent creaturefilter = new FilterCreaturePermanent("Each creature with mana value of the chosen value"); private static final ModeChoiceSourceCondition oddCondition = new ModeChoiceSourceCondition("Odd"); public AshlingsPrerogativeCorrectOddityEffect() { super(HasteAbility.getInstance(), Duration.WhileOnBattlefield, creaturefilter); - staticText = "Each creature with converted mana cost of the chosen value has haste."; + staticText = "Each creature with mana value of the chosen value has haste."; } public AshlingsPrerogativeCorrectOddityEffect(final AshlingsPrerogativeCorrectOddityEffect effect) { super(effect); @@ -107,7 +107,7 @@ class AshlingsPrerogativeCorrectOddityEffect extends GainAbilityAllEffect { } else { correctModResult = 0; } - return permanent != null && creaturefilter.match(permanent, game) && permanent.getConvertedManaCost() % 2 == correctModResult; + return permanent != null && creaturefilter.match(permanent, game) && permanent.getManaValue() % 2 == correctModResult; } @Override diff --git a/Mage.Sets/src/mage/cards/a/AtemsisAllSeeing.java b/Mage.Sets/src/mage/cards/a/AtemsisAllSeeing.java index 76f4e60caba..7f110b7c056 100644 --- a/Mage.Sets/src/mage/cards/a/AtemsisAllSeeing.java +++ b/Mage.Sets/src/mage/cards/a/AtemsisAllSeeing.java @@ -63,7 +63,7 @@ class AtemsisAllSeeingEffect extends OneShotEffect { AtemsisAllSeeingEffect() { super(Outcome.Benefit); - staticText = "reveal your hand. If cards with at least six different converted mana costs " + + staticText = "reveal your hand. If cards with at least six different mana values " + "are revealed this way, that player loses the game."; } @@ -88,7 +88,7 @@ class AtemsisAllSeeingEffect extends OneShotEffect { .getHand() .getCards(game) .stream() - .map(card -> card.getConvertedManaCost()) + .map(card -> card.getManaValue()) .distinct() .count() > 5) { opponent.lost(game); diff --git a/Mage.Sets/src/mage/cards/a/AuguryAdept.java b/Mage.Sets/src/mage/cards/a/AuguryAdept.java index 3b8f72faf53..503fb1f6b6b 100644 --- a/Mage.Sets/src/mage/cards/a/AuguryAdept.java +++ b/Mage.Sets/src/mage/cards/a/AuguryAdept.java @@ -49,7 +49,7 @@ class AuguryAdeptEffect extends OneShotEffect { AuguryAdeptEffect() { super(Outcome.GainLife); this.staticText = "reveal the top card of your library and put that card into your hand. " + - "You gain life equal to its converted mana cost"; + "You gain life equal to its mana value"; } private AuguryAdeptEffect(final AuguryAdeptEffect effect) { @@ -73,7 +73,7 @@ class AuguryAdeptEffect extends OneShotEffect { } controller.revealCards(source, new CardsImpl(card), game); controller.moveCards(card, Zone.HAND, source, game); - int cmc = card.getConvertedManaCost(); + int cmc = card.getManaValue(); if (cmc > 0) { controller.gainLife(cmc, game, source); } diff --git a/Mage.Sets/src/mage/cards/a/AuraMutation.java b/Mage.Sets/src/mage/cards/a/AuraMutation.java index fc9f2d28028..8f24b8c34bf 100644 --- a/Mage.Sets/src/mage/cards/a/AuraMutation.java +++ b/Mage.Sets/src/mage/cards/a/AuraMutation.java @@ -2,7 +2,7 @@ package mage.cards.a; import java.util.UUID; -import mage.abilities.dynamicvalue.common.TargetConvertedManaCost; +import mage.abilities.dynamicvalue.common.TargetManaValue; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; @@ -25,7 +25,7 @@ public final class AuraMutation extends CardImpl { this.getSpellAbility().addEffect(new DestroyTargetEffect()); this.getSpellAbility().addTarget(new TargetEnchantmentPermanent()); // create X 1/1 green Saproling creature tokens, where X is that enchantment's converted mana cost. - this.getSpellAbility().addEffect(new CreateTokenEffect(new SaprolingToken(), TargetConvertedManaCost.instance)); + this.getSpellAbility().addEffect(new CreateTokenEffect(new SaprolingToken(), TargetManaValue.instance)); } private AuraMutation(final AuraMutation card) { diff --git a/Mage.Sets/src/mage/cards/a/AuriokSalvagers.java b/Mage.Sets/src/mage/cards/a/AuriokSalvagers.java index fbfadb4b470..640982c66de 100644 --- a/Mage.Sets/src/mage/cards/a/AuriokSalvagers.java +++ b/Mage.Sets/src/mage/cards/a/AuriokSalvagers.java @@ -14,7 +14,7 @@ import mage.constants.ComparisonType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterArtifactCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.target.common.TargetCardInYourGraveyard; /** @@ -23,9 +23,9 @@ import mage.target.common.TargetCardInYourGraveyard; */ public final class AuriokSalvagers extends CardImpl { - private static final FilterArtifactCard filter = new FilterArtifactCard("artifact card with converted mana cost 1 or less from your graveyard"); + private static final FilterArtifactCard filter = new FilterArtifactCard("artifact card with mana value 1 or less from your graveyard"); static { - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 2)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 2)); } public AuriokSalvagers(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/AustereCommand.java b/Mage.Sets/src/mage/cards/a/AustereCommand.java index c470f5eff9c..5f0a0950bf2 100644 --- a/Mage.Sets/src/mage/cards/a/AustereCommand.java +++ b/Mage.Sets/src/mage/cards/a/AustereCommand.java @@ -11,7 +11,7 @@ import mage.constants.ComparisonType; import mage.filter.common.FilterArtifactPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterEnchantmentPermanent; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; /** * @@ -19,11 +19,11 @@ import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; */ public final class AustereCommand extends CardImpl { - private static final FilterCreaturePermanent filter3orLess = new FilterCreaturePermanent("creatures with converted mana cost 3 or less"); - private static final FilterCreaturePermanent filter4orMore = new FilterCreaturePermanent("creatures with converted mana cost 4 or greater"); + private static final FilterCreaturePermanent filter3orLess = new FilterCreaturePermanent("creatures with mana value 3 or less"); + private static final FilterCreaturePermanent filter4orMore = new FilterCreaturePermanent("creatures with mana value 4 or greater"); static { - filter3orLess.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 4)); - filter4orMore.add(new ConvertedManaCostPredicate(ComparisonType.MORE_THAN, 3)); + filter3orLess.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 4)); + filter4orMore.add(new ManaValuePredicate(ComparisonType.MORE_THAN, 3)); } public AustereCommand(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/AzorsGateway.java b/Mage.Sets/src/mage/cards/a/AzorsGateway.java index 43f91bd9008..a8d4649e8b2 100644 --- a/Mage.Sets/src/mage/cards/a/AzorsGateway.java +++ b/Mage.Sets/src/mage/cards/a/AzorsGateway.java @@ -60,7 +60,7 @@ class AzorsGatewayEffect extends OneShotEffect { public AzorsGatewayEffect() { super(Outcome.Benefit); - this.staticText = "Draw a card, then exile a card from your hand. If cards with five or more different converted mana costs are exiled with {this}, you gain 5 life, untap Azor's Gateway, and transform it"; + this.staticText = "Draw a card, then exile a card from your hand. If cards with five or more different mana values are exiled with {this}, you gain 5 life, untap Azor's Gateway, and transform it"; } public AzorsGatewayEffect(final AzorsGatewayEffect effect) { @@ -89,7 +89,7 @@ class AzorsGatewayEffect extends OneShotEffect { ExileZone exileZone = game.getExile().getExileZone(exileId); if (exileZone != null) { for (Card card : exileZone.getCards(game)) { - usedCMC.add(card.getConvertedManaCost()); + usedCMC.add(card.getManaValue()); } if (usedCMC.size() > 4) { controller.gainLife(4, game, source); diff --git a/Mage.Sets/src/mage/cards/b/BINGO.java b/Mage.Sets/src/mage/cards/b/BINGO.java index c25b26db8f4..0bac07222ac 100644 --- a/Mage.Sets/src/mage/cards/b/BINGO.java +++ b/Mage.Sets/src/mage/cards/b/BINGO.java @@ -68,7 +68,7 @@ class BingoEffect extends OneShotEffect { public BingoEffect() { super(Outcome.Neutral); - staticText = "put a chip counter on its converted mana cost"; + staticText = "put a chip counter on its mana value"; } public BingoEffect(final BingoEffect effect) { @@ -79,7 +79,7 @@ class BingoEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { Spell spell = game.getStack().getSpell(this.getTargetPointer().getFirst(game, source)); if (spell != null) { - if (spell.getConvertedManaCost() > 9) { + if (spell.getManaValue() > 9) { return true; } MageObject mageObject = game.getObject(source.getSourceId()); @@ -88,8 +88,8 @@ class BingoEffect extends OneShotEffect { if (game.getState().getValue(mageObject.getId() + "_chip") != null) { chipCounters.putAll((Map) game.getState().getValue(mageObject.getId() + "_chip")); } - chipCounters.putIfAbsent(spell.getConvertedManaCost(), 0); - chipCounters.put(spell.getConvertedManaCost(), chipCounters.get(spell.getConvertedManaCost()) + 1); + chipCounters.putIfAbsent(spell.getManaValue(), 0); + chipCounters.put(spell.getManaValue(), chipCounters.get(spell.getManaValue()) + 1); game.getState().setValue(mageObject.getId() + "_chip", chipCounters); if (mageObject instanceof Permanent) { StringBuilder sb = new StringBuilder(); diff --git a/Mage.Sets/src/mage/cards/b/BafflingEnd.java b/Mage.Sets/src/mage/cards/b/BafflingEnd.java index 7011b394370..057d7b54d52 100644 --- a/Mage.Sets/src/mage/cards/b/BafflingEnd.java +++ b/Mage.Sets/src/mage/cards/b/BafflingEnd.java @@ -13,7 +13,7 @@ import mage.constants.CardType; import mage.constants.ComparisonType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.permanent.token.DinosaurToken; import mage.target.Target; import mage.target.TargetPermanent; @@ -25,10 +25,10 @@ import mage.target.common.TargetOpponent; */ public final class BafflingEnd extends CardImpl { - private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with converted mana cost 3 or less an opponent controls"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with mana value 3 or less an opponent controls"); static { - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 4)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 4)); filter.add(TargetController.OPPONENT.getControllerPredicate()); } diff --git a/Mage.Sets/src/mage/cards/b/BanefulOmen.java b/Mage.Sets/src/mage/cards/b/BanefulOmen.java index a362632d87d..2c01f4bed15 100644 --- a/Mage.Sets/src/mage/cards/b/BanefulOmen.java +++ b/Mage.Sets/src/mage/cards/b/BanefulOmen.java @@ -10,7 +10,6 @@ import mage.constants.Outcome; import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; -import mage.game.events.GameEvent.EventType; import mage.players.Player; import java.util.Set; @@ -64,7 +63,7 @@ public final class BanefulOmen extends CardImpl { @Override public String getRule() { - return "At the beginning of your end step, you may reveal the top card of your library. If you do, each opponent loses life equal to that card's converted mana cost."; + return "At the beginning of your end step, you may reveal the top card of your library. If you do, each opponent loses life equal to that card's mana value."; } } @@ -95,7 +94,7 @@ public final class BanefulOmen extends CardImpl { player.revealCards("Baneful Omen", cards, game); - int loseLife = card.getConvertedManaCost(); + int loseLife = card.getManaValue(); Set opponents = game.getOpponents(source.getControllerId()); for (UUID opponentUuid : opponents) { Player opponent = game.getPlayer(opponentUuid); diff --git a/Mage.Sets/src/mage/cards/b/BattleOfFrostAndFire.java b/Mage.Sets/src/mage/cards/b/BattleOfFrostAndFire.java index f561c96dcd4..cfae8be3bee 100644 --- a/Mage.Sets/src/mage/cards/b/BattleOfFrostAndFire.java +++ b/Mage.Sets/src/mage/cards/b/BattleOfFrostAndFire.java @@ -91,13 +91,13 @@ class BattleOfFrostAndFireTriggeredAbility extends DelayedTriggeredAbility { public boolean checkTrigger(GameEvent event, Game game) { if (event.getPlayerId().equals(this.getControllerId())) { Spell spell = game.getStack().getSpell(event.getTargetId()); - return spell != null && spell.getConvertedManaCost() >= 5; + return spell != null && spell.getManaValue() >= 5; } return false; } @Override public String getRule() { - return "Whenever you cast a spell with converted mana cost 5 or greater this turn, " + super.getRule(); + return "Whenever you cast a spell with mana value 5 or greater this turn, " + super.getRule(); } } diff --git a/Mage.Sets/src/mage/cards/b/BellBorcaSpectralSergeant.java b/Mage.Sets/src/mage/cards/b/BellBorcaSpectralSergeant.java index ce92f6649ce..98218038742 100644 --- a/Mage.Sets/src/mage/cards/b/BellBorcaSpectralSergeant.java +++ b/Mage.Sets/src/mage/cards/b/BellBorcaSpectralSergeant.java @@ -75,7 +75,7 @@ class BellBorcaSpectralSergeantAbility extends StaticAbility implements MageSing } private BellBorcaSpectralSergeantAbility() { - super(Zone.BATTLEFIELD, new InfoEffect("note the converted mana cost of each card as it's put into exile")); + super(Zone.BATTLEFIELD, new InfoEffect("note the mana value of each card as it's put into exile")); } @Override @@ -132,7 +132,7 @@ class BellBorcaSpectralSergeantWatcher extends Watcher { if (card == null || card.isFaceDown(game)) { return; } - int cmc = card.getConvertedManaCost(); + int cmc = card.getManaValue(); for (Permanent permanent : game.getBattlefield().getActivePermanents(filter, game.getActivePlayerId(), game)) { if (permanent == null) { continue; diff --git a/Mage.Sets/src/mage/cards/b/BeseechTheQueen.java b/Mage.Sets/src/mage/cards/b/BeseechTheQueen.java index e4f4393d641..608fa790dd8 100644 --- a/Mage.Sets/src/mage/cards/b/BeseechTheQueen.java +++ b/Mage.Sets/src/mage/cards/b/BeseechTheQueen.java @@ -19,7 +19,7 @@ import mage.target.common.TargetCardInLibrary; */ public final class BeseechTheQueen extends CardImpl { - private static final FilterCard filter = new FilterCard("card with converted mana cost less than or equal to the number of lands you control"); + private static final FilterCard filter = new FilterCard("card with mana value less than or equal to the number of lands you control"); static{ filter.add(new BeseechTheQueenPredicate()); } @@ -48,7 +48,7 @@ class BeseechTheQueenPredicate implements Predicate { @Override public final boolean apply(Card input, Game game) { - if(input.getConvertedManaCost() <= game.getBattlefield().getAllActivePermanents(new FilterControlledLandPermanent(), input.getOwnerId(), game).size()){ + if(input.getManaValue() <= game.getBattlefield().getAllActivePermanents(new FilterControlledLandPermanent(), input.getOwnerId(), game).size()){ return true; } return false; @@ -56,6 +56,6 @@ class BeseechTheQueenPredicate implements Predicate { @Override public String toString() { - return "card with converted mana cost less than or equal to the number of lands you control"; + return "card with mana value less than or equal to the number of lands you control"; } } \ No newline at end of file diff --git a/Mage.Sets/src/mage/cards/b/BirthingPod.java b/Mage.Sets/src/mage/cards/b/BirthingPod.java index b88101d0cff..94e2b32e338 100644 --- a/Mage.Sets/src/mage/cards/b/BirthingPod.java +++ b/Mage.Sets/src/mage/cards/b/BirthingPod.java @@ -17,7 +17,7 @@ import mage.constants.Outcome; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.StaticFilters; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -60,8 +60,8 @@ class BirthingPodEffect extends OneShotEffect { BirthingPodEffect() { super(Outcome.Benefit); - staticText = "Search your library for a creature card with converted mana cost equal to 1 " + - "plus the sacrificed creature's converted mana cost, put that card " + + staticText = "Search your library for a creature card with mana value equal to 1 " + + "plus the sacrificed creature's mana value, put that card " + "onto the battlefield, then shuffle your library"; } @@ -85,9 +85,9 @@ class BirthingPodEffect extends OneShotEffect { if (sacrificedPermanent == null || controller == null) { return false; } - int newConvertedCost = sacrificedPermanent.getConvertedManaCost() + 1; - FilterCard filter = new FilterCard("creature card with converted mana cost " + newConvertedCost); - filter.add(new ConvertedManaCostPredicate(ComparisonType.EQUAL_TO, newConvertedCost)); + int newConvertedCost = sacrificedPermanent.getManaValue() + 1; + FilterCard filter = new FilterCard("creature card with mana value " + newConvertedCost); + filter.add(new ManaValuePredicate(ComparisonType.EQUAL_TO, newConvertedCost)); filter.add(CardType.CREATURE.getPredicate()); TargetCardInLibrary target = new TargetCardInLibrary(filter); if (controller.searchLibrary(target, source, game)) { diff --git a/Mage.Sets/src/mage/cards/b/BishopOfRebirth.java b/Mage.Sets/src/mage/cards/b/BishopOfRebirth.java index 37400fbdd09..741193165fe 100644 --- a/Mage.Sets/src/mage/cards/b/BishopOfRebirth.java +++ b/Mage.Sets/src/mage/cards/b/BishopOfRebirth.java @@ -14,7 +14,7 @@ import mage.constants.ComparisonType; import mage.constants.SubType; import mage.filter.FilterCard; import mage.filter.common.FilterCreatureCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.target.common.TargetCardInYourGraveyard; /** @@ -23,10 +23,10 @@ import mage.target.common.TargetCardInYourGraveyard; */ public final class BishopOfRebirth extends CardImpl { - private static final FilterCard filter = new FilterCreatureCard("creature card with converted mana cost 3 or less from your graveyard"); + private static final FilterCard filter = new FilterCreatureCard("creature card with mana value 3 or less from your graveyard"); static { - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 4)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 4)); filter.add(CardType.CREATURE.getPredicate()); } @@ -43,7 +43,7 @@ public final class BishopOfRebirth extends CardImpl { // Whenever Bishop of Rebirth attacks, you may return target creature card with converted mana cost 3 or less from your graveyard to the battlefield. Ability ability = new AttacksTriggeredAbility(new ReturnFromGraveyardToBattlefieldTargetEffect() - .setText("you may return target creature card with converted mana cost 3 or less from your graveyard to the battlefield"), true); + .setText("you may return target creature card with mana value 3 or less from your graveyard to the battlefield"), true); ability.addTarget(new TargetCardInYourGraveyard(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/b/BlastOfGenius.java b/Mage.Sets/src/mage/cards/b/BlastOfGenius.java index 781117bec26..f85e4f6254e 100644 --- a/Mage.Sets/src/mage/cards/b/BlastOfGenius.java +++ b/Mage.Sets/src/mage/cards/b/BlastOfGenius.java @@ -42,7 +42,7 @@ class BlastOfGeniusEffect extends OneShotEffect { public BlastOfGeniusEffect() { super(Outcome.Benefit); - this.staticText = "Choose any target. Draw three cards and discard a card. {this} deals damage equal to the converted mana cost of the discard card to that permanent or player"; + this.staticText = "Choose any target. Draw three cards and discard a card. {this} deals damage equal to the mana value of the discard card to that permanent or player"; } public BlastOfGeniusEffect(final BlastOfGeniusEffect effect) { @@ -65,7 +65,7 @@ class BlastOfGeniusEffect extends OneShotEffect { Card card = player.getHand().get(target.getFirstTarget(), game); if (card != null) { player.discard(card, false, source, game); - int damage = card.getConvertedManaCost(); + int damage = card.getManaValue(); Permanent creature = game.getPermanent(this.getTargetPointer().getFirst(game, source)); if (creature != null) { creature.damage(damage, source.getSourceId(), source, game, false, true); diff --git a/Mage.Sets/src/mage/cards/b/BlastZone.java b/Mage.Sets/src/mage/cards/b/BlastZone.java index 5f33f3a11d8..b3ba7544dda 100644 --- a/Mage.Sets/src/mage/cards/b/BlastZone.java +++ b/Mage.Sets/src/mage/cards/b/BlastZone.java @@ -20,7 +20,7 @@ import mage.constants.Outcome; import mage.counters.CounterType; import mage.filter.FilterPermanent; import mage.filter.common.FilterNonlandPermanent; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -72,7 +72,7 @@ class BlastZoneEffect extends OneShotEffect { BlastZoneEffect() { super(Outcome.Benefit); - staticText = "Destroy each nonland permanent with converted mana cost " + + staticText = "Destroy each nonland permanent with mana value " + "equal to the number of charge counters on {this}"; } @@ -90,7 +90,7 @@ class BlastZoneEffect extends OneShotEffect { Permanent permanent = game.getPermanentOrLKIBattlefield(source.getSourceId()); int xValue = permanent.getCounters(game).getCount(CounterType.CHARGE); FilterPermanent filter = new FilterNonlandPermanent(); - filter.add(new ConvertedManaCostPredicate(ComparisonType.EQUAL_TO, xValue)); + filter.add(new ManaValuePredicate(ComparisonType.EQUAL_TO, xValue)); return new DestroyAllEffect(filter).apply(game, source); } } \ No newline at end of file diff --git a/Mage.Sets/src/mage/cards/b/BlazingShoal.java b/Mage.Sets/src/mage/cards/b/BlazingShoal.java index 51892093df1..38cacbfced3 100644 --- a/Mage.Sets/src/mage/cards/b/BlazingShoal.java +++ b/Mage.Sets/src/mage/cards/b/BlazingShoal.java @@ -32,7 +32,7 @@ public final class BlazingShoal extends CardImpl { // You may exile a red card with converted mana cost X from your hand rather than pay Blazing Shoal's mana cost. - FilterOwnedCard filter = new FilterOwnedCard("a red card with converted mana cost X from your hand"); + FilterOwnedCard filter = new FilterOwnedCard("a red card with mana value X from your hand"); filter.add(new ColorPredicate(ObjectColor.RED)); filter.add(Predicates.not(new CardIdPredicate(this.getId()))); // the exile cost can never be paid with the card itself this.addAbility(new AlternativeCostSourceAbility(new ExileFromHandCost(new TargetCardInHand(filter),true))); diff --git a/Mage.Sets/src/mage/cards/b/Blightspeaker.java b/Mage.Sets/src/mage/cards/b/Blightspeaker.java index e23e6262eaa..2df75214dab 100644 --- a/Mage.Sets/src/mage/cards/b/Blightspeaker.java +++ b/Mage.Sets/src/mage/cards/b/Blightspeaker.java @@ -16,7 +16,7 @@ import mage.constants.ComparisonType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterPermanentCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.target.TargetPlayer; import mage.target.common.TargetCardInLibrary; @@ -26,11 +26,11 @@ import mage.target.common.TargetCardInLibrary; */ public final class Blightspeaker extends CardImpl { - private static final FilterPermanentCard filter = new FilterPermanentCard("Rebel permanent card with converted mana cost 3 or less"); + private static final FilterPermanentCard filter = new FilterPermanentCard("Rebel permanent card with mana value 3 or less"); static { filter.add(SubType.REBEL.getPredicate()); - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 4)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 4)); } public Blightspeaker(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BloodOnTheSnow.java b/Mage.Sets/src/mage/cards/b/BloodOnTheSnow.java index 64f36ed344f..fc935680f52 100644 --- a/Mage.Sets/src/mage/cards/b/BloodOnTheSnow.java +++ b/Mage.Sets/src/mage/cards/b/BloodOnTheSnow.java @@ -13,7 +13,7 @@ import mage.cards.CardSetInfo; import mage.filter.FilterCard; import mage.filter.StaticFilters; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCardInYourGraveyard; @@ -42,7 +42,7 @@ public final class BloodOnTheSnow extends CardImpl { mode.addEffect(new BloodOnTheSnowEffect()); this.getSpellAbility().addMode(mode); this.getSpellAbility().appendToRule( - "Then return a creature or planeswalker card with converted mana cost X or less" + "Then return a creature or planeswalker card with mana value X or less" + " from your graveyard to the battlefield, where X is the amount of {S} spent to cast this spell." ); } @@ -77,9 +77,9 @@ class BloodOnTheSnowEffect extends OneShotEffect { Player controller = game.getPlayer(source.getControllerId()); if (controller != null) { int snow = source.getManaCostsToPay().getUsedManaToPay().getSnow(); - FilterCard filter = new FilterCard("a creature or planeswalker card with CMC " + snow + " or less from your graveyard"); + FilterCard filter = new FilterCard("a creature or planeswalker card with mana value " + snow + " or less from your graveyard"); filter.add(Predicates.or(CardType.CREATURE.getPredicate(), CardType.PLANESWALKER.getPredicate())); - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, snow + 1)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, snow + 1)); TargetCardInYourGraveyard target = new TargetCardInYourGraveyard(1, 1, filter, true); controller.chooseTarget(outcome, target, source, game); Card card = game.getCard(target.getFirstTarget()); diff --git a/Mage.Sets/src/mage/cards/b/BloodchiefsThirst.java b/Mage.Sets/src/mage/cards/b/BloodchiefsThirst.java index a432b935ab8..fdbbe32ce9b 100644 --- a/Mage.Sets/src/mage/cards/b/BloodchiefsThirst.java +++ b/Mage.Sets/src/mage/cards/b/BloodchiefsThirst.java @@ -10,7 +10,7 @@ import mage.constants.CardType; import mage.constants.ComparisonType; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreatureOrPlaneswalkerPermanent; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.target.TargetPermanent; import mage.target.common.TargetCreatureOrPlaneswalker; @@ -31,7 +31,7 @@ public final class BloodchiefsThirst extends CardImpl { // Destroy target creature or planeswalker with converted mana cost 2 or less. If this spell was kicked, instead destroy target creature or planeswalker. this.getSpellAbility().addEffect(new DestroyTargetEffect( - "Destroy target creature or planeswalker with converted mana cost 2 or less. " + + "Destroy target creature or planeswalker with mana value 2 or less. " + "If this spell was kicked, instead destroy target creature or planeswalker." )); this.getSpellAbility().setTargetAdjuster(BloodchiefsThirstAdjuster.instance); @@ -51,11 +51,11 @@ enum BloodchiefsThirstAdjuster implements TargetAdjuster { instance; private static final FilterPermanent filter = new FilterCreatureOrPlaneswalkerPermanent( - "creature or planeswalker with converted mana cost 2 or less" + "creature or planeswalker with mana value 2 or less" ); static { - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 3)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 3)); } @Override diff --git a/Mage.Sets/src/mage/cards/b/BludgeonBrawl.java b/Mage.Sets/src/mage/cards/b/BludgeonBrawl.java index db9daac15f7..972eb3d2736 100644 --- a/Mage.Sets/src/mage/cards/b/BludgeonBrawl.java +++ b/Mage.Sets/src/mage/cards/b/BludgeonBrawl.java @@ -61,7 +61,7 @@ class BludgeonBrawlAbility extends StaticAbility { @Override public String getRule() { - return "Each noncreature, non-Equipment artifact is an Equipment with equip {X} and \"Equipped creature gets +X/+0,\" where X is that artifact's converted mana cost."; + return "Each noncreature, non-Equipment artifact is an Equipment with equip {X} and \"Equipped creature gets +X/+0,\" where X is that artifact's mana value."; } } @@ -121,9 +121,9 @@ class BludgeonBrawlGainAbilityEffect extends ContinuousEffectImpl { for (UUID permanentId : permanents) { Permanent permanent = game.getPermanent(permanentId); if (permanent != null) { - int convertedManaCost = permanent.getConvertedManaCost(); - permanent.addAbility(new EquipAbility(Outcome.BoostCreature, new GenericManaCost(convertedManaCost)), source.getSourceId(), game); - permanent.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(convertedManaCost, 0)), source.getSourceId(), game); + int manaValue = permanent.getManaValue(); + permanent.addAbility(new EquipAbility(Outcome.BoostCreature, new GenericManaCost(manaValue)), source.getSourceId(), game); + permanent.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(manaValue, 0)), source.getSourceId(), game); } } return true; diff --git a/Mage.Sets/src/mage/cards/b/BogGlider.java b/Mage.Sets/src/mage/cards/b/BogGlider.java index b5891baca82..9331d4a6203 100644 --- a/Mage.Sets/src/mage/cards/b/BogGlider.java +++ b/Mage.Sets/src/mage/cards/b/BogGlider.java @@ -18,7 +18,7 @@ import mage.constants.Zone; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterPermanentCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.target.common.TargetCardInLibrary; import mage.target.common.TargetControlledPermanent; @@ -29,11 +29,11 @@ import mage.target.common.TargetControlledPermanent; public final class BogGlider extends CardImpl { static final FilterControlledPermanent landFilter = new FilterControlledLandPermanent("a land"); - private static final FilterPermanentCard filter = new FilterPermanentCard("Mercenary permanent card with converted mana cost 2 or less"); + private static final FilterPermanentCard filter = new FilterPermanentCard("Mercenary permanent card with mana value 2 or less"); static { filter.add(SubType.MERCENARY.getPredicate()); - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 3)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 3)); } public BogGlider(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BolassCitadel.java b/Mage.Sets/src/mage/cards/b/BolassCitadel.java index 2c6dcb65036..cae98223fd2 100644 --- a/Mage.Sets/src/mage/cards/b/BolassCitadel.java +++ b/Mage.Sets/src/mage/cards/b/BolassCitadel.java @@ -70,7 +70,7 @@ class BolassCitadelPlayTheTopCardEffect extends AsThoughEffectImpl { super(AsThoughEffectType.PLAY_FROM_NOT_OWN_HAND_ZONE, Duration.WhileOnBattlefield, Outcome.AIDontUseIt); // AI will need help with this staticText = "You may play lands and cast spells from the top of your library. If you cast a spell this way, " - + "pay life equal to its converted mana cost rather than pay its mana cost."; + + "pay life equal to its mana value rather than pay its mana cost."; } private BolassCitadelPlayTheTopCardEffect(final BolassCitadelPlayTheTopCardEffect effect) { @@ -114,7 +114,7 @@ class BolassCitadelPlayTheTopCardEffect extends AsThoughEffectImpl { // allows to play/cast with alternative life cost if (!cardToCheck.isLand()) { - PayLifeCost lifeCost = new PayLifeCost(cardToCheck.getSpellAbility().getManaCosts().convertedManaCost()); + PayLifeCost lifeCost = new PayLifeCost(cardToCheck.getSpellAbility().getManaCosts().manaValue()); Costs newCosts = new CostsImpl(); newCosts.add(lifeCost); newCosts.addAll(cardToCheck.getSpellAbility().getCosts()); diff --git a/Mage.Sets/src/mage/cards/b/BoshIronGolem.java b/Mage.Sets/src/mage/cards/b/BoshIronGolem.java index 9ede0fe26e6..efaa22f7836 100644 --- a/Mage.Sets/src/mage/cards/b/BoshIronGolem.java +++ b/Mage.Sets/src/mage/cards/b/BoshIronGolem.java @@ -40,7 +40,7 @@ public final class BoshIronGolem extends CardImpl { // {3}{R}, Sacrifice an artifact: Bosh, Iron Golem deals damage equal to the sacrificed artifact's converted mana cost to any target. Effect effect = new DamageTargetEffect(new SacrificeCostConvertedMana("artifact")); - effect.setText("{this} deals damage equal to the sacrificed artifact's converted mana cost to any target"); + effect.setText("{this} deals damage equal to the sacrificed artifact's mana value to any target"); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl("{3}{R}")); ability.addCost(new SacrificeTargetCost(new TargetControlledPermanent(new FilterControlledArtifactPermanent("an artifact")))); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/b/BounteousKirin.java b/Mage.Sets/src/mage/cards/b/BounteousKirin.java index 1ee551b8a7c..52be3231c38 100644 --- a/Mage.Sets/src/mage/cards/b/BounteousKirin.java +++ b/Mage.Sets/src/mage/cards/b/BounteousKirin.java @@ -49,7 +49,7 @@ class BounteousKirinEffect extends OneShotEffect { public BounteousKirinEffect() { super(Outcome.GainLife); - this.staticText = "you may gain life equal to that spell's converted mana cost"; + this.staticText = "you may gain life equal to that spell's mana value"; } public BounteousKirinEffect(final BounteousKirinEffect effect) { @@ -67,7 +67,7 @@ class BounteousKirinEffect extends OneShotEffect { if (spell != null) { Player controller = game.getPlayer(source.getControllerId()); if (controller != null) { - int life = spell.getConvertedManaCost(); + int life = spell.getManaValue(); controller.gainLife(life, game, source); return true; } diff --git a/Mage.Sets/src/mage/cards/b/BrainInAJar.java b/Mage.Sets/src/mage/cards/b/BrainInAJar.java index 279560ecdbf..62ed9f8c0de 100644 --- a/Mage.Sets/src/mage/cards/b/BrainInAJar.java +++ b/Mage.Sets/src/mage/cards/b/BrainInAJar.java @@ -20,7 +20,7 @@ import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.FilterCard; import mage.filter.common.FilterInstantOrSorceryCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -71,7 +71,7 @@ class BrainInAJarCastEffect extends OneShotEffect { public BrainInAJarCastEffect() { super(Outcome.PlayForFree); this.staticText = ", then you may cast an instant or sorcery card " - + "with converted mana costs equal to the number of charge " + + "with mana values equal to the number of charge " + "counters on {this} from your hand without paying its mana cost"; } @@ -92,12 +92,12 @@ class BrainInAJarCastEffect extends OneShotEffect { && sourceObject != null) { int counters = sourceObject.getCounters(game).getCount(CounterType.CHARGE); FilterCard filter = new FilterInstantOrSorceryCard(); - filter.add(new ConvertedManaCostPredicate(ComparisonType.EQUAL_TO, counters)); + filter.add(new ManaValuePredicate(ComparisonType.EQUAL_TO, counters)); int cardsToCast = controller.getHand().count(filter, source.getControllerId(), source.getSourceId(), game); if (cardsToCast > 0 && controller.chooseUse(Outcome.PlayForFree, - "Cast an instant or sorcery card with converted mana costs of " + "Cast an instant or sorcery card with mana values of " + counters + " from your hand without paying its mana cost?", source, game)) { TargetCardInHand target = new TargetCardInHand(filter); diff --git a/Mage.Sets/src/mage/cards/b/BrinelinTheMoonKraken.java b/Mage.Sets/src/mage/cards/b/BrinelinTheMoonKraken.java index bb99efe6294..aaa03a6013c 100644 --- a/Mage.Sets/src/mage/cards/b/BrinelinTheMoonKraken.java +++ b/Mage.Sets/src/mage/cards/b/BrinelinTheMoonKraken.java @@ -73,7 +73,7 @@ class BrinelinTheMoonKrakenTriggeredAbility extends TriggeredAbilityImpl { return false; } Spell spell = game.getSpellOrLKIStack(event.getTargetId()); - return spell != null && spell.getConvertedManaCost() >= 6; + return spell != null && spell.getManaValue() >= 6; case ENTERS_THE_BATTLEFIELD: return event.getTargetId().equals(getSourceId()); default: @@ -83,7 +83,7 @@ class BrinelinTheMoonKrakenTriggeredAbility extends TriggeredAbilityImpl { @Override public String getRule() { - return "When {this} enters the battlefield or whenever you cast a spell with converted mana cost " + + return "When {this} enters the battlefield or whenever you cast a spell with mana value " + "6 or greater, you may return target nonland permanent to its owner's hand."; } diff --git a/Mage.Sets/src/mage/cards/b/BringToLight.java b/Mage.Sets/src/mage/cards/b/BringToLight.java index ec2c232a315..44a829be1a1 100644 --- a/Mage.Sets/src/mage/cards/b/BringToLight.java +++ b/Mage.Sets/src/mage/cards/b/BringToLight.java @@ -14,7 +14,7 @@ import mage.constants.Outcome; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCardInLibrary; @@ -70,7 +70,7 @@ class BringToLightEffect extends OneShotEffect { + "cost less than or equal to " + numberColors); filter.add(Predicates.or(CardType.CREATURE.getPredicate(), CardType.INSTANT.getPredicate(), CardType.SORCERY.getPredicate())); - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, numberColors + 1)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, numberColors + 1)); TargetCardInLibrary target = new TargetCardInLibrary(filter); controller.searchLibrary(target, source, game); Card card = controller.getLibrary().getCard(target.getFirstTarget(), game); diff --git a/Mage.Sets/src/mage/cards/b/BriselaVoiceOfNightmares.java b/Mage.Sets/src/mage/cards/b/BriselaVoiceOfNightmares.java index 832d0b7fd9b..981bbaffdd1 100644 --- a/Mage.Sets/src/mage/cards/b/BriselaVoiceOfNightmares.java +++ b/Mage.Sets/src/mage/cards/b/BriselaVoiceOfNightmares.java @@ -15,7 +15,6 @@ import mage.cards.MeldCard; import mage.constants.*; import mage.game.Game; import mage.game.events.GameEvent; -import mage.game.events.GameEvent.EventType; import mage.game.stack.Spell; import java.util.UUID; @@ -64,7 +63,7 @@ class BriselaVoiceOfNightmaresCantCastEffect extends ContinuousRuleModifyingEffe public BriselaVoiceOfNightmaresCantCastEffect() { super(Duration.WhileOnBattlefield, Outcome.Benefit); - staticText = "Your opponents can't cast spells with converted mana cost 3 or less"; + staticText = "Your opponents can't cast spells with mana value 3 or less"; } public BriselaVoiceOfNightmaresCantCastEffect(final BriselaVoiceOfNightmaresCantCastEffect effect) { @@ -85,7 +84,7 @@ class BriselaVoiceOfNightmaresCantCastEffect extends ContinuousRuleModifyingEffe public String getInfoMessage(Ability source, GameEvent event, Game game) { MageObject mageObject = game.getObject(source.getSourceId()); if (mageObject != null) { - return "You can't cast spells with converted mana cost 3 or less (" + mageObject.getIdName() + ")."; + return "You can't cast spells with mana value 3 or less (" + mageObject.getIdName() + ")."; } return null; } @@ -100,7 +99,7 @@ class BriselaVoiceOfNightmaresCantCastEffect extends ContinuousRuleModifyingEffe if (game.getOpponents(source.getControllerId()).contains(event.getPlayerId())) { Spell spell = game.getStack().getSpell(event.getTargetId()); if (spell != null) { - return spell.getConvertedManaCost() < 4; + return spell.getManaValue() < 4; } } return false; diff --git a/Mage.Sets/src/mage/cards/b/BygoneBishop.java b/Mage.Sets/src/mage/cards/b/BygoneBishop.java index da3e6c77abd..6809610ffc0 100644 --- a/Mage.Sets/src/mage/cards/b/BygoneBishop.java +++ b/Mage.Sets/src/mage/cards/b/BygoneBishop.java @@ -12,7 +12,7 @@ import mage.constants.CardType; import mage.constants.ComparisonType; import mage.constants.SubType; import mage.filter.FilterSpell; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; /** * @@ -20,11 +20,11 @@ import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; */ public final class BygoneBishop extends CardImpl { - private static final FilterSpell filterSpell = new FilterSpell("a creature spell with converted mana cost 3 or less"); + private static final FilterSpell filterSpell = new FilterSpell("a creature spell with mana value 3 or less"); static { filterSpell.add(CardType.CREATURE.getPredicate()); - filterSpell.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 4)); + filterSpell.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 4)); } public BygoneBishop(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/CabalConditioning.java b/Mage.Sets/src/mage/cards/c/CabalConditioning.java index 0b34f419b3b..0e678b17422 100644 --- a/Mage.Sets/src/mage/cards/c/CabalConditioning.java +++ b/Mage.Sets/src/mage/cards/c/CabalConditioning.java @@ -2,7 +2,7 @@ package mage.cards.c; import java.util.UUID; -import mage.abilities.dynamicvalue.common.HighestConvertedManaCostValue; +import mage.abilities.dynamicvalue.common.HighestManaValueCount; import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -19,8 +19,8 @@ public final class CabalConditioning extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{6}{B}"); // Any number of target players each discard a number of cards equal to the highest converted mana cost among permanents you control. - this.getSpellAbility().addEffect(new DiscardTargetEffect(new HighestConvertedManaCostValue()) - .setText("Any number of target players each discard a number of cards equal to the highest converted mana cost among permanents you control.") + this.getSpellAbility().addEffect(new DiscardTargetEffect(new HighestManaValueCount()) + .setText("Any number of target players each discard a number of cards equal to the highest mana value among permanents you control.") ); this.getSpellAbility().addTarget(new TargetPlayer(0, Integer.MAX_VALUE, false)); } diff --git a/Mage.Sets/src/mage/cards/c/CallOfTheDeathDweller.java b/Mage.Sets/src/mage/cards/c/CallOfTheDeathDweller.java index 34af149da95..583d2ad7fa5 100644 --- a/Mage.Sets/src/mage/cards/c/CallOfTheDeathDweller.java +++ b/Mage.Sets/src/mage/cards/c/CallOfTheDeathDweller.java @@ -13,7 +13,7 @@ import mage.filter.FilterCard; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreatureCard; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.filter.predicate.permanent.PermanentIdPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -55,7 +55,7 @@ class CallOfTheDeathDwellerEffect extends OneShotEffect { CallOfTheDeathDwellerEffect() { super(Outcome.Benefit); - staticText = "Return up to two target creature cards with total converted mana cost 3 or less " + + staticText = "Return up to two target creature cards with total mana value 3 or less " + "from your graveyard to the battlefield. Put a deathtouch counter on either of them. " + "Then put a menace counter on either of them."; } @@ -117,10 +117,10 @@ class CallOfTheDeathDwellerEffect extends OneShotEffect { class CallOfTheDeathDwellerTarget extends TargetCardInYourGraveyard { private static final FilterCard filter - = new FilterCreatureCard("creature cards with total converted mana cost 3 or less from your graveyard"); + = new FilterCreatureCard("creature cards with total mana value 3 or less from your graveyard"); static { - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 4)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 4)); } CallOfTheDeathDwellerTarget() { @@ -146,7 +146,7 @@ class CallOfTheDeathDwellerTarget extends TargetCardInYourGraveyard { this.getTargets() .stream() .map(game::getCard) - .mapToInt(Card::getConvertedManaCost) - .sum() + card.getConvertedManaCost() <= 3; + .mapToInt(Card::getManaValue) + .sum() + card.getManaValue() <= 3; } } diff --git a/Mage.Sets/src/mage/cards/c/CateranBrute.java b/Mage.Sets/src/mage/cards/c/CateranBrute.java index 063dbdfd289..939942429bb 100644 --- a/Mage.Sets/src/mage/cards/c/CateranBrute.java +++ b/Mage.Sets/src/mage/cards/c/CateranBrute.java @@ -16,7 +16,7 @@ import mage.constants.ComparisonType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterPermanentCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.target.common.TargetCardInLibrary; /** @@ -25,11 +25,11 @@ import mage.target.common.TargetCardInLibrary; */ public final class CateranBrute extends CardImpl { - private static final FilterPermanentCard filter = new FilterPermanentCard("Mercenary permanent card with converted mana cost 2 or less"); + private static final FilterPermanentCard filter = new FilterPermanentCard("Mercenary permanent card with mana value 2 or less"); static { filter.add(SubType.MERCENARY.getPredicate()); - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 3)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 3)); } public CateranBrute(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/CateranEnforcer.java b/Mage.Sets/src/mage/cards/c/CateranEnforcer.java index 4eb5ca912ad..379b0f498c1 100644 --- a/Mage.Sets/src/mage/cards/c/CateranEnforcer.java +++ b/Mage.Sets/src/mage/cards/c/CateranEnforcer.java @@ -17,7 +17,7 @@ import mage.constants.ComparisonType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterPermanentCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.target.common.TargetCardInLibrary; /** @@ -26,11 +26,11 @@ import mage.target.common.TargetCardInLibrary; */ public final class CateranEnforcer extends CardImpl { - private static final FilterPermanentCard filter = new FilterPermanentCard("Mercenary permanent card with converted mana cost 4 or less"); + private static final FilterPermanentCard filter = new FilterPermanentCard("Mercenary permanent card with mana value 4 or less"); static { filter.add(SubType.MERCENARY.getPredicate()); - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 5)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 5)); } public CateranEnforcer(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/CateranKidnappers.java b/Mage.Sets/src/mage/cards/c/CateranKidnappers.java index 94e37aecb7d..6d016703617 100644 --- a/Mage.Sets/src/mage/cards/c/CateranKidnappers.java +++ b/Mage.Sets/src/mage/cards/c/CateranKidnappers.java @@ -16,7 +16,7 @@ import mage.constants.ComparisonType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterPermanentCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.target.common.TargetCardInLibrary; /** @@ -24,11 +24,11 @@ import mage.target.common.TargetCardInLibrary; */ public final class CateranKidnappers extends CardImpl { - private static final FilterPermanentCard filter = new FilterPermanentCard("Mercenary permanent card with converted mana cost 3 or less"); + private static final FilterPermanentCard filter = new FilterPermanentCard("Mercenary permanent card with mana value 3 or less"); static { filter.add(SubType.MERCENARY.getPredicate()); - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 4)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 4)); } public CateranKidnappers(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/CateranOverlord.java b/Mage.Sets/src/mage/cards/c/CateranOverlord.java index ccbdd238aa8..267e6b26648 100644 --- a/Mage.Sets/src/mage/cards/c/CateranOverlord.java +++ b/Mage.Sets/src/mage/cards/c/CateranOverlord.java @@ -18,7 +18,7 @@ import mage.constants.SubType; import mage.constants.Zone; import static mage.filter.StaticFilters.FILTER_CONTROLLED_CREATURE_SHORT_TEXT; import mage.filter.common.FilterPermanentCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.target.common.TargetCardInLibrary; import mage.target.common.TargetControlledCreaturePermanent; @@ -28,11 +28,11 @@ import mage.target.common.TargetControlledCreaturePermanent; */ public final class CateranOverlord extends CardImpl { - private static final FilterPermanentCard filter = new FilterPermanentCard("Mercenary permanent card with converted mana cost 6 or less"); + private static final FilterPermanentCard filter = new FilterPermanentCard("Mercenary permanent card with mana value 6 or less"); static { filter.add(SubType.MERCENARY.getPredicate()); - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 7)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 7)); } public CateranOverlord(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/CateranPersuader.java b/Mage.Sets/src/mage/cards/c/CateranPersuader.java index f6a8bcc0452..caeacfd882c 100644 --- a/Mage.Sets/src/mage/cards/c/CateranPersuader.java +++ b/Mage.Sets/src/mage/cards/c/CateranPersuader.java @@ -16,7 +16,7 @@ import mage.constants.ComparisonType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterPermanentCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.target.common.TargetCardInLibrary; /** @@ -25,11 +25,11 @@ import mage.target.common.TargetCardInLibrary; */ public final class CateranPersuader extends CardImpl { - private static final FilterPermanentCard filter = new FilterPermanentCard("Mercenary permanent card with converted mana cost 1 or less"); + private static final FilterPermanentCard filter = new FilterPermanentCard("Mercenary permanent card with mana value 1 or less"); static { filter.add(SubType.MERCENARY.getPredicate()); - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 2)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 2)); } public CateranPersuader(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/CateranSlaver.java b/Mage.Sets/src/mage/cards/c/CateranSlaver.java index b0ef6b00d47..1ee40bdd05c 100644 --- a/Mage.Sets/src/mage/cards/c/CateranSlaver.java +++ b/Mage.Sets/src/mage/cards/c/CateranSlaver.java @@ -17,7 +17,7 @@ import mage.constants.ComparisonType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterPermanentCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.target.common.TargetCardInLibrary; /** @@ -26,11 +26,11 @@ import mage.target.common.TargetCardInLibrary; */ public final class CateranSlaver extends CardImpl { - private static final FilterPermanentCard filter = new FilterPermanentCard("Mercenary permanent card with converted mana cost 5 or less"); + private static final FilterPermanentCard filter = new FilterPermanentCard("Mercenary permanent card with mana value 5 or less"); static { filter.add(SubType.MERCENARY.getPredicate()); - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 6)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 6)); } public CateranSlaver(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/CavalierOfNight.java b/Mage.Sets/src/mage/cards/c/CavalierOfNight.java index ccf0aa529f0..6c0ab003f5d 100644 --- a/Mage.Sets/src/mage/cards/c/CavalierOfNight.java +++ b/Mage.Sets/src/mage/cards/c/CavalierOfNight.java @@ -19,7 +19,7 @@ import mage.filter.FilterCard; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterCreatureCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.common.TargetCardInYourGraveyard; import mage.target.common.TargetControlledPermanent; @@ -35,11 +35,11 @@ public final class CavalierOfNight extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledCreaturePermanent("another creature"); private static final FilterCard filter2 - = new FilterCreatureCard("creature card with converted mana cost 3 or less from your graveyard"); + = new FilterCreatureCard("creature card with mana value 3 or less from your graveyard"); static { filter.add(AnotherPredicate.instance); - filter2.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 4)); + filter2.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 4)); } public CavalierOfNight(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/CelestialKirin.java b/Mage.Sets/src/mage/cards/c/CelestialKirin.java index 4f4321881fd..1340fae59e2 100644 --- a/Mage.Sets/src/mage/cards/c/CelestialKirin.java +++ b/Mage.Sets/src/mage/cards/c/CelestialKirin.java @@ -13,7 +13,7 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.StaticFilters; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.game.stack.Spell; @@ -52,7 +52,7 @@ class CelestialKirinEffect extends OneShotEffect { public CelestialKirinEffect() { super(Outcome.GainLife); - this.staticText = "destroy all permanents with that spell's converted mana cost"; + this.staticText = "destroy all permanents with that spell's mana value"; } public CelestialKirinEffect(final CelestialKirinEffect effect) { @@ -68,9 +68,9 @@ class CelestialKirinEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { Spell spell = game.getSpellOrLKIStack(this.getTargetPointer().getFirst(game, source)); if (spell != null) { - int cmc = spell.getConvertedManaCost(); + int cmc = spell.getManaValue(); FilterPermanent filter = new FilterPermanent(); - filter.add(new ConvertedManaCostPredicate(ComparisonType.EQUAL_TO, cmc)); + filter.add(new ManaValuePredicate(ComparisonType.EQUAL_TO, cmc)); return new DestroyAllEffect(filter).apply(game, source); } return false; diff --git a/Mage.Sets/src/mage/cards/c/CerebralEruption.java b/Mage.Sets/src/mage/cards/c/CerebralEruption.java index 64a852a2f9f..518413092ca 100644 --- a/Mage.Sets/src/mage/cards/c/CerebralEruption.java +++ b/Mage.Sets/src/mage/cards/c/CerebralEruption.java @@ -43,7 +43,7 @@ class CerebralEruptionEffect extends OneShotEffect { CerebralEruptionEffect() { super(Outcome.Damage); - staticText = "Target opponent reveals the top card of their library. {this} deals damage equal to the revealed card's converted mana cost to that player and each creature they control. If a land card is revealed this way, return {this} to its owner's hand"; + staticText = "Target opponent reveals the top card of their library. {this} deals damage equal to the revealed card's mana value to that player and each creature they control. If a land card is revealed this way, return {this} to its owner's hand"; } CerebralEruptionEffect(final CerebralEruptionEffect effect) { @@ -59,7 +59,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.getConvertedManaCost(); + int damage = card.getManaValue(); player.damage(damage, source.getSourceId(), source, game); for (Permanent perm : game.getBattlefield().getAllActivePermanents(StaticFilters.FILTER_PERMANENT_CREATURES, player.getId(), game)) { perm.damage(damage, source.getSourceId(), source, game, false, true); diff --git a/Mage.Sets/src/mage/cards/c/ChaliceOfTheVoid.java b/Mage.Sets/src/mage/cards/c/ChaliceOfTheVoid.java index e5086cd9cc0..b18f9649fe6 100644 --- a/Mage.Sets/src/mage/cards/c/ChaliceOfTheVoid.java +++ b/Mage.Sets/src/mage/cards/c/ChaliceOfTheVoid.java @@ -68,7 +68,7 @@ class ChaliceOfTheVoidTriggeredAbility extends TriggeredAbilityImpl { public boolean checkTrigger(GameEvent event, Game game) { Permanent chalice = game.getPermanent(getSourceId()); Spell spell = game.getStack().getSpell(event.getTargetId()); - if (spell != null && chalice != null && spell.getConvertedManaCost() == chalice.getCounters(game).getCount(CounterType.CHARGE)) { + if (spell != null && chalice != null && spell.getManaValue() == chalice.getCounters(game).getCount(CounterType.CHARGE)) { for (Effect effect : this.getEffects()) { effect.setTargetPointer(new FixedTarget(event.getTargetId())); } @@ -79,6 +79,6 @@ class ChaliceOfTheVoidTriggeredAbility extends TriggeredAbilityImpl { @Override public String getRule() { - return "Whenever a player casts a spell with converted mana cost equal to the number of charge counters on {this}, counter that spell."; + return "Whenever a player casts a spell with mana value equal to the number of charge counters on {this}, counter that spell."; } } diff --git a/Mage.Sets/src/mage/cards/c/ChandraAcolyteOfFlame.java b/Mage.Sets/src/mage/cards/c/ChandraAcolyteOfFlame.java index 5c87e62c390..acce249973c 100644 --- a/Mage.Sets/src/mage/cards/c/ChandraAcolyteOfFlame.java +++ b/Mage.Sets/src/mage/cards/c/ChandraAcolyteOfFlame.java @@ -21,14 +21,13 @@ import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledPlaneswalkerPermanent; import mage.filter.common.FilterInstantOrSorceryCard; import mage.filter.predicate.mageobject.ColorPredicate; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.ZoneChangeEvent; import mage.game.permanent.Permanent; import mage.game.permanent.token.RedElementalToken; import mage.game.permanent.token.Token; -import mage.players.Player; import mage.target.common.TargetCardInYourGraveyard; import mage.target.targetpointer.FixedTarget; @@ -44,11 +43,11 @@ public final class ChandraAcolyteOfFlame extends CardImpl { private static final FilterPermanent filter = new FilterControlledPlaneswalkerPermanent("red planeswalker you control"); private static final FilterCard filter2 - = new FilterInstantOrSorceryCard("instant or sorcery card with converted mana cost 3 or less"); + = new FilterInstantOrSorceryCard("instant or sorcery card with mana value 3 or less"); static { filter.add(new ColorPredicate(ObjectColor.RED)); - filter2.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 4)); + filter2.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 4)); } public ChandraAcolyteOfFlame(UUID ownerId, CardSetInfo setInfo) { @@ -129,7 +128,7 @@ class ChandraAcolyteOfFlameGraveyardEffect extends OneShotEffect { ChandraAcolyteOfFlameGraveyardEffect() { super(Benefit); this.staticText = "You may cast target instant or sorcery card " + - "with converted mana cost 3 or less from your graveyard this turn. " + + "with mana value 3 or less from your graveyard this turn. " + "If that card would be put into your graveyard this turn, exile it instead"; } diff --git a/Mage.Sets/src/mage/cards/c/CitanulFlute.java b/Mage.Sets/src/mage/cards/c/CitanulFlute.java index d4cb750b042..33572651b32 100644 --- a/Mage.Sets/src/mage/cards/c/CitanulFlute.java +++ b/Mage.Sets/src/mage/cards/c/CitanulFlute.java @@ -15,7 +15,7 @@ import mage.constants.Outcome; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.common.FilterCreatureCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCardInLibrary; @@ -51,7 +51,7 @@ class CitanulFluteSearchEffect extends OneShotEffect { CitanulFluteSearchEffect() { super(Outcome.DrawCard); - staticText = "Search your library for a creature card with converted mana cost X or less, " + + staticText = "Search your library for a creature card with mana value X or less, " + "reveal it, and put it into your hand. Then shuffle your library"; } @@ -71,9 +71,9 @@ class CitanulFluteSearchEffect extends OneShotEffect { return false; } - FilterCard filter = new FilterCreatureCard("creature card with converted mana cost X or less"); + FilterCard filter = new FilterCreatureCard("creature card with mana value X or less"); //Set the mana cost one higher to 'emulate' a less than or equal to comparison. - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, source.getManaCostsToPay().getX() + 1)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, source.getManaCostsToPay().getX() + 1)); TargetCardInLibrary target = new TargetCardInLibrary(filter); player.searchLibrary(target, source, game); diff --git a/Mage.Sets/src/mage/cards/c/ClaimFame.java b/Mage.Sets/src/mage/cards/c/ClaimFame.java index db7768b8856..fcd9a4c36aa 100644 --- a/Mage.Sets/src/mage/cards/c/ClaimFame.java +++ b/Mage.Sets/src/mage/cards/c/ClaimFame.java @@ -15,7 +15,7 @@ import mage.constants.Duration; import mage.constants.SpellAbilityType; import mage.filter.FilterCard; import mage.filter.common.FilterCreatureCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.target.common.TargetCardInYourGraveyard; import mage.target.common.TargetCreaturePermanent; @@ -25,10 +25,10 @@ import mage.target.common.TargetCreaturePermanent; */ public final class ClaimFame extends SplitCard { - private static final FilterCard filter = new FilterCreatureCard("creature card with converted mana cost 2 or less from your graveyard"); + private static final FilterCard filter = new FilterCreatureCard("creature card with mana value 2 or less from your graveyard"); static { - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 3)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 3)); } public ClaimFame(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/ClaimTheFirstborn.java b/Mage.Sets/src/mage/cards/c/ClaimTheFirstborn.java index 8d328a64278..a84d62c24d6 100644 --- a/Mage.Sets/src/mage/cards/c/ClaimTheFirstborn.java +++ b/Mage.Sets/src/mage/cards/c/ClaimTheFirstborn.java @@ -11,7 +11,7 @@ import mage.constants.ComparisonType; import mage.constants.Duration; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.target.TargetPermanent; import java.util.UUID; @@ -22,10 +22,10 @@ import java.util.UUID; public final class ClaimTheFirstborn extends CardImpl { private static final FilterPermanent filter - = new FilterCreaturePermanent("creature with converted mana cost 3 or less"); + = new FilterCreaturePermanent("creature with mana value 3 or less"); static { - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 4)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 4)); } public ClaimTheFirstborn(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/CloudhoofKirin.java b/Mage.Sets/src/mage/cards/c/CloudhoofKirin.java index ea015a23d3c..3c99bb0d513 100644 --- a/Mage.Sets/src/mage/cards/c/CloudhoofKirin.java +++ b/Mage.Sets/src/mage/cards/c/CloudhoofKirin.java @@ -54,7 +54,7 @@ class CloudhoofKirinEffect extends OneShotEffect { CloudhoofKirinEffect() { super(Outcome.Detriment); - this.staticText = "have target player mill X cards, where X is that spell's converted mana cost"; + this.staticText = "have target player mill X cards, where X is that spell's mana value"; } private CloudhoofKirinEffect(final CloudhoofKirinEffect effect) { @@ -76,7 +76,7 @@ class CloudhoofKirinEffect extends OneShotEffect { targetPlayer = game.getPlayer(target.getFirstTarget()); } } - int cmc = spell.getConvertedManaCost(); + int cmc = spell.getManaValue(); if (targetPlayer != null && cmc > 0) { targetPlayer.millCards(cmc, source, game); return true; diff --git a/Mage.Sets/src/mage/cards/c/CodieVociferousCodex.java b/Mage.Sets/src/mage/cards/c/CodieVociferousCodex.java index f9ca6c3517f..52b6aadb06d 100644 --- a/Mage.Sets/src/mage/cards/c/CodieVociferousCodex.java +++ b/Mage.Sets/src/mage/cards/c/CodieVociferousCodex.java @@ -155,7 +155,7 @@ class CodieVociferousCodexEffect extends OneShotEffect { Card toCast = null; for (Card card : player.getLibrary().getCards(game)) { toExile.add(card); - if (card.isInstantOrSorcery() && card.getConvertedManaCost() < spell.getConvertedManaCost()) { + if (card.isInstantOrSorcery() && card.getManaValue() < spell.getManaValue()) { toCast = card; break; } diff --git a/Mage.Sets/src/mage/cards/c/CollectedCompany.java b/Mage.Sets/src/mage/cards/c/CollectedCompany.java index 05138dcf02a..8035c40fd81 100644 --- a/Mage.Sets/src/mage/cards/c/CollectedCompany.java +++ b/Mage.Sets/src/mage/cards/c/CollectedCompany.java @@ -9,7 +9,7 @@ import mage.constants.CardType; import mage.constants.ComparisonType; import mage.constants.Zone; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; /** * @@ -17,11 +17,11 @@ import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; */ public final class CollectedCompany extends CardImpl { - private static final FilterCard filter = new FilterCard("up to two creature cards with converted mana cost 3 or less"); + private static final FilterCard filter = new FilterCard("up to two creature cards with mana value 3 or less"); static { filter.add(CardType.CREATURE.getPredicate()); - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 4)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 4)); } public CollectedCompany(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/CollectedConjuring.java b/Mage.Sets/src/mage/cards/c/CollectedConjuring.java index 3e6ef64ae5d..9ee09215d22 100644 --- a/Mage.Sets/src/mage/cards/c/CollectedConjuring.java +++ b/Mage.Sets/src/mage/cards/c/CollectedConjuring.java @@ -9,7 +9,7 @@ import mage.constants.ComparisonType; import mage.constants.Outcome; import mage.constants.Zone; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.players.Player; import mage.target.TargetCard; @@ -45,23 +45,23 @@ public final class CollectedConjuring extends CardImpl { class CollectedConjuringEffect extends OneShotEffect { private static final FilterCard filter = new FilterCard( - "sorcery cards with converted mana cost 3 or less"); + "sorcery cards with mana value 3 or less"); static { filter.add(CardType.SORCERY.getPredicate()); - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 4)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 4)); } private static final FilterCard filter2 = filter.copy(); static { - filter2.setMessage("sorcery card with converted mana cost 3 or less"); + filter2.setMessage("sorcery card with mana value 3 or less"); } CollectedConjuringEffect() { super(Outcome.PlayForFree); this.staticText = "Exile the top six cards of your library. " - + "You may cast up to two sorcery cards with converted mana costs 3 or less from among them " + + "You may cast up to two sorcery cards with mana values 3 or less from among them " + "without paying their mana cost. Put the exiled cards not cast this way " + "on the bottom of your library in a random order."; } diff --git a/Mage.Sets/src/mage/cards/c/CombustibleGearhulk.java b/Mage.Sets/src/mage/cards/c/CombustibleGearhulk.java index f394f41dd20..cf082db7df2 100644 --- a/Mage.Sets/src/mage/cards/c/CombustibleGearhulk.java +++ b/Mage.Sets/src/mage/cards/c/CombustibleGearhulk.java @@ -54,7 +54,7 @@ class CombustibleGearhulkEffect extends OneShotEffect { public CombustibleGearhulkEffect() { super(Outcome.AIDontUseIt); - staticText = "target opponent may have you draw three cards. If the player doesn't, put the top three cards of your library into your graveyard, then {this} deals damage to that player equal to the total converted mana cost of those cards"; + staticText = "target opponent may have you draw three cards. If the player doesn't, put the top three cards of your library into your graveyard, then {this} deals damage to that player equal to the total mana value of those cards"; } public CombustibleGearhulkEffect(final CombustibleGearhulkEffect effect) { @@ -95,7 +95,7 @@ class CombustibleGearhulkMillAndDamageEffect extends OneShotEffect { public CombustibleGearhulkMillAndDamageEffect() { super(Outcome.Damage); - staticText = "mill three cards, then {this} deals damage to that player equal to the total converted mana cost of those cards."; + staticText = "mill three cards, then {this} deals damage to that player equal to the total mana value of those cards."; } public CombustibleGearhulkMillAndDamageEffect(final CombustibleGearhulkMillAndDamageEffect effect) { @@ -110,7 +110,7 @@ class CombustibleGearhulkMillAndDamageEffect extends OneShotEffect { .millCards(3, source, game) .getCards(game) .stream() - .mapToInt(MageObject::getConvertedManaCost) + .mapToInt(MageObject::getManaValue) .sum(); Player targetPlayer = game.getPlayer(targetPointer.getFirst(game, source)); if (targetPlayer != null) { diff --git a/Mage.Sets/src/mage/cards/c/CommandTheDreadhorde.java b/Mage.Sets/src/mage/cards/c/CommandTheDreadhorde.java index 7dc5cd57b06..b9c405f118a 100644 --- a/Mage.Sets/src/mage/cards/c/CommandTheDreadhorde.java +++ b/Mage.Sets/src/mage/cards/c/CommandTheDreadhorde.java @@ -51,7 +51,7 @@ class CommandTheDreadhordeEffect extends OneShotEffect { CommandTheDreadhordeEffect() { super(Outcome.Benefit); staticText = "Choose any number of target creature and/or planeswalker cards in graveyards. " + - "{this} deals damage to you equal to the total converted mana cost of those cards. " + + "{this} deals damage to you equal to the total mana value of those cards. " + "Put them onto the battlefield under your control."; } @@ -71,7 +71,7 @@ class CommandTheDreadhordeEffect extends OneShotEffect { return false; } Cards cards = new CardsImpl(source.getTargets().get(0).getTargets()); - int damage = cards.getCards(game).stream().mapToInt(Card::getConvertedManaCost).sum(); + int damage = cards.getCards(game).stream().mapToInt(Card::getManaValue).sum(); player.damage(damage, source.getSourceId(), source, game); return player.moveCards(cards, Zone.BATTLEFIELD, source, game); } diff --git a/Mage.Sets/src/mage/cards/c/ConduitOfRuin.java b/Mage.Sets/src/mage/cards/c/ConduitOfRuin.java index 1eadbaef31f..3e4fdcfcd4a 100644 --- a/Mage.Sets/src/mage/cards/c/ConduitOfRuin.java +++ b/Mage.Sets/src/mage/cards/c/ConduitOfRuin.java @@ -22,7 +22,7 @@ import mage.filter.common.FilterCreatureCard; import mage.filter.predicate.ObjectPlayer; import mage.filter.predicate.ObjectPlayerPredicate; import mage.filter.predicate.mageobject.ColorlessPredicate; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Controllable; import mage.game.Game; import mage.game.events.GameEvent; @@ -35,12 +35,12 @@ import mage.watchers.Watcher; */ public final class ConduitOfRuin extends CardImpl { - private static final FilterCreatureCard filter = new FilterCreatureCard("a colorless creature card with converted mana cost 7 or greater"); + private static final FilterCreatureCard filter = new FilterCreatureCard("a colorless creature card with mana value 7 or greater"); private static final FilterCreatureCard filterCost = new FilterCreatureCard("The first creature spell"); static { filter.add(ColorlessPredicate.instance); - filter.add(new ConvertedManaCostPredicate(ComparisonType.MORE_THAN, 6)); + filter.add(new ManaValuePredicate(ComparisonType.MORE_THAN, 6)); filterCost.add(new FirstCastCreatureSpellPredicate()); } diff --git a/Mage.Sets/src/mage/cards/c/ConfiscationCoup.java b/Mage.Sets/src/mage/cards/c/ConfiscationCoup.java index 3a07467ecd1..a019c188678 100644 --- a/Mage.Sets/src/mage/cards/c/ConfiscationCoup.java +++ b/Mage.Sets/src/mage/cards/c/ConfiscationCoup.java @@ -56,7 +56,7 @@ class ConfiscationCoupEffect extends OneShotEffect { public ConfiscationCoupEffect() { super(Outcome.GainControl); - this.staticText = "Choose target creature or artifact. You get {E}{E}{E}{E}, then you may pay an amount of {E} equal to that permanent's converted mana cost. If you do, gain control of it"; + this.staticText = "Choose target creature or artifact. You get {E}{E}{E}{E}, then you may pay an amount of {E} equal to that permanent's mana value. If you do, gain control of it"; } public ConfiscationCoupEffect(final ConfiscationCoupEffect effect) { @@ -75,11 +75,11 @@ class ConfiscationCoupEffect extends OneShotEffect { new GetEnergyCountersControllerEffect(4).apply(game, source); Permanent targetPermanent = game.getPermanent(getTargetPointer().getFirst(game, source)); if (targetPermanent != null) { - Cost cost = new PayEnergyCost(targetPermanent.getManaCost().convertedManaCost()); + Cost cost = new PayEnergyCost(targetPermanent.getManaCost().manaValue()); if (cost.canPay(source, source, source.getControllerId(), game)) { - int convertedManaCost = targetPermanent.getManaCost().convertedManaCost(); - StringBuilder energy = new StringBuilder(convertedManaCost); - for (int i = 0; i < convertedManaCost; i++) { + int manaValue = targetPermanent.getManaCost().manaValue(); + StringBuilder energy = new StringBuilder(manaValue); + for (int i = 0; i < manaValue; i++) { energy.append("{E}"); } if (controller.chooseUse(outcome, "Pay " + energy + " to get control of " + targetPermanent.getLogName() + '?', source, game)) { diff --git a/Mage.Sets/src/mage/cards/c/ConfrontThePast.java b/Mage.Sets/src/mage/cards/c/ConfrontThePast.java index 05017dc63fc..19b1507a8f4 100644 --- a/Mage.Sets/src/mage/cards/c/ConfrontThePast.java +++ b/Mage.Sets/src/mage/cards/c/ConfrontThePast.java @@ -11,7 +11,7 @@ import mage.constants.*; import mage.counters.CounterType; import mage.filter.common.FilterPermanentCard; import mage.filter.common.FilterPlaneswalkerPermanent; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetCardInYourGraveyard; @@ -70,7 +70,7 @@ enum ConfrontThePastAdjuster implements TargetAdjuster { ability.getTargets().clear(); FilterPermanentCard filter = new FilterPermanentCard("planeswalker card with mana value X or less"); filter.add(CardType.PLANESWALKER.getPredicate()); - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, xValue + 1)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, xValue + 1)); ability.addTarget(new TargetCardInYourGraveyard(filter)); } } diff --git a/Mage.Sets/src/mage/cards/c/ConsumeTheMeek.java b/Mage.Sets/src/mage/cards/c/ConsumeTheMeek.java index cabb07a2058..e1494d83f4d 100644 --- a/Mage.Sets/src/mage/cards/c/ConsumeTheMeek.java +++ b/Mage.Sets/src/mage/cards/c/ConsumeTheMeek.java @@ -8,7 +8,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.ComparisonType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; /** * @@ -16,10 +16,10 @@ import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; */ public final class ConsumeTheMeek extends CardImpl { - private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creatures with converted mana cost 3 or less"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creatures with mana value 3 or less"); static { - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 4)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 4)); } public ConsumeTheMeek(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/ContainmentBreach.java b/Mage.Sets/src/mage/cards/c/ContainmentBreach.java index 958cd974972..b5b4ff81d7b 100644 --- a/Mage.Sets/src/mage/cards/c/ContainmentBreach.java +++ b/Mage.Sets/src/mage/cards/c/ContainmentBreach.java @@ -64,7 +64,7 @@ class ContainmentBreachEffect extends OneShotEffect { return false; } permanent.destroy(source, game, false); - if (permanent.getConvertedManaCost() <= 2) { + if (permanent.getManaValue() <= 2) { new WitherbloomToken().putOntoBattlefield(1, game, source, source.getControllerId()); } return true; diff --git a/Mage.Sets/src/mage/cards/c/Corrosion.java b/Mage.Sets/src/mage/cards/c/Corrosion.java index ca3d0d2e17d..309a29fadd2 100644 --- a/Mage.Sets/src/mage/cards/c/Corrosion.java +++ b/Mage.Sets/src/mage/cards/c/Corrosion.java @@ -57,7 +57,7 @@ class CorrosionUpkeepEffect extends OneShotEffect { CorrosionUpkeepEffect() { super(Outcome.DestroyPermanent); - this.staticText = "put a rust counter on each artifact target opponent controls. Then destroy each artifact with converted mana cost less than or equal to the number of rust counters on it. Artifacts destroyed this way can't be regenerated"; + this.staticText = "put a rust counter on each artifact target opponent controls. Then destroy each artifact with mana value less than or equal to the number of rust counters on it. Artifacts destroyed this way can't be regenerated"; } CorrosionUpkeepEffect(final CorrosionUpkeepEffect effect) { @@ -83,7 +83,7 @@ class CorrosionUpkeepEffect extends OneShotEffect { } // destroy each artifact with converted mana cost less than or equal to the number of rust counters on it for (Permanent permanent : game.getBattlefield().getActivePermanents(filter, source.getControllerId(), source.getSourceId(), game)) { - if (permanent.getConvertedManaCost() <= permanent.getCounters(game).getCount(CounterType.RUST)) { + if (permanent.getManaValue() <= permanent.getCounters(game).getCount(CounterType.RUST)) { permanent.destroy(source, game, true); } } diff --git a/Mage.Sets/src/mage/cards/c/Counterbalance.java b/Mage.Sets/src/mage/cards/c/Counterbalance.java index 682b5e1bef2..11a567aae9c 100644 --- a/Mage.Sets/src/mage/cards/c/Counterbalance.java +++ b/Mage.Sets/src/mage/cards/c/Counterbalance.java @@ -47,7 +47,7 @@ class CounterbalanceEffect extends OneShotEffect { public CounterbalanceEffect() { super(Outcome.Neutral); - this.staticText = "you may reveal the top card of your library. If you do, counter that spell if it has the same converted mana cost as the revealed card"; + this.staticText = "you may reveal the top card of your library. If you do, counter that spell if it has the same mana value as the revealed card"; } public CounterbalanceEffect(final CounterbalanceEffect effect) { @@ -71,7 +71,7 @@ class CounterbalanceEffect extends OneShotEffect { CardsImpl cards = new CardsImpl(); cards.add(topcard); controller.revealCards(sourcePermanent.getName(), cards, game); - if (topcard.getConvertedManaCost() == spell.getConvertedManaCost()) { + if (topcard.getManaValue() == spell.getManaValue()) { return game.getStack().counter(spell.getId(), source, game); } } diff --git a/Mage.Sets/src/mage/cards/c/CovetedPrize.java b/Mage.Sets/src/mage/cards/c/CovetedPrize.java index 94e369e3d25..5fd841994c9 100644 --- a/Mage.Sets/src/mage/cards/c/CovetedPrize.java +++ b/Mage.Sets/src/mage/cards/c/CovetedPrize.java @@ -34,7 +34,7 @@ public final class CovetedPrize extends CardImpl { this.getSpellAbility().addEffect(new ConditionalOneShotEffect( new CastWithoutPayingManaCostEffect(4), FullPartyCondition.instance, "If you have a full party, " + - "you may cast a spell with converted mana cost 4 or less from your hand without paying its mana cost." + "you may cast a spell with mana value 4 or less from your hand without paying its mana cost." )); } diff --git a/Mage.Sets/src/mage/cards/c/CrimePunishment.java b/Mage.Sets/src/mage/cards/c/CrimePunishment.java index 1d8e5d4e3be..e73445287b9 100644 --- a/Mage.Sets/src/mage/cards/c/CrimePunishment.java +++ b/Mage.Sets/src/mage/cards/c/CrimePunishment.java @@ -53,7 +53,7 @@ class PunishmentEffect extends OneShotEffect { PunishmentEffect() { super(Outcome.DestroyPermanent); - this.staticText = "Destroy each artifact, creature, and enchantment with converted mana cost X"; + this.staticText = "Destroy each artifact, creature, and enchantment with mana value X"; } PunishmentEffect(final PunishmentEffect effect) { @@ -69,7 +69,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.getConvertedManaCost() == source.getManaCostsToPay().getX() + && permanent.getManaValue() == source.getManaCostsToPay().getX() && (permanent.isArtifact() || permanent.isCreature() || permanent.isEnchantment())) { diff --git a/Mage.Sets/src/mage/cards/c/Crumble.java b/Mage.Sets/src/mage/cards/c/Crumble.java index 5f79f01b3fb..629024c5548 100644 --- a/Mage.Sets/src/mage/cards/c/Crumble.java +++ b/Mage.Sets/src/mage/cards/c/Crumble.java @@ -43,7 +43,7 @@ class CrumbleEffect extends OneShotEffect { public CrumbleEffect() { super(Outcome.GainLife); - staticText = "That artifact's controller gains life equal to its converted mana cost"; + staticText = "That artifact's controller gains life equal to its mana value"; } public CrumbleEffect(final CrumbleEffect effect) { @@ -59,7 +59,7 @@ class CrumbleEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { Permanent permanent = getTargetPointer().getFirstTargetPermanentOrLKI(game, source); // must use LKI if (permanent != null) { - int cost = permanent.getConvertedManaCost(); + int cost = permanent.getManaValue(); Player player = game.getPlayer(permanent.getControllerId()); if (player != null) { player.gainLife(cost, game, source); diff --git a/Mage.Sets/src/mage/cards/c/CryptChampion.java b/Mage.Sets/src/mage/cards/c/CryptChampion.java index 70166884fcf..c3cb29d99ef 100644 --- a/Mage.Sets/src/mage/cards/c/CryptChampion.java +++ b/Mage.Sets/src/mage/cards/c/CryptChampion.java @@ -21,7 +21,7 @@ import mage.constants.Outcome; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.common.FilterCreatureCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.filter.predicate.card.OwnerIdPredicate; import mage.game.Game; import mage.players.Player; @@ -66,7 +66,7 @@ class CryptChampionEffect extends OneShotEffect { CryptChampionEffect() { super(Outcome.PutCreatureInPlay); - this.staticText = "each player puts a creature card with converted mana cost 3 or less from their graveyard onto the battlefield"; + this.staticText = "each player puts a creature card with mana value 3 or less from their graveyard onto the battlefield"; } CryptChampionEffect(final CryptChampionEffect effect) { @@ -86,9 +86,9 @@ class CryptChampionEffect extends OneShotEffect { for (UUID playerId : game.getState().getPlayersInRange(controller.getId(), game)) { Player player = game.getPlayer(playerId); if (player != null) { - FilterCard filter = new FilterCreatureCard("creature card with converted mana cost 3 or less from your graveyard"); + FilterCard filter = new FilterCreatureCard("creature card with mana value 3 or less from your graveyard"); filter.add(new OwnerIdPredicate(playerId)); - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 4)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 4)); Target target = new TargetCardInGraveyard(filter); if (target.canChoose(source.getSourceId(), playerId, game) && player.chooseTarget(outcome, target, source, game)) { diff --git a/Mage.Sets/src/mage/cards/c/CullingRitual.java b/Mage.Sets/src/mage/cards/c/CullingRitual.java index e32ec6937af..4d1f414ecfb 100644 --- a/Mage.Sets/src/mage/cards/c/CullingRitual.java +++ b/Mage.Sets/src/mage/cards/c/CullingRitual.java @@ -11,7 +11,7 @@ import mage.constants.ManaType; import mage.constants.Outcome; import mage.filter.FilterPermanent; import mage.filter.common.FilterNonlandPermanent; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -45,7 +45,7 @@ class CullingRitualEffect extends OneShotEffect { private static final FilterPermanent filter = new FilterNonlandPermanent(); static { - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 3)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 3)); } CullingRitualEffect() { diff --git a/Mage.Sets/src/mage/cards/c/CullingScales.java b/Mage.Sets/src/mage/cards/c/CullingScales.java index 942c3a0c538..0d3922d4a01 100644 --- a/Mage.Sets/src/mage/cards/c/CullingScales.java +++ b/Mage.Sets/src/mage/cards/c/CullingScales.java @@ -12,7 +12,7 @@ import mage.filter.FilterPermanent; import mage.filter.common.FilterNonlandPermanent; import mage.filter.predicate.ObjectSourcePlayer; import mage.filter.predicate.ObjectSourcePlayerPredicate; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.TargetPermanent; @@ -25,7 +25,7 @@ import java.util.UUID; public final class CullingScales extends CardImpl { private static final FilterPermanent filterNonlandPermanentWithLowestCmc = new FilterNonlandPermanent( - "nonland permanent with the lowest converted mana cost (If two or more permanents are tied for lowest cost, target any one of them.)" + "nonland permanent with the lowest mana value (If two or more permanents are tied for lowest cost, target any one of them.)" ); static { @@ -57,7 +57,7 @@ class HasLowestCMCAmongstNonlandPermanentsPredicate implements ObjectSourcePlaye @Override public boolean apply(ObjectSourcePlayer input, Game game) { FilterPermanent filter = new FilterNonlandPermanent(); - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, input.getObject().getConvertedManaCost())); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, input.getObject().getManaValue())); return !game.getBattlefield().contains(filter, input.getSourceId(), input.getPlayerId(), game, 1); } diff --git a/Mage.Sets/src/mage/cards/c/CullingSun.java b/Mage.Sets/src/mage/cards/c/CullingSun.java index 9472e71afbd..7ccf609304a 100644 --- a/Mage.Sets/src/mage/cards/c/CullingSun.java +++ b/Mage.Sets/src/mage/cards/c/CullingSun.java @@ -8,17 +8,17 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.ComparisonType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; /** * * @author Loki */ public final class CullingSun extends CardImpl { - private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with converted mana cost 3 or less"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with mana value 3 or less"); static { - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 4)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 4)); } public CullingSun(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/CustodiSoulcaller.java b/Mage.Sets/src/mage/cards/c/CustodiSoulcaller.java index 7d6acc55677..d43f233aa26 100644 --- a/Mage.Sets/src/mage/cards/c/CustodiSoulcaller.java +++ b/Mage.Sets/src/mage/cards/c/CustodiSoulcaller.java @@ -15,10 +15,9 @@ import mage.constants.WatcherScope; import mage.filter.FilterCard; import mage.filter.common.FilterCreatureCard; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.game.events.GameEvent; -import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; import mage.target.common.TargetCardInYourGraveyard; import mage.target.targetadjustment.TargetAdjuster; @@ -44,7 +43,7 @@ public final class CustodiSoulcaller extends CardImpl { // Whenever Custodi Soulcaller attacks, return target creature card with converted mana cost X or less from your graveyard to the battlefield, where X is the number of players you attacked with a creature this combat. Ability ability = new AttacksTriggeredAbility(new ReturnFromGraveyardToBattlefieldTargetEffect(), false); ability.addWatcher(new CustodiSoulcallerWatcher()); - ability.addTarget(new TargetCardInYourGraveyard(new FilterCreatureCard("creature card with converted mana cost X or less from your graveyard, where X is the number of players you attacked with a creature this combat"))); + ability.addTarget(new TargetCardInYourGraveyard(new FilterCreatureCard("creature card with mana value X or less from your graveyard, where X is the number of players you attacked with a creature this combat"))); ability.setTargetAdjuster(CustodiSoulcallerAdjuster.instance); this.addAbility(ability); } @@ -69,9 +68,9 @@ enum CustodiSoulcallerAdjuster implements TargetAdjuster { Permanent sourcePermanent = game.getPermanentOrLKIBattlefield(ability.getSourceId()); if (watcher != null) { int xValue = watcher.getNumberOfAttackedPlayers(sourcePermanent.getControllerId()); - FilterCard filter = new FilterCard("creature card with converted mana cost " + xValue + " or less"); + FilterCard filter = new FilterCard("creature card with mana value " + xValue + " or less"); filter.add(CardType.CREATURE.getPredicate()); - filter.add(Predicates.or(new ConvertedManaCostPredicate(ComparisonType.EQUAL_TO, xValue), new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, xValue))); + filter.add(Predicates.or(new ManaValuePredicate(ComparisonType.EQUAL_TO, xValue), new ManaValuePredicate(ComparisonType.FEWER_THAN, xValue))); ability.getTargets().add(new TargetCardInYourGraveyard(filter)); } } diff --git a/Mage.Sets/src/mage/cards/d/DanceOfTheManse.java b/Mage.Sets/src/mage/cards/d/DanceOfTheManse.java index 75dcf91da67..4d0b4fcaeda 100644 --- a/Mage.Sets/src/mage/cards/d/DanceOfTheManse.java +++ b/Mage.Sets/src/mage/cards/d/DanceOfTheManse.java @@ -12,7 +12,7 @@ import mage.cards.CardsImpl; import mage.constants.*; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.players.Player; import mage.target.Target; @@ -55,7 +55,7 @@ enum DanceOfTheManseAdjuster implements TargetAdjuster { public void adjustTargets(Ability ability, Game game) { int xValue = ability.getManaCostsToPay().getX(); FilterCard filter = new FilterCard("artifact and/or non-Aura enchantment cards " + - "each with converted mana cost " + xValue + " or less from your graveyard"); + "each with mana value " + xValue + " or less from your graveyard"); filter.add(Predicates.or( CardType.ARTIFACT.getPredicate(), Predicates.and( @@ -63,7 +63,7 @@ enum DanceOfTheManseAdjuster implements TargetAdjuster { Predicates.not(SubType.AURA.getPredicate()) ) )); - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, xValue + 1)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, xValue + 1)); ability.getTargets().clear(); ability.addTarget(new TargetCardInYourGraveyard(0, xValue, filter)); } @@ -74,7 +74,7 @@ class DanceOfTheManseEffect extends OneShotEffect { DanceOfTheManseEffect() { super(Outcome.Benefit); staticText = "Return up to X target artifact and/or non-Aura enchantment cards " + - "each with converted mana cost X or less from your graveyard to the battlefield. " + + "each with mana value X or less from your graveyard to the battlefield. " + "If X is 6 or more, those permanents are 4/4 creatures in addition to their other types."; } diff --git a/Mage.Sets/src/mage/cards/d/DarkConfidant.java b/Mage.Sets/src/mage/cards/d/DarkConfidant.java index a74dc25b840..8dcbc416c0f 100644 --- a/Mage.Sets/src/mage/cards/d/DarkConfidant.java +++ b/Mage.Sets/src/mage/cards/d/DarkConfidant.java @@ -48,7 +48,7 @@ class DarkConfidantEffect extends OneShotEffect { DarkConfidantEffect() { super(Outcome.DrawCard); - this.staticText = "reveal the top card of your library and put that card into your hand. You lose life equal to its converted mana cost"; + this.staticText = "reveal the top card of your library and put that card into your hand. You lose life equal to its mana value"; } DarkConfidantEffect(final DarkConfidantEffect effect) { @@ -66,7 +66,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.getConvertedManaCost(), game, source, false); + controller.loseLife(card.getManaValue(), game, source, false); } return true; diff --git a/Mage.Sets/src/mage/cards/d/DarkTutelage.java b/Mage.Sets/src/mage/cards/d/DarkTutelage.java index 02219d42f3c..8125fe71859 100644 --- a/Mage.Sets/src/mage/cards/d/DarkTutelage.java +++ b/Mage.Sets/src/mage/cards/d/DarkTutelage.java @@ -43,7 +43,7 @@ class DarkTutelageEffect extends OneShotEffect { DarkTutelageEffect() { super(Outcome.DrawCard); - staticText = "reveal the top card of your library and put that card into your hand. You lose life equal to its converted mana cost"; + staticText = "reveal the top card of your library and put that card into your hand. You lose life equal to its mana value"; } private DarkTutelageEffect(final DarkTutelageEffect effect) { @@ -62,8 +62,8 @@ class DarkTutelageEffect extends OneShotEffect { } player.revealCards(source, new CardsImpl(card), game); player.moveCards(card, Zone.HAND, source, game); - if (card.getConvertedManaCost() > 0) { - player.loseLife(card.getConvertedManaCost(), game, source, false); + if (card.getManaValue() > 0) { + player.loseLife(card.getManaValue(), game, source, false); } return true; } diff --git a/Mage.Sets/src/mage/cards/d/DawnEvangel.java b/Mage.Sets/src/mage/cards/d/DawnEvangel.java index 2b17d77d618..c8848aa074d 100644 --- a/Mage.Sets/src/mage/cards/d/DawnEvangel.java +++ b/Mage.Sets/src/mage/cards/d/DawnEvangel.java @@ -10,7 +10,7 @@ import mage.constants.ComparisonType; import mage.constants.SubType; import mage.filter.FilterCard; import mage.filter.common.FilterCreatureCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.ZoneChangeEvent; @@ -50,10 +50,10 @@ public final class DawnEvangel extends CardImpl { class DawnEvangelAbility extends DiesCreatureTriggeredAbility { private static final FilterCard cardFilter - = new FilterCreatureCard("creature card with converted mana cost 2 or less from your graveyard"); + = new FilterCreatureCard("creature card with mana value 2 or less from your graveyard"); static { - cardFilter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 3)); + cardFilter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 3)); } DawnEvangelAbility() { @@ -85,7 +85,7 @@ class DawnEvangelAbility extends DiesCreatureTriggeredAbility { @Override public String getRule() { return "Whenever a creature dies, if an Aura you controlled was attached to it, " + - "return target creature card with converted mana cost 2 or less from your graveyard to your hand."; + "return target creature card with mana value 2 or less from your graveyard to your hand."; } @Override diff --git a/Mage.Sets/src/mage/cards/d/DaxosOfMeletis.java b/Mage.Sets/src/mage/cards/d/DaxosOfMeletis.java index 752b04c69dc..21cb9ee126a 100644 --- a/Mage.Sets/src/mage/cards/d/DaxosOfMeletis.java +++ b/Mage.Sets/src/mage/cards/d/DaxosOfMeletis.java @@ -60,7 +60,7 @@ class DaxosOfMeletisEffect extends OneShotEffect { public DaxosOfMeletisEffect() { super(Outcome.PutCreatureInPlay); - this.staticText = "exile the top card of that player's library. You gain life equal to that card's converted mana cost. Until end of turn, you may cast that card and you may spend mana as though it were mana of any color to cast it"; + this.staticText = "exile the top card of that player's library. You gain life equal to that card's mana value. Until end of turn, you may cast that card and you may spend mana as though it were mana of any color to cast it"; } public DaxosOfMeletisEffect(final DaxosOfMeletisEffect effect) { @@ -85,7 +85,7 @@ class DaxosOfMeletisEffect extends OneShotEffect { // move card to exile controller.moveCardsToExile(card, source, game, true, exileId, sourceObject.getIdName()); // player gains life - controller.gainLife(card.getConvertedManaCost(), game, source); + controller.gainLife(card.getManaValue(), game, source); // Add effects only if the card has a spellAbility (e.g. not for lands). if (card.getSpellAbility() != null) { // allow to cast the card diff --git a/Mage.Sets/src/mage/cards/d/DeathMutation.java b/Mage.Sets/src/mage/cards/d/DeathMutation.java index bdd092a0cee..2fdbea7ba75 100644 --- a/Mage.Sets/src/mage/cards/d/DeathMutation.java +++ b/Mage.Sets/src/mage/cards/d/DeathMutation.java @@ -3,7 +3,7 @@ package mage.cards.d; import java.util.UUID; import mage.ObjectColor; -import mage.abilities.dynamicvalue.common.TargetConvertedManaCost; +import mage.abilities.dynamicvalue.common.TargetManaValue; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; @@ -35,7 +35,7 @@ public final class DeathMutation extends CardImpl { this.getSpellAbility().addEffect(new DestroyTargetEffect(true)); this.getSpellAbility().addTarget(new TargetPermanent(filter)); // create X 1/1 green Saproling creature tokens, where X is that creature's converted mana cost. - this.getSpellAbility().addEffect(new CreateTokenEffect(new SaprolingToken(), TargetConvertedManaCost.instance)); + this.getSpellAbility().addEffect(new CreateTokenEffect(new SaprolingToken(), TargetManaValue.instance)); } private DeathMutation(final DeathMutation card) { diff --git a/Mage.Sets/src/mage/cards/d/DeathsOasis.java b/Mage.Sets/src/mage/cards/d/DeathsOasis.java index 2748394fead..8f32e43df5a 100644 --- a/Mage.Sets/src/mage/cards/d/DeathsOasis.java +++ b/Mage.Sets/src/mage/cards/d/DeathsOasis.java @@ -21,7 +21,7 @@ import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreatureCard; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.Game; import mage.game.events.GameEvent; @@ -47,7 +47,7 @@ public final class DeathsOasis extends CardImpl { // {1}, Sacrifice Death's Oasis: You gain life equal to the greatest converted mana cost among creatures you control. Ability ability = new SimpleActivatedAbility( new GainLifeEffect(DeathsOasisValue.instance) - .setText("you gain life equal to the greatest converted mana cost among creatures you control"), + .setText("you gain life equal to the greatest mana value among creatures you control"), new GenericManaCost(1) ); ability.addCost(new SacrificeSourceCost()); @@ -96,14 +96,14 @@ class DeathsOasisTriggeredAbility extends DiesCreatureTriggeredAbility { } this.getEffects().clear(); this.addEffect(new MillCardsControllerEffect(2)); - this.addEffect(new DeathsOasisEffect(zEvent.getTarget().getConvertedManaCost())); + this.addEffect(new DeathsOasisEffect(zEvent.getTarget().getManaValue())); return true; } @Override public String getRule() { return "Whenever a nontoken creature you control dies, put the top two cards of your library " + - "into your graveyard. Then return a creature card with lesser converted mana cost " + + "into your graveyard. Then return a creature card with lesser mana value " + "than the creature that died from your graveyard to your hand."; } } @@ -114,8 +114,8 @@ class DeathsOasisEffect extends OneShotEffect { DeathsOasisEffect(int cmc) { super(Outcome.Benefit); - this.filter = new FilterCreatureCard("creature card in your graveyard with converted mana cost " + (cmc - 1) + " or less"); - this.filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, cmc)); + this.filter = new FilterCreatureCard("creature card in your graveyard with mana value " + (cmc - 1) + " or less"); + this.filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, cmc)); } private DeathsOasisEffect(final DeathsOasisEffect effect) { @@ -153,7 +153,7 @@ enum DeathsOasisValue implements DynamicValue { .getAllActivePermanents(sourceAbility.getControllerId()) .stream() .filter(Permanent::isCreature) - .mapToInt(Permanent::getConvertedManaCost) + .mapToInt(Permanent::getManaValue) .max() .orElse(0); } diff --git a/Mage.Sets/src/mage/cards/d/DeekahFractalTheorist.java b/Mage.Sets/src/mage/cards/d/DeekahFractalTheorist.java index 62189b23861..28642f1e746 100644 --- a/Mage.Sets/src/mage/cards/d/DeekahFractalTheorist.java +++ b/Mage.Sets/src/mage/cards/d/DeekahFractalTheorist.java @@ -66,7 +66,7 @@ enum DeekahFractalTheoristValue implements DynamicValue { @Override public int calculate(Game game, Ability sourceAbility, Effect effect) { Spell spell = (Spell) effect.getValue(MagecraftAbility.SPELL_KEY); - return spell != null ? spell.getConvertedManaCost() : 0; + return spell != null ? spell.getManaValue() : 0; } @Override diff --git a/Mage.Sets/src/mage/cards/d/DeepfireElemental.java b/Mage.Sets/src/mage/cards/d/DeepfireElemental.java index 9a542a4c545..fcf49f719e3 100644 --- a/Mage.Sets/src/mage/cards/d/DeepfireElemental.java +++ b/Mage.Sets/src/mage/cards/d/DeepfireElemental.java @@ -22,7 +22,7 @@ import mage.target.targetadjustment.XCMCPermanentAdjuster; */ public final class DeepfireElemental extends CardImpl { - private static final FilterPermanent filter = new FilterPermanent("artifact or creature with converted mana cost X"); + private static final FilterPermanent filter = new FilterPermanent("artifact or creature with mana value X"); static { filter.add(Predicates.or( diff --git a/Mage.Sets/src/mage/cards/d/DefiantFalcon.java b/Mage.Sets/src/mage/cards/d/DefiantFalcon.java index bcafd2094b3..471afb147af 100644 --- a/Mage.Sets/src/mage/cards/d/DefiantFalcon.java +++ b/Mage.Sets/src/mage/cards/d/DefiantFalcon.java @@ -15,7 +15,7 @@ import mage.constants.ComparisonType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterPermanentCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.target.common.TargetCardInLibrary; /** @@ -24,11 +24,11 @@ import mage.target.common.TargetCardInLibrary; */ public final class DefiantFalcon extends CardImpl { - private static final FilterPermanentCard filter = new FilterPermanentCard("Rebel permanent card with converted mana cost 3 or less"); + private static final FilterPermanentCard filter = new FilterPermanentCard("Rebel permanent card with mana value 3 or less"); static { filter.add(SubType.REBEL.getPredicate()); - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 4)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 4)); } public DefiantFalcon(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DefiantVanguard.java b/Mage.Sets/src/mage/cards/d/DefiantVanguard.java index b5225a24285..480673d4d5d 100644 --- a/Mage.Sets/src/mage/cards/d/DefiantVanguard.java +++ b/Mage.Sets/src/mage/cards/d/DefiantVanguard.java @@ -22,10 +22,9 @@ import mage.constants.Outcome; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterPermanentCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.game.events.GameEvent; -import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; import mage.target.common.TargetCardInLibrary; import mage.target.targetpointer.FixedTarget; @@ -36,11 +35,11 @@ import mage.target.targetpointer.FixedTarget; */ public final class DefiantVanguard extends CardImpl { - private static final FilterPermanentCard filter = new FilterPermanentCard("Rebel permanent card with converted mana cost 4 or less"); + private static final FilterPermanentCard filter = new FilterPermanentCard("Rebel permanent card with mana value 4 or less"); static { filter.add(SubType.REBEL.getPredicate()); - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 5)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 5)); } public DefiantVanguard(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DemonlordBelzenlok.java b/Mage.Sets/src/mage/cards/d/DemonlordBelzenlok.java index 01bc5612a11..6c11b5e926d 100644 --- a/Mage.Sets/src/mage/cards/d/DemonlordBelzenlok.java +++ b/Mage.Sets/src/mage/cards/d/DemonlordBelzenlok.java @@ -55,7 +55,7 @@ class DemonlordBelzenlokEffect extends OneShotEffect { public DemonlordBelzenlokEffect() { super(Outcome.Benefit); staticText = "exile cards from the top of your library until you exile a nonland card, then put that card into your hand. " - + "If the card's converted mana cost is 4 or greater, repeat this process. " + + "If the card's mana value is 4 or greater, repeat this process. " + "{this} deals 1 damage to you for each card put into your hand this way"; } @@ -77,7 +77,7 @@ class DemonlordBelzenlokEffect extends OneShotEffect { if (card != null) { controller.moveCards(card, Zone.EXILED, source, game); if (!card.isLand()) { - if (card.getConvertedManaCost() < 4) { + if (card.getManaValue() < 4) { cont = false; } controller.moveCards(card, Zone.HAND, source, game); diff --git a/Mage.Sets/src/mage/cards/d/Despark.java b/Mage.Sets/src/mage/cards/d/Despark.java index cca3d6bcae5..1cd082bc48e 100644 --- a/Mage.Sets/src/mage/cards/d/Despark.java +++ b/Mage.Sets/src/mage/cards/d/Despark.java @@ -6,7 +6,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.ComparisonType; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.target.TargetPermanent; import java.util.UUID; @@ -17,10 +17,10 @@ import java.util.UUID; public final class Despark extends CardImpl { private static final FilterPermanent filter - = new FilterPermanent("permanent with converted mana cost 4 or greater"); + = new FilterPermanent("permanent with mana value 4 or greater"); static { - filter.add(new ConvertedManaCostPredicate(ComparisonType.MORE_THAN, 3)); + filter.add(new ManaValuePredicate(ComparisonType.MORE_THAN, 3)); } public Despark(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/Detonate.java b/Mage.Sets/src/mage/cards/d/Detonate.java index 7f304d0b8cd..783fe1d1ffa 100644 --- a/Mage.Sets/src/mage/cards/d/Detonate.java +++ b/Mage.Sets/src/mage/cards/d/Detonate.java @@ -11,7 +11,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.ComparisonType; import mage.filter.common.FilterArtifactPermanent; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.target.common.TargetArtifactPermanent; import mage.target.targetadjustment.TargetAdjuster; @@ -28,7 +28,7 @@ public final class Detonate extends CardImpl { // Destroy target artifact with converted mana cost X. It can't be regenerated. Detonate deals X damage to that artifact's controller. this.getSpellAbility().addEffect(new DestroyTargetEffect(true)); - this.getSpellAbility().addTarget(new TargetArtifactPermanent(new FilterArtifactPermanent("artifact with converted mana cost X"))); + this.getSpellAbility().addTarget(new TargetArtifactPermanent(new FilterArtifactPermanent("artifact with mana value X"))); Effect effect = new DamageTargetControllerEffect(ManacostVariableValue.instance); effect.setText("{this} deals X damage to that artifact's controller"); this.getSpellAbility().addEffect(effect); @@ -52,8 +52,8 @@ enum DetonateAdjuster implements TargetAdjuster { public void adjustTargets(Ability ability, Game game) { ability.getTargets().clear(); int xValue = ability.getManaCostsToPay().getX(); - FilterArtifactPermanent filter = new FilterArtifactPermanent("artifact with converted mana cost X"); - filter.add(new ConvertedManaCostPredicate(ComparisonType.EQUAL_TO, xValue)); + FilterArtifactPermanent filter = new FilterArtifactPermanent("artifact with mana value X"); + filter.add(new ManaValuePredicate(ComparisonType.EQUAL_TO, xValue)); ability.addTarget(new TargetArtifactPermanent(filter)); } } \ No newline at end of file diff --git a/Mage.Sets/src/mage/cards/d/DevotedCropMate.java b/Mage.Sets/src/mage/cards/d/DevotedCropMate.java index 438256ca7e8..2ff3a4902d7 100644 --- a/Mage.Sets/src/mage/cards/d/DevotedCropMate.java +++ b/Mage.Sets/src/mage/cards/d/DevotedCropMate.java @@ -13,7 +13,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.ComparisonType; import mage.filter.common.FilterCreatureCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.target.common.TargetCardInYourGraveyard; /** @@ -22,10 +22,10 @@ import mage.target.common.TargetCardInYourGraveyard; */ public final class DevotedCropMate extends CardImpl { - private static final FilterCreatureCard filter = new FilterCreatureCard("creature card with converted mana cost 2 or less from your graveyard"); + private static final FilterCreatureCard filter = new FilterCreatureCard("creature card with mana value 2 or less from your graveyard"); static { - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 3)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 3)); } public DevotedCropMate(UUID ownerId, CardSetInfo setInfo) { @@ -38,7 +38,7 @@ public final class DevotedCropMate extends CardImpl { // You may exert Devoted Crop-Mate as it attacks. When you do, return target creature card with converted mana cost 2 or less from your graveyard to the battlefield. Effect effect = new ReturnFromGraveyardToBattlefieldTargetEffect(); - effect.setText("return target creature card with converted mana cost 2 or less from your graveyard to the battlefield"); + effect.setText("return target creature card with mana value 2 or less from your graveyard to the battlefield"); BecomesExertSourceTriggeredAbility ability = new BecomesExertSourceTriggeredAbility(effect); ability.addTarget(new TargetCardInYourGraveyard(filter)); addAbility(new ExertAbility(ability)); diff --git a/Mage.Sets/src/mage/cards/d/DisasterRadius.java b/Mage.Sets/src/mage/cards/d/DisasterRadius.java index 7173de1d619..36922e1ac27 100644 --- a/Mage.Sets/src/mage/cards/d/DisasterRadius.java +++ b/Mage.Sets/src/mage/cards/d/DisasterRadius.java @@ -54,7 +54,7 @@ class DisasterRadiusEffect extends OneShotEffect { public DisasterRadiusEffect() { super(Outcome.GainLife); - staticText = "{this} deals X damage to each creature your opponents control, where X is the revealed card's converted mana cost"; + staticText = "{this} deals X damage to each creature your opponents control, where X is the revealed card's mana value"; } public DisasterRadiusEffect(DisasterRadiusEffect effect) { @@ -65,7 +65,7 @@ class DisasterRadiusEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { RevealTargetFromHandCost cost = (RevealTargetFromHandCost) source.getCosts().get(0); if (cost != null) { - int damage = cost.convertedManaCosts; + int damage = cost.manaValues; for (Permanent creature : game.getBattlefield().getActivePermanents(filter, source.getControllerId(), game)) { if (creature != null) { creature.damage(damage, source.getSourceId(), source, game, false, false); diff --git a/Mage.Sets/src/mage/cards/d/DiscipleOfDeceit.java b/Mage.Sets/src/mage/cards/d/DiscipleOfDeceit.java index 91b50ce7845..4f3d2ffa121 100644 --- a/Mage.Sets/src/mage/cards/d/DiscipleOfDeceit.java +++ b/Mage.Sets/src/mage/cards/d/DiscipleOfDeceit.java @@ -19,7 +19,7 @@ import mage.constants.ComparisonType; import mage.constants.Outcome; import mage.filter.FilterCard; import mage.filter.common.FilterNonlandCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCardInHand; @@ -58,7 +58,7 @@ class DiscipleOfDeceitEffect extends OneShotEffect { public DiscipleOfDeceitEffect() { super(Outcome.Benefit); - this.staticText = "you may discard a nonland card. If you do, search your library for a card with the same converted mana cost as that card, reveal it, put it into your hand, then shuffle your library"; + this.staticText = "you may discard a nonland card. If you do, search your library for a card with the same mana value as that card, reveal it, put it into your hand, then shuffle your library"; } public DiscipleOfDeceitEffect(final DiscipleOfDeceitEffect effect) { @@ -84,9 +84,9 @@ class DiscipleOfDeceitEffect extends OneShotEffect { if (card == null) { return false; } - String targetName = "card with converted mana cost of " + card.getConvertedManaCost(); + String targetName = "card with mana value of " + card.getManaValue(); FilterCard filter = new FilterCard(targetName); - filter.add(new ConvertedManaCostPredicate(ComparisonType.EQUAL_TO, card.getConvertedManaCost())); + filter.add(new ManaValuePredicate(ComparisonType.EQUAL_TO, card.getManaValue())); return new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filter), true, true).apply(game, source); } } diff --git a/Mage.Sets/src/mage/cards/d/DiscoveryDispersal.java b/Mage.Sets/src/mage/cards/d/DiscoveryDispersal.java index 6daa999a758..08cbf7a1024 100644 --- a/Mage.Sets/src/mage/cards/d/DiscoveryDispersal.java +++ b/Mage.Sets/src/mage/cards/d/DiscoveryDispersal.java @@ -13,7 +13,7 @@ import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.common.FilterNonlandPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.filter.predicate.permanent.ControllerIdPredicate; import mage.filter.predicate.permanent.PermanentIdPredicate; import mage.game.Game; @@ -68,7 +68,7 @@ class DispersalEffect extends OneShotEffect { DispersalEffect() { super(Outcome.Benefit); this.staticText = "Each opponent returns a nonland permanent " - + "they control with the highest converted mana cost " + + "they control with the highest mana value " + "among permanents they control to its owner's hand, " + "then discards a card."; } @@ -97,11 +97,11 @@ class DispersalEffect extends OneShotEffect { int highestCMC = 0; for (Permanent permanent : game.getBattlefield().getAllActivePermanents(opponentId)) { if (permanent != null) { - highestCMC = Math.max(highestCMC, permanent.getConvertedManaCost()); + highestCMC = Math.max(highestCMC, permanent.getManaValue()); } } - FilterPermanent filter = new FilterNonlandPermanent("permanent you control with converted mana cost " + highestCMC); - filter.add(new ConvertedManaCostPredicate(ComparisonType.EQUAL_TO, highestCMC)); + FilterPermanent filter = new FilterNonlandPermanent("permanent you control with mana value " + highestCMC); + filter.add(new ManaValuePredicate(ComparisonType.EQUAL_TO, highestCMC)); filter.add(new ControllerIdPredicate(opponentId)); Target target = new TargetPermanent(1, 1, filter, true); if (opponent.choose(outcome, target, source.getSourceId(), game)) { diff --git a/Mage.Sets/src/mage/cards/d/DisdainfulStroke.java b/Mage.Sets/src/mage/cards/d/DisdainfulStroke.java index 5082249070a..c89c82ed6c5 100644 --- a/Mage.Sets/src/mage/cards/d/DisdainfulStroke.java +++ b/Mage.Sets/src/mage/cards/d/DisdainfulStroke.java @@ -8,7 +8,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.ComparisonType; import mage.filter.FilterSpell; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.target.TargetSpell; /** @@ -17,9 +17,9 @@ import mage.target.TargetSpell; */ public final class DisdainfulStroke extends CardImpl { - private static final FilterSpell filter = new FilterSpell("spell with converted mana cost 4 or greater"); + private static final FilterSpell filter = new FilterSpell("spell with mana value 4 or greater"); static { - filter.add(new ConvertedManaCostPredicate(ComparisonType.MORE_THAN, 3)); + filter.add(new ManaValuePredicate(ComparisonType.MORE_THAN, 3)); } public DisdainfulStroke(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/Disembowel.java b/Mage.Sets/src/mage/cards/d/Disembowel.java index 8aaf662e7f2..2ccbf96e1d1 100644 --- a/Mage.Sets/src/mage/cards/d/Disembowel.java +++ b/Mage.Sets/src/mage/cards/d/Disembowel.java @@ -8,7 +8,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.ComparisonType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.target.common.TargetCreaturePermanent; import mage.target.targetadjustment.TargetAdjuster; @@ -24,7 +24,7 @@ public final class Disembowel extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{X}{B}"); // Destroy target creature with converted mana cost X. - this.getSpellAbility().addEffect(new DestroyTargetEffect("creature with converted mana cost X")); + this.getSpellAbility().addEffect(new DestroyTargetEffect("creature with mana value X")); this.getSpellAbility().setTargetAdjuster(DisembowelAdjuster.instance); } @@ -45,8 +45,8 @@ enum DisembowelAdjuster implements TargetAdjuster { public void adjustTargets(Ability ability, Game game) { ability.getTargets().clear(); int xValue = ability.getManaCostsToPay().getX(); - FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with converted mana cost X"); - filter.add(new ConvertedManaCostPredicate(ComparisonType.EQUAL_TO, xValue)); + FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with mana value X"); + filter.add(new ManaValuePredicate(ComparisonType.EQUAL_TO, xValue)); ability.addTarget(new TargetCreaturePermanent(filter)); } } \ No newline at end of file diff --git a/Mage.Sets/src/mage/cards/d/DispersalShield.java b/Mage.Sets/src/mage/cards/d/DispersalShield.java index 53c633ae169..4c0372ceb12 100644 --- a/Mage.Sets/src/mage/cards/d/DispersalShield.java +++ b/Mage.Sets/src/mage/cards/d/DispersalShield.java @@ -4,7 +4,7 @@ package mage.cards.d; import java.util.UUID; import mage.abilities.Ability; import mage.abilities.dynamicvalue.DynamicValue; -import mage.abilities.dynamicvalue.common.HighestConvertedManaCostValue; +import mage.abilities.dynamicvalue.common.HighestManaValueCount; import mage.abilities.effects.Effect; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; @@ -43,7 +43,7 @@ class DispersalShieldEffect extends OneShotEffect { public DispersalShieldEffect() { super(Outcome.Detriment); - staticText = "Counter target spell if its converted mana cost is less than or equal to the highest converted mana cost among permanents you control"; + staticText = "Counter target spell if its mana value is less than or equal to the highest mana value among permanents you control"; } public DispersalShieldEffect(DispersalShieldEffect effect) { @@ -57,9 +57,9 @@ class DispersalShieldEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - DynamicValue amount = new HighestConvertedManaCostValue(); + DynamicValue amount = new HighestManaValueCount(); Spell spell = game.getStack().getSpell(targetPointer.getFirst(game, source)); - if (spell != null && spell.getConvertedManaCost() <= amount.calculate(game, source, this)) { + if (spell != null && spell.getManaValue() <= amount.calculate(game, source, this)) { return game.getStack().counter(source.getFirstTarget(), source, game); } return false; diff --git a/Mage.Sets/src/mage/cards/d/DisplacementWave.java b/Mage.Sets/src/mage/cards/d/DisplacementWave.java index 7851fc629fa..d05fc94cde7 100644 --- a/Mage.Sets/src/mage/cards/d/DisplacementWave.java +++ b/Mage.Sets/src/mage/cards/d/DisplacementWave.java @@ -42,7 +42,7 @@ class DisplacementWaveEffect extends OneShotEffect { DisplacementWaveEffect() { super(Outcome.ReturnToHand); - staticText = "Return all nonland permanents with converted mana cost X or less to their owners' hands"; + staticText = "Return all nonland permanents with mana value X or less to their owners' hands"; } private DisplacementWaveEffect(final DisplacementWaveEffect effect) { @@ -62,7 +62,7 @@ class DisplacementWaveEffect extends OneShotEffect { } Cards cards = new CardsImpl(); for (Permanent permanent : game.getBattlefield().getActivePermanents(source.getControllerId(), game)) { - if (!permanent.isLand() && permanent.getConvertedManaCost() <= source.getManaCostsToPay().getX()) { + if (!permanent.isLand() && permanent.getManaValue() <= source.getManaCostsToPay().getX()) { cards.add(permanent); } } diff --git a/Mage.Sets/src/mage/cards/d/DisruptingShoal.java b/Mage.Sets/src/mage/cards/d/DisruptingShoal.java index 9b628102292..b0c7d91c62d 100644 --- a/Mage.Sets/src/mage/cards/d/DisruptingShoal.java +++ b/Mage.Sets/src/mage/cards/d/DisruptingShoal.java @@ -34,7 +34,7 @@ public final class DisruptingShoal extends CardImpl { this.subtype.add(SubType.ARCANE); // You may exile a blue card with converted mana cost X from your hand rather than pay Disrupting Shoal's mana cost. - FilterOwnedCard filter = new FilterOwnedCard("a blue card with converted mana cost X from your hand"); + FilterOwnedCard filter = new FilterOwnedCard("a blue card with mana value X from your hand"); filter.add(new ColorPredicate(ObjectColor.BLUE)); filter.add(Predicates.not(new CardIdPredicate(this.getId()))); // the exile cost can never be paid with the card itself this.addAbility(new AlternativeCostSourceAbility(new ExileFromHandCost(new TargetCardInHand(filter), true))); @@ -73,17 +73,17 @@ class DisruptingShoalCounterTargetEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { Spell spell = game.getStack().getSpell(targetPointer.getFirst(game, source)); - if (spell != null && isConvertedManaCostEqual(source, spell.getConvertedManaCost())) { + if (spell != null && isManaValueEqual(source, spell.getManaValue())) { return game.getStack().counter(source.getFirstTarget(), source, game); } return false; } - private boolean isConvertedManaCostEqual(Ability sourceAbility, int amount) { + private boolean isManaValueEqual(Ability sourceAbility, int amount) { for (Cost cost : sourceAbility.getCosts()) { if (cost.isPaid() && cost instanceof ExileFromHandCost) { for (Card card : ((ExileFromHandCost) cost).getCards()) { - return card.getConvertedManaCost() == amount; + return card.getManaValue() == amount; } return false; } @@ -94,7 +94,7 @@ class DisruptingShoalCounterTargetEffect extends OneShotEffect { @Override public String getText(Mode mode) { - return "Counter target spell if its converted mana cost is X"; + return "Counter target spell if its mana value is X"; } } diff --git a/Mage.Sets/src/mage/cards/d/DistendedMindbender.java b/Mage.Sets/src/mage/cards/d/DistendedMindbender.java index a44e1353836..3a3f64d7b50 100644 --- a/Mage.Sets/src/mage/cards/d/DistendedMindbender.java +++ b/Mage.Sets/src/mage/cards/d/DistendedMindbender.java @@ -16,7 +16,7 @@ import mage.constants.Outcome; import mage.constants.SubType; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.players.Player; import mage.target.TargetCard; @@ -59,19 +59,19 @@ public final class DistendedMindbender extends CardImpl { class DistendedMindbenderEffect extends OneShotEffect { - private static final FilterCard filterFourOrGreater = new FilterCard("a card from it with converted mana cost 4 or greater"); - private static final FilterCard filterThreeOrLess = new FilterCard("a nonland card from it with converted mana cost 3 or less"); + private static final FilterCard filterFourOrGreater = new FilterCard("a card from it with mana value 4 or greater"); + private static final FilterCard filterThreeOrLess = new FilterCard("a nonland card from it with mana value 3 or less"); static { - filterFourOrGreater.add(new ConvertedManaCostPredicate(ComparisonType.MORE_THAN, 3)); - filterThreeOrLess.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 4)); + filterFourOrGreater.add(new ManaValuePredicate(ComparisonType.MORE_THAN, 3)); + filterThreeOrLess.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 4)); filterThreeOrLess.add(Predicates.not(CardType.LAND.getPredicate())); } public DistendedMindbenderEffect() { super(Outcome.Discard); - this.staticText = "target opponent reveals their hand. You choose from it a nonland card with converted mana cost 3 or less and a card with " - + "converted mana cost 4 or greater. That player discards those cards."; + this.staticText = "target opponent reveals their hand. You choose from it a nonland card with mana value 3 or less and a card with " + + "mana value 4 or greater. That player discards those cards."; } public DistendedMindbenderEffect(final DistendedMindbenderEffect effect) { diff --git a/Mage.Sets/src/mage/cards/d/DivideByZero.java b/Mage.Sets/src/mage/cards/d/DivideByZero.java index befb29c14c6..4852b204f0e 100644 --- a/Mage.Sets/src/mage/cards/d/DivideByZero.java +++ b/Mage.Sets/src/mage/cards/d/DivideByZero.java @@ -8,7 +8,7 @@ import mage.constants.CardType; import mage.constants.ComparisonType; import mage.filter.common.FilterSpellOrPermanent; import mage.filter.predicate.Predicate; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.target.common.TargetSpellOrPermanent; import java.util.UUID; @@ -21,7 +21,7 @@ public final class DivideByZero extends CardImpl { private static final FilterSpellOrPermanent filter = new FilterSpellOrPermanent("spell or permanent with mana value 1 or greater"); private static final Predicate predicate - = new ConvertedManaCostPredicate(ComparisonType.MORE_THAN, 0); + = new ManaValuePredicate(ComparisonType.MORE_THAN, 0); static { filter.getPermanentFilter().add(predicate); diff --git a/Mage.Sets/src/mage/cards/d/DivineOffering.java b/Mage.Sets/src/mage/cards/d/DivineOffering.java index 458ec7c33cd..bb48f8d734c 100644 --- a/Mage.Sets/src/mage/cards/d/DivineOffering.java +++ b/Mage.Sets/src/mage/cards/d/DivineOffering.java @@ -2,7 +2,7 @@ package mage.cards.d; import java.util.UUID; -import mage.abilities.dynamicvalue.common.TargetConvertedManaCost; +import mage.abilities.dynamicvalue.common.TargetManaValue; import mage.abilities.effects.Effect; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.effects.common.GainLifeEffect; @@ -23,8 +23,8 @@ public final class DivineOffering extends CardImpl { // Destroy target artifact. You gain life equal to its converted mana cost. this.getSpellAbility().addEffect(new DestroyTargetEffect()); - Effect effect = new GainLifeEffect(TargetConvertedManaCost.instance); - effect.setText("You gain life equal to its converted mana cost"); + Effect effect = new GainLifeEffect(TargetManaValue.instance); + effect.setText("You gain life equal to its mana value"); this.getSpellAbility().addEffect(effect); this.getSpellAbility().addTarget(new TargetArtifactPermanent()); } diff --git a/Mage.Sets/src/mage/cards/d/Dominate.java b/Mage.Sets/src/mage/cards/d/Dominate.java index e47c5d85154..1449ca8b771 100644 --- a/Mage.Sets/src/mage/cards/d/Dominate.java +++ b/Mage.Sets/src/mage/cards/d/Dominate.java @@ -9,7 +9,7 @@ import mage.constants.ComparisonType; import mage.constants.Duration; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.target.common.TargetCreaturePermanent; import mage.target.targetadjustment.TargetAdjuster; @@ -26,7 +26,7 @@ public final class Dominate extends CardImpl { // Gain control of target creature with converted mana cost X or less. this.getSpellAbility().addEffect(new GainControlTargetEffect(Duration.Custom, true)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(new FilterCreaturePermanent("creature with converted mana cost X or less"))); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(new FilterCreaturePermanent("creature with mana value X or less"))); this.getSpellAbility().setTargetAdjuster(DominateAdjuster.instance); } @@ -47,8 +47,8 @@ enum DominateAdjuster implements TargetAdjuster { public void adjustTargets(Ability ability, Game game) { ability.getTargets().clear(); int xValue = ability.getManaCostsToPay().getX(); - FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with converted mana cost X or less"); - filter.add(Predicates.not(new ConvertedManaCostPredicate(ComparisonType.MORE_THAN, xValue))); + FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with mana value X or less"); + filter.add(Predicates.not(new ManaValuePredicate(ComparisonType.MORE_THAN, xValue))); ability.addTarget(new TargetCreaturePermanent(filter)); } } \ No newline at end of file diff --git a/Mage.Sets/src/mage/cards/d/Dovescape.java b/Mage.Sets/src/mage/cards/d/Dovescape.java index 86088d5d282..31370e44374 100644 --- a/Mage.Sets/src/mage/cards/d/Dovescape.java +++ b/Mage.Sets/src/mage/cards/d/Dovescape.java @@ -50,7 +50,7 @@ class DovescapeEffect extends OneShotEffect { DovescapeEffect() { super(Outcome.Benefit); - this.staticText = "counter that spell. That player creates X 1/1 white and blue Bird creature tokens with flying, where X is the spell's converted mana cost"; + this.staticText = "counter that spell. That player creates X 1/1 white and blue Bird creature tokens with flying, where X is the spell's mana value"; } DovescapeEffect(final DovescapeEffect effect) { @@ -68,7 +68,7 @@ class DovescapeEffect extends OneShotEffect { int spellCMC = 0; UUID spellControllerID = null; if (spell != null) { - spellCMC = spell.getConvertedManaCost(); + spellCMC = spell.getManaValue(); spellControllerID = spell.getControllerId(); game.getStack().counter(spell.getId(), source, game); } diff --git a/Mage.Sets/src/mage/cards/d/DrJuliusJumblemorph.java b/Mage.Sets/src/mage/cards/d/DrJuliusJumblemorph.java index ad413e81a6a..e335a1dade1 100644 --- a/Mage.Sets/src/mage/cards/d/DrJuliusJumblemorph.java +++ b/Mage.Sets/src/mage/cards/d/DrJuliusJumblemorph.java @@ -10,7 +10,7 @@ import mage.constants.CardType; import mage.constants.ComparisonType; import mage.constants.SuperType; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import java.util.UUID; @@ -22,7 +22,7 @@ public final class DrJuliusJumblemorph extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("a host"); static { - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, -1)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, -1)); } public DrJuliusJumblemorph(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DraconicIntervention.java b/Mage.Sets/src/mage/cards/d/DraconicIntervention.java index 6e49f0f5d8b..59b53d11844 100644 --- a/Mage.Sets/src/mage/cards/d/DraconicIntervention.java +++ b/Mage.Sets/src/mage/cards/d/DraconicIntervention.java @@ -76,7 +76,7 @@ enum DraconicInterventionValue implements DynamicValue { .map(ExileFromGraveCost::getExiledCards) .flatMap(Collection::stream) .filter(Objects::nonNull) - .map(MageObject::getConvertedManaCost) + .map(MageObject::getManaValue) .findFirst() .orElse(0); } diff --git a/Mage.Sets/src/mage/cards/d/DragonBreath.java b/Mage.Sets/src/mage/cards/d/DragonBreath.java index ecebae65924..e068bc911b9 100644 --- a/Mage.Sets/src/mage/cards/d/DragonBreath.java +++ b/Mage.Sets/src/mage/cards/d/DragonBreath.java @@ -18,7 +18,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -31,9 +31,9 @@ import mage.target.common.TargetCreaturePermanent; */ public final class DragonBreath extends CardImpl { - private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("a creature with converted mana cost 6 or greater"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("a creature with mana value 6 or greater"); static { - filter.add(new ConvertedManaCostPredicate(ComparisonType.MORE_THAN, 5)); + filter.add(new ManaValuePredicate(ComparisonType.MORE_THAN, 5)); } public DragonBreath(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DragonFangs.java b/Mage.Sets/src/mage/cards/d/DragonFangs.java index cf21cea961b..79f652d8ca3 100644 --- a/Mage.Sets/src/mage/cards/d/DragonFangs.java +++ b/Mage.Sets/src/mage/cards/d/DragonFangs.java @@ -16,7 +16,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -29,9 +29,9 @@ import mage.target.common.TargetCreaturePermanent; */ public final class DragonFangs extends CardImpl { - private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("a creature with converted mana cost 6 or greater"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("a creature with mana value 6 or greater"); static { - filter.add(new ConvertedManaCostPredicate(ComparisonType.MORE_THAN, 5)); + filter.add(new ManaValuePredicate(ComparisonType.MORE_THAN, 5)); } public DragonFangs(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DragonScales.java b/Mage.Sets/src/mage/cards/d/DragonScales.java index 69623860976..0128adc3df2 100644 --- a/Mage.Sets/src/mage/cards/d/DragonScales.java +++ b/Mage.Sets/src/mage/cards/d/DragonScales.java @@ -16,7 +16,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -29,9 +29,9 @@ import mage.target.common.TargetCreaturePermanent; */ public final class DragonScales extends CardImpl { - private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("a creature with converted mana cost 6 or greater"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("a creature with mana value 6 or greater"); static { - filter.add(new ConvertedManaCostPredicate(ComparisonType.MORE_THAN, 5)); + filter.add(new ManaValuePredicate(ComparisonType.MORE_THAN, 5)); } public DragonScales(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DragonShadow.java b/Mage.Sets/src/mage/cards/d/DragonShadow.java index 4ed5cd4b93e..21ea31de54e 100644 --- a/Mage.Sets/src/mage/cards/d/DragonShadow.java +++ b/Mage.Sets/src/mage/cards/d/DragonShadow.java @@ -16,7 +16,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -29,9 +29,9 @@ import mage.target.common.TargetCreaturePermanent; */ public final class DragonShadow extends CardImpl { - private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("a creature with converted mana cost 6 or greater"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("a creature with mana value 6 or greater"); static { - filter.add(new ConvertedManaCostPredicate(ComparisonType.MORE_THAN, 5)); + filter.add(new ManaValuePredicate(ComparisonType.MORE_THAN, 5)); } public DragonShadow(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DragonWings.java b/Mage.Sets/src/mage/cards/d/DragonWings.java index 6a7b9a7da70..a5d4cd60713 100644 --- a/Mage.Sets/src/mage/cards/d/DragonWings.java +++ b/Mage.Sets/src/mage/cards/d/DragonWings.java @@ -17,7 +17,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -30,9 +30,9 @@ import mage.target.common.TargetCreaturePermanent; */ public final class DragonWings extends CardImpl { - private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("a creature with converted mana cost 6 or greater"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("a creature with mana value 6 or greater"); static { - filter.add(new ConvertedManaCostPredicate(ComparisonType.MORE_THAN, 5)); + filter.add(new ManaValuePredicate(ComparisonType.MORE_THAN, 5)); } public DragonWings(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DrainingWhelk.java b/Mage.Sets/src/mage/cards/d/DrainingWhelk.java index cf659a978a1..068124c6772 100644 --- a/Mage.Sets/src/mage/cards/d/DrainingWhelk.java +++ b/Mage.Sets/src/mage/cards/d/DrainingWhelk.java @@ -57,7 +57,7 @@ class DrainingWhelkEffect extends CounterTargetEffect { DrainingWhelkEffect() { super(); - staticText = "counter target spell. Put X +1/+1 counters on Draining Whelk, where X is that spell's converted mana cost"; + staticText = "counter target spell. Put X +1/+1 counters on Draining Whelk, where X is that spell's mana value"; } DrainingWhelkEffect(final DrainingWhelkEffect effect) { @@ -73,7 +73,7 @@ class DrainingWhelkEffect extends CounterTargetEffect { public boolean apply(Game game, Ability source) { Spell targetSpell = game.getStack().getSpell(getTargetPointer().getFirst(game, source)); if (targetSpell != null) { - int spellCMC = targetSpell.getConvertedManaCost(); + int spellCMC = targetSpell.getManaValue(); super.apply(game, source); new AddCountersSourceEffect(CounterType.P1P1.createInstance(spellCMC)).apply(game, source); return true; diff --git a/Mage.Sets/src/mage/cards/d/DralnusPet.java b/Mage.Sets/src/mage/cards/d/DralnusPet.java index 1d4f430c0e4..6c4ccd33688 100644 --- a/Mage.Sets/src/mage/cards/d/DralnusPet.java +++ b/Mage.Sets/src/mage/cards/d/DralnusPet.java @@ -50,7 +50,7 @@ public final class DralnusPet extends CardImpl { this.addAbility(new KickerAbility(kickerCosts)); // If Dralnu's Pet was kicked, it enters the battlefield with flying and with X +1/+1 counters on it, where X is the discarded card's converted mana cost. Ability ability = new EntersBattlefieldAbility(new DralnusPetEffect(), KickedCondition.instance, - "If {this} was kicked, it enters the battlefield with flying and with X +1/+1 counters on it, where X is the discarded card's converted mana cost.", ""); + "If {this} was kicked, it enters the battlefield with flying and with X +1/+1 counters on it, where X is the discarded card's mana value.", ""); ability.addEffect(new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.WhileOnBattlefield)); this.addAbility(ability); } @@ -69,7 +69,7 @@ class DralnusPetEffect extends OneShotEffect { public DralnusPetEffect() { super(Outcome.BoostCreature); - this.staticText = "and with X +1/+1 counters on it, where X is the discarded card's converted mana cost"; + this.staticText = "and with X +1/+1 counters on it, where X is the discarded card's mana value"; } public DralnusPetEffect(final DralnusPetEffect effect) { @@ -96,7 +96,7 @@ class DralnusPetEffect extends OneShotEffect { int cmc = 0; for (Cost cost : spellAbility.getCosts()) { if (cost instanceof DiscardCardCost && !((DiscardCardCost) cost).getCards().isEmpty()) { - cmc = ((DiscardCardCost) cost).getCards().get(0).getConvertedManaCost(); + cmc = ((DiscardCardCost) cost).getCards().get(0).getManaValue(); } if (cmc > 0) { return new AddCountersSourceEffect(CounterType.P1P1.createInstance(cmc), true).apply(game, source); diff --git a/Mage.Sets/src/mage/cards/d/DreadhordeArcanist.java b/Mage.Sets/src/mage/cards/d/DreadhordeArcanist.java index 0df75782b32..e472ef97f5a 100644 --- a/Mage.Sets/src/mage/cards/d/DreadhordeArcanist.java +++ b/Mage.Sets/src/mage/cards/d/DreadhordeArcanist.java @@ -32,7 +32,7 @@ import mage.ApprovingObject; public final class DreadhordeArcanist extends CardImpl { private static final FilterCard filter = new FilterInstantOrSorceryCard( - "instant or sorcery card with converted mana cost less than or equal to this creature's power" + "instant or sorcery card with mana value less than or equal to this creature's power" ); static { @@ -76,7 +76,7 @@ enum DreadhordeArcanistPredicate implements ObjectSourcePlayerPredicate input, Game game) { Permanent sourcePermanent = game.getPermanentOrLKIBattlefield(input.getSourceId()); return sourcePermanent != null - & input.getObject().getConvertedManaCost() <= sourcePermanent.getPower().getValue(); + & input.getObject().getManaValue() <= sourcePermanent.getPower().getValue(); } } @@ -84,7 +84,7 @@ class DreadhordeArcanistEffect extends OneShotEffect { DreadhordeArcanistEffect() { super(Outcome.PlayForFree); - this.staticText = "you may cast target instant or sorcery card with converted mana cost " + this.staticText = "you may cast target instant or sorcery card with mana value " + "less than or equal to {this}'s power from your graveyard without paying its mana cost. " + "If that card would be put into your graveyard this turn, exile it instead."; } diff --git a/Mage.Sets/src/mage/cards/d/DriverOfTheDead.java b/Mage.Sets/src/mage/cards/d/DriverOfTheDead.java index 00c34c3d634..e3e848ceaeb 100644 --- a/Mage.Sets/src/mage/cards/d/DriverOfTheDead.java +++ b/Mage.Sets/src/mage/cards/d/DriverOfTheDead.java @@ -12,7 +12,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.ComparisonType; import mage.filter.common.FilterCreatureCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.target.Target; import mage.target.common.TargetCardInYourGraveyard; @@ -21,10 +21,10 @@ import mage.target.common.TargetCardInYourGraveyard; */ public final class DriverOfTheDead extends CardImpl { - private static final FilterCreatureCard filter = new FilterCreatureCard("creature card with converted mana cost 2 or less from your graveyard"); + private static final FilterCreatureCard filter = new FilterCreatureCard("creature card with mana value 2 or less from your graveyard"); static { - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 3)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 3)); } public DriverOfTheDead(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DroningBureaucrats.java b/Mage.Sets/src/mage/cards/d/DroningBureaucrats.java index f100d135e0c..bc16f08bd03 100644 --- a/Mage.Sets/src/mage/cards/d/DroningBureaucrats.java +++ b/Mage.Sets/src/mage/cards/d/DroningBureaucrats.java @@ -17,7 +17,7 @@ import mage.constants.ComparisonType; import mage.constants.Duration; import mage.constants.Outcome; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; /** @@ -54,7 +54,7 @@ class DroningBureaucratsEffect extends OneShotEffect { DroningBureaucratsEffect() { super(Outcome.Benefit); - this.staticText = "Each creature with converted mana cost X can't attack or block this turn"; + this.staticText = "Each creature with mana value X can't attack or block this turn"; } DroningBureaucratsEffect(final DroningBureaucratsEffect effect) { @@ -69,8 +69,8 @@ class DroningBureaucratsEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { int xValue = source.getManaCostsToPay().getX(); - FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with converted mana cost X"); - filter.add(new ConvertedManaCostPredicate(ComparisonType.EQUAL_TO, xValue)); + FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with mana value X"); + filter.add(new ManaValuePredicate(ComparisonType.EQUAL_TO, xValue)); game.addEffect(new CantAttackBlockAllEffect(Duration.EndOfTurn, filter), source); return true; } diff --git a/Mage.Sets/src/mage/cards/d/DrownInTheLoch.java b/Mage.Sets/src/mage/cards/d/DrownInTheLoch.java index 0fcbf673e25..7a84ffa4ee6 100644 --- a/Mage.Sets/src/mage/cards/d/DrownInTheLoch.java +++ b/Mage.Sets/src/mage/cards/d/DrownInTheLoch.java @@ -24,10 +24,10 @@ import java.util.UUID; public final class DrownInTheLoch extends CardImpl { private static final FilterSpell filter - = new FilterSpell("spell with converted mana cost less than or equal to " + + = new FilterSpell("spell with mana value less than or equal to " + "the number of cards in its controller's graveyard"); private static final FilterPermanent filter2 - = new FilterCreaturePermanent("creature with converted mana cost less than or equal to " + + = new FilterCreaturePermanent("creature with mana value less than or equal to " + "the number of cards in its controller's graveyard"); static { @@ -65,6 +65,6 @@ enum DrownInTheLochPredicate implements Predicate { @Override public boolean apply(MageObject input, Game game) { Player player = game.getPlayer(game.getControllerId(input.getId())); - return player != null && input.getConvertedManaCost() <= player.getGraveyard().size(); + return player != null && input.getManaValue() <= player.getGraveyard().size(); } } \ No newline at end of file diff --git a/Mage.Sets/src/mage/cards/d/DualStrike.java b/Mage.Sets/src/mage/cards/d/DualStrike.java index 1bd267eacea..bbc143e43fc 100644 --- a/Mage.Sets/src/mage/cards/d/DualStrike.java +++ b/Mage.Sets/src/mage/cards/d/DualStrike.java @@ -68,7 +68,7 @@ class DualStrikeAbility extends DelayedTriggeredAbility { Spell spell = game.getStack().getSpell(event.getTargetId()); if (spell == null || !spell.isInstantOrSorcery() - || spell.getConvertedManaCost() > 4) { + || spell.getManaValue() > 4) { return false; } this.getEffects().setTargetPointer(new FixedTarget(event.getTargetId())); @@ -78,7 +78,7 @@ class DualStrikeAbility extends DelayedTriggeredAbility { @Override public String getRule() { return "When you cast your next instant or sorcery spell " + - "with converted mana cost 4 or less this turn, " + + "with mana value 4 or less this turn, " + "copy that spell. You may choose new targets for the copy."; } } diff --git a/Mage.Sets/src/mage/cards/d/DuskmantleSeer.java b/Mage.Sets/src/mage/cards/d/DuskmantleSeer.java index 51a515d8693..598a361a174 100644 --- a/Mage.Sets/src/mage/cards/d/DuskmantleSeer.java +++ b/Mage.Sets/src/mage/cards/d/DuskmantleSeer.java @@ -52,7 +52,7 @@ class DuskmantleSeerEffect extends OneShotEffect { public DuskmantleSeerEffect() { super(Outcome.Detriment); - this.staticText = "each player reveals the top card of their library, loses life equal to that card's converted mana cost, then puts it into their hand"; + this.staticText = "each player reveals the top card of their library, loses life equal to that card's mana value, then puts it into their hand"; } public DuskmantleSeerEffect(final DuskmantleSeerEffect effect) { @@ -75,7 +75,7 @@ class DuskmantleSeerEffect extends OneShotEffect { Card card = player.getLibrary().getFromTop(game); if (card != null) { player.revealCards(source, ": Revealed by " + player.getName(), new CardsImpl(card), game); - player.loseLife(card.getConvertedManaCost(), game, source, false); + player.loseLife(card.getManaValue(), game, source, false); player.moveCards(card, Zone.HAND, source, game); } } diff --git a/Mage.Sets/src/mage/cards/e/EasyPrey.java b/Mage.Sets/src/mage/cards/e/EasyPrey.java index 988b57063c0..a008fe9114b 100644 --- a/Mage.Sets/src/mage/cards/e/EasyPrey.java +++ b/Mage.Sets/src/mage/cards/e/EasyPrey.java @@ -9,7 +9,7 @@ import mage.constants.CardType; import mage.constants.ComparisonType; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.target.TargetPermanent; import java.util.UUID; @@ -20,10 +20,10 @@ import java.util.UUID; public final class EasyPrey extends CardImpl { private static final FilterPermanent filter - = new FilterCreaturePermanent("creature with converted mana cost 2 or less"); + = new FilterCreaturePermanent("creature with mana value 2 or less"); static { - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 3)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 3)); } public EasyPrey(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/e/EcologicalAppreciation.java b/Mage.Sets/src/mage/cards/e/EcologicalAppreciation.java index 03f4504155f..89d5224a4b9 100644 --- a/Mage.Sets/src/mage/cards/e/EcologicalAppreciation.java +++ b/Mage.Sets/src/mage/cards/e/EcologicalAppreciation.java @@ -13,7 +13,7 @@ import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.StaticFilters; import mage.filter.common.FilterCreatureCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.players.Player; import mage.target.TargetCard; @@ -75,7 +75,7 @@ class EcologicalAppreciationEffect extends OneShotEffect { } int xValue = source.getManaCostsToPay().getX(); FilterCard filter = new FilterCreatureCard(); - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, xValue + 1)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, xValue + 1)); TargetCard targetCardsInLibrary = new TargetCardInLibrary(0, 4, filter) { @Override public boolean canTarget(UUID playerId, UUID id, Ability source, Game game) { diff --git a/Mage.Sets/src/mage/cards/e/EidolonOfTheGreatRevel.java b/Mage.Sets/src/mage/cards/e/EidolonOfTheGreatRevel.java index e087b053504..afca5fc4de8 100644 --- a/Mage.Sets/src/mage/cards/e/EidolonOfTheGreatRevel.java +++ b/Mage.Sets/src/mage/cards/e/EidolonOfTheGreatRevel.java @@ -13,7 +13,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; -import mage.game.events.GameEvent.EventType; import mage.game.stack.Spell; import mage.target.targetpointer.FixedTarget; @@ -71,7 +70,7 @@ class EidolonOfTheGreatRevelTriggeredAbility extends TriggeredAbilityImpl { @Override public boolean checkTrigger(GameEvent event, Game game) { Spell spell = game.getStack().getSpell(event.getTargetId()); - if (spell != null && spell.getConvertedManaCost() <= 3){ + if (spell != null && spell.getManaValue() <= 3){ for (Effect effect : this.getEffects()) { effect.setTargetPointer(new FixedTarget(event.getPlayerId())); } @@ -82,6 +81,6 @@ class EidolonOfTheGreatRevelTriggeredAbility extends TriggeredAbilityImpl { @Override public String getRule() { - return "Whenever a player casts a spell with converted mana cost 3 or less, {this} deals 2 damage to that player."; + return "Whenever a player casts a spell with mana value 3 or less, {this} deals 2 damage to that player."; } } diff --git a/Mage.Sets/src/mage/cards/e/EldritchEvolution.java b/Mage.Sets/src/mage/cards/e/EldritchEvolution.java index 3d5bbd0a761..96e1afce4a3 100644 --- a/Mage.Sets/src/mage/cards/e/EldritchEvolution.java +++ b/Mage.Sets/src/mage/cards/e/EldritchEvolution.java @@ -16,7 +16,7 @@ import mage.constants.Outcome; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.StaticFilters; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -55,7 +55,7 @@ class EldritchEvolutionEffect extends OneShotEffect { EldritchEvolutionEffect() { super(Outcome.Benefit); - staticText = "Search your library for a creature card with converted mana cost X or less, where X is 2 plus the sacrificed creature's converted mana cost. Put that card " + staticText = "Search your library for a creature card with mana value X or less, where X is 2 plus the sacrificed creature's mana value. Put that card " + "onto the battlefield, then shuffle your library"; } @@ -77,9 +77,9 @@ class EldritchEvolutionEffect extends OneShotEffect { } Player controller = game.getPlayer(source.getControllerId()); if (sacrificedPermanent != null && controller != null) { - int newConvertedCost = sacrificedPermanent.getConvertedManaCost() + 2; - FilterCard filter = new FilterCard("creature card with converted mana cost " + newConvertedCost + " or less"); - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, newConvertedCost+1)); + int newConvertedCost = sacrificedPermanent.getManaValue() + 2; + FilterCard filter = new FilterCard("creature card with mana value " + newConvertedCost + " or less"); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, newConvertedCost+1)); filter.add(CardType.CREATURE.getPredicate()); TargetCardInLibrary target = new TargetCardInLibrary(filter); if (controller.searchLibrary(target, source, game)) { diff --git a/Mage.Sets/src/mage/cards/e/Eliminate.java b/Mage.Sets/src/mage/cards/e/Eliminate.java index 39423122e38..aff0dffe8fa 100644 --- a/Mage.Sets/src/mage/cards/e/Eliminate.java +++ b/Mage.Sets/src/mage/cards/e/Eliminate.java @@ -7,7 +7,7 @@ import mage.constants.CardType; import mage.constants.ComparisonType; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreatureOrPlaneswalkerPermanent; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.target.TargetPermanent; import java.util.UUID; @@ -18,11 +18,11 @@ import java.util.UUID; public final class Eliminate extends CardImpl { private static final FilterPermanent filter = new FilterCreatureOrPlaneswalkerPermanent( - "creature or planeswalker with converted mana cost 3 or less" + "creature or planeswalker with mana value 3 or less" ); static { - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 4)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 4)); } public Eliminate(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/e/EliteArcanist.java b/Mage.Sets/src/mage/cards/e/EliteArcanist.java index e7e4b7d434a..1bc1403f022 100644 --- a/Mage.Sets/src/mage/cards/e/EliteArcanist.java +++ b/Mage.Sets/src/mage/cards/e/EliteArcanist.java @@ -73,7 +73,7 @@ enum EliteArcanistAdjuster implements CostAdjuster { if (imprintedInstant == null) { return; } - int cmc = imprintedInstant.getConvertedManaCost(); + int cmc = imprintedInstant.getManaValue(); if (cmc > 0) { ability.getManaCostsToPay().clear(); ability.getManaCostsToPay().add(new GenericManaCost(cmc)); @@ -132,7 +132,7 @@ class EliteArcanistCopyEffect extends OneShotEffect { public EliteArcanistCopyEffect() { super(Outcome.PlayForFree); this.staticText = "Copy the exiled card. You may cast the copy " - + "without paying its mana cost. X is the converted mana cost of the exiled card"; + + "without paying its mana cost. X is the mana value of the exiled card"; } public EliteArcanistCopyEffect(final EliteArcanistCopyEffect effect) { diff --git a/Mage.Sets/src/mage/cards/e/ElspethConquersDeath.java b/Mage.Sets/src/mage/cards/e/ElspethConquersDeath.java index 83ddd3ce744..ae9ac27fe74 100644 --- a/Mage.Sets/src/mage/cards/e/ElspethConquersDeath.java +++ b/Mage.Sets/src/mage/cards/e/ElspethConquersDeath.java @@ -16,7 +16,7 @@ import mage.counters.CounterType; import mage.filter.FilterCard; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -30,13 +30,13 @@ import mage.util.CardUtil; public final class ElspethConquersDeath extends CardImpl { private static final FilterPermanent filter - = new FilterPermanent("permanent an opponent controls with converted mana cost 3 or greater"); + = new FilterPermanent("permanent an opponent controls with mana value 3 or greater"); private static final FilterCard filter2 = new FilterCard("creature or planeswalker card from your graveyard"); static { filter.add(TargetController.OPPONENT.getControllerPredicate()); - filter.add(new ConvertedManaCostPredicate(ComparisonType.MORE_THAN, 2)); + filter.add(new ManaValuePredicate(ComparisonType.MORE_THAN, 2)); filter2.add(Predicates.or( CardType.CREATURE.getPredicate(), CardType.PLANESWALKER.getPredicate() diff --git a/Mage.Sets/src/mage/cards/e/EmergencyPowers.java b/Mage.Sets/src/mage/cards/e/EmergencyPowers.java index e2495e3607e..4e081610b31 100644 --- a/Mage.Sets/src/mage/cards/e/EmergencyPowers.java +++ b/Mage.Sets/src/mage/cards/e/EmergencyPowers.java @@ -13,7 +13,7 @@ import mage.constants.CardType; import mage.constants.ComparisonType; import mage.constants.Outcome; import mage.filter.common.FilterPermanentCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import java.util.UUID; @@ -47,16 +47,16 @@ public final class EmergencyPowers extends CardImpl { class EmergencyPowersEffect extends OneShotEffect { public static final FilterPermanentCard filter - = new FilterPermanentCard("a permanent card with converted mana cost 7 or less"); + = new FilterPermanentCard("a permanent card with mana value 7 or less"); static { - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 8)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 8)); } EmergencyPowersEffect() { super(Outcome.Benefit); staticText = "Exile {this}.
Addendum — If you cast this spell during your main phase, " + - "you may put a permanent card with converted mana cost 7 or less from your hand onto the battlefield."; + "you may put a permanent card with mana value 7 or less from your hand onto the battlefield."; } private EmergencyPowersEffect(final EmergencyPowersEffect effect) { diff --git a/Mage.Sets/src/mage/cards/e/EmrakulsInfluence.java b/Mage.Sets/src/mage/cards/e/EmrakulsInfluence.java index 368c45f9c98..d0434d953e3 100644 --- a/Mage.Sets/src/mage/cards/e/EmrakulsInfluence.java +++ b/Mage.Sets/src/mage/cards/e/EmrakulsInfluence.java @@ -10,7 +10,7 @@ import mage.constants.CardType; import mage.constants.ComparisonType; import mage.constants.SubType; import mage.filter.FilterSpell; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; /** * @@ -18,11 +18,11 @@ import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; */ public final class EmrakulsInfluence extends CardImpl { - private static final FilterSpell filterSpell = new FilterSpell("Eldrazi creature spell with converted mana cost 7 or greater"); + private static final FilterSpell filterSpell = new FilterSpell("Eldrazi creature spell with mana value 7 or greater"); static { filterSpell.add(SubType.ELDRAZI.getPredicate()); - filterSpell.add(new ConvertedManaCostPredicate(ComparisonType.MORE_THAN, 6)); + filterSpell.add(new ManaValuePredicate(ComparisonType.MORE_THAN, 6)); } public EmrakulsInfluence(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/e/EnchantersBane.java b/Mage.Sets/src/mage/cards/e/EnchantersBane.java index 90c164185de..186c75801c3 100644 --- a/Mage.Sets/src/mage/cards/e/EnchantersBane.java +++ b/Mage.Sets/src/mage/cards/e/EnchantersBane.java @@ -46,7 +46,7 @@ class EnchantersBaneEffect extends OneShotEffect { public EnchantersBaneEffect() { super(Outcome.Benefit); this.staticText = "target enchantment deals damage equal to " - + "its converted mana cost to its controller " + + "its mana value to its controller " + "unless that player sacrifices it"; } @@ -72,7 +72,7 @@ class EnchantersBaneEffect extends OneShotEffect { if (player.chooseUse(Outcome.GainLife, "Sacrifice " + permanent.getLogName() + "?", source, game)) { permanent.sacrifice(source, game); } else { - player.damage(permanent.getConvertedManaCost(), permanent.getId(), source, game); + player.damage(permanent.getManaValue(), permanent.getId(), source, game); } return true; } diff --git a/Mage.Sets/src/mage/cards/e/EndrekSahrMasterBreeder.java b/Mage.Sets/src/mage/cards/e/EndrekSahrMasterBreeder.java index 3ae6c7784a7..09b3eb84f01 100644 --- a/Mage.Sets/src/mage/cards/e/EndrekSahrMasterBreeder.java +++ b/Mage.Sets/src/mage/cards/e/EndrekSahrMasterBreeder.java @@ -54,7 +54,7 @@ class EndrekSahrMasterBreederEffect extends OneShotEffect { public EndrekSahrMasterBreederEffect() { super(Outcome.PutCreatureInPlay); - this.staticText = "create X 1/1 black Thrull creature tokens, where X is that spell's converted mana cost"; + this.staticText = "create X 1/1 black Thrull creature tokens, where X is that spell's mana value"; } public EndrekSahrMasterBreederEffect(final EndrekSahrMasterBreederEffect effect) { @@ -70,7 +70,7 @@ class EndrekSahrMasterBreederEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { Spell spell = game.getSpellOrLKIStack(this.getTargetPointer().getFirst(game, source)); if (spell != null) { - int cmc = spell.getConvertedManaCost(); + int cmc = spell.getManaValue(); if (cmc > 0) { return new CreateTokenEffect(new ThrullToken(), cmc).apply(game, source); } diff --git a/Mage.Sets/src/mage/cards/e/EnergyTap.java b/Mage.Sets/src/mage/cards/e/EnergyTap.java index 661f41229f1..45bba2076fc 100644 --- a/Mage.Sets/src/mage/cards/e/EnergyTap.java +++ b/Mage.Sets/src/mage/cards/e/EnergyTap.java @@ -50,7 +50,7 @@ class EnergyTapEffect extends OneShotEffect { EnergyTapEffect() { super(Outcome.PutManaInPool); - this.staticText = "Tap target untapped creature you control. If you do, add an amount of {C} equal to that creature's converted mana cost"; + this.staticText = "Tap target untapped creature you control. If you do, add an amount of {C} equal to that creature's mana value"; } EnergyTapEffect(final EnergyTapEffect effect) { @@ -74,7 +74,7 @@ class EnergyTapEffect extends OneShotEffect { if (targetCreature != null) { applied = targetCreature.tap(source, game); if (applied) { - player.getManaPool().addMana(new Mana(0, 0, 0, 0, 0, 0, 0, targetCreature.getConvertedManaCost()), game, source); + player.getManaPool().addMana(new Mana(0, 0, 0, 0, 0, 0, 0, targetCreature.getManaValue()), game, source); } } return applied; diff --git a/Mage.Sets/src/mage/cards/e/EngineeredExplosives.java b/Mage.Sets/src/mage/cards/e/EngineeredExplosives.java index 7cb4f6f765c..1318712c0ae 100644 --- a/Mage.Sets/src/mage/cards/e/EngineeredExplosives.java +++ b/Mage.Sets/src/mage/cards/e/EngineeredExplosives.java @@ -54,7 +54,7 @@ class EngineeredExplosivesEffect extends OneShotEffect { public EngineeredExplosivesEffect() { super(Outcome.DestroyPermanent); - staticText = "Destroy each nonland permanent with converted mana cost equal to the number of charge counters on Engineered Explosives"; + staticText = "Destroy each nonland permanent with mana value equal to the number of charge counters on Engineered Explosives"; } @@ -73,7 +73,7 @@ class EngineeredExplosivesEffect extends OneShotEffect { if(engineeredExplosives instanceof Permanent){ int count = ((Permanent)engineeredExplosives).getCounters(game).getCount(CounterType.CHARGE); for (Permanent permanent : game.getBattlefield().getActivePermanents(filter, source.getControllerId(), source.getSourceId(), game)) { - if(permanent.getConvertedManaCost() == count){ + if(permanent.getManaValue() == count){ permanent.destroy(source, game, false); } } diff --git a/Mage.Sets/src/mage/cards/e/EnigmaticIncarnation.java b/Mage.Sets/src/mage/cards/e/EnigmaticIncarnation.java index 53df40ee2bf..e3e0383ed36 100644 --- a/Mage.Sets/src/mage/cards/e/EnigmaticIncarnation.java +++ b/Mage.Sets/src/mage/cards/e/EnigmaticIncarnation.java @@ -15,7 +15,7 @@ import mage.filter.FilterCard; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledEnchantmentPermanent; import mage.filter.common.FilterCreatureCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -59,8 +59,8 @@ class EnigmaticIncarnationEffect extends OneShotEffect { EnigmaticIncarnationEffect() { super(Outcome.Benefit); staticText = "you may sacrifice another enchantment. If you do, " - + "search your library for a creature card with converted mana cost " - + "equal to 1 plus the sacrificed enchantment's converted mana cost, " + + "search your library for a creature card with mana value " + + "equal to 1 plus the sacrificed enchantment's mana value, " + "put that card onto the battlefield, then shuffle your library."; } @@ -88,12 +88,12 @@ class EnigmaticIncarnationEffect extends OneShotEffect { return false; } game.getState().processAction(game); - int cmc = permanent.getConvertedManaCost(); + int cmc = permanent.getManaValue(); if (!permanent.sacrifice(source, game)) { return false; } - FilterCard filterCard = new FilterCreatureCard("creature card with converted mana cost " + (cmc + 1)); - filterCard.add(new ConvertedManaCostPredicate(ComparisonType.EQUAL_TO, cmc + 1)); + FilterCard filterCard = new FilterCreatureCard("creature card with mana value " + (cmc + 1)); + filterCard.add(new ManaValuePredicate(ComparisonType.EQUAL_TO, cmc + 1)); return new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filterCard)).apply(game, source); } } diff --git a/Mage.Sets/src/mage/cards/e/EntrancingMelody.java b/Mage.Sets/src/mage/cards/e/EntrancingMelody.java index 8f93beeae72..63c8c80eebd 100644 --- a/Mage.Sets/src/mage/cards/e/EntrancingMelody.java +++ b/Mage.Sets/src/mage/cards/e/EntrancingMelody.java @@ -9,7 +9,7 @@ import mage.constants.CardType; import mage.constants.ComparisonType; import mage.constants.Duration; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.target.common.TargetCreaturePermanent; import mage.target.targetadjustment.TargetAdjuster; @@ -21,7 +21,7 @@ import java.util.UUID; */ public final class EntrancingMelody extends CardImpl { - private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with converted mana cost X"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with mana value X"); public EntrancingMelody(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{X}{U}{U}"); @@ -49,8 +49,8 @@ enum EntrancingMelodyAdjuster implements TargetAdjuster { public void adjustTargets(Ability ability, Game game) { ability.getTargets().clear(); int xValue = ability.getManaCostsToPay().getX(); - FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with converted mana cost " + xValue); - filter.add(new ConvertedManaCostPredicate(ComparisonType.EQUAL_TO, xValue)); + FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with mana value " + xValue); + filter.add(new ManaValuePredicate(ComparisonType.EQUAL_TO, xValue)); ability.addTarget(new TargetCreaturePermanent(filter)); } } \ No newline at end of file diff --git a/Mage.Sets/src/mage/cards/e/EpicDownfall.java b/Mage.Sets/src/mage/cards/e/EpicDownfall.java index 79e307b008b..af5409c8606 100644 --- a/Mage.Sets/src/mage/cards/e/EpicDownfall.java +++ b/Mage.Sets/src/mage/cards/e/EpicDownfall.java @@ -7,7 +7,7 @@ import mage.constants.CardType; import mage.constants.ComparisonType; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.target.TargetPermanent; import java.util.UUID; @@ -18,10 +18,10 @@ import java.util.UUID; public final class EpicDownfall extends CardImpl { private static final FilterPermanent filter - = new FilterCreaturePermanent("creature with converted mana cost 3 or greater"); + = new FilterCreaturePermanent("creature with mana value 3 or greater"); static { - filter.add(new ConvertedManaCostPredicate(ComparisonType.MORE_THAN, 2)); + filter.add(new ManaValuePredicate(ComparisonType.MORE_THAN, 2)); } public EpicDownfall(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/e/EpicExperiment.java b/Mage.Sets/src/mage/cards/e/EpicExperiment.java index 870ed34baa3..c0fe068149b 100644 --- a/Mage.Sets/src/mage/cards/e/EpicExperiment.java +++ b/Mage.Sets/src/mage/cards/e/EpicExperiment.java @@ -10,7 +10,7 @@ import mage.constants.Outcome; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.common.FilterInstantOrSorceryCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.ExileZone; import mage.game.Game; import mage.players.Player; @@ -48,7 +48,7 @@ class EpicExperimentEffect extends OneShotEffect { public EpicExperimentEffect() { super(Outcome.PlayForFree); staticText = "Exile the top X cards of your library. For each instant and " - + "sorcery card with converted mana cost X or less among them, " + + "sorcery card with mana value X or less among them, " + "you may cast that card without paying its mana cost. Then put all " + "cards exiled this way that weren't cast into your graveyard"; } @@ -69,9 +69,9 @@ class EpicExperimentEffect extends OneShotEffect { // cast the possible cards without paying the mana ExileZone epicExperimentExileZone = game.getExile().getExileZone(source.getSourceId()); FilterCard filter = new FilterInstantOrSorceryCard(); - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, source.getManaCostsToPay().getX() + 1)); - filter.setMessage("instant and sorcery cards with converted mana cost " + filter.setMessage("instant and sorcery cards with mana value " + source.getManaCostsToPay().getX() + " or less"); Cards cardsToCast = new CardsImpl(); if (epicExperimentExileZone == null) { diff --git a/Mage.Sets/src/mage/cards/e/ErraticCyclops.java b/Mage.Sets/src/mage/cards/e/ErraticCyclops.java index 08755be4488..90f00bfe71b 100644 --- a/Mage.Sets/src/mage/cards/e/ErraticCyclops.java +++ b/Mage.Sets/src/mage/cards/e/ErraticCyclops.java @@ -68,7 +68,7 @@ class ErraticCyclopsTriggeredAbility extends TriggeredAbilityImpl { && spell.isInstantOrSorcery()) { this.getEffects().clear(); this.addEffect(new BoostSourceEffect( - spell.getConvertedManaCost(), 0, Duration.EndOfTurn + spell.getManaValue(), 0, Duration.EndOfTurn )); return true; } @@ -79,7 +79,7 @@ class ErraticCyclopsTriggeredAbility extends TriggeredAbilityImpl { public String getRule() { return "Whenever you cast an instant or sorcery spell, " + "{this} gets +X/+0 until end of turn, " - + "where X is that spell's converted mana cost"; + + "where X is that spell's mana value"; } @Override diff --git a/Mage.Sets/src/mage/cards/e/ErraticExplosion.java b/Mage.Sets/src/mage/cards/e/ErraticExplosion.java index d31a7c10164..96e5f05795a 100644 --- a/Mage.Sets/src/mage/cards/e/ErraticExplosion.java +++ b/Mage.Sets/src/mage/cards/e/ErraticExplosion.java @@ -42,7 +42,7 @@ class ErraticExplosionEffect extends OneShotEffect { public ErraticExplosionEffect() { super(Outcome.Damage); - this.staticText = "Choose any target. Reveal cards from the top of your library until you reveal a nonland card. {this} deals damage equal to that card's converted mana cost to that permanent or player. Put the revealed cards on the bottom of your library in any order"; + this.staticText = "Choose any target. Reveal cards from the top of your library until you reveal a nonland card. {this} deals damage equal to that card's mana value to that permanent or player. Put the revealed cards on the bottom of your library in any order"; } public ErraticExplosionEffect(ErraticExplosionEffect effect) { @@ -72,11 +72,11 @@ class ErraticExplosionEffect extends OneShotEffect { if (nonLandCard != null) { Permanent targetCreature = game.getPermanent(this.getTargetPointer().getFirst(game, source)); if (targetCreature != null) { - targetCreature.damage(nonLandCard.getConvertedManaCost(), source.getSourceId(), source, game, false, true); + targetCreature.damage(nonLandCard.getManaValue(), source.getSourceId(), source, game, false, true); } else { Player targetPlayer = game.getPlayer(this.getTargetPointer().getFirst(game, source)); if (targetPlayer != null) { - targetPlayer.damage(nonLandCard.getConvertedManaCost(), source.getSourceId(), source, game); + targetPlayer.damage(nonLandCard.getManaValue(), source.getSourceId(), source, game); } } } diff --git a/Mage.Sets/src/mage/cards/e/ErraticMutation.java b/Mage.Sets/src/mage/cards/e/ErraticMutation.java index 4e7f70ac3bb..57e8637505f 100644 --- a/Mage.Sets/src/mage/cards/e/ErraticMutation.java +++ b/Mage.Sets/src/mage/cards/e/ErraticMutation.java @@ -48,7 +48,7 @@ class ErraticMutationEffect extends OneShotEffect { public ErraticMutationEffect() { super(Outcome.UnboostCreature); - this.staticText = "Choose target creature. Reveal cards from the top of your library until you reveal a nonland card. That creature gets +X/-X until end of turn, where X is that card's converted mana cost. Put all cards revealed this way on the bottom of your library in any order"; + this.staticText = "Choose target creature. Reveal cards from the top of your library until you reveal a nonland card. That creature gets +X/-X until end of turn, where X is that card's mana value. Put all cards revealed this way on the bottom of your library in any order"; } public ErraticMutationEffect(final ErraticMutationEffect effect) { @@ -79,7 +79,7 @@ class ErraticMutationEffect extends OneShotEffect { // the nonland card if (nonLandCard != null) { - int boostValue = nonLandCard.getConvertedManaCost(); + int boostValue = nonLandCard.getManaValue(); // 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/cards/e/Evershrike.java b/Mage.Sets/src/mage/cards/e/Evershrike.java index 01c876a0bb9..2040992da91 100644 --- a/Mage.Sets/src/mage/cards/e/Evershrike.java +++ b/Mage.Sets/src/mage/cards/e/Evershrike.java @@ -16,7 +16,7 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterCard; import mage.filter.predicate.card.AuraCardCanAttachToPermanentId; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -64,7 +64,7 @@ class EvershrikeEffect extends OneShotEffect { EvershrikeEffect() { super(Outcome.Benefit); staticText = "Return {this} from your graveyard to the battlefield. " + - "You may put an Aura card with converted mana cost X or less from your hand " + + "You may put an Aura card with mana value X or less from your hand " + "onto the battlefield attached to it. If you don't, exile {this}"; } @@ -89,11 +89,11 @@ class EvershrikeEffect extends OneShotEffect { return false; } boolean exileSource = true; - FilterCard filterAuraCard = new FilterCard("Aura card with converted mana cost X or less from your hand"); + FilterCard filterAuraCard = new FilterCard("Aura card with mana value X or less from your hand"); filterAuraCard.add(CardType.ENCHANTMENT.getPredicate()); filterAuraCard.add(SubType.AURA.getPredicate()); filterAuraCard.add(new AuraCardCanAttachToPermanentId(evershrikePermanent.getId())); - filterAuraCard.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, xAmount + 1)); + filterAuraCard.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, xAmount + 1)); int count = controller.getHand().count(filterAuraCard, game); if (count > 0 && controller.chooseUse(Outcome.Benefit, "Put an Aura card from your hand onto the battlefield attached to " + evershrikeCard.getIdName() + "?", source, game)) { TargetCard targetAura = new TargetCard(Zone.HAND, filterAuraCard); diff --git a/Mage.Sets/src/mage/cards/e/ExileIntoDarkness.java b/Mage.Sets/src/mage/cards/e/ExileIntoDarkness.java index c9d5faf0bd3..8067eb46fa0 100644 --- a/Mage.Sets/src/mage/cards/e/ExileIntoDarkness.java +++ b/Mage.Sets/src/mage/cards/e/ExileIntoDarkness.java @@ -15,7 +15,7 @@ import mage.constants.ComparisonType; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.target.TargetPlayer; /** @@ -24,10 +24,10 @@ import mage.target.TargetPlayer; */ public final class ExileIntoDarkness extends CardImpl { - private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with converted mana cost 3 or less"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with mana value 3 or less"); static { - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 4)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 4)); } public ExileIntoDarkness(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/e/ExpansionExplosion.java b/Mage.Sets/src/mage/cards/e/ExpansionExplosion.java index ea59e7fb4f2..0ced362fc26 100644 --- a/Mage.Sets/src/mage/cards/e/ExpansionExplosion.java +++ b/Mage.Sets/src/mage/cards/e/ExpansionExplosion.java @@ -14,7 +14,7 @@ import mage.constants.Outcome; import mage.constants.SpellAbilityType; import mage.filter.FilterSpell; import mage.filter.common.FilterInstantOrSorcerySpell; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.players.Player; import mage.target.TargetPlayer; @@ -30,10 +30,10 @@ import java.util.UUID; public final class ExpansionExplosion extends SplitCard { private static final FilterSpell filter - = new FilterInstantOrSorcerySpell("instant or sorcery spell with converted mana cost 4 or less"); + = new FilterInstantOrSorcerySpell("instant or sorcery spell with mana value 4 or less"); static { - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 5)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 5)); } public ExpansionExplosion(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/e/ExplosiveRevelation.java b/Mage.Sets/src/mage/cards/e/ExplosiveRevelation.java index 98172b43fd1..5957cac229c 100644 --- a/Mage.Sets/src/mage/cards/e/ExplosiveRevelation.java +++ b/Mage.Sets/src/mage/cards/e/ExplosiveRevelation.java @@ -45,7 +45,7 @@ class ExplosiveRevelationEffect extends OneShotEffect { public ExplosiveRevelationEffect() { super(Outcome.DrawCard); - this.staticText = "Choose any target. Reveal cards from the top of your library until you reveal a nonland card, {this} deals damage equal to that card's converted mana cost to that permanent or player. Put the nonland card into your hand and the rest on the bottom of your library in any order"; + this.staticText = "Choose any target. Reveal cards from the top of your library until you reveal a nonland card, {this} deals damage equal to that card's mana value to that permanent or player. Put the nonland card into your hand and the rest on the bottom of your library in any order"; } public ExplosiveRevelationEffect(final ExplosiveRevelationEffect effect) { @@ -76,7 +76,7 @@ class ExplosiveRevelationEffect extends OneShotEffect { // reveal cards controller.revealCards(sourceObject.getIdName(), toReveal, game); // the nonland card - int damage = nonLandCard == null ? 0 : nonLandCard.getConvertedManaCost(); + int damage = nonLandCard == null ? 0 : nonLandCard.getManaValue(); // assign damage to target for (UUID targetId : targetPointer.getTargets(game, source)) { Permanent targetedCreature = game.getPermanent(targetId); diff --git a/Mage.Sets/src/mage/cards/e/ExtinctionEvent.java b/Mage.Sets/src/mage/cards/e/ExtinctionEvent.java index ac43a229a19..98319601c1c 100644 --- a/Mage.Sets/src/mage/cards/e/ExtinctionEvent.java +++ b/Mage.Sets/src/mage/cards/e/ExtinctionEvent.java @@ -9,7 +9,7 @@ import mage.constants.Outcome; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.ConvertedManaCostParityPredicate; +import mage.filter.predicate.mageobject.ManaValueParityPredicate; import mage.game.Game; import mage.players.Player; @@ -44,13 +44,13 @@ class ExtinctionEventEffect extends OneShotEffect { private static final FilterPermanent oddFilter = new FilterCreaturePermanent(); static { - evenFilter.add(ConvertedManaCostParityPredicate.EVEN); - oddFilter.add(ConvertedManaCostParityPredicate.ODD); + evenFilter.add(ManaValueParityPredicate.EVEN); + oddFilter.add(ManaValueParityPredicate.ODD); } ExtinctionEventEffect() { super(Outcome.Benefit); - staticText = "Choose odd or even. Exile each creature with converted mana cost of the chosen value. (Zero is even.)"; + staticText = "Choose odd or even. Exile each creature with mana value of the chosen value. (Zero is even.)"; } private ExtinctionEventEffect(final ExtinctionEventEffect effect) { diff --git a/Mage.Sets/src/mage/cards/f/FatalPush.java b/Mage.Sets/src/mage/cards/f/FatalPush.java index 347cf70a47c..7425407d33f 100644 --- a/Mage.Sets/src/mage/cards/f/FatalPush.java +++ b/Mage.Sets/src/mage/cards/f/FatalPush.java @@ -45,7 +45,7 @@ class FatalPushEffect extends OneShotEffect { FatalPushEffect() { super(Outcome.DestroyPermanent); - this.staticText = "Destroy target creature if it has converted mana cost 2 or less.
Revolt — Destroy that creature if it has converted mana cost 4 or less instead if a permanent you controlled left the battlefield this turn"; + this.staticText = "Destroy target creature if it has mana value 2 or less.
Revolt — Destroy that creature if it has mana value 4 or less instead if a permanent you controlled left the battlefield this turn"; } FatalPushEffect(final FatalPushEffect effect) { @@ -63,7 +63,7 @@ class FatalPushEffect extends OneShotEffect { if (controller != null) { Permanent targetCreature = game.getPermanent(this.getTargetPointer().getFirst(game, source)); if (targetCreature != null) { - int cmc = targetCreature.getConvertedManaCost(); + int cmc = targetCreature.getManaValue(); if (cmc <= 2 || (RevoltCondition.instance.apply(game, source) && cmc <= 4)) { targetCreature.destroy(source, game, false); diff --git a/Mage.Sets/src/mage/cards/f/FavorOfTheMighty.java b/Mage.Sets/src/mage/cards/f/FavorOfTheMighty.java index 6c91034a89c..2efa1ce72a5 100644 --- a/Mage.Sets/src/mage/cards/f/FavorOfTheMighty.java +++ b/Mage.Sets/src/mage/cards/f/FavorOfTheMighty.java @@ -16,7 +16,7 @@ import mage.filter.StaticFilters; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -60,7 +60,7 @@ class FavorOfTheMightyEffect extends ContinuousEffectImpl { FavorOfTheMightyEffect() { super(Duration.WhileOnBattlefield, Layer.AbilityAddingRemovingEffects_6, SubLayer.NA, Outcome.AddAbility); - this.staticText = "Each creature with the highest converted mana cost has protection from all colors."; + this.staticText = "Each creature with the highest mana value has protection from all colors."; } FavorOfTheMightyEffect(final FavorOfTheMightyEffect effect) { @@ -76,12 +76,12 @@ class FavorOfTheMightyEffect extends ContinuousEffectImpl { public boolean apply(Game game, Ability source) { int maxCMC = Integer.MIN_VALUE; for (Permanent permanent : game.getBattlefield().getActivePermanents(StaticFilters.FILTER_PERMANENT_CREATURE, source.getControllerId(), game)) { - if (permanent != null && permanent.getConvertedManaCost() > maxCMC) { - maxCMC = permanent.getConvertedManaCost(); + if (permanent != null && permanent.getManaValue() > maxCMC) { + maxCMC = permanent.getManaValue(); } } FilterPermanent filterMaxCMC = new FilterCreaturePermanent(); - filterMaxCMC.add(new ConvertedManaCostPredicate(ComparisonType.EQUAL_TO, maxCMC)); + filterMaxCMC.add(new ManaValuePredicate(ComparisonType.EQUAL_TO, maxCMC)); for (Permanent permanent : game.getBattlefield().getActivePermanents(filterMaxCMC, source.getControllerId(), game)) { if (permanent != null) { permanent.addAbility(new ProtectionAbility(filter), source.getSourceId(), game); diff --git a/Mage.Sets/src/mage/cards/f/FeedTheSwarm.java b/Mage.Sets/src/mage/cards/f/FeedTheSwarm.java index a80c755b83a..4c61ce614e2 100644 --- a/Mage.Sets/src/mage/cards/f/FeedTheSwarm.java +++ b/Mage.Sets/src/mage/cards/f/FeedTheSwarm.java @@ -55,7 +55,7 @@ class FeedTheSwarmEffect extends OneShotEffect { FeedTheSwarmEffect() { super(Outcome.Benefit); staticText = "destroy target creature or enchantment an opponent controls. " + - "You lose life equal to that permanent's converted mana cost"; + "You lose life equal to that permanent's mana value"; } private FeedTheSwarmEffect(final FeedTheSwarmEffect effect) { @@ -74,7 +74,7 @@ class FeedTheSwarmEffect extends OneShotEffect { if (permanent == null || player == null) { return false; } - player.loseLife(permanent.getConvertedManaCost(), game, source, false); + player.loseLife(permanent.getManaValue(), game, source, false); permanent.destroy(source, game, false); return true; } diff --git a/Mage.Sets/src/mage/cards/f/FerocityOfTheUnderworld.java b/Mage.Sets/src/mage/cards/f/FerocityOfTheUnderworld.java index 7a32b767861..259cfad3b3a 100644 --- a/Mage.Sets/src/mage/cards/f/FerocityOfTheUnderworld.java +++ b/Mage.Sets/src/mage/cards/f/FerocityOfTheUnderworld.java @@ -12,7 +12,7 @@ import mage.constants.CardType; import mage.constants.ComparisonType; import mage.filter.StaticFilters; import mage.filter.common.FilterNonlandPermanent; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.target.TargetSpell; import mage.target.common.TargetCardInYourGraveyard; import mage.target.common.TargetNonlandPermanent; @@ -23,10 +23,10 @@ import mage.target.common.TargetNonlandPermanent; */ public final class FerocityOfTheUnderworld extends CardImpl { - private static final FilterNonlandPermanent filterMode1 = new FilterNonlandPermanent("nonland permanent with converted mana cost 3 or less"); + private static final FilterNonlandPermanent filterMode1 = new FilterNonlandPermanent("nonland permanent with mana value 3 or less"); static { - filterMode1.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 4)); + filterMode1.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 4)); } public FerocityOfTheUnderworld(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/f/FiendArtisan.java b/Mage.Sets/src/mage/cards/f/FiendArtisan.java index 5289270613c..ef3014ef8a7 100644 --- a/Mage.Sets/src/mage/cards/f/FiendArtisan.java +++ b/Mage.Sets/src/mage/cards/f/FiendArtisan.java @@ -20,7 +20,7 @@ import mage.filter.StaticFilters; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterCreatureCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.target.common.TargetCardInLibrary; @@ -77,7 +77,7 @@ class FiendArtisanEffect extends OneShotEffect { FiendArtisanEffect() { super(Outcome.Benefit); - staticText = "search your library for a creature card with converted mana cost X or less, " + + staticText = "search your library for a creature card with mana value X or less, " + "put it onto the battlefield, then shuffle your library"; } @@ -93,8 +93,8 @@ class FiendArtisanEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { int xValue = source.getManaCostsToPay().getX(); - FilterCard filter = new FilterCreatureCard("creature card with converted mana cost " + xValue + " or less"); - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, xValue + 1)); + FilterCard filter = new FilterCreatureCard("creature card with mana value " + xValue + " or less"); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, xValue + 1)); return new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter)).apply(game, source); } } \ No newline at end of file diff --git a/Mage.Sets/src/mage/cards/f/FierceEmpath.java b/Mage.Sets/src/mage/cards/f/FierceEmpath.java index f8589adab40..33b341a5f4a 100644 --- a/Mage.Sets/src/mage/cards/f/FierceEmpath.java +++ b/Mage.Sets/src/mage/cards/f/FierceEmpath.java @@ -10,7 +10,7 @@ import mage.constants.CardType; import mage.constants.ComparisonType; import mage.constants.SubType; import mage.filter.common.FilterCreatureCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.target.common.TargetCardInLibrary; import java.util.UUID; @@ -21,9 +21,9 @@ import java.util.UUID; */ public final class FierceEmpath extends CardImpl { - private static final FilterCreatureCard filter = new FilterCreatureCard("creature card with converted mana cost 6 or greater"); + private static final FilterCreatureCard filter = new FilterCreatureCard("creature card with mana value 6 or greater"); static { - filter.add(new ConvertedManaCostPredicate(ComparisonType.MORE_THAN, 5)); + filter.add(new ManaValuePredicate(ComparisonType.MORE_THAN, 5)); } public FierceEmpath(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{G}"); @@ -35,7 +35,7 @@ public final class FierceEmpath extends CardImpl { // When Fierce Empath enters the battlefield, you may search your library for a creature card with converted mana cost 6 or greater, reveal it, put it into your hand, then shuffle your library. this.addAbility(new EntersBattlefieldTriggeredAbility(new SearchLibraryPutInHandEffect( new TargetCardInLibrary(filter), true, true) - .setText("search your library for a creature card with converted mana cost 6 or greater, reveal it, put it into your hand, then shuffle your library"), + .setText("search your library for a creature card with mana value 6 or greater, reveal it, put it into your hand, then shuffle your library"), true)); } diff --git a/Mage.Sets/src/mage/cards/f/FieryEncore.java b/Mage.Sets/src/mage/cards/f/FieryEncore.java index 027345cbc38..99a4e7579b7 100644 --- a/Mage.Sets/src/mage/cards/f/FieryEncore.java +++ b/Mage.Sets/src/mage/cards/f/FieryEncore.java @@ -70,7 +70,7 @@ class FieryEncoreEffect extends OneShotEffect { return true; } ReflexiveTriggeredAbility ability = new ReflexiveTriggeredAbility( - new DamageTargetEffect(card.getConvertedManaCost()), false, "when you discard a nonland " + + new DamageTargetEffect(card.getManaValue()), false, "when you discard a nonland " + "card this way, {this} deals damage equal to that card's mana value to target creature or planeswalker" ); ability.addTarget(new TargetCreatureOrPlaneswalker()); diff --git a/Mage.Sets/src/mage/cards/f/FinaleOfDevastation.java b/Mage.Sets/src/mage/cards/f/FinaleOfDevastation.java index 7e49ab9f077..948a3187578 100644 --- a/Mage.Sets/src/mage/cards/f/FinaleOfDevastation.java +++ b/Mage.Sets/src/mage/cards/f/FinaleOfDevastation.java @@ -10,7 +10,7 @@ import mage.game.Game; import mage.filter.FilterCard; import mage.filter.common.FilterCreaturePermanent; import mage.constants.CardType; -import mage.abilities.effects.common.search.SearchLibraryGraveyardWithLessCMCPutIntoPlay; +import mage.abilities.effects.common.search.SearchLibraryGraveyardWithLessMVPutIntoPlay; import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.continuous.BoostControlledEffect; @@ -34,7 +34,7 @@ public final class FinaleOfDevastation extends CardImpl { public FinaleOfDevastation(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{X}{G}{G}"); // Search your library and/or graveyard for a creature card with converted mana cost X or less and put it onto the battlefield. If you search your library this way, shuffle it. - this.getSpellAbility().addEffect(new SearchLibraryGraveyardWithLessCMCPutIntoPlay(filter)); + this.getSpellAbility().addEffect(new SearchLibraryGraveyardWithLessMVPutIntoPlay(filter)); // If X is 10 or more, creatures you control get +X/+X and gain haste until end of turn. this.getSpellAbility().addEffect(new FinaleOfDevastationEffect()); } diff --git a/Mage.Sets/src/mage/cards/f/FinaleOfPromise.java b/Mage.Sets/src/mage/cards/f/FinaleOfPromise.java index 74f3eeb5299..f9372cbfcc5 100644 --- a/Mage.Sets/src/mage/cards/f/FinaleOfPromise.java +++ b/Mage.Sets/src/mage/cards/f/FinaleOfPromise.java @@ -11,7 +11,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.ZoneChangeEvent; @@ -70,13 +70,13 @@ enum FinaleOfPromiseAdjuster implements TargetAdjuster { // <= must be replaced to <= for html view FilterCard filter1 = FinaleOfPromise.filterInstant.copy(); - filter1.setMessage("up to one INSTANT card from your graveyard with CMC <= " + xValue + " (target 1 of 2)"); - filter1.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, xValue + 1)); + filter1.setMessage("up to one INSTANT card from your graveyard with mana value <= " + xValue + " (target 1 of 2)"); + filter1.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, xValue + 1)); ability.addTarget(new TargetCardInYourGraveyard(0, 1, filter1)); FilterCard filter2 = FinaleOfPromise.filterSorcery.copy(); - filter2.setMessage("up to one SORCERY card from your graveyard with CMC <=" + xValue + " (target 2 of 2)"); - filter2.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, xValue + 1)); + filter2.setMessage("up to one SORCERY card from your graveyard with mana value <=" + xValue + " (target 2 of 2)"); + filter2.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, xValue + 1)); ability.addTarget(new TargetCardInYourGraveyard(0, 1, filter2)); } } @@ -86,7 +86,7 @@ class FinaleOfPromiseEffect extends OneShotEffect { public FinaleOfPromiseEffect() { super(Outcome.PlayForFree); this.staticText = "You may cast up to one target instant card and/or up to one target sorcery card from your graveyard " - + "each with converted mana cost X or less without paying their mana costs. If a card cast this way would " + + "each with mana value X or less without paying their mana costs. If a card cast this way would " + "be put into your graveyard this turn, exile it instead. If X is 10 or more, copy each of those spells " + "twice. You may choose new targets for the copies."; } diff --git a/Mage.Sets/src/mage/cards/f/FiremindsForesight.java b/Mage.Sets/src/mage/cards/f/FiremindsForesight.java index d270a963cac..f595c2a5d79 100644 --- a/Mage.Sets/src/mage/cards/f/FiremindsForesight.java +++ b/Mage.Sets/src/mage/cards/f/FiremindsForesight.java @@ -8,7 +8,7 @@ import mage.constants.ComparisonType; import mage.constants.Outcome; import mage.constants.Zone; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCardInLibrary; @@ -47,18 +47,18 @@ class FiremindsForesightSearchEffect extends OneShotEffect { static { for (int cmc = 3; cmc > 0; cmc--) { - FilterCard filter = new FilterCard("instant card with converted mana cost " + cmc); + FilterCard filter = new FilterCard("instant card with mana value " + cmc); filter.add(CardType.INSTANT.getPredicate()); - filter.add(new ConvertedManaCostPredicate(ComparisonType.EQUAL_TO, cmc)); + filter.add(new ManaValuePredicate(ComparisonType.EQUAL_TO, cmc)); filterMap.put(cmc, filter); } } FiremindsForesightSearchEffect() { super(Outcome.DrawCard); - staticText = "Search your library for an instant card with converted mana cost 3, " + + staticText = "Search your library for an instant card with mana value 3, " + "reveal it, and put it into your hand. Then repeat this process " + - "for instant cards with converted mana costs 2 and 1. Then shuffle your library"; + "for instant cards with mana values 2 and 1. Then shuffle your library"; } private FiremindsForesightSearchEffect(final FiremindsForesightSearchEffect effect) { diff --git a/Mage.Sets/src/mage/cards/f/FiresOfInvention.java b/Mage.Sets/src/mage/cards/f/FiresOfInvention.java index b87e4c6185c..2383d18bfcb 100644 --- a/Mage.Sets/src/mage/cards/f/FiresOfInvention.java +++ b/Mage.Sets/src/mage/cards/f/FiresOfInvention.java @@ -26,7 +26,7 @@ import java.util.UUID; public final class FiresOfInvention extends CardImpl { private static final FilterCard filter - = new FilterCard("spells with converted mana cost less than or equal to the number of lands you control"); + = new FilterCard("spells with mana value less than or equal to the number of lands you control"); static { filter.add(FiresOfInventionPredicate.instance); @@ -57,7 +57,7 @@ enum FiresOfInventionPredicate implements ObjectSourcePlayerPredicate input, Game game) { - return input.getObject().getConvertedManaCost() <= + return input.getObject().getManaValue() <= game.getBattlefield().countAll(StaticFilters.FILTER_LAND, game.getControllerId(input.getSourceId()), game); } } diff --git a/Mage.Sets/src/mage/cards/f/Fleshwrither.java b/Mage.Sets/src/mage/cards/f/Fleshwrither.java index ca1ac8f7a7c..52f82a49f73 100644 --- a/Mage.Sets/src/mage/cards/f/Fleshwrither.java +++ b/Mage.Sets/src/mage/cards/f/Fleshwrither.java @@ -20,7 +20,7 @@ import mage.constants.Outcome; import mage.constants.TimingRule; import mage.constants.Zone; import mage.filter.common.FilterCreatureCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCardInLibrary; @@ -59,7 +59,7 @@ class FleshwritherEffect extends OneShotEffect { FleshwritherEffect() { super(Outcome.Benefit); - staticText = "Transfigure: Sacrifice this creature: Search your library for a creature card with the same converted mana cost as this creature and put that card onto the battlefield"; + staticText = "Transfigure: Sacrifice this creature: Search your library for a creature card with the same mana value as this creature and put that card onto the battlefield"; } FleshwritherEffect(final FleshwritherEffect effect) { @@ -71,8 +71,8 @@ class FleshwritherEffect extends OneShotEffect { Player controller = game.getPlayer(source.getControllerId()); MageObject sourceObject = game.getObject(source.getSourceId()); if (sourceObject != null && controller != null) { - FilterCreatureCard filter = new FilterCreatureCard("creature with converted mana cost " + sourceObject.getConvertedManaCost()); - filter.add(new ConvertedManaCostPredicate(ComparisonType.EQUAL_TO, sourceObject.getConvertedManaCost())); + FilterCreatureCard filter = new FilterCreatureCard("creature with mana value " + sourceObject.getManaValue()); + filter.add(new ManaValuePredicate(ComparisonType.EQUAL_TO, sourceObject.getManaValue())); TargetCardInLibrary target = new TargetCardInLibrary(1, filter); if (controller.searchLibrary(target, source, game)) { if (!target.getTargets().isEmpty()) { diff --git a/Mage.Sets/src/mage/cards/f/FoodChain.java b/Mage.Sets/src/mage/cards/f/FoodChain.java index de27c4b6649..ecd427045b4 100644 --- a/Mage.Sets/src/mage/cards/f/FoodChain.java +++ b/Mage.Sets/src/mage/cards/f/FoodChain.java @@ -68,7 +68,7 @@ class FoodChainManaEffect extends ManaEffect { ConditionalManaBuilder manaBuilder = new FoodChainManaBuilder(); FoodChainManaEffect() { - this.staticText = "Add X mana of any one color, where X is 1 plus the exiled creature's converted mana cost. Spend this mana only to cast creature spells"; + this.staticText = "Add X mana of any one color, where X is 1 plus the exiled creature's mana value. Spend this mana only to cast creature spells"; } FoodChainManaEffect(final FoodChainManaEffect effect) { @@ -87,7 +87,7 @@ class FoodChainManaEffect extends ManaEffect { int cmc = -1; for (Permanent permanent : game.getBattlefield().getAllActivePermanents(source.getControllerId())) { if (permanent.isCreature()) { - cmc = Math.max(cmc, permanent.getManaCost().convertedManaCost()); + cmc = Math.max(cmc, permanent.getManaCost().manaValue()); } } if (cmc != -1) { @@ -113,7 +113,7 @@ class FoodChainManaEffect extends ManaEffect { for (Cost cost : source.getCosts()) { if (cost.isPaid() && cost instanceof ExileTargetCost) { for (Card card : ((ExileTargetCost) cost).getPermanents()) { - manaCostExiled += card.getConvertedManaCost(); + manaCostExiled += card.getManaValue(); } } } diff --git a/Mage.Sets/src/mage/cards/f/ForceChoke.java b/Mage.Sets/src/mage/cards/f/ForceChoke.java index 3d29ddfaf85..bf916742af9 100644 --- a/Mage.Sets/src/mage/cards/f/ForceChoke.java +++ b/Mage.Sets/src/mage/cards/f/ForceChoke.java @@ -50,7 +50,7 @@ class ForceChokeEffect extends OneShotEffect { public ForceChokeEffect() { super(Outcome.ReturnToHand); this.staticText = "Counter target spell. Its controller may pay life " - + "equal to that spell's converted mana cost to return it to its owner's hand"; + + "equal to that spell's mana value to return it to its owner's hand"; } public ForceChokeEffect(final ForceChokeEffect effect) { @@ -68,10 +68,10 @@ class ForceChokeEffect extends OneShotEffect { StackObject stackObject = (StackObject) game.getObject(getTargetPointer().getFirst(game, source)); Player objectController = game.getPlayer(stackObject.getControllerId()); if (player != null) { - Cost cost = new PayLifeCost(stackObject.getConvertedManaCost()); + Cost cost = new PayLifeCost(stackObject.getManaValue()); if (cost.canPay(source, source, objectController.getId(), game) && objectController.chooseUse(Outcome.LoseLife, "Pay " - + stackObject.getConvertedManaCost() + " life?", source, game) + + stackObject.getManaValue() + " life?", source, game) && cost.pay(source, game, source, objectController.getId(), false, null)) { objectController.moveCards((Card) stackObject, Zone.HAND, source, game); } else { diff --git a/Mage.Sets/src/mage/cards/f/ForceMastery.java b/Mage.Sets/src/mage/cards/f/ForceMastery.java index e2052c312b5..e20927051e3 100644 --- a/Mage.Sets/src/mage/cards/f/ForceMastery.java +++ b/Mage.Sets/src/mage/cards/f/ForceMastery.java @@ -41,7 +41,7 @@ class ForceMasteryEffect extends OneShotEffect { ForceMasteryEffect() { super(Outcome.DrawCard); - this.staticText = "reveal the top card of your library and put that card into your hand. You gain life equal to its converted mana cost"; + this.staticText = "reveal the top card of your library and put that card into your hand. You gain life equal to its mana value"; } ForceMasteryEffect(final ForceMasteryEffect effect) { @@ -56,7 +56,7 @@ class ForceMasteryEffect extends OneShotEffect { if (card != null) { controller.revealCards(source, new CardsImpl(card), game); controller.moveCards(card, Zone.HAND, source, game); - controller.gainLife(card.getConvertedManaCost(), game, source); + controller.gainLife(card.getManaValue(), game, source); } return true; } diff --git a/Mage.Sets/src/mage/cards/f/ForcedMarch.java b/Mage.Sets/src/mage/cards/f/ForcedMarch.java index 33ca40942b1..89ef76f2001 100644 --- a/Mage.Sets/src/mage/cards/f/ForcedMarch.java +++ b/Mage.Sets/src/mage/cards/f/ForcedMarch.java @@ -37,7 +37,7 @@ class ForcedMarchEffect extends OneShotEffect { public ForcedMarchEffect() { super(Outcome.DestroyPermanent); - staticText = "Destroy all creatures with converted mana cost X or less"; + staticText = "Destroy all creatures with mana value X or less"; } public ForcedMarchEffect(final ForcedMarchEffect effect) { @@ -57,7 +57,7 @@ class ForcedMarchEffect extends OneShotEffect { source.getControllerId(), source.getSourceId(), game)) { - if (permanent.getConvertedManaCost() <= source.getManaCostsToPay().getX()) { + if (permanent.getManaValue() <= source.getManaCostsToPay().getX()) { permanent.destroy(source, game, false); } } diff --git a/Mage.Sets/src/mage/cards/f/Fragmentize.java b/Mage.Sets/src/mage/cards/f/Fragmentize.java index 9a25ed4237b..9a27fe659bd 100644 --- a/Mage.Sets/src/mage/cards/f/Fragmentize.java +++ b/Mage.Sets/src/mage/cards/f/Fragmentize.java @@ -8,7 +8,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.ComparisonType; import mage.filter.common.FilterArtifactOrEnchantmentPermanent; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.target.TargetPermanent; /** @@ -17,10 +17,10 @@ import mage.target.TargetPermanent; */ public final class Fragmentize extends CardImpl { - private static final FilterArtifactOrEnchantmentPermanent filter = new FilterArtifactOrEnchantmentPermanent("artifact or enchantment with converted mana cost 4 or less"); + private static final FilterArtifactOrEnchantmentPermanent filter = new FilterArtifactOrEnchantmentPermanent("artifact or enchantment with mana value 4 or less"); static { - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 5)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 5)); } public Fragmentize(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/f/FriendlyFire.java b/Mage.Sets/src/mage/cards/f/FriendlyFire.java index a80d1557228..56e12f1db8b 100644 --- a/Mage.Sets/src/mage/cards/f/FriendlyFire.java +++ b/Mage.Sets/src/mage/cards/f/FriendlyFire.java @@ -41,7 +41,7 @@ class FriendlyFireEffect extends OneShotEffect { public FriendlyFireEffect() { super(Outcome.Discard); - this.staticText = "Target creature's controller reveals a card at random from their hand. {this} deals damage to that creature and that player equal to the revealed card's converted mana cost"; + this.staticText = "Target creature's controller reveals a card at random from their hand. {this} deals damage to that creature and that player equal to the revealed card's mana value"; } public FriendlyFireEffect(final FriendlyFireEffect effect) { @@ -67,7 +67,7 @@ class FriendlyFireEffect extends OneShotEffect { if (card != null) { Cards cards = new CardsImpl(card); controllerOfTargetCreature.revealCards(sourceObject.getName(), cards, game); - int damage = card.getConvertedManaCost(); + int damage = card.getManaValue(); targetCreature.damage(damage, source.getSourceId(), source, game, false, true); controllerOfTargetCreature.damage(damage, source.getSourceId(), source, game); return true; diff --git a/Mage.Sets/src/mage/cards/g/GaddockTeeg.java b/Mage.Sets/src/mage/cards/g/GaddockTeeg.java index 5f405b6350d..cd9b4c5b059 100644 --- a/Mage.Sets/src/mage/cards/g/GaddockTeeg.java +++ b/Mage.Sets/src/mage/cards/g/GaddockTeeg.java @@ -48,7 +48,7 @@ class GaddockTeegReplacementEffect4 extends ContinuousRuleModifyingEffectImpl { public GaddockTeegReplacementEffect4() { super(Duration.WhileOnBattlefield, Outcome.Detriment); - staticText = "Noncreature spells with converted mana cost 4 or greater can't be cast. Noncreature spells with {X} in their mana costs can't be cast"; + staticText = "Noncreature spells with mana value 4 or greater can't be cast. Noncreature spells with {X} in their mana costs can't be cast"; } public GaddockTeegReplacementEffect4(final GaddockTeegReplacementEffect4 effect) { @@ -73,7 +73,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.isCreature() && card.getConvertedManaCost() >= 4) { + if (card != null && !card.isCreature() && card.getManaValue() >= 4) { return true; } return false; diff --git a/Mage.Sets/src/mage/cards/g/GazeOfGranite.java b/Mage.Sets/src/mage/cards/g/GazeOfGranite.java index b884ed9bfa7..dae39139fa9 100644 --- a/Mage.Sets/src/mage/cards/g/GazeOfGranite.java +++ b/Mage.Sets/src/mage/cards/g/GazeOfGranite.java @@ -10,7 +10,7 @@ import mage.constants.CardType; import mage.constants.ComparisonType; import mage.constants.Outcome; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -20,9 +20,9 @@ import mage.game.permanent.Permanent; */ public final class GazeOfGranite extends CardImpl { - private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("each nonland permanent with converted mana cost X or less"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("each nonland permanent with mana value X or less"); static { - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 4)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 4)); } public GazeOfGranite(UUID ownerId, CardSetInfo setInfo) { @@ -47,7 +47,7 @@ class GazeOfGraniteEffect extends OneShotEffect { public GazeOfGraniteEffect() { super(Outcome.DestroyPermanent); - staticText = "Destroy each nonland permanent with converted mana cost X or less"; + staticText = "Destroy each nonland permanent with mana value X or less"; } public GazeOfGraniteEffect(final GazeOfGraniteEffect effect) { @@ -62,7 +62,7 @@ class GazeOfGraniteEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { for (Permanent permanent : game.getBattlefield().getActivePermanents(source.getControllerId(), game)) { - if (!permanent.isLand() && permanent.getConvertedManaCost() <= source.getManaCostsToPay().getX()) { + if (!permanent.isLand() && permanent.getManaValue() <= source.getManaCostsToPay().getX()) { permanent.destroy(source, game, false); } } diff --git a/Mage.Sets/src/mage/cards/g/GenesisHydra.java b/Mage.Sets/src/mage/cards/g/GenesisHydra.java index 3b9ce87bb71..2b5cd6c7a21 100644 --- a/Mage.Sets/src/mage/cards/g/GenesisHydra.java +++ b/Mage.Sets/src/mage/cards/g/GenesisHydra.java @@ -19,7 +19,7 @@ import mage.counters.CounterType; import mage.filter.FilterCard; import mage.filter.common.FilterPermanentCard; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.players.Player; import mage.target.TargetCard; @@ -59,7 +59,7 @@ class GenesisHydraPutOntoBattlefieldEffect extends OneShotEffect { public GenesisHydraPutOntoBattlefieldEffect() { super(Outcome.PutCardInPlay); - staticText = "reveal the top X cards of your library. You may put a nonland permanent card with converted mana cost X or less from among them onto the battlefield. Then shuffle the rest into your library"; + staticText = "reveal the top X cards of your library. You may put a nonland permanent card with mana value X or less from among them onto the battlefield. Then shuffle the rest into your library"; } public GenesisHydraPutOntoBattlefieldEffect(final GenesisHydraPutOntoBattlefieldEffect effect) { @@ -75,9 +75,9 @@ class GenesisHydraPutOntoBattlefieldEffect extends OneShotEffect { if (count > 0) { Cards cards = new CardsImpl(controller.getLibrary().getTopCards(game, count)); controller.revealCards(source, cards, game); - FilterCard filter = new FilterPermanentCard("a nonland permanent card with converted mana cost " + count + " or less to put onto the battlefield"); + FilterCard filter = new FilterPermanentCard("a nonland permanent card with mana value " + count + " or less to put onto the battlefield"); filter.add(Predicates.not(CardType.LAND.getPredicate())); - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, count + 1)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, count + 1)); TargetCard target1 = new TargetCard(Zone.LIBRARY, filter); target1.setRequired(false); if (cards.count(filter, controller.getId(), source.getSourceId(), game) > 0) { @@ -92,7 +92,7 @@ class GenesisHydraPutOntoBattlefieldEffect extends OneShotEffect { game.informPlayers(controller.getLogName() + " didn't choose anything"); } } else { - game.informPlayers("No nonland permanent card with converted mana cost " + count + " or less to choose."); + game.informPlayers("No nonland permanent card with mana value " + count + " or less to choose."); } if (!cards.isEmpty()) { controller.moveCards(cards, Zone.LIBRARY, source, game); diff --git a/Mage.Sets/src/mage/cards/g/GenesisWave.java b/Mage.Sets/src/mage/cards/g/GenesisWave.java index 5b337d25381..f809721ebca 100644 --- a/Mage.Sets/src/mage/cards/g/GenesisWave.java +++ b/Mage.Sets/src/mage/cards/g/GenesisWave.java @@ -12,7 +12,7 @@ import mage.constants.Outcome; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.common.FilterPermanentCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.players.Player; import mage.target.TargetCard; @@ -46,7 +46,7 @@ class GenesisWaveEffect extends OneShotEffect { public GenesisWaveEffect() { super(Outcome.PutCardInPlay); - staticText = "Reveal the top X cards of your library. You may put any number of permanent cards with converted mana cost X or less from among them onto the battlefield. Then put all cards revealed this way that weren't put onto the battlefield into your graveyard"; + staticText = "Reveal the top X cards of your library. You may put any number of permanent cards with mana value X or less from among them onto the battlefield. Then put all cards revealed this way that weren't put onto the battlefield into your graveyard"; } public GenesisWaveEffect(final GenesisWaveEffect effect) { @@ -63,8 +63,8 @@ class GenesisWaveEffect extends OneShotEffect { Cards cards = new CardsImpl(controller.getLibrary().getTopCards(game, xValue)); if (!cards.isEmpty()) { controller.revealCards(source, cards, game); - FilterCard filter = new FilterPermanentCard("cards with converted mana cost " + xValue + " or less to put onto the battlefield"); - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, xValue + 1)); + FilterCard filter = new FilterPermanentCard("cards with mana value " + xValue + " or less to put onto the battlefield"); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, xValue + 1)); TargetCard target1 = new TargetCard(0, Integer.MAX_VALUE, Zone.LIBRARY, filter); target1.setNotTarget(true); controller.choose(Outcome.PutCardInPlay, cards, target1, game); diff --git a/Mage.Sets/src/mage/cards/g/GethLordOfTheVault.java b/Mage.Sets/src/mage/cards/g/GethLordOfTheVault.java index d93dc196a8c..ce4b6e749ba 100644 --- a/Mage.Sets/src/mage/cards/g/GethLordOfTheVault.java +++ b/Mage.Sets/src/mage/cards/g/GethLordOfTheVault.java @@ -24,7 +24,7 @@ import java.util.UUID; */ public final class GethLordOfTheVault extends CardImpl { - private static final FilterCard filter = new FilterCard("artifact or creature card with converted mana cost X from an opponent's graveyard"); + private static final FilterCard filter = new FilterCard("artifact or creature card with mana value X from an opponent's graveyard"); static { filter.add(TargetController.OPPONENT.getOwnerPredicate()); @@ -66,7 +66,7 @@ class GethLordOfTheVaultEffect extends OneShotEffect { public GethLordOfTheVaultEffect() { super(Outcome.Benefit); - staticText = "Put target artifact or creature card with converted mana cost X from an opponent's graveyard onto the battlefield under your control tapped. Then that player mills X cards"; + staticText = "Put target artifact or creature card with mana value X from an opponent's graveyard onto the battlefield under your control tapped. Then that player mills X cards"; } public GethLordOfTheVaultEffect(final GethLordOfTheVaultEffect effect) { @@ -86,7 +86,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.millCards(card.getConvertedManaCost(), source, game); + player.millCards(card.getManaValue(), source, game); } return true; } diff --git a/Mage.Sets/src/mage/cards/g/GilanraCallerOfWirewood.java b/Mage.Sets/src/mage/cards/g/GilanraCallerOfWirewood.java index 4f3bdc208ca..6e93b10abec 100644 --- a/Mage.Sets/src/mage/cards/g/GilanraCallerOfWirewood.java +++ b/Mage.Sets/src/mage/cards/g/GilanraCallerOfWirewood.java @@ -93,7 +93,7 @@ class GilanraCallerOfWirewoodTriggeredAbility extends DelayedTriggeredAbility { return false; } Spell spell = game.getStack().getSpell(event.getTargetId()); - return spell != null && spell.getConvertedManaCost() >= 6; + return spell != null && spell.getManaValue() >= 6; } @Override @@ -114,6 +114,6 @@ class GilanraCallerOfWirewoodTriggeredAbility extends DelayedTriggeredAbility { @Override public String getRule() { - return "When you spend this mana to cast a spell with converted mana cost 6 or greater, draw a card."; + return "When you spend this mana to cast a spell with mana value 6 or greater, draw a card."; } } diff --git a/Mage.Sets/src/mage/cards/g/GlassCasket.java b/Mage.Sets/src/mage/cards/g/GlassCasket.java index a2267dcbb0f..c857d8e8d80 100644 --- a/Mage.Sets/src/mage/cards/g/GlassCasket.java +++ b/Mage.Sets/src/mage/cards/g/GlassCasket.java @@ -11,7 +11,7 @@ import mage.constants.CardType; import mage.constants.ComparisonType; import mage.filter.FilterPermanent; import mage.filter.common.FilterOpponentsCreaturePermanent; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.target.TargetPermanent; import java.util.UUID; @@ -22,10 +22,10 @@ import java.util.UUID; public final class GlassCasket extends CardImpl { private static final FilterPermanent filter - = new FilterOpponentsCreaturePermanent("creature an opponent controls with converted mana cost 3 or less"); + = new FilterOpponentsCreaturePermanent("creature an opponent controls with mana value 3 or less"); static { - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 4)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 4)); } public GlassCasket(UUID ownerId, CardSetInfo setInfo) { @@ -34,7 +34,7 @@ public final class GlassCasket extends CardImpl { // When Glass Casket enters the battlefield, exile target creature an opponent controls with converted mana cost 3 or less until Glass Casket leaves the battlefield. Ability ability = new EntersBattlefieldTriggeredAbility( new ExileUntilSourceLeavesEffect("") - .setText("exile target creature an opponent controls with converted mana cost 3 " + + .setText("exile target creature an opponent controls with mana value 3 " + "or less until {this} leaves the battlefield") ); ability.addTarget(new TargetPermanent(filter)); diff --git a/Mage.Sets/src/mage/cards/g/GlissaSunseeker.java b/Mage.Sets/src/mage/cards/g/GlissaSunseeker.java index 702c38114c7..501d594d07a 100644 --- a/Mage.Sets/src/mage/cards/g/GlissaSunseeker.java +++ b/Mage.Sets/src/mage/cards/g/GlissaSunseeker.java @@ -57,7 +57,7 @@ class GlissaSunseekerEffect extends OneShotEffect { public GlissaSunseekerEffect() { super(Outcome.DestroyPermanent); - this.staticText = "Destroy target artifact if its converted mana cost is equal to the amount of unspent mana you have"; + this.staticText = "Destroy target artifact if its mana value is equal to the amount of unspent mana you have"; } public GlissaSunseekerEffect(final GlissaSunseekerEffect effect) { @@ -84,7 +84,7 @@ class GlissaSunseekerEffect extends OneShotEffect { int redMana = pool.getRed(); int colorlessMana = pool.getColorless(); int manaPoolTotal = blackMana + whiteMana + blueMana + greenMana + redMana + colorlessMana; - if (permanent.getConvertedManaCost() == manaPoolTotal) { + if (permanent.getManaValue() == manaPoolTotal) { return permanent.destroy(source, game, false); } return false; diff --git a/Mage.Sets/src/mage/cards/g/GoblinDarkDwellers.java b/Mage.Sets/src/mage/cards/g/GoblinDarkDwellers.java index e68cc7bd5ee..6c0642398b0 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinDarkDwellers.java +++ b/Mage.Sets/src/mage/cards/g/GoblinDarkDwellers.java @@ -19,7 +19,7 @@ import mage.constants.Outcome; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterInstantOrSorceryCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.ZoneChangeEvent; @@ -34,10 +34,10 @@ import mage.target.targetpointer.FixedTarget; public final class GoblinDarkDwellers extends CardImpl { private static final FilterInstantOrSorceryCard filter - = new FilterInstantOrSorceryCard("instant or sorcery card with converted mana cost 3 or less"); + = new FilterInstantOrSorceryCard("instant or sorcery card with mana value 3 or less"); static { - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 4)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 4)); } public GoblinDarkDwellers(UUID ownerId, CardSetInfo setInfo) { @@ -71,7 +71,7 @@ class GoblinDarkDwellersEffect extends OneShotEffect { GoblinDarkDwellersEffect() { super(Outcome.PlayForFree); this.staticText = "you may cast target instant or sorcery card with " - + "converted mana cost 3 or less from your graveyard without paying its mana cost. " + + "mana value 3 or less from your graveyard without paying its mana cost. " + "If that card would be put into your graveyard this turn, exile it instead"; } diff --git a/Mage.Sets/src/mage/cards/g/GoblinEngineer.java b/Mage.Sets/src/mage/cards/g/GoblinEngineer.java index 9f3cb9b6f0d..4d5caa3d127 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinEngineer.java +++ b/Mage.Sets/src/mage/cards/g/GoblinEngineer.java @@ -17,7 +17,7 @@ import mage.filter.StaticFilters; import mage.filter.common.FilterArtifactCard; import mage.filter.common.FilterControlledArtifactPermanent; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCardInLibrary; @@ -34,10 +34,10 @@ public final class GoblinEngineer extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledArtifactPermanent("an artifact"); private static final FilterCard filter2 - = new FilterArtifactCard("artifact card with converted mana cost 3 or less from your graveyard"); + = new FilterArtifactCard("artifact card with mana value 3 or less from your graveyard"); static { - filter2.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 4)); + filter2.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 4)); } public GoblinEngineer(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GoblinMachinist.java b/Mage.Sets/src/mage/cards/g/GoblinMachinist.java index 4b7c47053cf..33dc8bea4a6 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinMachinist.java +++ b/Mage.Sets/src/mage/cards/g/GoblinMachinist.java @@ -50,7 +50,7 @@ class GoblinMachinistEffect extends OneShotEffect { public GoblinMachinistEffect() { super(Outcome.DrawCard); - this.staticText = "Reveal cards from the top of your library until you reveal a nonland card. {this} gets +X/+0 until end of turn, where X is that card's converted mana cost. Put the revealed cards on the bottom of your library in any order"; + this.staticText = "Reveal cards from the top of your library until you reveal a nonland card. {this} gets +X/+0 until end of turn, where X is that card's mana value. Put the revealed cards on the bottom of your library in any order"; } public GoblinMachinistEffect(final GoblinMachinistEffect effect) { @@ -71,8 +71,8 @@ class GoblinMachinistEffect extends OneShotEffect { if (card != null) { cards.add(card); if (!card.isLand()) { - if (card.getConvertedManaCost() > 0) { - game.addEffect(new BoostSourceEffect(card.getConvertedManaCost(), 0, Duration.EndOfTurn), source); + if (card.getManaValue() > 0) { + game.addEffect(new BoostSourceEffect(card.getManaValue(), 0, Duration.EndOfTurn), source); } break; } diff --git a/Mage.Sets/src/mage/cards/g/GoblinTinkerer.java b/Mage.Sets/src/mage/cards/g/GoblinTinkerer.java index 8541f5816cc..1658419229c 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinTinkerer.java +++ b/Mage.Sets/src/mage/cards/g/GoblinTinkerer.java @@ -56,7 +56,7 @@ class GoblinTinkererDamageEffect extends OneShotEffect { public GoblinTinkererDamageEffect() { super(Outcome.Detriment); - this.staticText = "That artifact deals damage equal to its converted mana cost to {this}"; + this.staticText = "That artifact deals damage equal to its mana value to {this}"; } public GoblinTinkererDamageEffect(final GoblinTinkererDamageEffect effect) { @@ -74,7 +74,7 @@ class GoblinTinkererDamageEffect extends OneShotEffect { Permanent targetArtifact = getTargetPointer().getFirstTargetPermanentOrLKI(game, source); if (controller != null && targetArtifact != null) { Permanent sourceObject = game.getPermanent(source.getSourceId()); - int damage = targetArtifact.getConvertedManaCost(); + int damage = targetArtifact.getManaValue(); if (sourceObject != null && damage > 0) { sourceObject.damage(damage, targetArtifact.getId(), source, game, false, true); } diff --git a/Mage.Sets/src/mage/cards/g/GorillaShaman.java b/Mage.Sets/src/mage/cards/g/GorillaShaman.java index 050bda821cb..33eeffbdf0b 100644 --- a/Mage.Sets/src/mage/cards/g/GorillaShaman.java +++ b/Mage.Sets/src/mage/cards/g/GorillaShaman.java @@ -22,7 +22,7 @@ import mage.target.targetadjustment.XCMCPermanentAdjuster; */ public final class GorillaShaman extends CardImpl { - private static final FilterPermanent filter = new FilterPermanent("noncreature artifact with converted mana cost X"); + private static final FilterPermanent filter = new FilterPermanent("noncreature artifact with mana value X"); static { filter.add(CardType.ARTIFACT.getPredicate()); diff --git a/Mage.Sets/src/mage/cards/g/Granulate.java b/Mage.Sets/src/mage/cards/g/Granulate.java index 88ac14173e5..13866ad1be0 100644 --- a/Mage.Sets/src/mage/cards/g/Granulate.java +++ b/Mage.Sets/src/mage/cards/g/Granulate.java @@ -8,7 +8,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.ComparisonType; import mage.filter.common.FilterNonlandPermanent; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; /** * @@ -16,10 +16,10 @@ import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; */ public final class Granulate extends CardImpl { - private static final FilterNonlandPermanent filter = new FilterNonlandPermanent("nonland artifact with converted mana cost 4 or less"); + private static final FilterNonlandPermanent filter = new FilterNonlandPermanent("nonland artifact with mana value 4 or less"); static { filter.add(CardType.ARTIFACT.getPredicate()); - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 5)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 5)); } public Granulate(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{2}{R}{R}"); diff --git a/Mage.Sets/src/mage/cards/g/GreatDefender.java b/Mage.Sets/src/mage/cards/g/GreatDefender.java index d6fae702962..5f82bc8fa33 100644 --- a/Mage.Sets/src/mage/cards/g/GreatDefender.java +++ b/Mage.Sets/src/mage/cards/g/GreatDefender.java @@ -3,7 +3,7 @@ package mage.cards.g; import java.util.UUID; import mage.abilities.dynamicvalue.common.StaticValue; -import mage.abilities.dynamicvalue.common.TargetConvertedManaCost; +import mage.abilities.dynamicvalue.common.TargetManaValue; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -22,8 +22,8 @@ public final class GreatDefender extends CardImpl { // Target creature gets +0/+X until end of turn, where X is its converted mana cost. this.getSpellAbility().addTarget(new TargetCreaturePermanent()); - this.getSpellAbility().addEffect(new BoostTargetEffect(StaticValue.get(0), TargetConvertedManaCost.instance, Duration.EndOfTurn, true) - .setText("Target creature gets +0/+X until end of turn, where X is its converted mana cost.") + this.getSpellAbility().addEffect(new BoostTargetEffect(StaticValue.get(0), TargetManaValue.instance, Duration.EndOfTurn, true) + .setText("Target creature gets +0/+X until end of turn, where X is its mana value.") ); } diff --git a/Mage.Sets/src/mage/cards/g/Grozoth.java b/Mage.Sets/src/mage/cards/g/Grozoth.java index f5910cf48b5..9d4fd5a1eb0 100644 --- a/Mage.Sets/src/mage/cards/g/Grozoth.java +++ b/Mage.Sets/src/mage/cards/g/Grozoth.java @@ -19,7 +19,7 @@ import mage.constants.Duration; import mage.constants.Outcome; import mage.constants.Zone; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCardInLibrary; @@ -67,12 +67,12 @@ class GrozothEffect extends SearchEffect { private static final FilterCard filter = new FilterCard(); static { - filter.add(new ConvertedManaCostPredicate(ComparisonType.EQUAL_TO, 9)); + filter.add(new ManaValuePredicate(ComparisonType.EQUAL_TO, 9)); } public GrozothEffect() { super(new TargetCardInLibrary(0, Integer.MAX_VALUE, filter), Outcome.DrawCard); - staticText = "you may search your library for any number of cards that have converted mana cost 9, reveal them, and put them into your hand. If you do, shuffle your library"; + staticText = "you may search your library for any number of cards that have mana value 9, reveal them, and put them into your hand. If you do, shuffle your library"; } public GrozothEffect(final GrozothEffect effect) { diff --git a/Mage.Sets/src/mage/cards/g/GruesomeMenagerie.java b/Mage.Sets/src/mage/cards/g/GruesomeMenagerie.java index 6eeeaf9391d..ee7310ed349 100644 --- a/Mage.Sets/src/mage/cards/g/GruesomeMenagerie.java +++ b/Mage.Sets/src/mage/cards/g/GruesomeMenagerie.java @@ -14,7 +14,7 @@ import mage.constants.Outcome; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.common.FilterCreatureCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.players.Player; import mage.target.Target; @@ -46,23 +46,23 @@ public final class GruesomeMenagerie extends CardImpl { class GruesomeMenagerieEffect extends OneShotEffect { private static final FilterCard filter1 - = new FilterCreatureCard("creature card with converted mana cost 1"); + = new FilterCreatureCard("creature card with mana value 1"); private static final FilterCard filter2 - = new FilterCreatureCard("creature card with converted mana cost 2"); + = new FilterCreatureCard("creature card with mana value 2"); private static final FilterCard filter3 - = new FilterCreatureCard("creature card with converted mana cost 3"); + = new FilterCreatureCard("creature card with mana value 3"); static { - filter1.add(new ConvertedManaCostPredicate(ComparisonType.EQUAL_TO, 1)); - filter2.add(new ConvertedManaCostPredicate(ComparisonType.EQUAL_TO, 2)); - filter3.add(new ConvertedManaCostPredicate(ComparisonType.EQUAL_TO, 3)); + filter1.add(new ManaValuePredicate(ComparisonType.EQUAL_TO, 1)); + filter2.add(new ManaValuePredicate(ComparisonType.EQUAL_TO, 2)); + filter3.add(new ManaValuePredicate(ComparisonType.EQUAL_TO, 3)); } public GruesomeMenagerieEffect() { super(Outcome.Benefit); - this.staticText = "Choose a creature card with converted mana cost 1 " + this.staticText = "Choose a creature card with mana value 1 " + "in your graveyard, then do the same for creature cards " - + "with converted mana costs 2 and 3. " + + "with mana values 2 and 3. " + "Return those cards to the battlefield."; } diff --git a/Mage.Sets/src/mage/cards/g/GyrudaDoomOfDepths.java b/Mage.Sets/src/mage/cards/g/GyrudaDoomOfDepths.java index effc47bf9a7..aec97874ad3 100644 --- a/Mage.Sets/src/mage/cards/g/GyrudaDoomOfDepths.java +++ b/Mage.Sets/src/mage/cards/g/GyrudaDoomOfDepths.java @@ -11,7 +11,7 @@ import mage.cards.*; import mage.constants.*; import mage.filter.FilterCard; import mage.filter.common.FilterCreatureCard; -import mage.filter.predicate.mageobject.ConvertedManaCostParityPredicate; +import mage.filter.predicate.mageobject.ManaValueParityPredicate; import mage.game.Game; import mage.players.Player; import mage.target.TargetCard; @@ -56,14 +56,14 @@ enum GyrudaDoomOfDepthsCompanionCondition implements CompanionCondition { @Override public String getRule() { - return "Your starting deck contains only cards with even converted mana costs."; + return "Your starting deck contains only cards with even mana values."; } @Override public boolean isLegal(Set deck, int startingSize) { return deck .stream() - .mapToInt(MageObject::getConvertedManaCost) + .mapToInt(MageObject::getManaValue) .map(i -> i % 2) .allMatch(i -> i == 0); } @@ -72,15 +72,15 @@ enum GyrudaDoomOfDepthsCompanionCondition implements CompanionCondition { class GyrudaDoomOfDepthsEffect extends OneShotEffect { private static final FilterCard filter - = new FilterCreatureCard("creature card with an even converted mana cost"); + = new FilterCreatureCard("creature card with an even mana value"); static { - filter.add(ConvertedManaCostParityPredicate.EVEN); + filter.add(ManaValueParityPredicate.EVEN); } GyrudaDoomOfDepthsEffect() { super(Outcome.Benefit); - staticText = "each player mills four cards. Put a creature card with an even converted mana cost " + + staticText = "each player mills four cards. Put a creature card with an even mana value " + "from among the milled cards onto the battlefield under your control"; } diff --git a/Mage.Sets/src/mage/cards/h/HaktosTheUnscarred.java b/Mage.Sets/src/mage/cards/h/HaktosTheUnscarred.java index d5f0960f3b2..3a585e8ee91 100644 --- a/Mage.Sets/src/mage/cards/h/HaktosTheUnscarred.java +++ b/Mage.Sets/src/mage/cards/h/HaktosTheUnscarred.java @@ -53,7 +53,7 @@ public final class HaktosTheUnscarred extends CardImpl { ability.setRuleVisible(false); this.addAbility(new SimpleStaticAbility( new GainAbilitySourceEffect(ability, Duration.WhileOnBattlefield) - .setText("{this} has protection from each converted mana cost other than the chosen number") + .setText("{this} has protection from each mana value other than the chosen number") )); } @@ -111,6 +111,6 @@ enum HaktosTheUnscarredPredicate implements ObjectSourcePlayerPredicate 0) { player.gainLife(cmc, game, source); } diff --git a/Mage.Sets/src/mage/cards/h/HisokaMinamoSensei.java b/Mage.Sets/src/mage/cards/h/HisokaMinamoSensei.java index 4d356f93707..013d99f54d2 100644 --- a/Mage.Sets/src/mage/cards/h/HisokaMinamoSensei.java +++ b/Mage.Sets/src/mage/cards/h/HisokaMinamoSensei.java @@ -108,7 +108,7 @@ class HisokaMinamoSenseiDiscardTargetCost extends CostImpl { class HisokaMinamoSenseiCounterEffect extends OneShotEffect { HisokaMinamoSenseiCounterEffect() { super(Outcome.Detriment); - staticText = "Counter target spell if it has the same converted mana cost as the discarded card"; + staticText = "Counter target spell if it has the same mana value as the discarded card"; } HisokaMinamoSenseiCounterEffect(final HisokaMinamoSenseiCounterEffect effect) { @@ -120,7 +120,7 @@ class HisokaMinamoSenseiCounterEffect extends OneShotEffect { Spell spell = game.getStack().getSpell(targetPointer.getFirst(game, source)); if (spell != null) { HisokaMinamoSenseiDiscardTargetCost cost = (HisokaMinamoSenseiDiscardTargetCost) source.getCosts().get(0); - if (cost != null && cost.getDiscardedCard().getConvertedManaCost() == spell.getConvertedManaCost()) { + if (cost != null && cost.getDiscardedCard().getManaValue() == spell.getManaValue()) { return game.getStack().counter(targetPointer.getFirst(game, source), source, game); } } diff --git a/Mage.Sets/src/mage/cards/h/HitRun.java b/Mage.Sets/src/mage/cards/h/HitRun.java index 4d676b8add3..33924e502d9 100644 --- a/Mage.Sets/src/mage/cards/h/HitRun.java +++ b/Mage.Sets/src/mage/cards/h/HitRun.java @@ -55,7 +55,7 @@ class HitEffect extends OneShotEffect { public HitEffect() { super(Outcome.DestroyPermanent); - this.staticText = "Target player sacrifices an artifact or creature. Hit deals damage to that player equal to that permanent's converted mana cost"; + this.staticText = "Target player sacrifices an artifact or creature. Hit deals damage to that player equal to that permanent's mana value"; } public HitEffect(final HitEffect effect) { @@ -82,7 +82,7 @@ class HitEffect extends OneShotEffect { Permanent permanent = game.getPermanent(target.getFirstTarget()); if (permanent != null) { permanent.sacrifice(source, game); - int damage = permanent.getConvertedManaCost(); + int damage = permanent.getManaValue(); if (damage > 0) { targetPlayer.damage(damage, source.getSourceId(), source, game); } diff --git a/Mage.Sets/src/mage/cards/h/HoardSmelterDragon.java b/Mage.Sets/src/mage/cards/h/HoardSmelterDragon.java index cb6a49e0555..96b903d0d72 100644 --- a/Mage.Sets/src/mage/cards/h/HoardSmelterDragon.java +++ b/Mage.Sets/src/mage/cards/h/HoardSmelterDragon.java @@ -58,7 +58,7 @@ class HoardSmelterEffect extends ContinuousEffectImpl { HoardSmelterEffect() { super(Duration.EndOfTurn, Layer.PTChangingEffects_7, SubLayer.ModifyPT_7c, Outcome.BoostCreature); - staticText = "{this} gets +X/+0 until end of turn, where X is that artifact's converted mana cost"; + staticText = "{this} gets +X/+0 until end of turn, where X is that artifact's mana value"; } HoardSmelterEffect(final HoardSmelterEffect effect) { @@ -80,7 +80,7 @@ class HoardSmelterEffect extends ContinuousEffectImpl { public void init(Ability source, Game game) { Card targeted = game.getCard(source.getFirstTarget()); if (targeted != null) { - costValue = targeted.getConvertedManaCost(); + costValue = targeted.getManaValue(); } } diff --git a/Mage.Sets/src/mage/cards/h/HogaakArisenNecropolis.java b/Mage.Sets/src/mage/cards/h/HogaakArisenNecropolis.java index 5aa89d98660..72cb7f4dbf6 100644 --- a/Mage.Sets/src/mage/cards/h/HogaakArisenNecropolis.java +++ b/Mage.Sets/src/mage/cards/h/HogaakArisenNecropolis.java @@ -13,7 +13,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import java.util.UUID; @@ -26,7 +26,7 @@ public final class HogaakArisenNecropolis extends CardImpl { private static final FilterPermanent filter = new FilterPermanent(); static { - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, -1)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, -1)); } public HogaakArisenNecropolis(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/h/HorriblyAwry.java b/Mage.Sets/src/mage/cards/h/HorriblyAwry.java index 10f2cbed72b..80c556dd4ab 100644 --- a/Mage.Sets/src/mage/cards/h/HorriblyAwry.java +++ b/Mage.Sets/src/mage/cards/h/HorriblyAwry.java @@ -10,7 +10,7 @@ import mage.constants.CardType; import mage.constants.ComparisonType; import mage.constants.Zone; import mage.filter.common.FilterCreatureSpell; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.target.TargetSpell; /** @@ -19,10 +19,10 @@ import mage.target.TargetSpell; */ public final class HorriblyAwry extends CardImpl { - private static final FilterCreatureSpell filter = new FilterCreatureSpell("creature spell with converted mana cost 4 or less"); + private static final FilterCreatureSpell filter = new FilterCreatureSpell("creature spell with mana value 4 or less"); static { - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 5)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 5)); } public HorriblyAwry(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/h/HypnoticSprite.java b/Mage.Sets/src/mage/cards/h/HypnoticSprite.java index 89b51318570..205199389c8 100644 --- a/Mage.Sets/src/mage/cards/h/HypnoticSprite.java +++ b/Mage.Sets/src/mage/cards/h/HypnoticSprite.java @@ -9,7 +9,7 @@ import mage.constants.CardType; import mage.constants.ComparisonType; import mage.constants.SubType; import mage.filter.FilterSpell; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.target.TargetSpell; import java.util.UUID; @@ -19,10 +19,10 @@ import java.util.UUID; */ public final class HypnoticSprite extends AdventureCard { - private static final FilterSpell filter = new FilterSpell("spell with converted mana cost 3 or less"); + private static final FilterSpell filter = new FilterSpell("spell with mana value 3 or less"); static { - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 4)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 4)); } public HypnoticSprite(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/i/IdolOfEndurance.java b/Mage.Sets/src/mage/cards/i/IdolOfEndurance.java index a9570fc12eb..c11171f6e39 100644 --- a/Mage.Sets/src/mage/cards/i/IdolOfEndurance.java +++ b/Mage.Sets/src/mage/cards/i/IdolOfEndurance.java @@ -13,7 +13,7 @@ import mage.cards.*; import mage.constants.*; import mage.filter.FilterCard; import mage.filter.common.FilterCreatureCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.ZoneChangeEvent; @@ -58,12 +58,12 @@ class IdolOfEnduranceExileEffect extends OneShotEffect { private static final FilterCard filter = new FilterCreatureCard(); static { - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 4)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 4)); } IdolOfEnduranceExileEffect() { super(Outcome.Benefit); - staticText = "exile all creature cards with converted mana cost 3 or less from your graveyard until {this} leaves the battlefield"; + staticText = "exile all creature cards with mana value 3 or less from your graveyard until {this} leaves the battlefield"; } private IdolOfEnduranceExileEffect(final IdolOfEnduranceExileEffect effect) { diff --git a/Mage.Sets/src/mage/cards/i/IgniteMemories.java b/Mage.Sets/src/mage/cards/i/IgniteMemories.java index 474dac244ef..6d322820105 100644 --- a/Mage.Sets/src/mage/cards/i/IgniteMemories.java +++ b/Mage.Sets/src/mage/cards/i/IgniteMemories.java @@ -42,7 +42,7 @@ class IgniteMemoriesEffect extends OneShotEffect { public IgniteMemoriesEffect() { super(Outcome.Damage); - staticText = "Target player reveals a card at random from their hand. {this} deals damage to that player equal to that card's converted mana cost"; + staticText = "Target player reveals a card at random from their hand. {this} deals damage to that player equal to that card's mana value"; } public IgniteMemoriesEffect(final IgniteMemoriesEffect effect) { @@ -60,7 +60,7 @@ class IgniteMemoriesEffect extends OneShotEffect { if (card != null) { revealed.add(card); controller.revealCards(sourceObject.getIdName(), revealed, game); - controller.damage(card.getConvertedManaCost(), source.getSourceId(), source, game); + controller.damage(card.getManaValue(), source.getSourceId(), source, game); return true; } return false; diff --git a/Mage.Sets/src/mage/cards/i/Illumination.java b/Mage.Sets/src/mage/cards/i/Illumination.java index eba22be9467..5894d6b6f81 100644 --- a/Mage.Sets/src/mage/cards/i/Illumination.java +++ b/Mage.Sets/src/mage/cards/i/Illumination.java @@ -55,7 +55,7 @@ class IlluminationEffect extends OneShotEffect { public IlluminationEffect() { super(Outcome.GainLife); - staticText = "Its controller gains life equal to its converted mana cost"; + staticText = "Its controller gains life equal to its mana value"; } public IlluminationEffect(final IlluminationEffect effect) { @@ -81,7 +81,7 @@ class IlluminationEffect extends OneShotEffect { } if (controller != null) { Spell spell = game.getStack().getSpell(targetPointer.getFirst(game, source)); - int cost = spell.getConvertedManaCost(); + int cost = spell.getManaValue(); Player player = game.getPlayer(spell.getControllerId()); if (player != null) { player.gainLife(cost, game, source); diff --git a/Mage.Sets/src/mage/cards/i/ImminentDoom.java b/Mage.Sets/src/mage/cards/i/ImminentDoom.java index 56be45926fb..e68e7df7626 100644 --- a/Mage.Sets/src/mage/cards/i/ImminentDoom.java +++ b/Mage.Sets/src/mage/cards/i/ImminentDoom.java @@ -52,7 +52,7 @@ public final class ImminentDoom extends CardImpl { class ImminentDoomTriggeredAbility extends TriggeredAbilityImpl { - private String rule = "Whenever you cast a spell with converted mana cost equal to the number of doom counters on {this}, {this} deals that much damage to any target. Then put a doom counter on {this}."; + private String rule = "Whenever you cast a spell with mana value equal to the number of doom counters on {this}, {this} deals that much damage to any target. Then put a doom counter on {this}."; public ImminentDoomTriggeredAbility() { super(Zone.BATTLEFIELD, new ImminentDoomEffect()); @@ -79,7 +79,7 @@ class ImminentDoomTriggeredAbility extends TriggeredAbilityImpl { Spell spell = game.getStack().getSpell(event.getTargetId()); if (spell != null && imminentDoom != null - && spell.getConvertedManaCost() == imminentDoom.getCounters(game).getCount(CounterType.DOOM)) { + && spell.getManaValue() == imminentDoom.getCounters(game).getCount(CounterType.DOOM)) { game.getState().setValue("ImminentDoomCount" + getSourceId().toString(), imminentDoom.getCounters(game).getCount(CounterType.DOOM)); // store its current value return true; } diff --git a/Mage.Sets/src/mage/cards/i/ImmortalServitude.java b/Mage.Sets/src/mage/cards/i/ImmortalServitude.java index baf03db3ba8..5704d4df4a2 100644 --- a/Mage.Sets/src/mage/cards/i/ImmortalServitude.java +++ b/Mage.Sets/src/mage/cards/i/ImmortalServitude.java @@ -42,7 +42,7 @@ class ImmortalServitudeEffect extends OneShotEffect { ImmortalServitudeEffect() { super(Outcome.PutCreatureInPlay); - this.staticText = "Return each creature card with converted mana cost X from your graveyard to the battlefield"; + this.staticText = "Return each creature card with mana value X from your graveyard to the battlefield"; } private ImmortalServitudeEffect(final ImmortalServitudeEffect effect) { @@ -64,7 +64,7 @@ class ImmortalServitudeEffect extends OneShotEffect { Set cards = you.getGraveyard().getCards(StaticFilters.FILTER_CARD_CREATURE, game); cards.removeIf(Objects::isNull); cards.removeIf(card -> !card.isCreature()); - cards.removeIf(card -> card.getConvertedManaCost() != count); + cards.removeIf(card -> card.getManaValue() != count); return you.moveCards(cards, Zone.BATTLEFIELD, source, game); } } diff --git a/Mage.Sets/src/mage/cards/i/ImotiCelebrantOfBounty.java b/Mage.Sets/src/mage/cards/i/ImotiCelebrantOfBounty.java index 51015c50ced..0ea33ab8a56 100644 --- a/Mage.Sets/src/mage/cards/i/ImotiCelebrantOfBounty.java +++ b/Mage.Sets/src/mage/cards/i/ImotiCelebrantOfBounty.java @@ -11,7 +11,7 @@ import mage.constants.ComparisonType; import mage.constants.SubType; import mage.constants.SuperType; import mage.filter.FilterObject; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import java.util.UUID; @@ -21,10 +21,10 @@ import java.util.UUID; public final class ImotiCelebrantOfBounty extends CardImpl { private static final FilterObject filter - = new FilterObject("Spells you cast with converted mana cost 6 or greater"); + = new FilterObject("Spells you cast with mana value 6 or greater"); static { - filter.add(new ConvertedManaCostPredicate(ComparisonType.MORE_THAN, 5)); + filter.add(new ManaValuePredicate(ComparisonType.MORE_THAN, 5)); } public ImotiCelebrantOfBounty(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/i/ImpsMischief.java b/Mage.Sets/src/mage/cards/i/ImpsMischief.java index 4bfa899fb64..68c4809ce46 100644 --- a/Mage.Sets/src/mage/cards/i/ImpsMischief.java +++ b/Mage.Sets/src/mage/cards/i/ImpsMischief.java @@ -54,7 +54,7 @@ class ImpsMischiefLoseLifeEffect extends OneShotEffect { public ImpsMischiefLoseLifeEffect() { super(Outcome.LoseLife); - staticText = "You lose life equal to that spell's converted mana cost"; + staticText = "You lose life equal to that spell's mana value"; } public ImpsMischiefLoseLifeEffect(final ImpsMischiefLoseLifeEffect effect) { @@ -72,7 +72,7 @@ class ImpsMischiefLoseLifeEffect extends OneShotEffect { if (spell != null) { Player player = game.getPlayer(source.getControllerId()); if (player != null) { - player.loseLife(spell.getConvertedManaCost(), game, source, false); + player.loseLife(spell.getManaValue(), game, source, false); return true; } } diff --git a/Mage.Sets/src/mage/cards/i/InSearchOfGreatness.java b/Mage.Sets/src/mage/cards/i/InSearchOfGreatness.java index 8ba640a75b9..66b78be6045 100644 --- a/Mage.Sets/src/mage/cards/i/InSearchOfGreatness.java +++ b/Mage.Sets/src/mage/cards/i/InSearchOfGreatness.java @@ -12,7 +12,7 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterPermanentCard; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -49,8 +49,8 @@ class InSearchOfGreatnessEffect extends OneShotEffect { public InSearchOfGreatnessEffect() { super(Outcome.PlayForFree); - staticText = "you may cast a permanent spell from your hand with converted mana cost " - + "equal to 1 plus the highest converted mana cost among other permanents you control " + staticText = "you may cast a permanent spell from your hand with mana value " + + "equal to 1 plus the highest mana value among other permanents you control " + "without paying its mana cost. If you don't, scry 1"; } @@ -73,7 +73,7 @@ class InSearchOfGreatnessEffect extends OneShotEffect { UUID permId = source.getSourceId(); for (Permanent permanent : game.getBattlefield().getAllActivePermanents(controller.getId())) { if (permanent != null && !permanent.getId().equals(permId)) { - int permCmc = permanent.getConvertedManaCost(); + int permCmc = permanent.getManaValue(); if (permCmc > cmc) { cmc = permCmc; } @@ -83,7 +83,7 @@ class InSearchOfGreatnessEffect extends OneShotEffect { + ++cmc + "?", source, game)) { FilterPermanentCard filter = new FilterPermanentCard("permanent spell from your hand"); filter.add(Predicates.not(CardType.LAND.getPredicate())); - filter.add(new ConvertedManaCostPredicate(ComparisonType.EQUAL_TO, cmc)); + filter.add(new ManaValuePredicate(ComparisonType.EQUAL_TO, cmc)); TargetCardInHand target = new TargetCardInHand(filter); if (controller.chooseTarget(outcome, target, source, game)) { Card card = game.getCard(target.getFirstTarget()); diff --git a/Mage.Sets/src/mage/cards/i/InTheEyeOfChaos.java b/Mage.Sets/src/mage/cards/i/InTheEyeOfChaos.java index c79881788a1..fef374ce419 100644 --- a/Mage.Sets/src/mage/cards/i/InTheEyeOfChaos.java +++ b/Mage.Sets/src/mage/cards/i/InTheEyeOfChaos.java @@ -49,7 +49,7 @@ class InTheEyeOfChaosEffect extends OneShotEffect { InTheEyeOfChaosEffect() { super(Outcome.Detriment); - this.staticText = "counter it unless that player pays {X}, where X is its converted mana cost"; + this.staticText = "counter it unless that player pays {X}, where X is its mana value"; } InTheEyeOfChaosEffect(final InTheEyeOfChaosEffect effect) { @@ -67,7 +67,7 @@ class InTheEyeOfChaosEffect extends OneShotEffect { if (spell != null) { Player player = game.getPlayer(spell.getControllerId()); if (player != null) { - Cost cost = ManaUtil.createManaCost(spell.getConvertedManaCost(), true); + Cost cost = ManaUtil.createManaCost(spell.getManaValue(), true); if (!cost.pay(source, game, source, player.getId(), false)) { game.getStack().counter(spell.getId(), source, game); } diff --git a/Mage.Sets/src/mage/cards/i/InduceDespair.java b/Mage.Sets/src/mage/cards/i/InduceDespair.java index 3cdab1c3a97..2b87a2c8ed6 100644 --- a/Mage.Sets/src/mage/cards/i/InduceDespair.java +++ b/Mage.Sets/src/mage/cards/i/InduceDespair.java @@ -51,7 +51,7 @@ class InduceDespairEffect extends OneShotEffect { public InduceDespairEffect() { super(Outcome.UnboostCreature); - staticText = "Target creature gets -X/-X until end of turn, where X is the revealed card's converted mana cost"; + staticText = "Target creature gets -X/-X until end of turn, where X is the revealed card's mana value"; } public InduceDespairEffect(InduceDespairEffect effect) { @@ -63,7 +63,7 @@ class InduceDespairEffect extends OneShotEffect { RevealTargetFromHandCost cost = (RevealTargetFromHandCost) source.getCosts().get(0); Permanent creature = game.getPermanent(targetPointer.getFirst(game, source)); if (cost != null && creature != null) { - int cmcBoost = -1 * cost.convertedManaCosts; + int cmcBoost = -1 * cost.manaValues; ContinuousEffect effect = new BoostTargetEffect(cmcBoost, cmcBoost, Duration.EndOfTurn); effect.setTargetPointer(new FixedTarget(creature.getId(), creature.getZoneChangeCounter(game))); game.addEffect(effect, source); diff --git a/Mage.Sets/src/mage/cards/i/InduceParanoia.java b/Mage.Sets/src/mage/cards/i/InduceParanoia.java index 5ac7b094da6..3b78be82902 100644 --- a/Mage.Sets/src/mage/cards/i/InduceParanoia.java +++ b/Mage.Sets/src/mage/cards/i/InduceParanoia.java @@ -30,7 +30,7 @@ public final class InduceParanoia extends CardImpl { this.getSpellAbility().addEffect(new ConditionalOneShotEffect( new InduceParanoiaEffect(), new CounterTargetEffect(), - new ManaWasSpentCondition(ColoredManaSymbol.B), "Counter target spell. If {B} was spent to cast this spell, that spell's controller puts the top X cards of their library into their graveyard, where X is the spell's converted mana cost.")); + new ManaWasSpentCondition(ColoredManaSymbol.B), "Counter target spell. If {B} was spent to cast this spell, that spell's controller puts the top X cards of their library into their graveyard, where X is the spell's mana value.")); // Counter target spell. this.getSpellAbility().addTarget(new TargetSpell()); @@ -50,7 +50,7 @@ class InduceParanoiaEffect extends OneShotEffect { InduceParanoiaEffect() { super(Outcome.Detriment); - this.staticText = "Counter target spell. If {B} was spent to cast this spell, that spell's controller mills X cards, where X is the spell's converted mana cost."; + this.staticText = "Counter target spell. If {B} was spent to cast this spell, that spell's controller mills X cards, where X is the spell's mana value."; } InduceParanoiaEffect(final InduceParanoiaEffect effect) { @@ -67,7 +67,7 @@ class InduceParanoiaEffect extends OneShotEffect { StackObject spell = game.getStack().getStackObject(targetPointer.getFirst(game, source)); if (spell != null) { game.getStack().counter(spell.getId(), source, game); - int spellCMC = spell.getConvertedManaCost(); + int spellCMC = spell.getManaValue(); Player player = game.getPlayer(spell.getControllerId()); if (player != null) { player.millCards(spellCMC, source, game); diff --git a/Mage.Sets/src/mage/cards/i/InfernalGenesis.java b/Mage.Sets/src/mage/cards/i/InfernalGenesis.java index 89b387f0bbc..dfd44f3e29e 100644 --- a/Mage.Sets/src/mage/cards/i/InfernalGenesis.java +++ b/Mage.Sets/src/mage/cards/i/InfernalGenesis.java @@ -47,7 +47,7 @@ class InfernalGenesisEffect extends OneShotEffect { InfernalGenesisEffect() { super(Outcome.PutCreatureInPlay); staticText = "that player mills a card. Then they create X 1/1 black Minion creature tokens, " + - "where X is the milled card's converted mana cost."; + "where X is the milled card's mana value."; } private InfernalGenesisEffect(final InfernalGenesisEffect effect) { @@ -62,7 +62,7 @@ class InfernalGenesisEffect extends OneShotEffect { .getCards(game) .stream() .filter(Objects::nonNull) - .mapToInt(MageObject::getConvertedManaCost) + .mapToInt(MageObject::getManaValue) .sum(); if (totalCMC > 0) { token.putOntoBattlefield(totalCMC, game, source, player.getId()); diff --git a/Mage.Sets/src/mage/cards/i/InfernalKirin.java b/Mage.Sets/src/mage/cards/i/InfernalKirin.java index a2c770de072..307eb2a50f6 100644 --- a/Mage.Sets/src/mage/cards/i/InfernalKirin.java +++ b/Mage.Sets/src/mage/cards/i/InfernalKirin.java @@ -55,7 +55,7 @@ class InfernalKirinEffect extends OneShotEffect { InfernalKirinEffect() { super(Outcome.Detriment); - this.staticText = "target player reveals their hand and discards all cards with that spell's converted mana cost"; + this.staticText = "target player reveals their hand and discards all cards with that spell's mana value"; } private InfernalKirinEffect(final InfernalKirinEffect effect) { @@ -73,7 +73,7 @@ class InfernalKirinEffect extends OneShotEffect { if (spell == null) { return false; } - int cmc = spell.getConvertedManaCost(); + int cmc = spell.getManaValue(); Player targetPlayer = null; for (Target target : source.getTargets()) { if (target instanceof TargetPlayer) { @@ -88,7 +88,7 @@ class InfernalKirinEffect extends OneShotEffect { } targetPlayer.revealCards(source, targetPlayer.getHand(), game); Cards cards = targetPlayer.getHand().copy(); - cards.removeIf(uuid -> game.getCard(uuid).getConvertedManaCost() != cmc); + cards.removeIf(uuid -> game.getCard(uuid).getManaValue() != cmc); targetPlayer.discard(cards, false, source, game); return true; } diff --git a/Mage.Sets/src/mage/cards/i/InfernoProject.java b/Mage.Sets/src/mage/cards/i/InfernoProject.java index de4981b1afd..b99734de101 100644 --- a/Mage.Sets/src/mage/cards/i/InfernoProject.java +++ b/Mage.Sets/src/mage/cards/i/InfernoProject.java @@ -72,7 +72,7 @@ enum InfernoProjectValue implements DynamicValue { .stream() .filter(Objects::nonNull) .filter(MageObject::isInstantOrSorcery) - .mapToInt(MageObject::getConvertedManaCost) + .mapToInt(MageObject::getManaValue) .sum(); } diff --git a/Mage.Sets/src/mage/cards/i/InquisitionOfKozilek.java b/Mage.Sets/src/mage/cards/i/InquisitionOfKozilek.java index ed0742d905d..71fffde96ab 100644 --- a/Mage.Sets/src/mage/cards/i/InquisitionOfKozilek.java +++ b/Mage.Sets/src/mage/cards/i/InquisitionOfKozilek.java @@ -11,7 +11,7 @@ import mage.constants.ComparisonType; import mage.constants.TargetController; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.target.TargetPlayer; /** @@ -20,11 +20,11 @@ import mage.target.TargetPlayer; */ public final class InquisitionOfKozilek extends CardImpl { - private static final FilterCard filter = new FilterCard("nonland card with converted mana cost 3 or less"); + private static final FilterCard filter = new FilterCard("nonland card with mana value 3 or less"); static { filter.add(Predicates.not(CardType.LAND.getPredicate())); - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 4)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 4)); } public InquisitionOfKozilek(UUID ownerId, CardSetInfo setInfo){ diff --git a/Mage.Sets/src/mage/cards/i/InscriptionOfRuin.java b/Mage.Sets/src/mage/cards/i/InscriptionOfRuin.java index b7760fb148a..e2d4c696131 100644 --- a/Mage.Sets/src/mage/cards/i/InscriptionOfRuin.java +++ b/Mage.Sets/src/mage/cards/i/InscriptionOfRuin.java @@ -13,7 +13,7 @@ import mage.filter.FilterCard; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreatureCard; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.target.TargetPermanent; import mage.target.common.TargetCardInYourGraveyard; import mage.target.common.TargetOpponent; @@ -26,13 +26,13 @@ import java.util.UUID; public final class InscriptionOfRuin extends CardImpl { private static final FilterCard filter - = new FilterCreatureCard("creature card with converted mana cost 2 or less from your graveyard"); + = new FilterCreatureCard("creature card with mana value 2 or less from your graveyard"); private static final FilterPermanent filter2 - = new FilterCreaturePermanent("creature with converted mana cost 3 or less"); + = new FilterCreaturePermanent("creature with mana value 3 or less"); static { - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 3)); - filter2.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 4)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 3)); + filter2.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 4)); } public InscriptionOfRuin(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/i/InterpretTheSigns.java b/Mage.Sets/src/mage/cards/i/InterpretTheSigns.java index 14bfa9b62a9..25a0b4b3272 100644 --- a/Mage.Sets/src/mage/cards/i/InterpretTheSigns.java +++ b/Mage.Sets/src/mage/cards/i/InterpretTheSigns.java @@ -39,7 +39,7 @@ class InterpretTheSignsEffect extends OneShotEffect { public InterpretTheSignsEffect() { super(Outcome.DrawCard); - this.staticText = "scry 3, then reveal the top card of your library. Draw cards equal to that card's converted mana cost"; + this.staticText = "scry 3, then reveal the top card of your library. Draw cards equal to that card's mana value"; } public InterpretTheSignsEffect(final InterpretTheSignsEffect effect) { @@ -63,7 +63,7 @@ class InterpretTheSignsEffect extends OneShotEffect { return true; } controller.revealCards(source, new CardsImpl(card), game); - controller.drawCards(card.getConvertedManaCost(), source, game); + controller.drawCards(card.getManaValue(), source, game); return true; } } diff --git a/Mage.Sets/src/mage/cards/i/InvokePrejudice.java b/Mage.Sets/src/mage/cards/i/InvokePrejudice.java index 21eb76d163a..e3cea30c48e 100644 --- a/Mage.Sets/src/mage/cards/i/InvokePrejudice.java +++ b/Mage.Sets/src/mage/cards/i/InvokePrejudice.java @@ -15,7 +15,6 @@ import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.game.Game; import mage.game.events.GameEvent; -import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; import mage.game.stack.Spell; import mage.target.targetpointer.FixedTarget; @@ -97,7 +96,7 @@ class InvokePrejudiceEffect extends CounterUnlessPaysEffect { public InvokePrejudiceEffect() { super(new GenericManaCost(1)); - this.staticText = "counter that spell unless that player pays {X}, where X is its converted mana cost"; + this.staticText = "counter that spell unless that player pays {X}, where X is its mana value"; } public InvokePrejudiceEffect(final InvokePrejudiceEffect effect) { @@ -114,7 +113,7 @@ class InvokePrejudiceEffect extends CounterUnlessPaysEffect { boolean result = true; Spell spell = game.getStack().getSpell(getTargetPointer().getFirst(game, source)); if (spell != null) { - CounterUnlessPaysEffect effect = new CounterUnlessPaysEffect(new GenericManaCost(spell.getConvertedManaCost())); + CounterUnlessPaysEffect effect = new CounterUnlessPaysEffect(new GenericManaCost(spell.getManaValue())); effect.setTargetPointer(getTargetPointer()); result = effect.apply(game, source); } diff --git a/Mage.Sets/src/mage/cards/i/IsarethTheAwakener.java b/Mage.Sets/src/mage/cards/i/IsarethTheAwakener.java index d6b45bece8f..86b4934d34d 100644 --- a/Mage.Sets/src/mage/cards/i/IsarethTheAwakener.java +++ b/Mage.Sets/src/mage/cards/i/IsarethTheAwakener.java @@ -18,7 +18,7 @@ import mage.counters.CounterType; import mage.counters.Counters; import mage.filter.FilterCard; import mage.filter.common.FilterCreatureCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.ZoneChangeEvent; @@ -61,7 +61,7 @@ public final class IsarethTheAwakener extends CardImpl { class IsarethTheAwakenerCreateReflexiveTriggerEffect extends OneShotEffect { private static final String rule = "return target creature card " - + "with converted mana cost X from your graveyard to the battlefield " + + "with mana value X from your graveyard to the battlefield " + "with a corpse counter on it. If that creature would leave the battlefield, " + "exile it instead of putting it anywhere else."; @@ -103,10 +103,10 @@ class IsarethTheAwakenerCreateReflexiveTriggerEffect extends OneShotEffect { private static FilterCard makeFilter(int xValue) { FilterCard filter = new FilterCreatureCard( - "creature card with converted mana cost " + + "creature card with mana value " + xValue + " or less from your graveyard" ); - filter.add(new ConvertedManaCostPredicate( + filter.add(new ManaValuePredicate( ComparisonType.EQUAL_TO, xValue )); return filter; diff --git a/Mage.Sets/src/mage/cards/i/IsochronScepter.java b/Mage.Sets/src/mage/cards/i/IsochronScepter.java index e27d76eb23a..2677ac5296b 100644 --- a/Mage.Sets/src/mage/cards/i/IsochronScepter.java +++ b/Mage.Sets/src/mage/cards/i/IsochronScepter.java @@ -16,7 +16,7 @@ import mage.constants.ComparisonType; import mage.constants.Outcome; import mage.constants.Zone; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -60,11 +60,11 @@ public final class IsochronScepter extends CardImpl { class IsochronScepterImprintEffect extends OneShotEffect { private static final FilterCard filter = new FilterCard("instant card with " - + "converted mana cost 2 or less from your hand"); + + "mana value 2 or less from your hand"); static { filter.add(CardType.INSTANT.getPredicate()); - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 3)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 3)); } public IsochronScepterImprintEffect() { diff --git a/Mage.Sets/src/mage/cards/i/Isolate.java b/Mage.Sets/src/mage/cards/i/Isolate.java index 3fe07ae781a..d8fe93ca5b8 100644 --- a/Mage.Sets/src/mage/cards/i/Isolate.java +++ b/Mage.Sets/src/mage/cards/i/Isolate.java @@ -7,7 +7,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.ComparisonType; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.target.TargetPermanent; /** @@ -16,10 +16,10 @@ import mage.target.TargetPermanent; */ public final class Isolate extends CardImpl { - private static final FilterPermanent filter = new FilterPermanent("permanent with converted mana cost 1"); + private static final FilterPermanent filter = new FilterPermanent("permanent with mana value 1"); static { - filter.add(new ConvertedManaCostPredicate(ComparisonType.EQUAL_TO, 1)); + filter.add(new ManaValuePredicate(ComparisonType.EQUAL_TO, 1)); } public Isolate(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/i/IzzetGuildmage.java b/Mage.Sets/src/mage/cards/i/IzzetGuildmage.java index 1a88f788866..93c201ea68e 100644 --- a/Mage.Sets/src/mage/cards/i/IzzetGuildmage.java +++ b/Mage.Sets/src/mage/cards/i/IzzetGuildmage.java @@ -15,7 +15,7 @@ import mage.constants.ComparisonType; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.FilterSpell; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.target.TargetSpell; /** @@ -24,15 +24,15 @@ import mage.target.TargetSpell; */ public final class IzzetGuildmage extends CardImpl { - private static final FilterSpell filterInstant = new FilterSpell("instant spell you control with converted mana cost 2 or less"); - private static final FilterSpell filterSorcery = new FilterSpell("sorcery spell you control with converted mana cost 2 or less"); + private static final FilterSpell filterInstant = new FilterSpell("instant spell you control with mana value 2 or less"); + private static final FilterSpell filterSorcery = new FilterSpell("sorcery spell you control with mana value 2 or less"); static { filterInstant.add(CardType.INSTANT.getPredicate()); - filterInstant.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 3)); + filterInstant.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 3)); filterInstant.add(TargetController.YOU.getControllerPredicate()); filterSorcery.add(CardType.SORCERY.getPredicate()); - filterSorcery.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 3)); + filterSorcery.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 3)); filterSorcery.add(TargetController.YOU.getControllerPredicate()); } diff --git a/Mage.Sets/src/mage/cards/j/JaceMirrorMage.java b/Mage.Sets/src/mage/cards/j/JaceMirrorMage.java index 7d2bacda1d3..faabc94065e 100644 --- a/Mage.Sets/src/mage/cards/j/JaceMirrorMage.java +++ b/Mage.Sets/src/mage/cards/j/JaceMirrorMage.java @@ -98,7 +98,7 @@ class JaceMirrorMageDrawEffect extends OneShotEffect { JaceMirrorMageDrawEffect() { super(Outcome.Benefit); - staticText = "draw a card and reveal it. Remove a number of loyalty counters equal to that card's converted mana cost from {this}"; + staticText = "draw a card and reveal it. Remove a number of loyalty counters equal to that card's mana value from {this}"; } private JaceMirrorMageDrawEffect(final JaceMirrorMageDrawEffect effect) { @@ -124,14 +124,14 @@ class JaceMirrorMageDrawEffect extends OneShotEffect { return true; } controller.revealCards(source, new CardsImpl(card), game); - if (card == null || card.getConvertedManaCost() == 0) { + if (card == null || card.getManaValue() == 0) { return true; } Permanent permanent = source.getSourcePermanentIfItStillExists(game); if (permanent == null) { return true; } - permanent.removeCounters(CounterType.LOYALTY.createInstance(card.getConvertedManaCost()), source, game); + permanent.removeCounters(CounterType.LOYALTY.createInstance(card.getManaValue()), source, game); return true; } } diff --git a/Mage.Sets/src/mage/cards/j/JelevaNephaliasScourge.java b/Mage.Sets/src/mage/cards/j/JelevaNephaliasScourge.java index 3a76cca32b2..95915d4afb5 100644 --- a/Mage.Sets/src/mage/cards/j/JelevaNephaliasScourge.java +++ b/Mage.Sets/src/mage/cards/j/JelevaNephaliasScourge.java @@ -172,7 +172,7 @@ class JelevaNephaliasWatcher extends Watcher { Spell spell = (Spell) stackObject; manaSpendToCast.putIfAbsent(spell.getSourceId().toString() + spell.getCard().getZoneChangeCounter(game), - spell.getSpellAbility().getManaCostsToPay().convertedManaCost()); + spell.getSpellAbility().getManaCostsToPay().manaValue()); } } } diff --git a/Mage.Sets/src/mage/cards/j/JudgeUnworthy.java b/Mage.Sets/src/mage/cards/j/JudgeUnworthy.java index 189e682b30f..ebe17f1fe92 100644 --- a/Mage.Sets/src/mage/cards/j/JudgeUnworthy.java +++ b/Mage.Sets/src/mage/cards/j/JudgeUnworthy.java @@ -48,7 +48,7 @@ class JudgeUnworthyEffect extends OneShotEffect { public JudgeUnworthyEffect() { super(Outcome.Damage); - this.staticText = ", then reveal the top card of your library. {this} deals damage equal to that card's converted mana cost to that creature"; + this.staticText = ", then reveal the top card of your library. {this} deals damage equal to that card's mana value to that creature"; } public JudgeUnworthyEffect(final JudgeUnworthyEffect effect) { @@ -70,7 +70,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.getConvertedManaCost(), source.getSourceId(), source, game, false, true); + targetCreature.damage(card.getManaValue(), source.getSourceId(), source, game, false, true); return true; } } diff --git a/Mage.Sets/src/mage/cards/j/Juxtapose.java b/Mage.Sets/src/mage/cards/j/Juxtapose.java index 7e6ebe71000..7ca76718649 100644 --- a/Mage.Sets/src/mage/cards/j/Juxtapose.java +++ b/Mage.Sets/src/mage/cards/j/Juxtapose.java @@ -29,7 +29,7 @@ public final class Juxtapose extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{3}{U}"); // You and target player exchange control of the creature you each control with the highest converted mana cost. Then exchange control of artifacts the same way. If two or more permanents a player controls are tied for highest cost, their controller chooses one of them. - this.getSpellAbility().addEffect(new JuxtaposeEffect(StaticFilters.FILTER_PERMANENT_CREATURE, "You and target player exchange control of the creature you each control with the highest converted mana cost")); + this.getSpellAbility().addEffect(new JuxtaposeEffect(StaticFilters.FILTER_PERMANENT_CREATURE, "You and target player exchange control of the creature you each control with the highest mana value")); this.getSpellAbility().addEffect(new JuxtaposeEffect(new FilterArtifactPermanent(), "Then exchange control of artifacts the same way. If two or more permanents a player controls are tied for highest cost, their controller chooses one of them")); this.getSpellAbility().addTarget(new TargetPlayer()); } @@ -140,13 +140,13 @@ class JuxtaposeEffect extends ContinuousEffectImpl { List permanents = game.getBattlefield().getAllActivePermanents(filter, playerId, game); int highestCMC = -1; for (Permanent permanent : permanents) { - if (highestCMC < permanent.getConvertedManaCost()) { - highestCMC = permanent.getConvertedManaCost(); + if (highestCMC < permanent.getManaValue()) { + highestCMC = permanent.getManaValue(); } } List result = new ArrayList<>(); for (Permanent permanent : permanents) { - if (permanent.getConvertedManaCost() == highestCMC) { + if (permanent.getManaValue() == highestCMC) { result.add(permanent); } } diff --git a/Mage.Sets/src/mage/cards/k/KaervekTheMerciless.java b/Mage.Sets/src/mage/cards/k/KaervekTheMerciless.java index 8fe6a6c0146..22f1c228534 100644 --- a/Mage.Sets/src/mage/cards/k/KaervekTheMerciless.java +++ b/Mage.Sets/src/mage/cards/k/KaervekTheMerciless.java @@ -51,7 +51,7 @@ class KaervekTheMercilessEffect extends OneShotEffect { public KaervekTheMercilessEffect() { super(Outcome.Benefit); - this.staticText = "{this} deals damage to any target equal to that spell's converted mana cost"; + this.staticText = "{this} deals damage to any target equal to that spell's mana value"; } public KaervekTheMercilessEffect(final KaervekTheMercilessEffect effect) { @@ -67,7 +67,7 @@ class KaervekTheMercilessEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { Spell spell = game.getSpellOrLKIStack(this.getTargetPointer().getFirst(game, source)); if (spell != null) { - int cost = spell.getConvertedManaCost(); + int cost = spell.getManaValue(); Player target = game.getPlayer(source.getFirstTarget()); if (target != null) { target.damage(cost, source.getSourceId(), source, game); diff --git a/Mage.Sets/src/mage/cards/k/KaerveksPurge.java b/Mage.Sets/src/mage/cards/k/KaerveksPurge.java index 43d352bd709..aa62b44507d 100644 --- a/Mage.Sets/src/mage/cards/k/KaerveksPurge.java +++ b/Mage.Sets/src/mage/cards/k/KaerveksPurge.java @@ -9,7 +9,7 @@ import mage.constants.ComparisonType; import mage.constants.Outcome; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -48,8 +48,8 @@ enum KaerveksPurgeAdjuster implements TargetAdjuster { public void adjustTargets(Ability ability, Game game) { ability.getTargets().clear(); int xValue = ability.getManaCostsToPay().getX(); - FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with converted mana cost " + xValue); - filter.add(new ConvertedManaCostPredicate(ComparisonType.EQUAL_TO, xValue)); + FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with mana value " + xValue); + filter.add(new ManaValuePredicate(ComparisonType.EQUAL_TO, xValue)); ability.addTarget(new TargetCreaturePermanent(filter)); } } @@ -58,7 +58,7 @@ class KaerveksPurgeEffect extends OneShotEffect { public KaerveksPurgeEffect() { super(Outcome.DestroyPermanent); - this.staticText = "Destroy target creature with converted mana cost X. " + + this.staticText = "Destroy target creature with mana value X. " + "If that creature dies this way, " + "{this} deals damage equal to the creature's power" + " to the creature's controller"; diff --git a/Mage.Sets/src/mage/cards/k/KahoMinamoHistorian.java b/Mage.Sets/src/mage/cards/k/KahoMinamoHistorian.java index a98ccd6d895..175d4951a8b 100644 --- a/Mage.Sets/src/mage/cards/k/KahoMinamoHistorian.java +++ b/Mage.Sets/src/mage/cards/k/KahoMinamoHistorian.java @@ -19,7 +19,7 @@ import mage.constants.SubType; import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCardInExile; @@ -109,7 +109,7 @@ class KahoMinamoHistorianCastEffect extends OneShotEffect { public KahoMinamoHistorianCastEffect() { super(Outcome.PlayForFree); - this.staticText = "you may cast a card with converted mana cost X " + this.staticText = "you may cast a card with mana value X " + "exiled with {this} without paying its mana cost"; } @@ -127,7 +127,7 @@ class KahoMinamoHistorianCastEffect extends OneShotEffect { Player controller = game.getPlayer(source.getControllerId()); if (controller != null) { FilterCard filter = new FilterCard(); - filter.add(new ConvertedManaCostPredicate(ComparisonType.EQUAL_TO, source.getManaCostsToPay().getX())); + filter.add(new ManaValuePredicate(ComparisonType.EQUAL_TO, source.getManaCostsToPay().getX())); TargetCardInExile target = new TargetCardInExile(filter, CardUtil.getCardExileZoneId(game, source)); Cards cards = game.getExile().getExileZone(CardUtil.getCardExileZoneId(game, source)); if (cards != null diff --git a/Mage.Sets/src/mage/cards/k/KalemneDiscipleOfIroas.java b/Mage.Sets/src/mage/cards/k/KalemneDiscipleOfIroas.java index e8e992c8f53..3c1741a8553 100644 --- a/Mage.Sets/src/mage/cards/k/KalemneDiscipleOfIroas.java +++ b/Mage.Sets/src/mage/cards/k/KalemneDiscipleOfIroas.java @@ -22,7 +22,7 @@ import mage.constants.SuperType; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.FilterSpell; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.players.Player; @@ -32,11 +32,11 @@ import mage.players.Player; */ public final class KalemneDiscipleOfIroas extends CardImpl { - private static final FilterSpell filterSpell = new FilterSpell("a creature spell with converted mana cost 5 or greater"); + private static final FilterSpell filterSpell = new FilterSpell("a creature spell with mana value 5 or greater"); static { filterSpell.add(CardType.CREATURE.getPredicate()); - filterSpell.add(new ConvertedManaCostPredicate(ComparisonType.MORE_THAN, 4)); + filterSpell.add(new ManaValuePredicate(ComparisonType.MORE_THAN, 4)); } public KalemneDiscipleOfIroas(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/k/KamahlsDruidicVow.java b/Mage.Sets/src/mage/cards/k/KamahlsDruidicVow.java index 428fab7e879..bf0ab36d674 100644 --- a/Mage.Sets/src/mage/cards/k/KamahlsDruidicVow.java +++ b/Mage.Sets/src/mage/cards/k/KamahlsDruidicVow.java @@ -16,7 +16,7 @@ import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.common.FilterPermanentCard; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.players.Player; import mage.target.TargetCard; @@ -54,7 +54,7 @@ class KamahlsDruidicVowEffect extends OneShotEffect { public KamahlsDruidicVowEffect() { super(Outcome.PutCardInPlay); - this.staticText = "Look at the top X cards of your library. You may put any number of land and/or legendary permanent cards with converted mana cost X or less from among them onto the battlefield. Put the rest into your graveyard"; + this.staticText = "Look at the top X cards of your library. You may put any number of land and/or legendary permanent cards with mana value X or less from among them onto the battlefield. Put the rest into your graveyard"; } public KamahlsDruidicVowEffect(final KamahlsDruidicVowEffect effect) { @@ -71,8 +71,8 @@ class KamahlsDruidicVowEffect extends OneShotEffect { Cards cards = new CardsImpl(controller.getLibrary().getTopCards(game, xValue)); controller.lookAtCards(source, null, cards, game); if (!cards.isEmpty()) { - FilterCard filter = new FilterPermanentCard("land and/or legendary permanent cards with converted mana cost " + xValue + " or less to put onto the battlefield"); - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, xValue + 1)); + FilterCard filter = new FilterPermanentCard("land and/or legendary permanent cards with mana value " + xValue + " or less to put onto the battlefield"); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, xValue + 1)); filter.add( Predicates.or( CardType.LAND.getPredicate(), diff --git a/Mage.Sets/src/mage/cards/k/KarnSilverGolem.java b/Mage.Sets/src/mage/cards/k/KarnSilverGolem.java index e7e33379fb1..d84895174f6 100644 --- a/Mage.Sets/src/mage/cards/k/KarnSilverGolem.java +++ b/Mage.Sets/src/mage/cards/k/KarnSilverGolem.java @@ -60,7 +60,7 @@ class KarnSilverGolemEffect extends ContinuousEffectImpl { public KarnSilverGolemEffect() { super(Duration.EndOfTurn, Outcome.BecomeCreature); - staticText = "Target noncreature artifact becomes an artifact creature with power and toughness each equal to its converted mana cost until end of turn"; + staticText = "Target noncreature artifact becomes an artifact creature with power and toughness each equal to its mana value until end of turn"; } public KarnSilverGolemEffect(final KarnSilverGolemEffect effect) { @@ -89,7 +89,7 @@ class KarnSilverGolemEffect extends ContinuousEffectImpl { case PTChangingEffects_7: if (sublayer == SubLayer.SetPT_7b) { - int cmc = artifact.getConvertedManaCost(); + int cmc = artifact.getManaValue(); artifact.getPower().setValue(cmc); artifact.getToughness().setValue(cmc); } diff --git a/Mage.Sets/src/mage/cards/k/KarnTheGreatCreator.java b/Mage.Sets/src/mage/cards/k/KarnTheGreatCreator.java index ed497824c02..8f85098a320 100644 --- a/Mage.Sets/src/mage/cards/k/KarnTheGreatCreator.java +++ b/Mage.Sets/src/mage/cards/k/KarnTheGreatCreator.java @@ -95,7 +95,7 @@ class KarnTheGreatCreatorAnimateEffect extends ContinuousEffectImpl { KarnTheGreatCreatorAnimateEffect() { super(Duration.UntilYourNextTurn, Outcome.BecomeCreature); staticText = "Until your next turn, up to one target noncreature artifact becomes " + - "an artifact creature with power and toughness each equal to its converted mana cost."; + "an artifact creature with power and toughness each equal to its mana value."; } private KarnTheGreatCreatorAnimateEffect(final KarnTheGreatCreatorAnimateEffect effect) { @@ -124,7 +124,7 @@ class KarnTheGreatCreatorAnimateEffect extends ContinuousEffectImpl { case PTChangingEffects_7: if (sublayer == SubLayer.SetPT_7b) { - int cmc = artifact.getConvertedManaCost(); + int cmc = artifact.getManaValue(); artifact.getPower().setValue(cmc); artifact.getToughness().setValue(cmc); } diff --git a/Mage.Sets/src/mage/cards/k/KarnsTouch.java b/Mage.Sets/src/mage/cards/k/KarnsTouch.java index 773e7491cb9..4353daac74a 100644 --- a/Mage.Sets/src/mage/cards/k/KarnsTouch.java +++ b/Mage.Sets/src/mage/cards/k/KarnsTouch.java @@ -51,7 +51,7 @@ class KarnsTouchEffect extends ContinuousEffectImpl { public KarnsTouchEffect() { super(Duration.EndOfTurn, Outcome.BecomeCreature); - staticText = "Target noncreature artifact becomes an artifact creature with power and toughness each equal to its converted mana cost until end of turn"; + staticText = "Target noncreature artifact becomes an artifact creature with power and toughness each equal to its mana value until end of turn"; } public KarnsTouchEffect(final KarnsTouchEffect effect) { @@ -83,7 +83,7 @@ class KarnsTouchEffect extends ContinuousEffectImpl { case PTChangingEffects_7: if (sublayer == SubLayer.SetPT_7b) { - int cmc = artifact.getConvertedManaCost(); + int cmc = artifact.getManaValue(); artifact.getPower().setValue(cmc); artifact.getToughness().setValue(cmc); } diff --git a/Mage.Sets/src/mage/cards/k/KayaOrzhovUsurper.java b/Mage.Sets/src/mage/cards/k/KayaOrzhovUsurper.java index dbd1c07d874..dd8eb03591d 100644 --- a/Mage.Sets/src/mage/cards/k/KayaOrzhovUsurper.java +++ b/Mage.Sets/src/mage/cards/k/KayaOrzhovUsurper.java @@ -10,7 +10,7 @@ import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.StaticFilters; import mage.filter.common.FilterNonlandPermanent; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.players.Player; import mage.target.Target; @@ -26,10 +26,10 @@ import java.util.UUID; public final class KayaOrzhovUsurper extends CardImpl { private static final FilterPermanent filter - = new FilterNonlandPermanent("nonland permanent with converted mana cost 1 or less"); + = new FilterNonlandPermanent("nonland permanent with mana value 1 or less"); static { - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 2)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 2)); } public KayaOrzhovUsurper(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/k/KeenDuelist.java b/Mage.Sets/src/mage/cards/k/KeenDuelist.java index bdea133058d..07a4e28ee4f 100644 --- a/Mage.Sets/src/mage/cards/k/KeenDuelist.java +++ b/Mage.Sets/src/mage/cards/k/KeenDuelist.java @@ -74,11 +74,11 @@ class KeenDuelistEffect extends OneShotEffect { Card theirCard = opponent.getLibrary().getFromTop(game); cards.add(theirCard); controller.revealCards(source, cards, game); - if (theirCard != null && theirCard.getConvertedManaCost() < 1) { - controller.loseLife(theirCard.getConvertedManaCost(), game, source, false); + if (theirCard != null && theirCard.getManaValue() < 1) { + controller.loseLife(theirCard.getManaValue(), game, source, false); } - if (myCard != null && myCard.getConvertedManaCost() < 1) { - opponent.loseLife(myCard.getConvertedManaCost(), game, source, false); + if (myCard != null && myCard.getManaValue() < 1) { + opponent.loseLife(myCard.getManaValue(), game, source, false); } controller.moveCards(cards, Zone.HAND, source, game); return true; diff --git a/Mage.Sets/src/mage/cards/k/KentaroTheSmilingCat.java b/Mage.Sets/src/mage/cards/k/KentaroTheSmilingCat.java index c54215c25f8..3b73053c011 100644 --- a/Mage.Sets/src/mage/cards/k/KentaroTheSmilingCat.java +++ b/Mage.Sets/src/mage/cards/k/KentaroTheSmilingCat.java @@ -61,11 +61,11 @@ class KentaroTheSmilingCatCastingEffect extends ContinuousEffectImpl { } private final AlternativeCostSourceAbility alternativeCastingCostAbility = new AlternativeCostSourceAbility( - SourceIsSpellCondition.instance, null, filterSamurai, true, new ColorlessConvertedManaCost()); + SourceIsSpellCondition.instance, null, filterSamurai, true, new ColorlessManaValue()); public KentaroTheSmilingCatCastingEffect() { super(Duration.WhileOnBattlefield, Outcome.Benefit); - staticText = "You may pay {X} rather than pay the mana cost for Samurai spells you cast, where X is that spell's converted mana cost"; + staticText = "You may pay {X} rather than pay the mana cost for Samurai spells you cast, where X is that spell's mana value"; } public KentaroTheSmilingCatCastingEffect(final KentaroTheSmilingCatCastingEffect effect) { @@ -104,11 +104,11 @@ class KentaroTheSmilingCatCastingEffect extends ContinuousEffectImpl { } } -class ColorlessConvertedManaCost implements DynamicCost { +class ColorlessManaValue implements DynamicCost { @Override public Cost getCost(Ability ability, Game game) { - return new GenericManaCost(ability.getManaCosts().convertedManaCost()); + return new GenericManaCost(ability.getManaCosts().manaValue()); } @Override diff --git a/Mage.Sets/src/mage/cards/k/KerugaTheMacrosage.java b/Mage.Sets/src/mage/cards/k/KerugaTheMacrosage.java index 6d751460f8b..0abde82c078 100644 --- a/Mage.Sets/src/mage/cards/k/KerugaTheMacrosage.java +++ b/Mage.Sets/src/mage/cards/k/KerugaTheMacrosage.java @@ -14,7 +14,7 @@ import mage.constants.ComparisonType; import mage.constants.SubType; import mage.constants.SuperType; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.filter.predicate.mageobject.AnotherPredicate; import java.util.Set; @@ -25,11 +25,11 @@ import java.util.UUID; */ public final class KerugaTheMacrosage extends CardImpl { - private static final FilterControlledPermanent filter = new FilterControlledPermanent("other permanent you control with converted mana cost 3 or greater"); + private static final FilterControlledPermanent filter = new FilterControlledPermanent("other permanent you control with mana value 3 or greater"); static { filter.add(AnotherPredicate.instance); - filter.add(new ConvertedManaCostPredicate(ComparisonType.MORE_THAN, 2)); + filter.add(new ManaValuePredicate(ComparisonType.MORE_THAN, 2)); } public KerugaTheMacrosage(UUID ownerId, CardSetInfo setInfo) { @@ -62,11 +62,11 @@ enum KerugaCondition implements CompanionCondition { @Override public String getRule() { - return "Your starting deck contains only cards with converted mana cost 3 or greater and land cards."; + return "Your starting deck contains only cards with mana value 3 or greater and land cards."; } @Override public boolean isLegal(Set deck, int startingSize) { - return deck.stream().allMatch(card -> card.isLand() || card.getConvertedManaCost() >= 3); + return deck.stream().allMatch(card -> card.isLand() || card.getManaValue() >= 3); } } \ No newline at end of file diff --git a/Mage.Sets/src/mage/cards/k/KianneDeanOfSubstance.java b/Mage.Sets/src/mage/cards/k/KianneDeanOfSubstance.java index b2bf3733090..4517e661368 100644 --- a/Mage.Sets/src/mage/cards/k/KianneDeanOfSubstance.java +++ b/Mage.Sets/src/mage/cards/k/KianneDeanOfSubstance.java @@ -130,7 +130,7 @@ enum KianneDeanOfSubstanceValue implements DynamicValue { .filter(Objects::nonNull) .filter(card -> card.isOwnedBy(sourceAbility.getControllerId())) .filter(card -> card.getCounters(game).containsKey(CounterType.STUDY)) - .map(MageObject::getConvertedManaCost) + .map(MageObject::getManaValue) .distinct() .mapToInt(x -> 1) .sum(); @@ -158,7 +158,7 @@ enum KianneDeanOfSubstanceHint implements Hint { .filter(Objects::nonNull) .filter(card -> card.isOwnedBy(ability.getControllerId())) .filter(card -> card.getCounters(game).containsKey(CounterType.STUDY)) - .map(MageObject::getConvertedManaCost) + .map(MageObject::getManaValue) .distinct() .sorted() .collect(Collectors.toList()); diff --git a/Mage.Sets/src/mage/cards/k/KindleTheCarnage.java b/Mage.Sets/src/mage/cards/k/KindleTheCarnage.java index 814b1ea0d7b..49ae8cd77dc 100644 --- a/Mage.Sets/src/mage/cards/k/KindleTheCarnage.java +++ b/Mage.Sets/src/mage/cards/k/KindleTheCarnage.java @@ -42,7 +42,7 @@ class KindleTheCarnageEffect extends OneShotEffect { public KindleTheCarnageEffect() { super(Outcome.AIDontUseIt); - this.staticText = "Discard a card at random. If you do, {this} deals damage equal to that card's converted mana cost to each creature. You may repeat this process any number of times"; + this.staticText = "Discard a card at random. If you do, {this} deals damage equal to that card's mana value to each creature. You may repeat this process any number of times"; } public KindleTheCarnageEffect(final KindleTheCarnageEffect effect) { @@ -64,7 +64,7 @@ class KindleTheCarnageEffect extends OneShotEffect { && controller.chooseUse(Outcome.AIDontUseIt, "Discard a card randomly from your hand?", source, game)) { Card discardedCard = controller.discardOne(true, false, source, game); if (discardedCard != null) { - new DamageAllEffect(discardedCard.getConvertedManaCost(), new FilterCreaturePermanent()).apply(game, source); + new DamageAllEffect(discardedCard.getManaValue(), new FilterCreaturePermanent()).apply(game, source); } } return true; diff --git a/Mage.Sets/src/mage/cards/k/KnollspineInvocation.java b/Mage.Sets/src/mage/cards/k/KnollspineInvocation.java index 893e525a1b8..8a6243381a6 100644 --- a/Mage.Sets/src/mage/cards/k/KnollspineInvocation.java +++ b/Mage.Sets/src/mage/cards/k/KnollspineInvocation.java @@ -14,7 +14,7 @@ import mage.constants.CardType; import mage.constants.ComparisonType; import mage.constants.Zone; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.target.common.TargetAnyTarget; import mage.target.common.TargetCardInHand; @@ -26,7 +26,7 @@ import java.util.UUID; */ public final class KnollspineInvocation extends CardImpl { - private static final FilterCard filter = new FilterCard("a card with converted mana cost X"); + private static final FilterCard filter = new FilterCard("a card with mana value X"); public KnollspineInvocation(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{1}{R}{R}"); @@ -61,8 +61,8 @@ enum KnollspineInvocationAdjuster implements CostAdjuster { } DiscardTargetCost discardCost = (DiscardTargetCost) cost; discardCost.getTargets().clear(); - FilterCard adjustedFilter = new FilterCard("a card with converted mana cost X"); - adjustedFilter.add(new ConvertedManaCostPredicate(ComparisonType.EQUAL_TO, xValue)); + FilterCard adjustedFilter = new FilterCard("a card with mana value X"); + adjustedFilter.add(new ManaValuePredicate(ComparisonType.EQUAL_TO, xValue)); discardCost.addTarget(new TargetCardInHand(adjustedFilter)); return; } diff --git a/Mage.Sets/src/mage/cards/k/KodamaOfTheEastTree.java b/Mage.Sets/src/mage/cards/k/KodamaOfTheEastTree.java index 5040e4c548d..e85cd70256d 100644 --- a/Mage.Sets/src/mage/cards/k/KodamaOfTheEastTree.java +++ b/Mage.Sets/src/mage/cards/k/KodamaOfTheEastTree.java @@ -18,7 +18,7 @@ import mage.filter.FilterCard; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterPermanentCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; import mage.game.events.GameEvent; @@ -56,7 +56,7 @@ public final class KodamaOfTheEastTree extends CardImpl { new EntersBattlefieldAllTriggeredAbility(new KodamaOfTheEastTreeEffect(), filter), KodamaOfTheEastTreeCondition.instance, "Whenever another permanent enters the battlefield " + "under your control, if it wasn't put onto the battlefield with this ability, you may put " + - "a permanent card with equal or lesser converted mana cost from your hand onto the battlefield." + "a permanent card with equal or lesser mana value from your hand onto the battlefield." ), new KodamaOfTheEastTreeWatcher()); // Partner @@ -118,10 +118,10 @@ class KodamaOfTheEastTreeEffect extends OneShotEffect { return false; } FilterCard filter = new FilterPermanentCard( - "a permanent card with converted mana cost " + permanent.getConvertedManaCost() + " or less" + "a permanent card with mana value " + permanent.getManaValue() + " or less" ); - filter.add(new ConvertedManaCostPredicate( - ComparisonType.FEWER_THAN, permanent.getConvertedManaCost() + 1 + filter.add(new ManaValuePredicate( + ComparisonType.FEWER_THAN, permanent.getManaValue() + 1 )); TargetCardInHand target = new TargetCardInHand(filter); if (!target.canChoose(source.getSourceId(), source.getControllerId(), game) diff --git a/Mage.Sets/src/mage/cards/k/KozilekTheGreatDistortion.java b/Mage.Sets/src/mage/cards/k/KozilekTheGreatDistortion.java index 696859a6247..7dac92f0b6a 100644 --- a/Mage.Sets/src/mage/cards/k/KozilekTheGreatDistortion.java +++ b/Mage.Sets/src/mage/cards/k/KozilekTheGreatDistortion.java @@ -26,7 +26,7 @@ import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.FilterSpell; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.game.stack.Spell; import mage.game.stack.StackObject; @@ -57,7 +57,7 @@ public final class KozilekTheGreatDistortion extends CardImpl { // Discard a card with converted mana cost X: Counter target spell with converted mana cost X. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CounterTargetEffect(), new KozilekDiscardCost()); - ability.addTarget(new TargetSpell(new FilterSpell("spell with converted mana cost X"))); + ability.addTarget(new TargetSpell(new FilterSpell("spell with mana value X"))); this.addAbility(ability); } @@ -101,7 +101,7 @@ class KozilekDrawEffect extends OneShotEffect { class KozilekDiscardCost extends CostImpl { public KozilekDiscardCost() { - this.text = "discard a card with converted mana cost X"; + this.text = "discard a card with mana value X"; } public KozilekDiscardCost(final KozilekDiscardCost cost) { @@ -118,8 +118,8 @@ class KozilekDiscardCost extends CostImpl { if (player == null) { return false; } - FilterCard filter = new FilterCard("card with converted mana cost of " + targetSpell.getConvertedManaCost()); - filter.add(new ConvertedManaCostPredicate(ComparisonType.EQUAL_TO, targetSpell.getConvertedManaCost())); + FilterCard filter = new FilterCard("card with mana value of " + targetSpell.getManaValue()); + filter.add(new ManaValuePredicate(ComparisonType.EQUAL_TO, targetSpell.getManaValue())); TargetCardInHand target = new TargetCardInHand(filter); this.getTargets().clear(); this.getTargets().add(target); @@ -150,13 +150,13 @@ class KozilekDiscardCost extends CostImpl { Set stackCMC = new HashSet<>(); for (StackObject stackObject : game.getStack()) { if (stackObject instanceof Spell) { - stackCMC.add(stackObject.getConvertedManaCost()); + stackCMC.add(stackObject.getManaValue()); } } Player controller = game.getPlayer(ability.getControllerId()); if(controller != null) { for (Card card : controller.getHand().getCards(game)) { - if (stackCMC.contains(card.getConvertedManaCost())) { + if (stackCMC.contains(card.getManaValue())) { return true; } } diff --git a/Mage.Sets/src/mage/cards/k/KozileksReturn.java b/Mage.Sets/src/mage/cards/k/KozileksReturn.java index b6d19e65098..484b6acdf37 100644 --- a/Mage.Sets/src/mage/cards/k/KozileksReturn.java +++ b/Mage.Sets/src/mage/cards/k/KozileksReturn.java @@ -15,7 +15,7 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterSpell; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; /** * @@ -23,12 +23,12 @@ import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; */ public final class KozileksReturn extends CardImpl { - private static final FilterSpell filter = new FilterSpell("an Eldrazi creature spell with converted mana cost 7 or greater"); + private static final FilterSpell filter = new FilterSpell("an Eldrazi creature spell with mana value 7 or greater"); static { filter.add(SubType.ELDRAZI.getPredicate()); filter.add(CardType.CREATURE.getPredicate()); - filter.add(new ConvertedManaCostPredicate(ComparisonType.MORE_THAN, 6)); + filter.add(new ManaValuePredicate(ComparisonType.MORE_THAN, 6)); } public KozileksReturn(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/k/KrosanDrover.java b/Mage.Sets/src/mage/cards/k/KrosanDrover.java index 0c37e4fb3d3..f92153a8238 100644 --- a/Mage.Sets/src/mage/cards/k/KrosanDrover.java +++ b/Mage.Sets/src/mage/cards/k/KrosanDrover.java @@ -13,7 +13,7 @@ import mage.constants.SubType; import mage.constants.ComparisonType; import mage.constants.Zone; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; /** * @@ -21,11 +21,11 @@ import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; */ public final class KrosanDrover extends CardImpl { - private static final FilterCard filter = new FilterCard("Creature spells with converted mana cost 6 or greater"); + private static final FilterCard filter = new FilterCard("Creature spells with mana value 6 or greater"); static { filter.add(CardType.CREATURE.getPredicate()); - filter.add(new ConvertedManaCostPredicate(ComparisonType.MORE_THAN, 5)); + filter.add(new ManaValuePredicate(ComparisonType.MORE_THAN, 5)); } public KrosanDrover(UUID ownerId, CardSetInfo setInfo) { @@ -36,7 +36,7 @@ public final class KrosanDrover extends CardImpl { // Creature spells you cast with converted mana cost 6 or greater cost {2} less to cast. Effect effect = new SpellsCostReductionControllerEffect(filter, 2); - effect.setText("Creature spells you cast with converted mana cost 6 or greater cost {2} less to cast."); + effect.setText("Creature spells you cast with mana value 6 or greater cost {2} less to cast."); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); } diff --git a/Mage.Sets/src/mage/cards/k/KryShield.java b/Mage.Sets/src/mage/cards/k/KryShield.java index 0278c23736c..47162385fa1 100644 --- a/Mage.Sets/src/mage/cards/k/KryShield.java +++ b/Mage.Sets/src/mage/cards/k/KryShield.java @@ -7,7 +7,7 @@ import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.dynamicvalue.common.StaticValue; -import mage.abilities.dynamicvalue.common.TargetConvertedManaCost; +import mage.abilities.dynamicvalue.common.TargetManaValue; import mage.abilities.effects.Effect; import mage.abilities.effects.common.PreventDamageByTargetEffect; import mage.abilities.effects.common.continuous.BoostTargetEffect; @@ -31,8 +31,8 @@ public final class KryShield extends CardImpl { Effect effect = new PreventDamageByTargetEffect(Duration.EndOfTurn); effect.setText("Prevent all damage that would be dealt this turn by target creature you control"); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new GenericManaCost(2)); - ability.addEffect(new BoostTargetEffect(StaticValue.get(0), TargetConvertedManaCost.instance, Duration.EndOfTurn, true) - .setText("That creature gets +0/+X until end of turn, where X is its converted mana cost")); + ability.addEffect(new BoostTargetEffect(StaticValue.get(0), TargetManaValue.instance, Duration.EndOfTurn, true) + .setText("That creature gets +0/+X until end of turn, where X is its mana value")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/k/Kurgadon.java b/Mage.Sets/src/mage/cards/k/Kurgadon.java index 039b6b722f9..eac1b3aeff7 100644 --- a/Mage.Sets/src/mage/cards/k/Kurgadon.java +++ b/Mage.Sets/src/mage/cards/k/Kurgadon.java @@ -12,7 +12,7 @@ import mage.constants.SubType; import mage.constants.ComparisonType; import mage.counters.CounterType; import mage.filter.FilterSpell; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; /** * @@ -20,11 +20,11 @@ import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; */ public final class Kurgadon extends CardImpl { - private static final FilterSpell filterSpell = new FilterSpell("a creature spell with converted mana cost 6 or greater"); + private static final FilterSpell filterSpell = new FilterSpell("a creature spell with mana value 6 or greater"); static { filterSpell.add(CardType.CREATURE.getPredicate()); - filterSpell.add(new ConvertedManaCostPredicate(ComparisonType.MORE_THAN, 5)); + filterSpell.add(new ManaValuePredicate(ComparisonType.MORE_THAN, 5)); } public Kurgadon(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/l/LagonnaBandStoryteller.java b/Mage.Sets/src/mage/cards/l/LagonnaBandStoryteller.java index 8da903278f4..a4d23f6b061 100644 --- a/Mage.Sets/src/mage/cards/l/LagonnaBandStoryteller.java +++ b/Mage.Sets/src/mage/cards/l/LagonnaBandStoryteller.java @@ -58,7 +58,7 @@ class LagonnaBandStorytellerEffect extends OneShotEffect { LagonnaBandStorytellerEffect() { super(Outcome.Benefit); staticText = "put target enchantment card from your graveyard on top of your library. " - + "If you do, you gain life equal to its converted mana cost."; + + "If you do, you gain life equal to its mana value."; } private LagonnaBandStorytellerEffect(final LagonnaBandStorytellerEffect effect) { @@ -80,7 +80,7 @@ class LagonnaBandStorytellerEffect extends OneShotEffect { || game.getState().getZone(card.getId()) != Zone.GRAVEYARD) { return false; } - int cmc = card.getConvertedManaCost(); + int cmc = card.getManaValue(); if (controller.putCardsOnTopOfLibrary(new CardsImpl(card), game, source, false)) { controller.gainLife(cmc, game, source); return true; diff --git a/Mage.Sets/src/mage/cards/l/LammastideWeave.java b/Mage.Sets/src/mage/cards/l/LammastideWeave.java index fc9365efdbc..5c49206133f 100644 --- a/Mage.Sets/src/mage/cards/l/LammastideWeave.java +++ b/Mage.Sets/src/mage/cards/l/LammastideWeave.java @@ -49,7 +49,7 @@ class LammastideWeaveEffect extends OneShotEffect { LammastideWeaveEffect() { super(Outcome.DrawCard); this.staticText = ", then target player mills a card. If a card with the chosen name was milled this way, " + - "you gain life equal to its converted mana cost."; + "you gain life equal to its mana value."; } private LammastideWeaveEffect(final LammastideWeaveEffect effect) { @@ -71,7 +71,7 @@ class LammastideWeaveEffect extends OneShotEffect { } for (Card card : targetPlayer.millCards(1, source, game).getCards(game)) { if (CardUtil.haveSameNames(card, cardName, game)) { - controller.gainLife(card.getConvertedManaCost(), game, source); + controller.gainLife(card.getManaValue(), game, source); } } return true; diff --git a/Mage.Sets/src/mage/cards/l/LavabrinkVenturer.java b/Mage.Sets/src/mage/cards/l/LavabrinkVenturer.java index ef18a42db35..5a29acbd2e8 100644 --- a/Mage.Sets/src/mage/cards/l/LavabrinkVenturer.java +++ b/Mage.Sets/src/mage/cards/l/LavabrinkVenturer.java @@ -12,7 +12,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterObject; -import mage.filter.predicate.mageobject.ConvertedManaCostParityPredicate; +import mage.filter.predicate.mageobject.ManaValueParityPredicate; import mage.game.Game; import java.util.UUID; @@ -53,20 +53,20 @@ public final class LavabrinkVenturer extends CardImpl { class LavabrinkVenturerEffect extends GainAbilitySourceEffect { private static final FilterObject nullFilter = new FilterObject("nothing"); - private static final FilterObject oddFilter = new FilterObject("odd converted mana costs"); - private static final FilterObject evenFilter = new FilterObject("even converted mana costs"); + private static final FilterObject oddFilter = new FilterObject("odd mana values"); + private static final FilterObject evenFilter = new FilterObject("even mana values"); static { - nullFilter.add(ConvertedManaCostParityPredicate.ODD); - nullFilter.add(ConvertedManaCostParityPredicate.EVEN); - oddFilter.add(ConvertedManaCostParityPredicate.ODD); - evenFilter.add(ConvertedManaCostParityPredicate.EVEN); + nullFilter.add(ManaValueParityPredicate.ODD); + nullFilter.add(ManaValueParityPredicate.EVEN); + oddFilter.add(ManaValueParityPredicate.ODD); + evenFilter.add(ManaValueParityPredicate.EVEN); } LavabrinkVenturerEffect() { super(new ProtectionAbility(nullFilter)); this.ability.setRuleVisible(false); - staticText = "{this} has protection from each converted mana cost of the chosen value. (Zero is even.)"; + staticText = "{this} has protection from each mana value of the chosen value. (Zero is even.)"; } private LavabrinkVenturerEffect(final LavabrinkVenturerEffect effect) { diff --git a/Mage.Sets/src/mage/cards/l/LaviniaAzoriusRenegade.java b/Mage.Sets/src/mage/cards/l/LaviniaAzoriusRenegade.java index 5e65d312e3b..9419111fda6 100644 --- a/Mage.Sets/src/mage/cards/l/LaviniaAzoriusRenegade.java +++ b/Mage.Sets/src/mage/cards/l/LaviniaAzoriusRenegade.java @@ -16,7 +16,7 @@ import mage.constants.*; import mage.filter.FilterCard; import mage.filter.StaticFilters; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; @@ -62,7 +62,7 @@ class LaviniaAzoriusRenegadeReplacementEffect extends ContinuousRuleModifyingEff LaviniaAzoriusRenegadeReplacementEffect() { super(Duration.WhileOnBattlefield, Outcome.Detriment); - staticText = "Each opponent can't cast noncreature spells with converted mana cost greater than the number of lands that player controls."; + staticText = "Each opponent can't cast noncreature spells with mana value greater than the number of lands that player controls."; } LaviniaAzoriusRenegadeReplacementEffect(final LaviniaAzoriusRenegadeReplacementEffect effect) { @@ -73,7 +73,7 @@ class LaviniaAzoriusRenegadeReplacementEffect extends ContinuousRuleModifyingEff public String getInfoMessage(Ability source, GameEvent event, Game game) { MageObject mageObject = game.getObject(source.getSourceId()); if (mageObject != null) { - return "You can't cast noncreature spells with converted mana cost greater than " + getLandCount(source, event, game) + " (" + mageObject.getIdName() + ")."; + return "You can't cast noncreature spells with mana value greater than " + getLandCount(source, event, game) + " (" + mageObject.getIdName() + ")."; } return null; } @@ -88,7 +88,7 @@ class LaviniaAzoriusRenegadeReplacementEffect extends ContinuousRuleModifyingEff if (game.getPlayer(source.getControllerId()).hasOpponent(event.getPlayerId(), game)) { FilterCard filter = new FilterCard(); filter.add(Predicates.not(CardType.CREATURE.getPredicate())); - filter.add(new ConvertedManaCostPredicate(ComparisonType.MORE_THAN, getLandCount(source, event, game))); + filter.add(new ManaValuePredicate(ComparisonType.MORE_THAN, getLandCount(source, event, game))); Card card = game.getCard(event.getSourceId()); return card != null && filter.match(card, game); diff --git a/Mage.Sets/src/mage/cards/l/LaviniaOfTheTenth.java b/Mage.Sets/src/mage/cards/l/LaviniaOfTheTenth.java index af6af973627..9b58cae057f 100644 --- a/Mage.Sets/src/mage/cards/l/LaviniaOfTheTenth.java +++ b/Mage.Sets/src/mage/cards/l/LaviniaOfTheTenth.java @@ -17,7 +17,7 @@ import mage.constants.SuperType; import mage.constants.TargetController; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; /** * @@ -25,11 +25,11 @@ import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; */ public final class LaviniaOfTheTenth extends CardImpl { - private static final FilterPermanent filterDetain = new FilterPermanent("each nonland permanent your opponents control with converted mana cost 4 or less"); + private static final FilterPermanent filterDetain = new FilterPermanent("each nonland permanent your opponents control with mana value 4 or less"); static { filterDetain.add(TargetController.OPPONENT.getControllerPredicate()); filterDetain.add(Predicates.not(CardType.LAND.getPredicate())); - filterDetain.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 5)); + filterDetain.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 5)); } public LaviniaOfTheTenth (UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/l/LawRuneEnforcer.java b/Mage.Sets/src/mage/cards/l/LawRuneEnforcer.java index 1105305a9cc..16d37b2d0ac 100644 --- a/Mage.Sets/src/mage/cards/l/LawRuneEnforcer.java +++ b/Mage.Sets/src/mage/cards/l/LawRuneEnforcer.java @@ -13,7 +13,7 @@ import mage.constants.ComparisonType; import mage.constants.SubType; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.target.TargetPermanent; import java.util.UUID; @@ -24,10 +24,10 @@ import java.util.UUID; public final class LawRuneEnforcer extends CardImpl { private static final FilterPermanent filter - = new FilterCreaturePermanent("creature with converted mana cost 2 or greater"); + = new FilterCreaturePermanent("creature with mana value 2 or greater"); static { - filter.add(new ConvertedManaCostPredicate(ComparisonType.MORE_THAN, 1)); + filter.add(new ManaValuePredicate(ComparisonType.MORE_THAN, 1)); } public LawRuneEnforcer(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/l/LazavTheMultifarious.java b/Mage.Sets/src/mage/cards/l/LazavTheMultifarious.java index 6454fddadb3..e5f78b3f615 100644 --- a/Mage.Sets/src/mage/cards/l/LazavTheMultifarious.java +++ b/Mage.Sets/src/mage/cards/l/LazavTheMultifarious.java @@ -21,7 +21,7 @@ import mage.constants.Duration; import mage.constants.Outcome; import mage.filter.FilterCard; import mage.filter.common.FilterCreatureCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.game.permanent.PermanentCard; @@ -74,8 +74,8 @@ enum LazavTheMultifariousAdjuster implements TargetAdjuster { @Override public void adjustTargets(Ability ability, Game game) { int xValue = ability.getManaCostsToPay().getX(); - FilterCard filterCard = new FilterCreatureCard("creature card with converted mana cost " + xValue + " in your graveyard"); - filterCard.add(new ConvertedManaCostPredicate(ComparisonType.EQUAL_TO, xValue)); + FilterCard filterCard = new FilterCreatureCard("creature card with mana value " + xValue + " in your graveyard"); + filterCard.add(new ManaValuePredicate(ComparisonType.EQUAL_TO, xValue)); ability.getTargets().clear(); ability.getTargets().add(new TargetCardInYourGraveyard(filterCard)); } @@ -86,7 +86,7 @@ class LazavTheMultifariousEffect extends OneShotEffect { LazavTheMultifariousEffect() { super(Outcome.Copy); staticText = "{this} becomes a copy of target creature card " - + "in your graveyard with converted mana cost X, " + + "in your graveyard with mana value X, " + "except its name is Lazav, the Multifarious, " + "it's legendary in addition to its other types, " + "and it has this ability"; diff --git a/Mage.Sets/src/mage/cards/l/LeagueGuildmage.java b/Mage.Sets/src/mage/cards/l/LeagueGuildmage.java index 0dccbe71455..e51f1a594b7 100644 --- a/Mage.Sets/src/mage/cards/l/LeagueGuildmage.java +++ b/Mage.Sets/src/mage/cards/l/LeagueGuildmage.java @@ -16,7 +16,7 @@ import mage.constants.ComparisonType; import mage.constants.TargetController; import mage.filter.FilterSpell; import mage.filter.common.FilterInstantOrSorcerySpell; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.target.TargetSpell; import mage.target.targetadjustment.TargetAdjuster; @@ -27,7 +27,7 @@ import mage.target.targetadjustment.TargetAdjuster; */ public final class LeagueGuildmage extends CardImpl { - private static final FilterSpell filter = new FilterInstantOrSorcerySpell("instant or sorcery you control with converted mana cost X"); + private static final FilterSpell filter = new FilterInstantOrSorcerySpell("instant or sorcery you control with mana value X"); static { filter.add(TargetController.YOU.getControllerPredicate()); @@ -76,9 +76,9 @@ enum LeagueGuildmageAdjuster implements TargetAdjuster { @Override public void adjustTargets(Ability ability, Game game) { int xValue = ability.getManaCostsToPay().getX(); - FilterSpell spellFilter = new FilterInstantOrSorcerySpell("instant or sorcery you control with converted mana cost " + xValue); + FilterSpell spellFilter = new FilterInstantOrSorcerySpell("instant or sorcery you control with mana value " + xValue); spellFilter.add(TargetController.YOU.getControllerPredicate()); - spellFilter.add(new ConvertedManaCostPredicate(ComparisonType.EQUAL_TO, xValue)); + spellFilter.add(new ManaValuePredicate(ComparisonType.EQUAL_TO, xValue)); ability.getTargets().clear(); ability.addTarget(new TargetSpell(spellFilter)); } diff --git a/Mage.Sets/src/mage/cards/l/LegacyOfTheBeloved.java b/Mage.Sets/src/mage/cards/l/LegacyOfTheBeloved.java index 022dd2de50d..74046ce6721 100644 --- a/Mage.Sets/src/mage/cards/l/LegacyOfTheBeloved.java +++ b/Mage.Sets/src/mage/cards/l/LegacyOfTheBeloved.java @@ -16,7 +16,7 @@ import mage.constants.Outcome; import mage.constants.Zone; import static mage.filter.StaticFilters.FILTER_CONTROLLED_CREATURE_SHORT_TEXT; import mage.filter.common.FilterCreatureCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -51,11 +51,11 @@ public final class LegacyOfTheBeloved extends CardImpl { class LegacyOfTheBelovedEffect extends OneShotEffect { - private static final FilterCreatureCard filter = new FilterCreatureCard("up to two creatures cards that each have a lower converted mana cost that sacrificied creature's converted mana cost"); + private static final FilterCreatureCard filter = new FilterCreatureCard("up to two creatures cards that each have a lower mana value that sacrificied creature's mana value"); public LegacyOfTheBelovedEffect() { super(Outcome.DrawCard); - this.staticText = "Search you library for up to two creatures cards that each have a lower converted mana cost that sacrificied creature's converted mana cost, reveal them and put them onto the battlefield, then shuffle you library"; + this.staticText = "Search you library for up to two creatures cards that each have a lower mana value that sacrificied creature's mana value, reveal them and put them onto the battlefield, then shuffle you library"; } public LegacyOfTheBelovedEffect(final LegacyOfTheBelovedEffect effect) { @@ -75,7 +75,7 @@ class LegacyOfTheBelovedEffect extends OneShotEffect { if (cost instanceof SacrificeTargetCost) { Permanent p = (Permanent) game.getLastKnownInformation(((SacrificeTargetCost) cost).getPermanents().get(0).getId(), Zone.BATTLEFIELD); if (p != null) { - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, p.getConvertedManaCost())); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, p.getManaValue())); TargetCardInLibrary target = new TargetCardInLibrary(0, 2, filter); Player player = game.getPlayer(source.getControllerId()); if (player != null && player.searchLibrary(target, source, game)) { diff --git a/Mage.Sets/src/mage/cards/l/LegionsEnd.java b/Mage.Sets/src/mage/cards/l/LegionsEnd.java index c96c788c009..6041696698d 100644 --- a/Mage.Sets/src/mage/cards/l/LegionsEnd.java +++ b/Mage.Sets/src/mage/cards/l/LegionsEnd.java @@ -13,7 +13,7 @@ import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.StaticFilters; import mage.filter.common.FilterOpponentsCreaturePermanent; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -27,10 +27,10 @@ import java.util.UUID; public final class LegionsEnd extends CardImpl { private static final FilterPermanent filter - = new FilterOpponentsCreaturePermanent("creature an opponent controls with converted mana cost 2 or less"); + = new FilterOpponentsCreaturePermanent("creature an opponent controls with mana value 2 or less"); static { - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 3)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 3)); } public LegionsEnd(UUID ownerId, CardSetInfo setInfo) { @@ -55,7 +55,7 @@ class LegionsEndEffect extends OneShotEffect { LegionsEndEffect() { super(Outcome.Benefit); - staticText = "Exile target creature an opponent controls with converted mana cost 2 or less " + + staticText = "Exile target creature an opponent controls with mana value 2 or less " + "and all other creatures that player controls with the same name as that creature. " + "Then that player reveals their hand and exiles all cards with that name from their hand and graveyard."; } diff --git a/Mage.Sets/src/mage/cards/l/LeoninSquire.java b/Mage.Sets/src/mage/cards/l/LeoninSquire.java index 876e6ff4195..b8febb7018e 100644 --- a/Mage.Sets/src/mage/cards/l/LeoninSquire.java +++ b/Mage.Sets/src/mage/cards/l/LeoninSquire.java @@ -12,7 +12,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.ComparisonType; import mage.filter.common.FilterArtifactCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.target.common.TargetCardInYourGraveyard; /** @@ -21,9 +21,9 @@ import mage.target.common.TargetCardInYourGraveyard; */ public final class LeoninSquire extends CardImpl { - private static final FilterArtifactCard filter = new FilterArtifactCard("target artifact card with converted mana cost 1 or less from your graveyard"); + private static final FilterArtifactCard filter = new FilterArtifactCard("target artifact card with mana value 1 or less from your graveyard"); static { - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 2)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 2)); } public LeoninSquire(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/l/LifeDeath.java b/Mage.Sets/src/mage/cards/l/LifeDeath.java index 790e36ac15e..a4e61f26fc4 100644 --- a/Mage.Sets/src/mage/cards/l/LifeDeath.java +++ b/Mage.Sets/src/mage/cards/l/LifeDeath.java @@ -58,7 +58,7 @@ class DeathEffect extends OneShotEffect { public DeathEffect() { super(Outcome.PutCreatureInPlay); - this.staticText = "return target creature card from your graveyard to the battlefield. You lose life equal to its converted mana cost"; + this.staticText = "return target creature card from your graveyard to the battlefield. You lose life equal to its mana value"; } public DeathEffect(final DeathEffect effect) { @@ -79,7 +79,7 @@ class DeathEffect extends OneShotEffect { if (game.getState().getZone(creatureCard.getId()) == Zone.GRAVEYARD) { controller.moveCards(creatureCard, Zone.BATTLEFIELD, source, game); } - controller.loseLife(creatureCard.getConvertedManaCost(), game, source, false); + controller.loseLife(creatureCard.getManaValue(), game, source, false); return true; } return false; diff --git a/Mage.Sets/src/mage/cards/l/LilianaDefiantNecromancer.java b/Mage.Sets/src/mage/cards/l/LilianaDefiantNecromancer.java index 836670fe3b3..9efcd1fd6f6 100644 --- a/Mage.Sets/src/mage/cards/l/LilianaDefiantNecromancer.java +++ b/Mage.Sets/src/mage/cards/l/LilianaDefiantNecromancer.java @@ -15,7 +15,7 @@ import mage.constants.*; import mage.filter.FilterCard; import mage.filter.common.FilterCreatureCard; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.game.command.emblems.LilianaDefiantNecromancerEmblem; import mage.target.common.TargetCardInYourGraveyard; @@ -27,7 +27,7 @@ import mage.target.targetadjustment.TargetAdjuster; */ public final class LilianaDefiantNecromancer extends CardImpl { - protected static final FilterCreatureCard filter = new FilterCreatureCard("nonlegendary creature with converted mana cost X from your graveyard"); + protected static final FilterCreatureCard filter = new FilterCreatureCard("nonlegendary creature with mana value X from your graveyard"); static { filter.add(Predicates.not(SuperType.LEGENDARY.getPredicate())); @@ -78,7 +78,7 @@ enum LilianaDefiantNecromancerAdjuster implements TargetAdjuster { } } FilterCard newFilter = LilianaDefiantNecromancer.filter.copy(); - newFilter.add(new ConvertedManaCostPredicate(ComparisonType.EQUAL_TO, cmc)); + newFilter.add(new ManaValuePredicate(ComparisonType.EQUAL_TO, cmc)); ability.getTargets().clear(); ability.addTarget(new TargetCardInYourGraveyard(newFilter)); } diff --git a/Mage.Sets/src/mage/cards/l/LinSivviDefiantHero.java b/Mage.Sets/src/mage/cards/l/LinSivviDefiantHero.java index 0bedca2045b..2b5d6ecc9c0 100644 --- a/Mage.Sets/src/mage/cards/l/LinSivviDefiantHero.java +++ b/Mage.Sets/src/mage/cards/l/LinSivviDefiantHero.java @@ -16,7 +16,7 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterCard; import mage.filter.common.FilterPermanentCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCardInLibrary; @@ -72,7 +72,7 @@ class LinSivviDefiantHeroEffect extends OneShotEffect { public LinSivviDefiantHeroEffect() { super(Outcome.DrawCard); - this.staticText = "Search your library for a Rebel permanent card with converted mana cost X or less and put it onto the battlefield. Then shuffle your library"; + this.staticText = "Search your library for a Rebel permanent card with mana value X or less and put it onto the battlefield. Then shuffle your library"; } public LinSivviDefiantHeroEffect(final LinSivviDefiantHeroEffect effect) { @@ -93,8 +93,8 @@ class LinSivviDefiantHeroEffect extends OneShotEffect { int xCost = source.getManaCostsToPay().getX(); - FilterPermanentCard filter = new FilterPermanentCard("Rebel permanent card with converted mana cost " + xCost + " or less"); - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, xCost + 1)); + FilterPermanentCard filter = new FilterPermanentCard("Rebel permanent card with mana value " + xCost + " or less"); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, xCost + 1)); filter.add(SubType.REBEL.getPredicate()); TargetCardInLibrary target = new TargetCardInLibrary(filter); diff --git a/Mage.Sets/src/mage/cards/l/LinessaZephyrMage.java b/Mage.Sets/src/mage/cards/l/LinessaZephyrMage.java index ff0e83fdabd..2156ede808c 100644 --- a/Mage.Sets/src/mage/cards/l/LinessaZephyrMage.java +++ b/Mage.Sets/src/mage/cards/l/LinessaZephyrMage.java @@ -34,7 +34,7 @@ import mage.target.targetadjustment.XCMCPermanentAdjuster; */ public final class LinessaZephyrMage extends CardImpl { - private static final FilterPermanent filter = new FilterPermanent("creature with converted mana cost X"); + private static final FilterPermanent filter = new FilterPermanent("creature with mana value X"); static { filter.add(CardType.CREATURE.getPredicate()); diff --git a/Mage.Sets/src/mage/cards/l/Liquify.java b/Mage.Sets/src/mage/cards/l/Liquify.java index f5c7c89924e..0a342aeda8c 100644 --- a/Mage.Sets/src/mage/cards/l/Liquify.java +++ b/Mage.Sets/src/mage/cards/l/Liquify.java @@ -9,7 +9,7 @@ import mage.constants.CardType; import mage.constants.ComparisonType; import mage.constants.Zone; import mage.filter.FilterSpell; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.target.TargetSpell; /** @@ -18,10 +18,10 @@ import mage.target.TargetSpell; */ public final class Liquify extends CardImpl { - private static final FilterSpell filter = new FilterSpell("spell with converted mana cost 3 or less"); + private static final FilterSpell filter = new FilterSpell("spell with mana value 3 or less"); static { - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 4)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 4)); } public Liquify(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/l/LivingArmor.java b/Mage.Sets/src/mage/cards/l/LivingArmor.java index c3631592d1a..38d5be12ef2 100644 --- a/Mage.Sets/src/mage/cards/l/LivingArmor.java +++ b/Mage.Sets/src/mage/cards/l/LivingArmor.java @@ -46,7 +46,7 @@ public final class LivingArmor extends CardImpl { public LivingArmorEffect() { super(Outcome.BoostCreature); - this.staticText = "Put X +0/+1 counters on target creature, where X is that creature's converted mana cost"; + this.staticText = "Put X +0/+1 counters on target creature, where X is that creature's mana value"; } public LivingArmorEffect(final LivingArmorEffect effect) { @@ -62,7 +62,7 @@ public final class LivingArmor extends CardImpl { public boolean apply(Game game, Ability source) { Permanent creature = game.getPermanent(source.getTargets().getFirstTarget()); if (creature != null) { - int amount = creature.getConvertedManaCost(); + int amount = creature.getManaValue(); creature.addCounters(new BoostCounter(0, 1, amount), source.getControllerId(), source, game); return true; } diff --git a/Mage.Sets/src/mage/cards/l/LivingDestiny.java b/Mage.Sets/src/mage/cards/l/LivingDestiny.java index 51d81120e71..09879698dba 100644 --- a/Mage.Sets/src/mage/cards/l/LivingDestiny.java +++ b/Mage.Sets/src/mage/cards/l/LivingDestiny.java @@ -46,7 +46,7 @@ class LivingDestinyEffect extends OneShotEffect { public LivingDestinyEffect() { super(Outcome.GainLife); - staticText = "You gain life equal to its converted mana cost"; + staticText = "You gain life equal to its mana value"; } public LivingDestinyEffect(LivingDestinyEffect effect) { @@ -58,7 +58,7 @@ class LivingDestinyEffect extends OneShotEffect { RevealTargetFromHandCost cost = (RevealTargetFromHandCost) source.getCosts().get(0); if (cost != null) { Player player = game.getPlayer(source.getControllerId()); - int CMC = cost.convertedManaCosts; + int CMC = cost.manaValues; if (player != null) { player.gainLife(CMC, game, source); } diff --git a/Mage.Sets/src/mage/cards/l/LivingLore.java b/Mage.Sets/src/mage/cards/l/LivingLore.java index 484c58b187e..b45827d5ea7 100644 --- a/Mage.Sets/src/mage/cards/l/LivingLore.java +++ b/Mage.Sets/src/mage/cards/l/LivingLore.java @@ -100,7 +100,7 @@ class LivingLoreSetPowerToughnessSourceEffect extends ContinuousEffectImpl { public LivingLoreSetPowerToughnessSourceEffect() { super(Duration.Custom, Layer.PTChangingEffects_7, SubLayer.SetPT_7b, Outcome.BoostCreature); - staticText = "{this}'s power and toughness are each equal to the exiled card's converted mana cost"; + staticText = "{this}'s power and toughness are each equal to the exiled card's mana value"; } public LivingLoreSetPowerToughnessSourceEffect(final LivingLoreSetPowerToughnessSourceEffect effect) { @@ -135,7 +135,7 @@ class LivingLoreSetPowerToughnessSourceEffect extends ContinuousEffectImpl { break; } if (exiledCard != null) { - int value = exiledCard.getConvertedManaCost(); + int value = exiledCard.getManaValue(); permanent.getPower().setValue(value); permanent.getToughness().setValue(value); } diff --git a/Mage.Sets/src/mage/cards/l/LukkaCoppercoatOutcast.java b/Mage.Sets/src/mage/cards/l/LukkaCoppercoatOutcast.java index 2eeb8485535..3a91a6827fc 100644 --- a/Mage.Sets/src/mage/cards/l/LukkaCoppercoatOutcast.java +++ b/Mage.Sets/src/mage/cards/l/LukkaCoppercoatOutcast.java @@ -129,7 +129,7 @@ class LukkaCoppercoatOutcastPolymorphEffect extends OneShotEffect { LukkaCoppercoatOutcastPolymorphEffect() { super(Outcome.Benefit); staticText = "Exile target creature you control, then reveal cards from the top of your library " + - "until you reveal a creature card with higher converted mana cost. " + + "until you reveal a creature card with higher mana value. " + "Put that card onto the battlefield and the rest on the bottom of your library in a random order."; } @@ -149,13 +149,13 @@ class LukkaCoppercoatOutcastPolymorphEffect extends OneShotEffect { if (permanent == null || player == null) { return false; } - int cmc = permanent.getConvertedManaCost(); + int cmc = permanent.getManaValue(); player.moveCards(permanent, Zone.EXILED, source, game); Card toBattlefield = null; Cards toReveal = new CardsImpl(); for (Card card : player.getLibrary().getCards(game)) { toReveal.add(card); - if (card.isCreature() && card.getConvertedManaCost() > cmc) { + if (card.isCreature() && card.getManaValue() > cmc) { toBattlefield = card; break; } diff --git a/Mage.Sets/src/mage/cards/l/LullmagesDomination.java b/Mage.Sets/src/mage/cards/l/LullmagesDomination.java index 01c3df74fea..338e184b031 100644 --- a/Mage.Sets/src/mage/cards/l/LullmagesDomination.java +++ b/Mage.Sets/src/mage/cards/l/LullmagesDomination.java @@ -15,7 +15,7 @@ import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicate; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -49,7 +49,7 @@ public final class LullmagesDomination extends CardImpl { // Gain control of target creature with converted mana cost X. this.getSpellAbility().addEffect(new GainControlTargetEffect(Duration.Custom) - .setText("gain control of target creature with converted mana cost X")); + .setText("gain control of target creature with mana value X")); this.getSpellAbility().setTargetAdjuster(LullmagesDominationAdjuster.instance); } @@ -80,8 +80,8 @@ enum LullmagesDominationAdjuster implements TargetAdjuster { public void adjustTargets(Ability ability, Game game) { ability.getTargets().clear(); int xValue = ability.getManaCostsToPay().getX(); - FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with converted mana cost " + xValue); - filter.add(new ConvertedManaCostPredicate(ComparisonType.EQUAL_TO, xValue)); + FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with mana value " + xValue); + filter.add(new ManaValuePredicate(ComparisonType.EQUAL_TO, xValue)); ability.addTarget(new TargetCreaturePermanent(filter)); } } diff --git a/Mage.Sets/src/mage/cards/l/LurrusOfTheDreamDen.java b/Mage.Sets/src/mage/cards/l/LurrusOfTheDreamDen.java index 262fd7b1304..300e4886a3c 100644 --- a/Mage.Sets/src/mage/cards/l/LurrusOfTheDreamDen.java +++ b/Mage.Sets/src/mage/cards/l/LurrusOfTheDreamDen.java @@ -63,14 +63,14 @@ enum LurrusOfTheDreamDenCompanionCondition implements CompanionCondition { @Override public String getRule() { - return "Each permanent card in your starting deck has converted mana cost 2 or less."; + return "Each permanent card in your starting deck has mana value 2 or less."; } @Override public boolean isLegal(Set deck, int startingSize) { return deck.stream() .filter(MageObject::isPermanent) - .mapToInt(MageObject::getConvertedManaCost) + .mapToInt(MageObject::getManaValue) .max() .orElse(0) <= 2; } @@ -80,7 +80,7 @@ class LurrusOfTheDreamDenCastFromGraveyardEffect extends AsThoughEffectImpl { LurrusOfTheDreamDenCastFromGraveyardEffect() { super(AsThoughEffectType.PLAY_FROM_NOT_OWN_HAND_ZONE, Duration.WhileOnBattlefield, Outcome.Benefit, true); - staticText = "During each of your turns, you may cast one permanent spell with converted mana cost 2 or less from your graveyard"; + staticText = "During each of your turns, you may cast one permanent spell with mana value 2 or less from your graveyard"; } private LurrusOfTheDreamDenCastFromGraveyardEffect(final LurrusOfTheDreamDenCastFromGraveyardEffect effect) { @@ -107,7 +107,7 @@ class LurrusOfTheDreamDenCastFromGraveyardEffect extends AsThoughEffectImpl { if (sourceObject != null && objectCard != null && objectCard.isPermanent() && objectCard.isOwnedBy(source.getControllerId()) - && objectCard.getConvertedManaCost() < 3 + && objectCard.getManaValue() < 3 && objectCard.getSpellAbility() != null && objectCard.getSpellAbility().spellCanBeActivatedRegularlyNow(affectedControllerId, game)) { LurrusOfTheDreamDenWatcher watcher = game.getState().getWatcher(LurrusOfTheDreamDenWatcher.class); diff --git a/Mage.Sets/src/mage/cards/m/MagesContest.java b/Mage.Sets/src/mage/cards/m/MagesContest.java index 7a27c03559b..317062d274a 100644 --- a/Mage.Sets/src/mage/cards/m/MagesContest.java +++ b/Mage.Sets/src/mage/cards/m/MagesContest.java @@ -73,7 +73,7 @@ class MagesContestEffect extends OneShotEffect { if (currentPlayer.isComputer()) { // AI hint // make AI evaluate value of the spell to decide on bidding, should be reworked - int maxBid = Math.min(RandomUtil.nextInt(Math.max(currentPlayer.getLife(), 1)) + RandomUtil.nextInt(Math.max(spell.getConvertedManaCost(), 1)), currentPlayer.getLife()); + int maxBid = Math.min(RandomUtil.nextInt(Math.max(currentPlayer.getLife(), 1)) + RandomUtil.nextInt(Math.max(spell.getManaValue(), 1)), currentPlayer.getLife()); if (highBid + 1 < maxBid) { newBid = highBid + 1; } diff --git a/Mage.Sets/src/mage/cards/m/ManaDrain.java b/Mage.Sets/src/mage/cards/m/ManaDrain.java index 45bbe97f0b9..b0a6b5e116f 100644 --- a/Mage.Sets/src/mage/cards/m/ManaDrain.java +++ b/Mage.Sets/src/mage/cards/m/ManaDrain.java @@ -47,7 +47,7 @@ class ManaDrainCounterEffect extends OneShotEffect { public ManaDrainCounterEffect() { super(Outcome.Benefit); - this.staticText = "Counter target spell. At the beginning of your next main phase, add an amount of {C} equal to that spell's converted mana cost"; + this.staticText = "Counter target spell. At the beginning of your next main phase, add an amount of {C} equal to that spell's mana value"; } public ManaDrainCounterEffect(final ManaDrainCounterEffect effect) { @@ -65,7 +65,7 @@ class ManaDrainCounterEffect extends OneShotEffect { if (spell != null) { game.getStack().counter(getTargetPointer().getFirst(game, source), source, game); // mana gets added also if counter is not successful - int cmc = spell.getConvertedManaCost(); + int cmc = spell.getManaValue(); Effect effect = new AddManaToManaPoolTargetControllerEffect(Mana.ColorlessMana(cmc), "your"); effect.setTargetPointer(new FixedTarget(source.getControllerId())); AtTheBeginOfMainPhaseDelayedTriggeredAbility delayedAbility diff --git a/Mage.Sets/src/mage/cards/m/Manaplasm.java b/Mage.Sets/src/mage/cards/m/Manaplasm.java index 552136c85fb..f83ef347dbd 100644 --- a/Mage.Sets/src/mage/cards/m/Manaplasm.java +++ b/Mage.Sets/src/mage/cards/m/Manaplasm.java @@ -14,7 +14,6 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; -import mage.game.events.GameEvent.EventType; import mage.game.stack.Spell; import mage.target.targetpointer.FixedTarget; @@ -50,7 +49,7 @@ public final class Manaplasm extends CardImpl { class ManaplasmAbility extends TriggeredAbilityImpl { public ManaplasmAbility() { - super(Zone.BATTLEFIELD, new InfoEffect("{this} gets +X/+X until end of turn, where X is that spell's converted mana cost"), false); + super(Zone.BATTLEFIELD, new InfoEffect("{this} gets +X/+X until end of turn, where X is that spell's mana value"), false); } @@ -69,7 +68,7 @@ class ManaplasmAbility extends TriggeredAbilityImpl { Spell spell = game.getStack().getSpell(event.getTargetId()); if (spell != null && spell.isControlledBy(controllerId)) { this.getEffects().remove(0); - int x = spell.getConvertedManaCost(); + int x = spell.getManaValue(); this.addEffect(new BoostSourceEffect(x,x, Duration.EndOfTurn)); this.getEffects().get(0).setTargetPointer(new FixedTarget(event.getPlayerId())); return true; @@ -79,7 +78,7 @@ class ManaplasmAbility extends TriggeredAbilityImpl { @Override public String getRule() { - return "Whenever you cast a spell, {this} gets +X/+X until end of turn, where X is that spell's converted mana cost"; + return "Whenever you cast a spell, {this} gets +X/+X until end of turn, where X is that spell's mana value"; } @Override diff --git a/Mage.Sets/src/mage/cards/m/MarchFromTheTomb.java b/Mage.Sets/src/mage/cards/m/MarchFromTheTomb.java index 4704ff205ce..c006b945d82 100644 --- a/Mage.Sets/src/mage/cards/m/MarchFromTheTomb.java +++ b/Mage.Sets/src/mage/cards/m/MarchFromTheTomb.java @@ -28,7 +28,7 @@ public final class MarchFromTheTomb extends CardImpl { // Return any number of target Ally creature cards with total converted mana cost of 8 or less from your graveyard to the battlefield. Effect effect = new ReturnFromGraveyardToBattlefieldTargetEffect(); - effect.setText("Return any number of target Ally creature cards with total converted mana cost of 8 or less from your graveyard to the battlefield"); + effect.setText("Return any number of target Ally creature cards with total mana value of 8 or less from your graveyard to the battlefield"); this.getSpellAbility().addEffect(effect); FilterCard filter = new FilterCreatureCard(); filter.add(SubType.ALLY.getPredicate()); @@ -61,18 +61,18 @@ class MarchFromTheTombTarget extends TargetCardInYourGraveyard { for (UUID targetId : this.getTargets()) { Card card = game.getCard(targetId); if (card != null) { - cmcLeft -= card.getConvertedManaCost(); + cmcLeft -= card.getManaValue(); } } Set possibleTargets = super.possibleTargets(sourceId, sourceControllerId, game); Set leftPossibleTargets = new HashSet<>(); for (UUID targetId : possibleTargets) { Card card = game.getCard(targetId); - if (card != null && card.getConvertedManaCost() <= cmcLeft) { + if (card != null && card.getManaValue() <= cmcLeft) { leftPossibleTargets.add(targetId); } } - setTargetName("any number of target Ally creature cards with total converted mana cost of 8 or less (" + cmcLeft + " left) from your graveyard"); + setTargetName("any number of target Ally creature cards with total mana value of 8 or less (" + cmcLeft + " left) from your graveyard"); return leftPossibleTargets; } @@ -83,11 +83,11 @@ class MarchFromTheTombTarget extends TargetCardInYourGraveyard { for (UUID targetId : this.getTargets()) { Card card = game.getCard(targetId); if (card != null) { - cmcLeft -= card.getConvertedManaCost(); + cmcLeft -= card.getManaValue(); } } Card card = game.getCard(objectId); - return card != null && card.getConvertedManaCost() <= cmcLeft; + return card != null && card.getManaValue() <= cmcLeft; } return false; } diff --git a/Mage.Sets/src/mage/cards/m/MarchOfTheMachines.java b/Mage.Sets/src/mage/cards/m/MarchOfTheMachines.java index 88ca46e5730..c5fbacfabc6 100644 --- a/Mage.Sets/src/mage/cards/m/MarchOfTheMachines.java +++ b/Mage.Sets/src/mage/cards/m/MarchOfTheMachines.java @@ -48,7 +48,7 @@ class MarchOfTheMachinesEffect extends ContinuousEffectImpl { public MarchOfTheMachinesEffect() { super(Duration.WhileOnBattlefield, Outcome.BecomeCreature); - staticText = "Each noncreature artifact is an artifact creature with power and toughness each equal to its converted mana cost"; + staticText = "Each noncreature artifact is an artifact creature with power and toughness each equal to its mana value"; dependendToTypes.add(DependencyType.ArtifactAddingRemoving); } @@ -81,7 +81,7 @@ class MarchOfTheMachinesEffect extends ContinuousEffectImpl { for (Iterator it = affectedObjectList.iterator(); it.hasNext();) { Permanent permanent = it.next().getPermanent(game); if (permanent != null) { - int manaCost = permanent.getConvertedManaCost(); + int manaCost = permanent.getManaValue(); permanent.getPower().setValue(manaCost); permanent.getToughness().setValue(manaCost); } diff --git a/Mage.Sets/src/mage/cards/m/MasterOfPredicaments.java b/Mage.Sets/src/mage/cards/m/MasterOfPredicaments.java index f7fed59f58e..af736eb8347 100644 --- a/Mage.Sets/src/mage/cards/m/MasterOfPredicaments.java +++ b/Mage.Sets/src/mage/cards/m/MasterOfPredicaments.java @@ -57,7 +57,7 @@ class MasterOfPredicamentsEffect extends OneShotEffect { public MasterOfPredicamentsEffect() { super(Outcome.PlayForFree); this.staticText = "choose a card in your hand. That player guesses whether " - + "the card's converted mana cost is greater than 4. If the player " + + "the card's mana value is greater than 4. If the player " + "guessed wrong, you may cast the card without paying its mana cost"; } @@ -95,12 +95,12 @@ class MasterOfPredicamentsEffect extends OneShotEffect { 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.getConvertedManaCost() <= 4; + + "card's mana value is greater than 4"); + guessWrong = cardFromHand.getManaValue() <= 4; } else { game.informPlayers(attackedPlayer.getLogName() + " guessed that the chosen " - + "card's converted mana cost is not greater than 4"); - guessWrong = cardFromHand.getConvertedManaCost() > 4; + + "card's mana value is not greater than 4"); + guessWrong = cardFromHand.getManaValue() > 4; } game.informPlayers(attackedPlayer.getLogName() + " guessed " + (guessWrong ? "wrong" : "right")); if (guessWrong) { diff --git a/Mage.Sets/src/mage/cards/m/MatterReshaper.java b/Mage.Sets/src/mage/cards/m/MatterReshaper.java index 6c31426e185..2f319f419af 100644 --- a/Mage.Sets/src/mage/cards/m/MatterReshaper.java +++ b/Mage.Sets/src/mage/cards/m/MatterReshaper.java @@ -16,7 +16,7 @@ import mage.constants.Outcome; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterPermanentCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.players.Player; @@ -52,7 +52,7 @@ class MatterReshaperEffect extends OneShotEffect { public MatterReshaperEffect() { super(Outcome.Benefit); staticText = "reveal the top card of your library. You may put that card onto the battlefield if it's a permanent card" - + " with converted mana cost 3 or less. Otherwise, put that card into your hand"; + + " with mana value 3 or less. Otherwise, put that card into your hand"; } public MatterReshaperEffect(final MatterReshaperEffect effect) { @@ -68,8 +68,8 @@ class MatterReshaperEffect extends OneShotEffect { return false; } controller.revealCards(source, new CardsImpl(card), game); - FilterPermanentCard filter = new FilterPermanentCard("permanent card with converted mana cost 3 or less"); - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 4)); + FilterPermanentCard filter = new FilterPermanentCard("permanent card with mana value 3 or less"); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 4)); if (filter.match(card, game)) { if (controller.chooseUse(Outcome.PutCardInPlay, "Put " + card.getName() + " onto the battlefield (otherwise put in hand)?", source, game)) { controller.moveCards(card, Zone.BATTLEFIELD, source, game); diff --git a/Mage.Sets/src/mage/cards/m/MausoleumSecrets.java b/Mage.Sets/src/mage/cards/m/MausoleumSecrets.java index fc592c55271..089c6afb689 100644 --- a/Mage.Sets/src/mage/cards/m/MausoleumSecrets.java +++ b/Mage.Sets/src/mage/cards/m/MausoleumSecrets.java @@ -13,7 +13,7 @@ import mage.constants.Outcome; import mage.filter.FilterCard; import mage.filter.StaticFilters; import mage.filter.predicate.mageobject.ColorPredicate; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCardInLibrary; @@ -46,7 +46,7 @@ class MausoleumSecretsEffect extends OneShotEffect { public MausoleumSecretsEffect() { super(Outcome.Benefit); this.staticText = "Undergrowth — Search your library " - + "for a black card with converted mana cost less than " + + "for a black card with mana value less than " + "or equal to the number of creature cards in your graveyard, " + "reveal it, put it into your hand, then shuffle your library."; } @@ -67,9 +67,9 @@ class MausoleumSecretsEffect extends OneShotEffect { return false; } int critterCount = player.getGraveyard().count(StaticFilters.FILTER_CARD_CREATURE, game); - FilterCard filter = new FilterCard("a black card with converted mana cost less than or equal to " + critterCount); + FilterCard filter = new FilterCard("a black card with mana value less than or equal to " + critterCount); filter.add(new ColorPredicate(ObjectColor.BLACK)); - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, critterCount + 1)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, critterCount + 1)); return new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filter), true).apply(game, source); } } diff --git a/Mage.Sets/src/mage/cards/m/Meltdown.java b/Mage.Sets/src/mage/cards/m/Meltdown.java index c9faffc6c84..686ecf57d79 100644 --- a/Mage.Sets/src/mage/cards/m/Meltdown.java +++ b/Mage.Sets/src/mage/cards/m/Meltdown.java @@ -39,7 +39,7 @@ class MeltdownEffect extends OneShotEffect { MeltdownEffect() { super(Outcome.DestroyPermanent); - this.staticText = "Destroy each artifact with converted mana cost X or less"; + this.staticText = "Destroy each artifact with mana value X or less"; } MeltdownEffect(final MeltdownEffect effect) { @@ -54,7 +54,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.isArtifact() && permanent.getConvertedManaCost() <= source.getManaCostsToPay().getX()) { + if (permanent != null && permanent.isArtifact() && permanent.getManaValue() <= source.getManaCostsToPay().getX()) { permanent.destroy(source, game, false); } } diff --git a/Mage.Sets/src/mage/cards/m/MentalMisstep.java b/Mage.Sets/src/mage/cards/m/MentalMisstep.java index e1a4e1f9ade..69d051198db 100644 --- a/Mage.Sets/src/mage/cards/m/MentalMisstep.java +++ b/Mage.Sets/src/mage/cards/m/MentalMisstep.java @@ -8,7 +8,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.ComparisonType; import mage.filter.FilterSpell; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.target.TargetSpell; /** @@ -17,10 +17,10 @@ import mage.target.TargetSpell; */ public final class MentalMisstep extends CardImpl { - private static final FilterSpell FILTER = new FilterSpell("spell with converted mana cost 1"); + private static final FilterSpell FILTER = new FilterSpell("spell with mana value 1"); static { - FILTER.add(new ConvertedManaCostPredicate(ComparisonType.EQUAL_TO, 1)); + FILTER.add(new ManaValuePredicate(ComparisonType.EQUAL_TO, 1)); } public MentalMisstep(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MercadianLift.java b/Mage.Sets/src/mage/cards/m/MercadianLift.java index 8b84910a79e..57cbc2c200f 100644 --- a/Mage.Sets/src/mage/cards/m/MercadianLift.java +++ b/Mage.Sets/src/mage/cards/m/MercadianLift.java @@ -18,7 +18,7 @@ import mage.constants.Outcome; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterCreatureCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCardInHand; @@ -58,7 +58,7 @@ class MercadianLiftEffect extends OneShotEffect { public MercadianLiftEffect() { super(Outcome.PutCardInPlay); - staticText = "You may put a creature card with converted mana cost X from your hand onto the battlefield"; + staticText = "You may put a creature card with mana value X from your hand onto the battlefield"; } public MercadianLiftEffect(final MercadianLiftEffect effect) { @@ -82,8 +82,8 @@ class MercadianLiftEffect extends OneShotEffect { } System.out.println("The number is " + numberOfCounters); FilterCreatureCard filter = new FilterCreatureCard(); - filter.add(new ConvertedManaCostPredicate(ComparisonType.EQUAL_TO, numberOfCounters)); - filter.setMessage("creature card with converted mana cost " + numberOfCounters); + filter.add(new ManaValuePredicate(ComparisonType.EQUAL_TO, numberOfCounters)); + filter.setMessage("creature card with mana value " + numberOfCounters); TargetCardInHand target = new TargetCardInHand(filter); if (target.canChoose(source.getSourceId(), controller.getId(), game) && controller.chooseUse(Outcome.PutCardInPlay, "Put " + filter.getMessage() + " from your hand onto the battlefield?", source, game) diff --git a/Mage.Sets/src/mage/cards/m/MerenOfClanNelToth.java b/Mage.Sets/src/mage/cards/m/MerenOfClanNelToth.java index bc9fde97ce2..8b0bf5cfe6c 100644 --- a/Mage.Sets/src/mage/cards/m/MerenOfClanNelToth.java +++ b/Mage.Sets/src/mage/cards/m/MerenOfClanNelToth.java @@ -67,7 +67,7 @@ class MerenOfClanNelTothEffect extends OneShotEffect { MerenOfClanNelTothEffect() { super(Outcome.PutCreatureInPlay); - this.staticText = "choose target creature card in your graveyard. If that card's converted mana cost " + + this.staticText = "choose target creature card in your graveyard. If that card's mana value " + "is less than or equal to the number of experience counters you have, " + "return it to the battlefield. Otherwise, put it into your hand"; } @@ -88,7 +88,7 @@ class MerenOfClanNelTothEffect extends OneShotEffect { if (player == null || card == null) { return false; } - boolean flag = card.getConvertedManaCost() <= player.getCounters().getCount(CounterType.EXPERIENCE); + boolean flag = card.getManaValue() <= player.getCounters().getCount(CounterType.EXPERIENCE); return player.moveCards(card, flag ? Zone.BATTLEFIELD : Zone.HAND, source, game); } } diff --git a/Mage.Sets/src/mage/cards/m/MetallurgicSummonings.java b/Mage.Sets/src/mage/cards/m/MetallurgicSummonings.java index 582b6fa48b2..0834887424d 100644 --- a/Mage.Sets/src/mage/cards/m/MetallurgicSummonings.java +++ b/Mage.Sets/src/mage/cards/m/MetallurgicSummonings.java @@ -69,7 +69,7 @@ class MetallurgicSummoningsTokenEffect extends OneShotEffect { public MetallurgicSummoningsTokenEffect() { super(Outcome.PutCreatureInPlay); - staticText = "create an X/X colorless Construct artifact creature token, where X is that spell's converted mana cost"; + staticText = "create an X/X colorless Construct artifact creature token, where X is that spell's mana value"; } public MetallurgicSummoningsTokenEffect(MetallurgicSummoningsTokenEffect ability) { @@ -80,7 +80,7 @@ class MetallurgicSummoningsTokenEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { Spell spell = game.getSpellOrLKIStack(this.getTargetPointer().getFirst(game, source)); if (spell != null) { - int cmc = spell.getConvertedManaCost(); + int cmc = spell.getManaValue(); if (cmc > 0) { return new CreateTokenEffect(new MetallurgicSummoningsConstructToken(cmc)).apply(game, source); } diff --git a/Mage.Sets/src/mage/cards/m/MetalworkColossus.java b/Mage.Sets/src/mage/cards/m/MetalworkColossus.java index efffcd00687..d780b401a60 100644 --- a/Mage.Sets/src/mage/cards/m/MetalworkColossus.java +++ b/Mage.Sets/src/mage/cards/m/MetalworkColossus.java @@ -64,7 +64,7 @@ class MetalworkColossusCostReductionEffect extends CostModificationEffectImpl { MetalworkColossusCostReductionEffect() { super(Duration.Custom, Outcome.Benefit, CostModificationType.REDUCE_COST); - staticText = "{this} costs {X} less to cast, where X is the total converted mana cost of noncreature artifacts you control"; + staticText = "{this} costs {X} less to cast, where X is the total mana value of noncreature artifacts you control"; } MetalworkColossusCostReductionEffect(final MetalworkColossusCostReductionEffect effect) { @@ -75,7 +75,7 @@ class MetalworkColossusCostReductionEffect extends CostModificationEffectImpl { public boolean apply(Game game, Ability source, Ability abilityToModify) { int totalCMC = 0; for (Permanent permanent : game.getBattlefield().getActivePermanents(filter, source.getControllerId(), source.getSourceId(), game)) { - totalCMC += permanent.getConvertedManaCost(); + totalCMC += permanent.getManaValue(); } CardUtil.reduceCost(abilityToModify, totalCMC); return true; diff --git a/Mage.Sets/src/mage/cards/m/Metamorphosis.java b/Mage.Sets/src/mage/cards/m/Metamorphosis.java index d3a60140dfc..b834fde58b3 100644 --- a/Mage.Sets/src/mage/cards/m/Metamorphosis.java +++ b/Mage.Sets/src/mage/cards/m/Metamorphosis.java @@ -47,7 +47,7 @@ class MetamorphosisEffect extends OneShotEffect { public MetamorphosisEffect() { super(Outcome.PutManaInPool); - staticText = "Add X mana of any one color, where X is 1 plus the sacrificed creature's converted mana cost. Spend this mana only to cast creature spells."; + staticText = "Add X mana of any one color, where X is 1 plus the sacrificed creature's mana value. Spend this mana only to cast creature spells."; } public MetamorphosisEffect(final MetamorphosisEffect effect) { @@ -59,7 +59,7 @@ class MetamorphosisEffect extends OneShotEffect { int amount = 0; for (Cost cost : source.getCosts()) { if (cost instanceof SacrificeTargetCost && !((SacrificeTargetCost) cost).getPermanents().isEmpty()) { - amount = ((SacrificeTargetCost) cost).getPermanents().get(0).getConvertedManaCost() + 1; + amount = ((SacrificeTargetCost) cost).getPermanents().get(0).getManaValue() + 1; break; } } diff --git a/Mage.Sets/src/mage/cards/m/MetathranAerostat.java b/Mage.Sets/src/mage/cards/m/MetathranAerostat.java index e89b81f25f3..8ad43b8513e 100644 --- a/Mage.Sets/src/mage/cards/m/MetathranAerostat.java +++ b/Mage.Sets/src/mage/cards/m/MetathranAerostat.java @@ -16,7 +16,7 @@ import mage.constants.CardType; import mage.constants.ComparisonType; import mage.constants.Outcome; import mage.filter.common.FilterCreatureCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.players.Player; @@ -54,7 +54,7 @@ class MetathranAerostatEffect extends OneShotEffect { public MetathranAerostatEffect() { super(Outcome.Benefit); - this.staticText = "You may put a creature card with converted mana cost " + this.staticText = "You may put a creature card with mana value " + "X from your hand onto the battlefield. " + "If you do, return {this} to its owner's hand"; } @@ -75,8 +75,8 @@ class MetathranAerostatEffect extends OneShotEffect { return false; } int xValue = source.getManaCostsToPay().getX(); - FilterCreatureCard filter = new FilterCreatureCard("a creature with converted mana cost " + xValue); - filter.add(new ConvertedManaCostPredicate(ComparisonType.EQUAL_TO, xValue)); + FilterCreatureCard filter = new FilterCreatureCard("a creature with mana value " + xValue); + filter.add(new ManaValuePredicate(ComparisonType.EQUAL_TO, xValue)); if (new PutCardFromHandOntoBattlefieldEffect(filter).apply(game, source)) { return new ReturnToHandSourceEffect(true).apply(game, source); } diff --git a/Mage.Sets/src/mage/cards/m/MidnightScavengers.java b/Mage.Sets/src/mage/cards/m/MidnightScavengers.java index bbc7d405cc9..c6ac8ba52f7 100644 --- a/Mage.Sets/src/mage/cards/m/MidnightScavengers.java +++ b/Mage.Sets/src/mage/cards/m/MidnightScavengers.java @@ -15,7 +15,7 @@ import mage.constants.SubType; import mage.constants.ComparisonType; import mage.constants.Zone; import mage.filter.common.FilterCreatureCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.target.Target; import mage.target.common.TargetCardInYourGraveyard; @@ -25,10 +25,10 @@ import mage.target.common.TargetCardInYourGraveyard; */ public final class MidnightScavengers extends CardImpl { - private static final FilterCreatureCard filter = new FilterCreatureCard("creature card with converted mana cost 3 or less from your graveyard"); + private static final FilterCreatureCard filter = new FilterCreatureCard("creature card with mana value 3 or less from your graveyard"); static { - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 4)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 4)); } public MidnightScavengers(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/Mindshrieker.java b/Mage.Sets/src/mage/cards/m/Mindshrieker.java index b37a91f4b13..83050d28100 100644 --- a/Mage.Sets/src/mage/cards/m/Mindshrieker.java +++ b/Mage.Sets/src/mage/cards/m/Mindshrieker.java @@ -58,7 +58,7 @@ class MindshriekerEffect extends OneShotEffect { MindshriekerEffect() { super(Outcome.Detriment); staticText = "Target player mills a card. {this} gets +X/+X until end of turn, " + - "where X is the milled card's converted mana cost"; + "where X is the milled card's mana value"; } private MindshriekerEffect(final MindshriekerEffect effect) { @@ -76,7 +76,7 @@ class MindshriekerEffect extends OneShotEffect { .getCards(game) .stream() .filter(Objects::nonNull) - .mapToInt(MageObject::getConvertedManaCost) + .mapToInt(MageObject::getManaValue) .sum(); if (totalCMC > 0) { game.addEffect(new BoostSourceEffect(totalCMC, totalCMC, Duration.EndOfTurn), source); diff --git a/Mage.Sets/src/mage/cards/m/MistmeadowSkulk.java b/Mage.Sets/src/mage/cards/m/MistmeadowSkulk.java index efeafcb87cd..8f3800f23a3 100644 --- a/Mage.Sets/src/mage/cards/m/MistmeadowSkulk.java +++ b/Mage.Sets/src/mage/cards/m/MistmeadowSkulk.java @@ -11,7 +11,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.ComparisonType; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; /** * @@ -19,10 +19,10 @@ import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; */ public final class MistmeadowSkulk extends CardImpl { - private static final FilterCard filter = new FilterCard("converted mana cost 3 or greater"); + private static final FilterCard filter = new FilterCard("mana value 3 or greater"); static { - filter.add(new ConvertedManaCostPredicate(ComparisonType.MORE_THAN, 2)); + filter.add(new ManaValuePredicate(ComparisonType.MORE_THAN, 2)); } public MistmeadowSkulk(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MizzixOfTheIzmagnus.java b/Mage.Sets/src/mage/cards/m/MizzixOfTheIzmagnus.java index 3c0a08c1ae7..b5bc737a42c 100644 --- a/Mage.Sets/src/mage/cards/m/MizzixOfTheIzmagnus.java +++ b/Mage.Sets/src/mage/cards/m/MizzixOfTheIzmagnus.java @@ -28,7 +28,7 @@ import mage.util.CardUtil; */ public final class MizzixOfTheIzmagnus extends CardImpl { - private static final FilterInstantOrSorcerySpell filter = new FilterInstantOrSorcerySpell("an instant or sorcery spell with converted mana cost greater than the number of experience counters you have"); + private static final FilterInstantOrSorcerySpell filter = new FilterInstantOrSorcerySpell("an instant or sorcery spell with mana value greater than the number of experience counters you have"); static { filter.add(new MizzixOfTheIzmagnusPredicate()); @@ -68,7 +68,7 @@ class MizzixOfTheIzmagnusPredicate implements Predicate { if (spell != null) { Player controller = game.getPlayer(spell.getControllerId()); if (controller != null) { - if (spell.getConvertedManaCost() > controller.getCounters().getCount(CounterType.EXPERIENCE)) { + if (spell.getManaValue() > controller.getCounters().getCount(CounterType.EXPERIENCE)) { return true; } } diff --git a/Mage.Sets/src/mage/cards/m/Molder.java b/Mage.Sets/src/mage/cards/m/Molder.java index 00cbe6a6931..0302c2e383c 100644 --- a/Mage.Sets/src/mage/cards/m/Molder.java +++ b/Mage.Sets/src/mage/cards/m/Molder.java @@ -11,7 +11,7 @@ import mage.constants.CardType; import mage.constants.ComparisonType; import mage.filter.FilterPermanent; import mage.filter.common.FilterArtifactOrEnchantmentPermanent; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.target.TargetPermanent; import mage.target.targetadjustment.TargetAdjuster; @@ -27,7 +27,7 @@ public final class Molder extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{X}{G}"); // Destroy target artifact or enchantment with converted mana cost X. It can't be regenerated. You gain X life. - this.getSpellAbility().addEffect(new DestroyTargetEffect("Destroy target artifact or enchantment with converted mana cost X", true)); + this.getSpellAbility().addEffect(new DestroyTargetEffect("Destroy target artifact or enchantment with mana value X", true)); this.getSpellAbility().addEffect(new GainLifeEffect(ManacostVariableValue.instance)); this.getSpellAbility().setTargetAdjuster(MolderAdjuster.instance); } @@ -49,8 +49,8 @@ enum MolderAdjuster implements TargetAdjuster { public void adjustTargets(Ability ability, Game game) { ability.getTargets().clear(); int xValue = ability.getManaCostsToPay().getX(); - FilterPermanent filter = new FilterArtifactOrEnchantmentPermanent("artifact or enchantment with converted mana cost " + xValue); - filter.add(new ConvertedManaCostPredicate(ComparisonType.EQUAL_TO, xValue)); + FilterPermanent filter = new FilterArtifactOrEnchantmentPermanent("artifact or enchantment with mana value " + xValue); + filter.add(new ManaValuePredicate(ComparisonType.EQUAL_TO, xValue)); ability.addTarget(new TargetPermanent(filter)); } } \ No newline at end of file diff --git a/Mage.Sets/src/mage/cards/m/MonkeyCage.java b/Mage.Sets/src/mage/cards/m/MonkeyCage.java index 889bf4374e7..f146d6141e6 100644 --- a/Mage.Sets/src/mage/cards/m/MonkeyCage.java +++ b/Mage.Sets/src/mage/cards/m/MonkeyCage.java @@ -48,7 +48,7 @@ class MonkeyCageEffect extends OneShotEffect { public MonkeyCageEffect() { super(Outcome.Benefit); - staticText = "and create X 2/2 green Ape creature tokens, where X is that creature's converted mana cost"; + staticText = "and create X 2/2 green Ape creature tokens, where X is that creature's mana value"; } public MonkeyCageEffect(final MonkeyCageEffect effect) { @@ -63,7 +63,7 @@ class MonkeyCageEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { Permanent creature = getTargetPointer().getFirstTargetPermanentOrLKI(game, source); if (creature != null) { - int cmc = creature.getConvertedManaCost(); + int cmc = creature.getManaValue(); return new CreateTokenEffect(new ApeToken(), cmc).apply(game, source); } return false; diff --git a/Mage.Sets/src/mage/cards/m/MuxusGoblinGrandee.java b/Mage.Sets/src/mage/cards/m/MuxusGoblinGrandee.java index 9564c8eb642..c46314ad760 100644 --- a/Mage.Sets/src/mage/cards/m/MuxusGoblinGrandee.java +++ b/Mage.Sets/src/mage/cards/m/MuxusGoblinGrandee.java @@ -68,7 +68,7 @@ class MuxusGoblinGrandeeEffect extends OneShotEffect { MuxusGoblinGrandeeEffect() { super(Outcome.Benefit); staticText = "reveal the top six cards of your library. " + - "Put all Goblin creature cards with converted mana cost 5 or less " + + "Put all Goblin creature cards with mana value 5 or less " + "from among them onto the battlefield and the rest on the bottom of your library in a random order."; } @@ -97,7 +97,7 @@ class MuxusGoblinGrandeeEffect extends OneShotEffect { .forEach(card -> { if (card.isCreature() && card.hasSubtype(SubType.GOBLIN, game) - && card.getConvertedManaCost() <= 5) { + && card.getManaValue() <= 5) { toBattlfield.add(card); } else { toBottom.add(card); diff --git a/Mage.Sets/src/mage/cards/m/MuzzioVisionaryArchitect.java b/Mage.Sets/src/mage/cards/m/MuzzioVisionaryArchitect.java index f429ece06ab..b1dc33560ba 100644 --- a/Mage.Sets/src/mage/cards/m/MuzzioVisionaryArchitect.java +++ b/Mage.Sets/src/mage/cards/m/MuzzioVisionaryArchitect.java @@ -56,7 +56,7 @@ class MuzzioVisionaryArchitectEffect extends OneShotEffect { public MuzzioVisionaryArchitectEffect() { super(Outcome.Benefit); - this.staticText = "Look at the top X cards of your library, where X is the highest converted mana cost among artifacts you control. You may reveal an artifact card from among them and put it onto the battlefield. Put the rest on the bottom of your library in any order"; + this.staticText = "Look at the top X cards of your library, where X is the highest mana value among artifacts you control. You may reveal an artifact card from among them and put it onto the battlefield. Put the rest on the bottom of your library in any order"; } public MuzzioVisionaryArchitectEffect(final MuzzioVisionaryArchitectEffect effect) { @@ -79,7 +79,7 @@ class MuzzioVisionaryArchitectEffect extends OneShotEffect { List controlledArtifacts = game.getBattlefield().getAllActivePermanents(new FilterArtifactPermanent(), controller.getId(), game); for (Permanent permanent : controlledArtifacts) { if (permanent.getSpellAbility() != null) { - int cmc = permanent.getSpellAbility().getManaCosts().convertedManaCost(); + int cmc = permanent.getSpellAbility().getManaCosts().manaValue(); if (cmc > highCMC) { highCMC = cmc; } diff --git a/Mage.Sets/src/mage/cards/m/MysticGenesis.java b/Mage.Sets/src/mage/cards/m/MysticGenesis.java index e16ff17fdbc..4faf3febd22 100644 --- a/Mage.Sets/src/mage/cards/m/MysticGenesis.java +++ b/Mage.Sets/src/mage/cards/m/MysticGenesis.java @@ -43,7 +43,7 @@ class MysticGenesisEffect extends OneShotEffect { public MysticGenesisEffect() { super(Outcome.Detriment); - staticText = "Counter target spell. Create an X/X green Ooze creature token, where X is that spell's converted mana cost"; + staticText = "Counter target spell. Create an X/X green Ooze creature token, where X is that spell's mana value"; } public MysticGenesisEffect(final MysticGenesisEffect effect) { @@ -60,7 +60,7 @@ class MysticGenesisEffect extends OneShotEffect { StackObject stackObject = game.getStack().getStackObject(targetPointer.getFirst(game, source)); if (stackObject != null) { game.getStack().counter(source.getFirstTarget(), source, game); - return new CreateTokenEffect(new MysticGenesisOozeToken(stackObject.getConvertedManaCost())).apply(game, source); + return new CreateTokenEffect(new MysticGenesisOozeToken(stackObject.getManaValue())).apply(game, source); } return false; } diff --git a/Mage.Sets/src/mage/cards/n/NahirisWrath.java b/Mage.Sets/src/mage/cards/n/NahirisWrath.java index a464b4f6975..876ffb881b0 100644 --- a/Mage.Sets/src/mage/cards/n/NahirisWrath.java +++ b/Mage.Sets/src/mage/cards/n/NahirisWrath.java @@ -35,7 +35,7 @@ public final class NahirisWrath extends CardImpl { // Nahiri's Wrath deals damage equal to the total converted mana cost of the discarded cards to each of up to X target creatures and/or planeswalkers. Effect effect = new DamageTargetEffect(DiscardCostCardConvertedMana.instance); - effect.setText("{this} deals damage equal to the total converted mana cost of the discarded cards to each of up to X target creatures and/or planeswalkers"); + effect.setText("{this} deals damage equal to the total mana value of the discarded cards to each of up to X target creatures and/or planeswalkers"); this.getSpellAbility().addEffect(effect); this.getSpellAbility().setTargetAdjuster(NahirisWrathAdjuster.instance); } diff --git a/Mage.Sets/src/mage/cards/n/NarsetOfTheAncientWay.java b/Mage.Sets/src/mage/cards/n/NarsetOfTheAncientWay.java index ab7d2d7faf5..00c0cd9b370 100644 --- a/Mage.Sets/src/mage/cards/n/NarsetOfTheAncientWay.java +++ b/Mage.Sets/src/mage/cards/n/NarsetOfTheAncientWay.java @@ -116,7 +116,7 @@ class NarsetOfTheAncientWayDrawEffect extends OneShotEffect { NarsetOfTheAncientWayDrawEffect() { super(Outcome.Benefit); staticText = "Draw a card, then you may discard a card. When you discard a nonland card this way, " + - "{this} deals damage equal to that card's converted mana cost to target creature or planeswalker."; + "{this} deals damage equal to that card's mana value to target creature or planeswalker."; } private NarsetOfTheAncientWayDrawEffect(final NarsetOfTheAncientWayDrawEffect effect) { @@ -143,8 +143,8 @@ class NarsetOfTheAncientWayDrawEffect extends OneShotEffect { return false; } ReflexiveTriggeredAbility ability = new ReflexiveTriggeredAbility( - new DamageTargetEffect(card.getConvertedManaCost()), false, "{this} deals damage " + - "to target creature or planeswalker equal to the discarded card's converted mana cost" + new DamageTargetEffect(card.getManaValue()), false, "{this} deals damage " + + "to target creature or planeswalker equal to the discarded card's mana value" ); ability.addTarget(new TargetCreatureOrPlaneswalker()); game.fireReflexiveTriggeredAbility(ability, source); diff --git a/Mage.Sets/src/mage/cards/n/NaturalState.java b/Mage.Sets/src/mage/cards/n/NaturalState.java index 3c2ebf3d206..add706469ef 100644 --- a/Mage.Sets/src/mage/cards/n/NaturalState.java +++ b/Mage.Sets/src/mage/cards/n/NaturalState.java @@ -8,7 +8,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.ComparisonType; import mage.filter.common.FilterArtifactOrEnchantmentPermanent; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.target.TargetPermanent; /** @@ -17,10 +17,10 @@ import mage.target.TargetPermanent; */ public final class NaturalState extends CardImpl { - private static final FilterArtifactOrEnchantmentPermanent filter = new FilterArtifactOrEnchantmentPermanent("artifact or enchantment with converted mana cost 3 or less"); + private static final FilterArtifactOrEnchantmentPermanent filter = new FilterArtifactOrEnchantmentPermanent("artifact or enchantment with mana value 3 or less"); static { - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 4)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 4)); } public NaturalState(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/n/NayaSoulbeast.java b/Mage.Sets/src/mage/cards/n/NayaSoulbeast.java index 7b94e665edb..ff034ab47ab 100644 --- a/Mage.Sets/src/mage/cards/n/NayaSoulbeast.java +++ b/Mage.Sets/src/mage/cards/n/NayaSoulbeast.java @@ -83,7 +83,7 @@ class NayaSoulbeastCastEffect extends OneShotEffect { if (player != null) { if (player.getLibrary().hasCards()) { Card card = player.getLibrary().getFromTop(game); - cmc += card.getConvertedManaCost(); + cmc += card.getManaValue(); player.revealCards(sourceObject.getName() + " (" + player.getName() + ')', new CardsImpl(card), game); } } @@ -103,7 +103,7 @@ class NayaSoulbeastReplacementEffect extends ReplacementEffectImpl { public NayaSoulbeastReplacementEffect() { super(Duration.OneUse, Outcome.BoostCreature); - staticText = "{this} enters the battlefield with X +1/+1 counters on it, where X is the total converted mana cost of all cards revealed this way"; + staticText = "{this} enters the battlefield with X +1/+1 counters on it, where X is the total mana value of all cards revealed this way"; } public NayaSoulbeastReplacementEffect(final NayaSoulbeastReplacementEffect effect) { diff --git a/Mage.Sets/src/mage/cards/n/Necropanther.java b/Mage.Sets/src/mage/cards/n/Necropanther.java index 4edad9309e6..9f3ce68d7c7 100644 --- a/Mage.Sets/src/mage/cards/n/Necropanther.java +++ b/Mage.Sets/src/mage/cards/n/Necropanther.java @@ -12,7 +12,7 @@ import mage.constants.ComparisonType; import mage.constants.SubType; import mage.filter.FilterCard; import mage.filter.common.FilterCreatureCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.target.common.TargetCardInYourGraveyard; import java.util.UUID; @@ -23,10 +23,10 @@ import java.util.UUID; public final class Necropanther extends CardImpl { private static final FilterCard filter - = new FilterCreatureCard("creature card with converted mana cost 3 or less from your graveyard"); + = new FilterCreatureCard("creature card with mana value 3 or less from your graveyard"); static { - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 4)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 4)); } public Necropanther(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/n/Necroplasm.java b/Mage.Sets/src/mage/cards/n/Necroplasm.java index 47f2be79870..e8c870c903e 100644 --- a/Mage.Sets/src/mage/cards/n/Necroplasm.java +++ b/Mage.Sets/src/mage/cards/n/Necroplasm.java @@ -18,7 +18,7 @@ import mage.constants.Outcome; import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -60,7 +60,7 @@ class NecroplasmEffect extends OneShotEffect { NecroplasmEffect() { super(Outcome.DestroyPermanent); - this.staticText = "destroy each creature with converted mana cost equal to the number of +1/+1 counters on {this}."; + this.staticText = "destroy each creature with mana value equal to the number of +1/+1 counters on {this}."; } NecroplasmEffect(final NecroplasmEffect effect) { @@ -79,7 +79,7 @@ class NecroplasmEffect extends OneShotEffect { if (player != null && sourcePermanent != null) { int numCounters = sourcePermanent.getCounters(game).getCount(CounterType.P1P1); FilterCreaturePermanent filter = new FilterCreaturePermanent(); - filter.add(new ConvertedManaCostPredicate(ComparisonType.EQUAL_TO, numCounters)); + filter.add(new ManaValuePredicate(ComparisonType.EQUAL_TO, numCounters)); for (Permanent permanent : game.getBattlefield().getActivePermanents(filter, source.getControllerId(), source.getSourceId(), game)) { if(permanent != null) { permanent.destroy(source, game, false); diff --git a/Mage.Sets/src/mage/cards/n/Necropolis.java b/Mage.Sets/src/mage/cards/n/Necropolis.java index bd514c50fa3..f45749a485f 100644 --- a/Mage.Sets/src/mage/cards/n/Necropolis.java +++ b/Mage.Sets/src/mage/cards/n/Necropolis.java @@ -39,7 +39,7 @@ public final class Necropolis extends CardImpl { // Exile a creature card from your graveyard: Put X +0/+1 counters on Necropolis, where X is the exiled card's converted mana cost. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, - new AddCountersSourceEffect(CounterType.P0P1.createInstance(0), new NecropolisValue(), true).setText("Put X +0/+1 counters on {this}, where X is the exiled card's converted mana cost"), + new AddCountersSourceEffect(CounterType.P0P1.createInstance(0), new NecropolisValue(), true).setText("Put X +0/+1 counters on {this}, where X is the exiled card's mana value"), new ExileFromGraveCost(new TargetCardInYourGraveyard(new FilterCreatureCard("a creature card"))))); } @@ -61,7 +61,7 @@ class NecropolisValue implements DynamicValue { if (cost.isPaid() && cost instanceof ExileFromGraveCost) { int xValue = 0; for (Card card : ((ExileFromGraveCost) cost).getExiledCards()) { - xValue += card.getConvertedManaCost(); + xValue += card.getManaValue(); } return xValue; } diff --git a/Mage.Sets/src/mage/cards/n/Neoform.java b/Mage.Sets/src/mage/cards/n/Neoform.java index 1d6bac5871e..1b75f050f2d 100644 --- a/Mage.Sets/src/mage/cards/n/Neoform.java +++ b/Mage.Sets/src/mage/cards/n/Neoform.java @@ -13,7 +13,7 @@ import mage.constants.*; import mage.counters.CounterType; import mage.filter.FilterCard; import mage.filter.StaticFilters; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.game.events.EntersTheBattlefieldEvent; import mage.game.events.GameEvent; @@ -57,8 +57,8 @@ class NeoformEffect extends OneShotEffect { NeoformEffect() { super(Outcome.Benefit); - staticText = "Search your library for a creature card with converted mana cost equal to " + - "1 plus the sacrificed creature's converted mana cost, " + + staticText = "Search your library for a creature card with mana value equal to " + + "1 plus the sacrificed creature's mana value, " + "put that card onto the battlefield with an additional +1/+1 counter on it, then shuffle your library."; } @@ -82,9 +82,9 @@ class NeoformEffect extends OneShotEffect { if (sacrificedPermanent == null || controller == null) { return false; } - int newConvertedCost = sacrificedPermanent.getConvertedManaCost() + 1; - FilterCard filter = new FilterCard("creature card with converted mana cost " + newConvertedCost); - filter.add(new ConvertedManaCostPredicate(ComparisonType.EQUAL_TO, newConvertedCost)); + int newConvertedCost = sacrificedPermanent.getManaValue() + 1; + FilterCard filter = new FilterCard("creature card with mana value " + newConvertedCost); + filter.add(new ManaValuePredicate(ComparisonType.EQUAL_TO, newConvertedCost)); filter.add(CardType.CREATURE.getPredicate()); TargetCardInLibrary target = new TargetCardInLibrary(filter); if (controller.searchLibrary(target, source, game)) { diff --git a/Mage.Sets/src/mage/cards/n/NiambiEsteemedSpeaker.java b/Mage.Sets/src/mage/cards/n/NiambiEsteemedSpeaker.java index 8f609a81c40..415a41a6548 100644 --- a/Mage.Sets/src/mage/cards/n/NiambiEsteemedSpeaker.java +++ b/Mage.Sets/src/mage/cards/n/NiambiEsteemedSpeaker.java @@ -84,7 +84,7 @@ class NiambiEsteemedSpeakerEffect extends OneShotEffect { NiambiEsteemedSpeakerEffect() { super(Outcome.Benefit); - staticText = "If you do, you gain life equal to that creature's converted mana cost."; + staticText = "If you do, you gain life equal to that creature's mana value."; } private NiambiEsteemedSpeakerEffect(final NiambiEsteemedSpeakerEffect effect) { @@ -103,7 +103,7 @@ class NiambiEsteemedSpeakerEffect extends OneShotEffect { if (permanent == null || player == null) { return false; } - return permanent.getConvertedManaCost() > 0 - && player.gainLife(permanent.getConvertedManaCost(), game, source) > 0; + return permanent.getManaValue() > 0 + && player.gainLife(permanent.getManaValue(), game, source) > 0; } } \ No newline at end of file diff --git a/Mage.Sets/src/mage/cards/n/NightDealings.java b/Mage.Sets/src/mage/cards/n/NightDealings.java index 95c026d52d4..d7058d57e19 100644 --- a/Mage.Sets/src/mage/cards/n/NightDealings.java +++ b/Mage.Sets/src/mage/cards/n/NightDealings.java @@ -18,7 +18,7 @@ import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.FilterCard; import mage.filter.common.FilterNonlandCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; @@ -124,7 +124,7 @@ public final class NightDealings extends CardImpl { private NightDealingsSearchEffect() { super(Outcome.DrawCard); - this.staticText = "Search your library for a nonland card with converted mana cost X, " + + this.staticText = "Search your library for a nonland card with mana value X, " + "reveal it, and put it into your hand. Then shuffle your library"; } @@ -152,8 +152,8 @@ public final class NightDealings extends CardImpl { } } - FilterCard filter = new FilterNonlandCard("nonland card with converted mana cost " + cmc); - filter.add(new ConvertedManaCostPredicate(ComparisonType.EQUAL_TO, cmc)); + FilterCard filter = new FilterNonlandCard("nonland card with mana value " + cmc); + filter.add(new ManaValuePredicate(ComparisonType.EQUAL_TO, cmc)); TargetCardInLibrary target = new TargetCardInLibrary(filter); player.searchLibrary(target, source, game); Card card = player.getLibrary().getCard(target.getFirstTarget(), game); diff --git a/Mage.Sets/src/mage/cards/n/NissaOfShadowedBoughs.java b/Mage.Sets/src/mage/cards/n/NissaOfShadowedBoughs.java index c4b7f144390..1b3a3667d46 100644 --- a/Mage.Sets/src/mage/cards/n/NissaOfShadowedBoughs.java +++ b/Mage.Sets/src/mage/cards/n/NissaOfShadowedBoughs.java @@ -18,7 +18,7 @@ import mage.counters.CounterType; import mage.filter.FilterCard; import mage.filter.StaticFilters; import mage.filter.common.FilterCreatureCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.game.permanent.token.custom.CreatureToken; @@ -105,7 +105,7 @@ class NissaOfShadowedBoughsCreatureEffect extends OneShotEffect { NissaOfShadowedBoughsCreatureEffect() { super(Outcome.Benefit); - staticText = "You may put a creature card with converted mana cost less than or equal to " + + staticText = "You may put a creature card with mana value less than or equal to " + "the number of lands you control onto the battlefield from your hand or graveyard " + "with two +1/+1 counters on it."; } @@ -129,8 +129,8 @@ class NissaOfShadowedBoughsCreatureEffect extends OneShotEffect { StaticFilters.FILTER_CONTROLLED_PERMANENT_LAND, source.getSourceId(), source.getControllerId(), game ); - FilterCard filter = new FilterCreatureCard("creature card with converted mana cost " + lands + " or less"); - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, lands + 1)); + FilterCard filter = new FilterCreatureCard("creature card with mana value " + lands + " or less"); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, lands + 1)); int inHand = player.getHand().count(filter, game); int inGrave = player.getGraveyard().count(filter, game); if (inHand < 1 && inGrave < 1) { diff --git a/Mage.Sets/src/mage/cards/n/NissaStewardOfElements.java b/Mage.Sets/src/mage/cards/n/NissaStewardOfElements.java index eb9f16fb6b8..60717a9fbcc 100644 --- a/Mage.Sets/src/mage/cards/n/NissaStewardOfElements.java +++ b/Mage.Sets/src/mage/cards/n/NissaStewardOfElements.java @@ -21,7 +21,7 @@ import mage.counters.CounterType; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.common.FilterPermanentCard; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.game.permanent.token.TokenImpl; import mage.players.Player; @@ -74,7 +74,7 @@ class NissaStewardOfElementsEffect extends OneShotEffect { public NissaStewardOfElementsEffect() { super(Outcome.PutCardInPlay); - this.staticText = "look at the top card of your library. If it's a land card or a creature card with converted mana cost less than or equal " + this.staticText = "look at the top card of your library. If it's a land card or a creature card with mana value less than or equal " + "to the number of loyalty counters on {this}, you may put that card onto the battlefield"; } @@ -97,7 +97,7 @@ class NissaStewardOfElementsEffect extends OneShotEffect { FilterPermanentCard filter = new FilterPermanentCard(); filter.add(Predicates.or(CardType.CREATURE.getPredicate(), CardType.LAND.getPredicate())); - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, count)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, count)); Card card = controller.getLibrary().getFromTop(game); if (card != null) { controller.lookAtCards(source, null, new CardsImpl(card), game); diff --git a/Mage.Sets/src/mage/cards/n/NourishingShoal.java b/Mage.Sets/src/mage/cards/n/NourishingShoal.java index 9304ac77267..4e0885a8689 100644 --- a/Mage.Sets/src/mage/cards/n/NourishingShoal.java +++ b/Mage.Sets/src/mage/cards/n/NourishingShoal.java @@ -30,7 +30,7 @@ public final class NourishingShoal extends CardImpl { // You may exile a green card with converted mana cost X from your hand rather than pay Nourishing Shoal's mana cost. - FilterOwnedCard filter = new FilterOwnedCard("a green card with converted mana cost X from your hand"); + FilterOwnedCard filter = new FilterOwnedCard("a green card with mana value X from your hand"); filter.add(new ColorPredicate(ObjectColor.GREEN)); filter.add(Predicates.not(new CardIdPredicate(this.getId()))); // the exile cost can never be paid with the card itself this.addAbility(new AlternativeCostSourceAbility(new ExileFromHandCost(new TargetCardInHand(filter), true))); diff --git a/Mage.Sets/src/mage/cards/n/NoxiousDragon.java b/Mage.Sets/src/mage/cards/n/NoxiousDragon.java index 32b4fe907b4..457d9dcdb89 100644 --- a/Mage.Sets/src/mage/cards/n/NoxiousDragon.java +++ b/Mage.Sets/src/mage/cards/n/NoxiousDragon.java @@ -13,7 +13,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.ComparisonType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -22,10 +22,10 @@ import mage.target.common.TargetCreaturePermanent; */ public final class NoxiousDragon extends CardImpl { - private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with converted mana cost 3 or less"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with mana value 3 or less"); static { - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 4)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 4)); } public NoxiousDragon(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/o/OboshThePreypiercer.java b/Mage.Sets/src/mage/cards/o/OboshThePreypiercer.java index f2a0ecb5f03..593d445aa4c 100644 --- a/Mage.Sets/src/mage/cards/o/OboshThePreypiercer.java +++ b/Mage.Sets/src/mage/cards/o/OboshThePreypiercer.java @@ -54,7 +54,7 @@ enum OboshThePreypiercerCompanionCondition implements CompanionCondition { @Override public String getRule() { - return "Your starting deck contains only cards with odd converted mana costs and land cards."; + return "Your starting deck contains only cards with odd mana values and land cards."; } @Override @@ -62,7 +62,7 @@ enum OboshThePreypiercerCompanionCondition implements CompanionCondition { return deck .stream() .filter(card -> !card.isLand()) - .mapToInt(MageObject::getConvertedManaCost) + .mapToInt(MageObject::getManaValue) .map(i -> i % 2) .allMatch(i -> i == 1); } @@ -72,7 +72,7 @@ class OboshThePreypiercerEffect extends ReplacementEffectImpl { OboshThePreypiercerEffect() { super(Duration.WhileOnBattlefield, Outcome.Damage); - staticText = "If a source you control with an odd converted mana cost would deal damage " + + staticText = "If a source you control with an odd mana value would deal damage " + "to a permanent or player, it deals double that damage to that permanent or player instead."; } @@ -95,7 +95,7 @@ class OboshThePreypiercerEffect extends ReplacementEffectImpl { public boolean applies(GameEvent event, Ability source, Game game) { MageObject sourceObject = game.getObject(event.getSourceId()); return sourceObject != null - && sourceObject.getConvertedManaCost() % 2 == 1 + && sourceObject.getManaValue() % 2 == 1 && game.getControllerId(event.getSourceId()).equals(source.getControllerId()); } diff --git a/Mage.Sets/src/mage/cards/o/OjutaisCommand.java b/Mage.Sets/src/mage/cards/o/OjutaisCommand.java index ab112a0081f..e31d447dbc8 100644 --- a/Mage.Sets/src/mage/cards/o/OjutaisCommand.java +++ b/Mage.Sets/src/mage/cards/o/OjutaisCommand.java @@ -14,7 +14,7 @@ import mage.constants.ComparisonType; import mage.filter.FilterCard; import mage.filter.StaticFilters; import mage.filter.common.FilterCreatureCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.target.TargetSpell; import mage.target.common.TargetCardInYourGraveyard; @@ -24,10 +24,10 @@ import mage.target.common.TargetCardInYourGraveyard; */ public final class OjutaisCommand extends CardImpl { - private static final FilterCard filter = new FilterCreatureCard("creature card with converted mana cost 2 or less from your graveyard"); + private static final FilterCard filter = new FilterCreatureCard("creature card with mana value 2 or less from your graveyard"); static { - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 3)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 3)); } public OjutaisCommand(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/o/OneWithTheMachine.java b/Mage.Sets/src/mage/cards/o/OneWithTheMachine.java index 13f6004261e..ab33ed55038 100644 --- a/Mage.Sets/src/mage/cards/o/OneWithTheMachine.java +++ b/Mage.Sets/src/mage/cards/o/OneWithTheMachine.java @@ -1,7 +1,7 @@ package mage.cards.o; import java.util.UUID; -import mage.abilities.dynamicvalue.common.HighestConvertedManaCostValue; +import mage.abilities.dynamicvalue.common.HighestManaValueCount; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -19,8 +19,8 @@ public final class OneWithTheMachine extends CardImpl { // Draw cards equal to the highest converted mana cost among artifacts you control. this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect( - new HighestConvertedManaCostValue(StaticFilters.FILTER_CONTROLLED_PERMANENT_ARTIFACT) - ).setText("Draw cards equal to the highest converted mana cost among artifacts you control")); + new HighestManaValueCount(StaticFilters.FILTER_CONTROLLED_PERMANENT_ARTIFACT) + ).setText("Draw cards equal to the highest mana value among artifacts you control")); } private OneWithTheMachine(final OneWithTheMachine card) { diff --git a/Mage.Sets/src/mage/cards/o/Opalescence.java b/Mage.Sets/src/mage/cards/o/Opalescence.java index 4e2e5b3be01..1d897919a30 100644 --- a/Mage.Sets/src/mage/cards/o/Opalescence.java +++ b/Mage.Sets/src/mage/cards/o/Opalescence.java @@ -51,7 +51,7 @@ public final class Opalescence extends CardImpl { public OpalescenceEffect() { super(Duration.WhileOnBattlefield, Outcome.BecomeCreature); staticText = "Each other non-Aura enchantment is a creature in addition to its other " - + "types and has base power and base toughness each equal to its converted mana cost"; + + "types and has base power and base toughness each equal to its mana value"; this.dependendToTypes.add(DependencyType.EnchantmentAddingRemoving); // Enchanted Evening this.dependendToTypes.add(DependencyType.AuraAddingRemoving); // Cloudform @@ -83,7 +83,7 @@ public final class Opalescence extends CardImpl { case PTChangingEffects_7: if (sublayer == SubLayer.SetPT_7b) { - int manaCost = permanent.getConvertedManaCost(); + int manaCost = permanent.getManaValue(); permanent.getPower().setValue(manaCost); permanent.getToughness().setValue(manaCost); } diff --git a/Mage.Sets/src/mage/cards/o/OrahSkyclaveHierophant.java b/Mage.Sets/src/mage/cards/o/OrahSkyclaveHierophant.java index 84b81c34831..7d4f8c3931c 100644 --- a/Mage.Sets/src/mage/cards/o/OrahSkyclaveHierophant.java +++ b/Mage.Sets/src/mage/cards/o/OrahSkyclaveHierophant.java @@ -8,7 +8,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.ZoneChangeEvent; @@ -73,11 +73,11 @@ class OrahSkyclaveHierophantTriggeredAbility extends TriggeredAbilityImpl { return false; } FilterCard filterCard = new FilterCard( - "Cleric card with converted mana cost less than " + (zEvent.getTarget().getConvertedManaCost()) + "Cleric card with mana value less than " + (zEvent.getTarget().getManaValue()) ); filterCard.add(SubType.CLERIC.getPredicate()); - filterCard.add(new ConvertedManaCostPredicate( - ComparisonType.FEWER_THAN, zEvent.getTarget().getConvertedManaCost() + filterCard.add(new ManaValuePredicate( + ComparisonType.FEWER_THAN, zEvent.getTarget().getManaValue() )); this.getTargets().clear(); this.addTarget(new TargetCardInYourGraveyard(filterCard)); @@ -92,6 +92,6 @@ class OrahSkyclaveHierophantTriggeredAbility extends TriggeredAbilityImpl { @Override public String getRule() { return "Whenever {this} or another Cleric you control dies, return target Cleric card " + - "with lesser converted mana cost from your graveyard to the battlefield."; + "with lesser mana value from your graveyard to the battlefield."; } } diff --git a/Mage.Sets/src/mage/cards/o/OrderOfWhiteclay.java b/Mage.Sets/src/mage/cards/o/OrderOfWhiteclay.java index efd48838037..7331784c158 100644 --- a/Mage.Sets/src/mage/cards/o/OrderOfWhiteclay.java +++ b/Mage.Sets/src/mage/cards/o/OrderOfWhiteclay.java @@ -15,7 +15,7 @@ import mage.constants.SubType; import mage.constants.ComparisonType; import mage.constants.Zone; import mage.filter.common.FilterCreatureCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.target.Target; import mage.target.common.TargetCardInYourGraveyard; @@ -26,10 +26,10 @@ import mage.target.common.TargetCardInYourGraveyard; */ public final class OrderOfWhiteclay extends CardImpl { - private static final FilterCreatureCard filter = new FilterCreatureCard("creature card with converted mana cost 3 or less from your graveyard"); + private static final FilterCreatureCard filter = new FilterCreatureCard("creature card with mana value 3 or less from your graveyard"); static { - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 4)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 4)); } public OrderOfWhiteclay(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/o/OrimsThunder.java b/Mage.Sets/src/mage/cards/o/OrimsThunder.java index 0392e3cc529..e686cb50360 100644 --- a/Mage.Sets/src/mage/cards/o/OrimsThunder.java +++ b/Mage.Sets/src/mage/cards/o/OrimsThunder.java @@ -37,7 +37,7 @@ public final class OrimsThunder extends CardImpl { this.getSpellAbility().addEffect(new ConditionalOneShotEffect( new OrimsThunderEffect2(), KickedCondition.instance, - "If Orim's Thunder was kicked, it deals damage equal to that permanent's converted mana cost to target creature") + "If Orim's Thunder was kicked, it deals damage equal to that permanent's mana value to target creature") ); this.getSpellAbility().setTargetAdjuster(OrimsThunderAdjuster.instance); } @@ -80,7 +80,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.getConvertedManaCost(); + damage = firstTarget.getManaValue(); } boolean kicked = KickedCondition.instance.apply(game, source); if (kicked && secondTarget != null) { diff --git a/Mage.Sets/src/mage/cards/o/OrzhovCharm.java b/Mage.Sets/src/mage/cards/o/OrzhovCharm.java index bfe6a3e2a2f..3f510dab820 100644 --- a/Mage.Sets/src/mage/cards/o/OrzhovCharm.java +++ b/Mage.Sets/src/mage/cards/o/OrzhovCharm.java @@ -11,7 +11,7 @@ import mage.cards.CardsImpl; import mage.constants.*; import mage.filter.FilterCard; import mage.filter.common.FilterCreatureCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -28,10 +28,10 @@ import java.util.UUID; public final class OrzhovCharm extends CardImpl { private static final FilterCard filter - = new FilterCreatureCard("creature card with converted mana cost 1 or less from your graveyard"); + = new FilterCreatureCard("creature card with mana value 1 or less from your graveyard"); static { - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 2)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 2)); } public OrzhovCharm(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/o/Overload.java b/Mage.Sets/src/mage/cards/o/Overload.java index 05d4aad44b3..d730e9a5046 100644 --- a/Mage.Sets/src/mage/cards/o/Overload.java +++ b/Mage.Sets/src/mage/cards/o/Overload.java @@ -46,7 +46,7 @@ class OverloadEffect extends OneShotEffect { OverloadEffect() { super(Outcome.DestroyPermanent); - this.staticText = "Destroy target artifact if its converted mana cost is 2 or less. if this spell was kicked, destroy that artifact if its converted mana cost is 5 or less instead."; + this.staticText = "Destroy target artifact if its mana value is 2 or less. if this spell was kicked, destroy that artifact if its mana value is 5 or less instead."; } OverloadEffect(final OverloadEffect effect) { @@ -64,7 +64,7 @@ class OverloadEffect extends OneShotEffect { if (controller != null) { Permanent targetArtifact = game.getPermanent(this.getTargetPointer().getFirst(game, source)); if (targetArtifact != null) { - int cmc = targetArtifact.getConvertedManaCost(); + int cmc = targetArtifact.getManaValue(); if (cmc <= 2 || (KickedCondition.instance.apply(game, source) && cmc <= 5)) { targetArtifact.destroy(source, game, false); } diff --git a/Mage.Sets/src/mage/cards/o/OverwhelmingIntellect.java b/Mage.Sets/src/mage/cards/o/OverwhelmingIntellect.java index 161dd19f8e0..298d8fdc5ae 100644 --- a/Mage.Sets/src/mage/cards/o/OverwhelmingIntellect.java +++ b/Mage.Sets/src/mage/cards/o/OverwhelmingIntellect.java @@ -43,7 +43,7 @@ class OverwhelmingIntellectEffect extends OneShotEffect { public OverwhelmingIntellectEffect() { super(Outcome.Detriment); - staticText = "Counter target creature spell. Draw cards equal to that spell's converted mana cost"; + staticText = "Counter target creature spell. Draw cards equal to that spell's mana value"; } public OverwhelmingIntellectEffect(final OverwhelmingIntellectEffect effect) { @@ -61,7 +61,7 @@ class OverwhelmingIntellectEffect extends OneShotEffect { Spell spell = game.getStack().getSpell(getTargetPointer().getFirst(game, source)); if (controller != null && spell != null) { game.getStack().counter(source.getFirstTarget(), source, game); - controller.drawCards(spell.getConvertedManaCost(), source, game); + controller.drawCards(spell.getManaValue(), source, game); return true; } return false; diff --git a/Mage.Sets/src/mage/cards/p/PadeemConsulOfInnovation.java b/Mage.Sets/src/mage/cards/p/PadeemConsulOfInnovation.java index 98a2f3995a4..970ffc25aeb 100644 --- a/Mage.Sets/src/mage/cards/p/PadeemConsulOfInnovation.java +++ b/Mage.Sets/src/mage/cards/p/PadeemConsulOfInnovation.java @@ -37,7 +37,7 @@ public final class PadeemConsulOfInnovation extends CardImpl { // At the beginning of your upkeep, if you control the artifact with the highest converted mana cost or tied for the highest converted mana cost, draw a card. Ability ability = new ConditionalInterveningIfTriggeredAbility(new BeginningOfUpkeepTriggeredAbility(new DrawCardSourceControllerEffect(1), TargetController.YOU, false), new ControlsPermanentGreatestCMCCondition(new FilterArtifactPermanent()), - "At the beginning of your upkeep, if you control the artifact with the highest converted mana cost or tied for the highest converted mana cost, draw a card."); + "At the beginning of your upkeep, if you control the artifact with the highest mana value or tied for the highest mana value, draw a card."); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/p/PainSeer.java b/Mage.Sets/src/mage/cards/p/PainSeer.java index 00b1b8f79b9..8efb6a56db6 100644 --- a/Mage.Sets/src/mage/cards/p/PainSeer.java +++ b/Mage.Sets/src/mage/cards/p/PainSeer.java @@ -46,7 +46,7 @@ class PainSeerEffect extends OneShotEffect { public PainSeerEffect() { super(Outcome.DrawCard); - this.staticText = "reveal the top card of your library and put that card into your hand. You lose life equal to that card's converted mana cost"; + this.staticText = "reveal the top card of your library and put that card into your hand. You lose life equal to that card's mana value"; } public PainSeerEffect(final PainSeerEffect effect) { @@ -72,7 +72,7 @@ class PainSeerEffect extends OneShotEffect { Cards cards = new CardsImpl(card); player.revealCards("Pain Seer", cards, game); if(player.moveCards(card, Zone.HAND, source, game)) { - player.loseLife(card.getConvertedManaCost(), game, source, false); + player.loseLife(card.getManaValue(), game, source, false); return true; } } diff --git a/Mage.Sets/src/mage/cards/p/PanopticMirror.java b/Mage.Sets/src/mage/cards/p/PanopticMirror.java index c1ecc18b4ed..8faeea8f0df 100644 --- a/Mage.Sets/src/mage/cards/p/PanopticMirror.java +++ b/Mage.Sets/src/mage/cards/p/PanopticMirror.java @@ -11,7 +11,7 @@ import mage.cards.*; import mage.constants.*; import mage.filter.FilterCard; import mage.filter.common.FilterInstantOrSorceryCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -51,7 +51,7 @@ class PanopticMirrorExileEffect extends OneShotEffect { public PanopticMirrorExileEffect() { super(Outcome.Exile); - this.staticText = "You may exile an instant or sorcery card with converted mana cost X from your hand"; + this.staticText = "You may exile an instant or sorcery card with mana value X from your hand"; } public PanopticMirrorExileEffect(final PanopticMirrorExileEffect effect) { @@ -68,8 +68,8 @@ class PanopticMirrorExileEffect extends OneShotEffect { source.getManaCostsToPay().getX(); int count = source.getManaCostsToPay().getX(); - FilterInstantOrSorceryCard filter = new FilterInstantOrSorceryCard("instant or sorcery card with converted mana cost equal to " + count); - filter.add(new ConvertedManaCostPredicate(ComparisonType.EQUAL_TO, count)); + FilterInstantOrSorceryCard filter = new FilterInstantOrSorceryCard("instant or sorcery card with mana value equal to " + count); + filter.add(new ManaValuePredicate(ComparisonType.EQUAL_TO, count)); String choiceText = "Exile a " + filter.getMessage() + " from your hand?"; Player player = game.getPlayer(source.getControllerId()); diff --git a/Mage.Sets/src/mage/cards/p/ParallectricFeedback.java b/Mage.Sets/src/mage/cards/p/ParallectricFeedback.java index ad4709b34b9..12eacba11bd 100644 --- a/Mage.Sets/src/mage/cards/p/ParallectricFeedback.java +++ b/Mage.Sets/src/mage/cards/p/ParallectricFeedback.java @@ -41,7 +41,7 @@ class ParallectricFeedbackEffect extends OneShotEffect { public ParallectricFeedbackEffect() { super(Outcome.Damage); - staticText = "{this} deals damage to target spell's controller equal to that spell's converted mana cost"; + staticText = "{this} deals damage to target spell's controller equal to that spell's mana value"; } public ParallectricFeedbackEffect(final ParallectricFeedbackEffect effect) { @@ -61,7 +61,7 @@ class ParallectricFeedbackEffect extends OneShotEffect { if (spell != null) { Player spellController = game.getPlayer(spell.getControllerId()); if (spellController != null) { - spellController.damage(spell.getConvertedManaCost(), source.getSourceId(), source, game); + spellController.damage(spell.getManaValue(), source.getSourceId(), source, game); return true; } } diff --git a/Mage.Sets/src/mage/cards/p/PelakkaPredation.java b/Mage.Sets/src/mage/cards/p/PelakkaPredation.java index 4b1afec77d9..bd09c73c039 100644 --- a/Mage.Sets/src/mage/cards/p/PelakkaPredation.java +++ b/Mage.Sets/src/mage/cards/p/PelakkaPredation.java @@ -3,7 +3,6 @@ package mage.cards.p; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.effects.common.discard.DiscardCardYouChooseTargetEffect; import mage.abilities.mana.BlackManaAbility; -import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.cards.ModalDoubleFacesCard; import mage.constants.CardType; @@ -11,7 +10,7 @@ import mage.constants.ComparisonType; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.target.common.TargetOpponent; import java.util.UUID; @@ -21,10 +20,10 @@ import java.util.UUID; */ public final class PelakkaPredation extends ModalDoubleFacesCard { - private static final FilterCard filter = new FilterCard("a card from it with converted mana cost 3 or greater"); + private static final FilterCard filter = new FilterCard("a card from it with mana value 3 or greater"); static { - filter.add(new ConvertedManaCostPredicate(ComparisonType.MORE_THAN, 2)); + filter.add(new ManaValuePredicate(ComparisonType.MORE_THAN, 2)); } public PelakkaPredation(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/p/PentarchPaladin.java b/Mage.Sets/src/mage/cards/p/PentarchPaladin.java index cc7fe7f1f84..bf7b6338c09 100644 --- a/Mage.Sets/src/mage/cards/p/PentarchPaladin.java +++ b/Mage.Sets/src/mage/cards/p/PentarchPaladin.java @@ -21,7 +21,7 @@ import mage.target.TargetPermanent; import mage.abilities.effects.common.DestroyTargetEffect; import mage.constants.ComparisonType; import mage.filter.predicate.mageobject.ColorPredicate; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.target.targetadjustment.TargetAdjuster; @@ -76,7 +76,7 @@ enum PentarchPaladinAdjuster implements TargetAdjuster { if (chosenColor != null) { filter.add(new ColorPredicate(chosenColor)); } else { - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, -5));// Pretty sure this is always false + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, -5));// Pretty sure this is always false } TargetPermanent oldTargetPermanent = new TargetPermanent(filter); ability.addTarget(oldTargetPermanent); diff --git a/Mage.Sets/src/mage/cards/p/PerilousVoyage.java b/Mage.Sets/src/mage/cards/p/PerilousVoyage.java index ab885fe0dc1..774bc9bd3fc 100644 --- a/Mage.Sets/src/mage/cards/p/PerilousVoyage.java +++ b/Mage.Sets/src/mage/cards/p/PerilousVoyage.java @@ -51,7 +51,7 @@ class PerilousVoyageEffect extends OneShotEffect { PerilousVoyageEffect() { super(Outcome.ReturnToHand); this.staticText = "Return target nonland permanent you don't control to its owner's hand. " + - "If its converted mana cost was 2 or less, scry 2"; + "If its mana value was 2 or less, scry 2"; } private PerilousVoyageEffect(final PerilousVoyageEffect effect) { @@ -70,7 +70,7 @@ class PerilousVoyageEffect extends OneShotEffect { if (player == null || permanent == null) { return false; } - boolean flag = permanent.getConvertedManaCost() <= 2; + boolean flag = permanent.getManaValue() <= 2; player.moveCards(permanent, Zone.HAND, source, game); if (flag) { player.scry(2, source, game); diff --git a/Mage.Sets/src/mage/cards/p/PerniciousDeed.java b/Mage.Sets/src/mage/cards/p/PerniciousDeed.java index 63c5affa433..a84867f98a3 100644 --- a/Mage.Sets/src/mage/cards/p/PerniciousDeed.java +++ b/Mage.Sets/src/mage/cards/p/PerniciousDeed.java @@ -15,7 +15,7 @@ import mage.constants.Outcome; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; /** @@ -46,7 +46,7 @@ class PerniciousDeedEffect extends OneShotEffect { public PerniciousDeedEffect() { super(Outcome.DestroyPermanent); - staticText = "Destroy each artifact, creature, and enchantment with converted mana cost X or less"; + staticText = "Destroy each artifact, creature, and enchantment with mana value X or less"; } public PerniciousDeedEffect(final PerniciousDeedEffect effect) { @@ -67,7 +67,7 @@ class PerniciousDeedEffect extends OneShotEffect { CardType.ARTIFACT.getPredicate(), CardType.CREATURE.getPredicate(), CardType.ENCHANTMENT.getPredicate())); - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, source.getManaCostsToPay().getX() + 1)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, source.getManaCostsToPay().getX() + 1)); return new DestroyAllEffect(filter).apply(game, source); } diff --git a/Mage.Sets/src/mage/cards/p/PhyrexianDelver.java b/Mage.Sets/src/mage/cards/p/PhyrexianDelver.java index cc192608b9c..cd04e49362f 100644 --- a/Mage.Sets/src/mage/cards/p/PhyrexianDelver.java +++ b/Mage.Sets/src/mage/cards/p/PhyrexianDelver.java @@ -53,7 +53,7 @@ class PhyrexianDelverEffect extends OneShotEffect { public PhyrexianDelverEffect() { super(Outcome.PutCreatureInPlay); - this.staticText = "return target creature card from your graveyard to the battlefield. You lose life equal to that card's converted mana cost"; + this.staticText = "return target creature card from your graveyard to the battlefield. You lose life equal to that card's mana value"; } public PhyrexianDelverEffect(final PhyrexianDelverEffect effect) { @@ -74,7 +74,7 @@ class PhyrexianDelverEffect extends OneShotEffect { if (game.getState().getZone(creatureCard.getId()) == Zone.GRAVEYARD) { result = controller.moveCards(creatureCard, Zone.BATTLEFIELD, source, game); } - controller.loseLife(creatureCard.getConvertedManaCost(), game, source, false); + controller.loseLife(creatureCard.getManaValue(), game, source, false); return result; } return false; diff --git a/Mage.Sets/src/mage/cards/p/PhyrexianDevourer.java b/Mage.Sets/src/mage/cards/p/PhyrexianDevourer.java index b25aade1217..a6bea763ef5 100644 --- a/Mage.Sets/src/mage/cards/p/PhyrexianDevourer.java +++ b/Mage.Sets/src/mage/cards/p/PhyrexianDevourer.java @@ -86,7 +86,7 @@ class PhyrexianDevourerEffect extends OneShotEffect { public PhyrexianDevourerEffect() { super(Outcome.BoostCreature); - this.staticText = "Put X +1/+1 counters on {this}, where X is the exiled card's converted mana cost"; + this.staticText = "Put X +1/+1 counters on {this}, where X is the exiled card's mana value"; } public PhyrexianDevourerEffect(final PhyrexianDevourerEffect effect) { @@ -109,7 +109,7 @@ class PhyrexianDevourerEffect extends OneShotEffect { } } if (card != null) { - int amount = card.getConvertedManaCost(); + int amount = card.getManaValue(); if (amount > 0) { return new AddCountersSourceEffect(CounterType.P1P1.createInstance(amount)).apply(game, source); } diff --git a/Mage.Sets/src/mage/cards/p/PillardropRescuer.java b/Mage.Sets/src/mage/cards/p/PillardropRescuer.java index 5d3724fb2d2..0cf5fce3980 100644 --- a/Mage.Sets/src/mage/cards/p/PillardropRescuer.java +++ b/Mage.Sets/src/mage/cards/p/PillardropRescuer.java @@ -11,7 +11,7 @@ import mage.constants.CardType; import mage.constants.ComparisonType; import mage.constants.SubType; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.target.common.TargetCardInYourGraveyard; import java.util.UUID; @@ -25,7 +25,7 @@ public final class PillardropRescuer extends CardImpl { = new FilterCard("creature card with mana value 3 or less from your graveyard"); static { - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 4)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 4)); } public PillardropRescuer(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/p/Plaguebearer.java b/Mage.Sets/src/mage/cards/p/Plaguebearer.java index 38298850790..270cacdfc2c 100644 --- a/Mage.Sets/src/mage/cards/p/Plaguebearer.java +++ b/Mage.Sets/src/mage/cards/p/Plaguebearer.java @@ -24,7 +24,7 @@ import mage.target.targetadjustment.XCMCPermanentAdjuster; */ public final class Plaguebearer extends CardImpl { - private static final FilterPermanent filter = new FilterPermanent("nonblack creature with converted mana cost X"); + private static final FilterPermanent filter = new FilterPermanent("nonblack creature with mana value X"); static { filter.add(CardType.CREATURE.getPredicate()); diff --git a/Mage.Sets/src/mage/cards/p/PlaneswalkersFavor.java b/Mage.Sets/src/mage/cards/p/PlaneswalkersFavor.java index 2fd191ff764..62f9bb6f814 100644 --- a/Mage.Sets/src/mage/cards/p/PlaneswalkersFavor.java +++ b/Mage.Sets/src/mage/cards/p/PlaneswalkersFavor.java @@ -56,7 +56,7 @@ class PlaneswalkersFavorEffect extends OneShotEffect { public PlaneswalkersFavorEffect() { super(Outcome.Damage); - staticText = "Target opponent reveals a card at random from their hand. Target creature gets +X/+X until end of turn, where X is the revealed card's converted mana cost"; + staticText = "Target opponent reveals a card at random from their hand. Target creature gets +X/+X until end of turn, where X is the revealed card's mana value"; } public PlaneswalkersFavorEffect(final PlaneswalkersFavorEffect effect) { @@ -71,7 +71,7 @@ class PlaneswalkersFavorEffect extends OneShotEffect { Card card = opponent.getHand().getRandom(game); if (card != null) { revealed.add(card); - int boostValue = card.getConvertedManaCost(); + int boostValue = card.getManaValue(); 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/cards/p/PlaneswalkersFury.java b/Mage.Sets/src/mage/cards/p/PlaneswalkersFury.java index 0195e886610..c6817d6ee83 100644 --- a/Mage.Sets/src/mage/cards/p/PlaneswalkersFury.java +++ b/Mage.Sets/src/mage/cards/p/PlaneswalkersFury.java @@ -42,7 +42,7 @@ class PlaneswalkersFuryEffect extends OneShotEffect { public PlaneswalkersFuryEffect() { super(Outcome.Damage); - staticText = "Target opponent reveals a card at random from their hand. Planeswalker's Fury deals damage equal to that card's converted mana cost to that player"; + staticText = "Target opponent reveals a card at random from their hand. Planeswalker's Fury deals damage equal to that card's mana value to that player"; } public PlaneswalkersFuryEffect(final PlaneswalkersFuryEffect effect) { @@ -58,7 +58,7 @@ class PlaneswalkersFuryEffect extends OneShotEffect { if (card != null) { revealed.add(card); opponent.revealCards("Planeswalker's Fury", revealed, game); - opponent.damage(card.getConvertedManaCost(), source.getSourceId(), source, game); + opponent.damage(card.getManaValue(), source.getSourceId(), source, game); } return true; } diff --git a/Mage.Sets/src/mage/cards/p/PlaneswalkersMirth.java b/Mage.Sets/src/mage/cards/p/PlaneswalkersMirth.java index 23e82793036..a467798081f 100644 --- a/Mage.Sets/src/mage/cards/p/PlaneswalkersMirth.java +++ b/Mage.Sets/src/mage/cards/p/PlaneswalkersMirth.java @@ -47,7 +47,7 @@ class PlaneswalkersMirthEffect extends OneShotEffect { public PlaneswalkersMirthEffect() { super(Outcome.Damage); - staticText = "Target opponent reveals a card at random from their hand. You gain life equal to that card's converted mana cost"; + staticText = "Target opponent reveals a card at random from their hand. You gain life equal to that card's mana value"; } public PlaneswalkersMirthEffect(final PlaneswalkersMirthEffect effect) { @@ -64,7 +64,7 @@ class PlaneswalkersMirthEffect extends OneShotEffect { if (card != null) { revealed.add(card); opponent.revealCards("Planeswalker's Mirth", revealed, game); - player.gainLife(card.getConvertedManaCost(), game, source); + player.gainLife(card.getManaValue(), game, source); } return true; } diff --git a/Mage.Sets/src/mage/cards/p/PlaneswalkersScorn.java b/Mage.Sets/src/mage/cards/p/PlaneswalkersScorn.java index 5e0a72d985a..8b80b4a4278 100644 --- a/Mage.Sets/src/mage/cards/p/PlaneswalkersScorn.java +++ b/Mage.Sets/src/mage/cards/p/PlaneswalkersScorn.java @@ -56,7 +56,7 @@ class PlaneswalkersScornEffect extends OneShotEffect { public PlaneswalkersScornEffect() { super(Outcome.Damage); - staticText = "Target opponent reveals a card at random from their hand. Target creature gets -X/-X until end of turn, where X is the revealed card's converted mana cost"; + staticText = "Target opponent reveals a card at random from their hand. Target creature gets -X/-X until end of turn, where X is the revealed card's mana value"; } public PlaneswalkersScornEffect(final PlaneswalkersScornEffect effect) { @@ -71,7 +71,7 @@ class PlaneswalkersScornEffect extends OneShotEffect { Card card = opponent.getHand().getRandom(game); if (card != null) { revealed.add(card); - int boostValue = -1 * card.getConvertedManaCost(); + int boostValue = -1 * card.getManaValue(); 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/cards/p/PlarggDeanOfChaos.java b/Mage.Sets/src/mage/cards/p/PlarggDeanOfChaos.java index 589c477d4fc..9dad935a3ff 100644 --- a/Mage.Sets/src/mage/cards/p/PlarggDeanOfChaos.java +++ b/Mage.Sets/src/mage/cards/p/PlarggDeanOfChaos.java @@ -104,7 +104,7 @@ class PlarggDeanOfChaosEffect extends OneShotEffect { public PlarggDeanOfChaosEffect() { super(Outcome.PlayForFree); this.staticText = "reveal cards from the top of your library until you reveal a " - + "nonlegendary, nonland card with converted mana cost 3 or less. " + + "nonlegendary, nonland card with mana value 3 or less. " + "You may cast that card without paying its mana cost. Put all revealed " + "cards not cast this way on the bottom of your library in a random order"; } @@ -122,7 +122,7 @@ class PlarggDeanOfChaosEffect extends OneShotEffect { Card eligibleCard = null; for (Card card : controller.getLibrary().getCards(game)) { toReveal.add(card); - if (!card.isLand() && !card.isLegendary() && card.getConvertedManaCost() < 4) { + if (!card.isLand() && !card.isLegendary() && card.getManaValue() < 4) { eligibleCard = card; break; } diff --git a/Mage.Sets/src/mage/cards/p/PlasmCapture.java b/Mage.Sets/src/mage/cards/p/PlasmCapture.java index 04faec4080f..1452fbaab45 100644 --- a/Mage.Sets/src/mage/cards/p/PlasmCapture.java +++ b/Mage.Sets/src/mage/cards/p/PlasmCapture.java @@ -44,7 +44,7 @@ class PlasmCaptureCounterEffect extends OneShotEffect { public PlasmCaptureCounterEffect() { super(Outcome.Benefit); - this.staticText = "Counter target spell. At the beginning of your next precombat main phase, add X mana in any combination of colors, where X is that spell's converted mana cost"; + this.staticText = "Counter target spell. At the beginning of your next precombat main phase, add X mana in any combination of colors, where X is that spell's mana value"; } public PlasmCaptureCounterEffect(final PlasmCaptureCounterEffect effect) { @@ -62,7 +62,7 @@ class PlasmCaptureCounterEffect extends OneShotEffect { if (spell != null) { game.getStack().counter(getTargetPointer().getFirst(game, source), source, game); // mana gets added also if counter is not successful - int mana = spell.getConvertedManaCost(); + int mana = spell.getManaValue(); AtTheBeginOfMainPhaseDelayedTriggeredAbility delayedAbility = new AtTheBeginOfMainPhaseDelayedTriggeredAbility(new AddManaInAnyCombinationEffect(mana), false, TargetController.YOU, PhaseSelection.NEXT_PRECOMBAT_MAIN); game.addDelayedTriggeredAbility(delayedAbility, source); diff --git a/Mage.Sets/src/mage/cards/p/PostmortemLunge.java b/Mage.Sets/src/mage/cards/p/PostmortemLunge.java index 9ef675a188f..4f706ff79c4 100644 --- a/Mage.Sets/src/mage/cards/p/PostmortemLunge.java +++ b/Mage.Sets/src/mage/cards/p/PostmortemLunge.java @@ -14,7 +14,7 @@ import mage.constants.*; import mage.filter.FilterCard; import mage.filter.StaticFilters; import mage.filter.common.FilterCreatureCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -55,8 +55,8 @@ enum PostmortemLungeAdjuster implements TargetAdjuster { public void adjustTargets(Ability ability, Game game) { ability.getTargets().clear(); int xValue = ability.getManaCostsToPay().getX(); - FilterCard filter = new FilterCreatureCard("creature card with converted mana cost " + xValue + " or less from your graveyard"); - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, xValue + 1)); + FilterCard filter = new FilterCreatureCard("creature card with mana value " + xValue + " or less from your graveyard"); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, xValue + 1)); ability.getTargets().add(new TargetCardInYourGraveyard(filter)); } } @@ -65,7 +65,7 @@ class PostmortemLungeEffect extends OneShotEffect { public PostmortemLungeEffect() { super(Outcome.PutCreatureInPlay); - this.staticText = "Return target creature card with converted mana cost X from your graveyard to the battlefield. It gains haste. Exile it at the beginning of the next end step"; + this.staticText = "Return target creature card with mana value X from your graveyard to the battlefield. It gains haste. Exile it at the beginning of the next end step"; } public PostmortemLungeEffect(final PostmortemLungeEffect effect) { diff --git a/Mage.Sets/src/mage/cards/p/PowderKeg.java b/Mage.Sets/src/mage/cards/p/PowderKeg.java index 7e1896b8dc2..afc9a251195 100644 --- a/Mage.Sets/src/mage/cards/p/PowderKeg.java +++ b/Mage.Sets/src/mage/cards/p/PowderKeg.java @@ -19,7 +19,7 @@ import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -55,7 +55,7 @@ class PowderKegEffect extends OneShotEffect { public PowderKegEffect() { super(Outcome.DestroyPermanent); - staticText = "Destroy each artifact and creature with converted mana cost equal to the number of fuse counters on {this}"; + staticText = "Destroy each artifact and creature with mana value equal to the number of fuse counters on {this}"; } public PowderKegEffect(final PowderKegEffect effect) { @@ -71,7 +71,7 @@ class PowderKegEffect extends OneShotEffect { int count = sourcePermanent.getCounters(game).getCount(CounterType.FUSE); FilterPermanent filter = new FilterPermanent(); filter.add(Predicates.or(CardType.ARTIFACT.getPredicate(), CardType.CREATURE.getPredicate())); - filter.add(new ConvertedManaCostPredicate(ComparisonType.EQUAL_TO, count)); + filter.add(new ManaValuePredicate(ComparisonType.EQUAL_TO, count)); for (Permanent perm : game.getBattlefield().getActivePermanents(filter, source.getControllerId(), source.getSourceId(), game)) { perm.destroy(source, game, false); } diff --git a/Mage.Sets/src/mage/cards/p/PriestOfYawgmoth.java b/Mage.Sets/src/mage/cards/p/PriestOfYawgmoth.java index dbb49020029..8dbc04fd347 100644 --- a/Mage.Sets/src/mage/cards/p/PriestOfYawgmoth.java +++ b/Mage.Sets/src/mage/cards/p/PriestOfYawgmoth.java @@ -33,7 +33,7 @@ public final class PriestOfYawgmoth extends CardImpl { // {T}, Sacrifice an artifact: Add an amount of {B} equal to the sacrificed artifact's converted mana cost. Ability ability = new DynamicManaAbility(Mana.BlackMana(1), new SacrificeCostConvertedMana("artifact"), new TapSourceCost(), - "add an amount of {B} equal to the sacrificed artifact's converted mana cost", + "add an amount of {B} equal to the sacrificed artifact's mana value", false, new HighestCMCOfPermanentValue(StaticFilters.FILTER_CONTROLLED_PERMANENT_ARTIFACT, true) ); diff --git a/Mage.Sets/src/mage/cards/p/PrimeSpeakerVannifar.java b/Mage.Sets/src/mage/cards/p/PrimeSpeakerVannifar.java index 887b3bbd484..596dd9ae8ac 100644 --- a/Mage.Sets/src/mage/cards/p/PrimeSpeakerVannifar.java +++ b/Mage.Sets/src/mage/cards/p/PrimeSpeakerVannifar.java @@ -13,7 +13,7 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterCard; import mage.filter.StaticFilters; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -61,8 +61,8 @@ class PrimeSpeakerVannifarEffect extends OneShotEffect { PrimeSpeakerVannifarEffect() { super(Outcome.Benefit); - staticText = "Search your library for a creature card with converted mana cost equal to 1 " + - "plus the sacrificed creature's converted mana cost, put that card " + + staticText = "Search your library for a creature card with mana value equal to 1 " + + "plus the sacrificed creature's mana value, put that card " + "onto the battlefield, then shuffle your library"; } @@ -86,9 +86,9 @@ class PrimeSpeakerVannifarEffect extends OneShotEffect { if (sacrificedPermanent == null || controller == null) { return false; } - int newConvertedCost = sacrificedPermanent.getConvertedManaCost() + 1; - FilterCard filter = new FilterCard("creature card with converted mana cost " + newConvertedCost); - filter.add(new ConvertedManaCostPredicate(ComparisonType.EQUAL_TO, newConvertedCost)); + int newConvertedCost = sacrificedPermanent.getManaValue() + 1; + FilterCard filter = new FilterCard("creature card with mana value " + newConvertedCost); + filter.add(new ManaValuePredicate(ComparisonType.EQUAL_TO, newConvertedCost)); filter.add(CardType.CREATURE.getPredicate()); TargetCardInLibrary target = new TargetCardInLibrary(filter); if (controller.searchLibrary(target, source, game)) { diff --git a/Mage.Sets/src/mage/cards/p/PrismariApprentice.java b/Mage.Sets/src/mage/cards/p/PrismariApprentice.java index 5d456f26bb5..5083ea1403b 100644 --- a/Mage.Sets/src/mage/cards/p/PrismariApprentice.java +++ b/Mage.Sets/src/mage/cards/p/PrismariApprentice.java @@ -56,6 +56,6 @@ enum PrismariApprenticeCondition implements Condition { @Override public boolean apply(Game game, Ability source) { Spell spell = (Spell) source.getEffects().get(0).getValue(MagecraftAbility.SPELL_KEY); - return spell != null && spell.getConvertedManaCost() >= 5; + return spell != null && spell.getManaValue() >= 5; } } diff --git a/Mage.Sets/src/mage/cards/p/ProclamationOfRebirth.java b/Mage.Sets/src/mage/cards/p/ProclamationOfRebirth.java index 99306566544..dcf8e71930f 100644 --- a/Mage.Sets/src/mage/cards/p/ProclamationOfRebirth.java +++ b/Mage.Sets/src/mage/cards/p/ProclamationOfRebirth.java @@ -10,7 +10,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.ComparisonType; import mage.filter.common.FilterCreatureCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.target.common.TargetCardInYourGraveyard; /** @@ -19,11 +19,11 @@ import mage.target.common.TargetCardInYourGraveyard; */ public final class ProclamationOfRebirth extends CardImpl { - private static final FilterCreatureCard filter1 = new FilterCreatureCard("creature card with converted mana cost {1} or less from your graveyard"); - private static final FilterCreatureCard filter3 = new FilterCreatureCard("creature cards with converted mana cost {1} or less from your graveyard"); + private static final FilterCreatureCard filter1 = new FilterCreatureCard("creature card with mana value {1} or less from your graveyard"); + private static final FilterCreatureCard filter3 = new FilterCreatureCard("creature cards with mana value {1} or less from your graveyard"); static { - filter1.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 2)); - filter3.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 2)); + filter1.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 2)); + filter3.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 2)); } public ProclamationOfRebirth(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{2}{W}"); diff --git a/Mage.Sets/src/mage/cards/p/ProfaneCommand.java b/Mage.Sets/src/mage/cards/p/ProfaneCommand.java index 05327cfc1f3..694961c93f6 100644 --- a/Mage.Sets/src/mage/cards/p/ProfaneCommand.java +++ b/Mage.Sets/src/mage/cards/p/ProfaneCommand.java @@ -19,7 +19,7 @@ import mage.constants.Duration; import mage.filter.FilterCard; import mage.filter.common.FilterCreatureCard; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.target.TargetPlayer; import mage.target.common.TargetCardInYourGraveyard; @@ -48,7 +48,7 @@ public final class ProfaneCommand extends CardImpl { // * Return target creature card with converted mana cost X or less from your graveyard to the battlefield. Mode mode = new Mode(); mode.addEffect(new ReturnFromGraveyardToBattlefieldTargetEffect(false, false)); - mode.addTarget(new TargetCardInYourGraveyard(new FilterCreatureCard("creature card with converted mana cost X or less from your graveyard"))); + mode.addTarget(new TargetCardInYourGraveyard(new FilterCreatureCard("creature card with mana value X or less from your graveyard"))); this.getSpellAbility().addMode(mode); // * Target creature gets -X/-X until end of turn. @@ -90,8 +90,8 @@ enum ProfaneCommandAdjuster implements TargetAdjuster { for (Effect effect : mode.getEffects()) { if (effect instanceof ReturnFromGraveyardToBattlefieldTargetEffect) { mode.getTargets().clear(); - FilterCard filter = new FilterCreatureCard("creature card with converted mana cost " + xValue + " or less from your graveyard"); - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, xValue + 1)); + FilterCard filter = new FilterCreatureCard("creature card with mana value " + xValue + " or less from your graveyard"); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, xValue + 1)); mode.addTarget(new TargetCardInYourGraveyard(filter)); } if (effect instanceof GainAbilityTargetEffect) { diff --git a/Mage.Sets/src/mage/cards/p/Prohibit.java b/Mage.Sets/src/mage/cards/p/Prohibit.java index 3351baa1696..37e81815f98 100644 --- a/Mage.Sets/src/mage/cards/p/Prohibit.java +++ b/Mage.Sets/src/mage/cards/p/Prohibit.java @@ -47,9 +47,9 @@ class ProhibitEffect extends OneShotEffect { ProhibitEffect() { super(Outcome.DestroyPermanent); - this.staticText = "Counter target spell if its converted mana cost " + this.staticText = "Counter target spell if its mana value " + "is 2 or less. if this spell was kicked, counter that " - + "spell if its converted mana cost is 4 or less instead."; + + "spell if its mana value is 4 or less instead."; } ProhibitEffect(final ProhibitEffect effect) { @@ -67,7 +67,7 @@ class ProhibitEffect extends OneShotEffect { if (controller != null) { Spell targetSpell = game.getSpell(this.getTargetPointer().getFirst(game, source)); if (targetSpell != null) { - int cmc = targetSpell.getConvertedManaCost(); + int cmc = targetSpell.getManaValue(); if (cmc <= 2 || (KickedCondition.instance.apply(game, source) && cmc <= 4)) { game.getStack().counter(targetSpell.getId(), source, game); diff --git a/Mage.Sets/src/mage/cards/p/ProteanHulk.java b/Mage.Sets/src/mage/cards/p/ProteanHulk.java index 5e087e9a86d..7e4f2aa49fb 100644 --- a/Mage.Sets/src/mage/cards/p/ProteanHulk.java +++ b/Mage.Sets/src/mage/cards/p/ProteanHulk.java @@ -45,7 +45,7 @@ public final class ProteanHulk extends CardImpl { class ProteanHulkTarget extends TargetCardInLibrary { private static final FilterCard filter - = new FilterCreatureCard("any number of creature cards with total converted mana cost 6 or less"); + = new FilterCreatureCard("any number of creature cards with total mana value 6 or less"); ProteanHulkTarget() { super(0, Integer.MAX_VALUE, filter); @@ -71,6 +71,6 @@ class ProteanHulkTarget extends TargetCardInLibrary { } Cards cards = new CardsImpl(this.getTargets()); cards.add(id); - return cards.getCards(game).stream().filter(Objects::nonNull).mapToInt(MageObject::getConvertedManaCost).sum() <= 6; + return cards.getCards(game).stream().filter(Objects::nonNull).mapToInt(MageObject::getManaValue).sum() <= 6; } } diff --git a/Mage.Sets/src/mage/cards/p/PrototypePortal.java b/Mage.Sets/src/mage/cards/p/PrototypePortal.java index d69fb443b68..f9de015016f 100644 --- a/Mage.Sets/src/mage/cards/p/PrototypePortal.java +++ b/Mage.Sets/src/mage/cards/p/PrototypePortal.java @@ -67,7 +67,7 @@ enum PrototypePortalAdjuster implements CostAdjuster { if (!card.getImprinted().isEmpty()) { Card imprinted = game.getCard(card.getImprinted().get(0)); if (imprinted != null) { - ability.getManaCostsToPay().add(0, new GenericManaCost(imprinted.getConvertedManaCost())); + ability.getManaCostsToPay().add(0, new GenericManaCost(imprinted.getManaValue())); } } } @@ -125,7 +125,7 @@ class PrototypePortalCreateTokenEffect extends OneShotEffect { PrototypePortalCreateTokenEffect() { super(Outcome.PutCreatureInPlay); - this.staticText = "Create a token that's a copy of the exiled card. X is the converted mana cost of that card"; + this.staticText = "Create a token that's a copy of the exiled card. X is the mana value of that card"; } private PrototypePortalCreateTokenEffect(final PrototypePortalCreateTokenEffect effect) { diff --git a/Mage.Sets/src/mage/cards/p/PsychicBattle.java b/Mage.Sets/src/mage/cards/p/PsychicBattle.java index 6004e9e4633..bfe222fe638 100644 --- a/Mage.Sets/src/mage/cards/p/PsychicBattle.java +++ b/Mage.Sets/src/mage/cards/p/PsychicBattle.java @@ -88,7 +88,7 @@ class PsychicBattleEffect extends OneShotEffect { public PsychicBattleEffect() { super(Outcome.Benefit); - this.staticText = "each player reveals the top card of their library. The player who reveals the card with the highest converted mana cost may change the target or targets. If two or more cards are tied for highest cost, the target or targets remain unchanged"; + this.staticText = "each player reveals the top card of their library. The player who reveals the card with the highest mana value may change the target or targets. If two or more cards are tied for highest cost, the target or targets remain unchanged"; } public PsychicBattleEffect(final PsychicBattleEffect effect) { @@ -110,7 +110,7 @@ class PsychicBattleEffect extends OneShotEffect { if (player != null && player.getLibrary().hasCards()) { Card card = player.getLibrary().getFromTop(game); player.revealCards(sourceObject.getIdName() + " (" + player.getName() + ')', new CardsImpl(card), game); - manacostMap.put(player, card.getConvertedManaCost()); + manacostMap.put(player, card.getManaValue()); } } diff --git a/Mage.Sets/src/mage/cards/p/PucasMischief.java b/Mage.Sets/src/mage/cards/p/PucasMischief.java index 8fca055d953..9c3c739ccc9 100644 --- a/Mage.Sets/src/mage/cards/p/PucasMischief.java +++ b/Mage.Sets/src/mage/cards/p/PucasMischief.java @@ -26,7 +26,7 @@ import mage.target.common.TargetControlledPermanent; */ public final class PucasMischief extends CardImpl { - private static final String rule = "you may exchange control of target nonland permanent you control and target nonland permanent an opponent controls with an equal or lesser converted mana cost"; + private static final String rule = "you may exchange control of target nonland permanent you control and target nonland permanent an opponent controls with an equal or lesser mana value"; public PucasMischief(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{3}{U}"); @@ -91,7 +91,7 @@ class PucasMischiefSecondTarget extends TargetPermanent { this.filter = this.filter.copy(); filter.add(TargetController.OPPONENT.getControllerPredicate()); filter.add(Predicates.not(CardType.LAND.getPredicate())); - setTargetName("permanent an opponent controls with an equal or lesser converted mana cost"); + setTargetName("permanent an opponent controls with an equal or lesser mana value"); } public PucasMischiefSecondTarget(final PucasMischiefSecondTarget target) { @@ -105,7 +105,7 @@ class PucasMischiefSecondTarget extends TargetPermanent { Permanent target1 = game.getPermanent(source.getFirstTarget()); Permanent opponentPermanent = game.getPermanent(id); if (target1 != null && opponentPermanent != null) { - return target1.getConvertedManaCost() >= opponentPermanent.getConvertedManaCost(); + return target1.getManaValue() >= opponentPermanent.getManaValue(); } } return false; @@ -119,7 +119,7 @@ class PucasMischiefSecondTarget extends TargetPermanent { if (targetSource != null) { for (Permanent permanent : game.getBattlefield().getActivePermanents(filter, sourceControllerId, sourceId, game)) { if (!targets.containsKey(permanent.getId()) && permanent.canBeTargetedBy(targetSource, sourceControllerId, game)) { - if (firstTarget.getConvertedManaCost() >= permanent.getConvertedManaCost()) { + if (firstTarget.getManaValue() >= permanent.getManaValue()) { possibleTargets.add(permanent.getId()); } } diff --git a/Mage.Sets/src/mage/cards/p/PureReflection.java b/Mage.Sets/src/mage/cards/p/PureReflection.java index a3f856e2d8d..280e3bcdd20 100644 --- a/Mage.Sets/src/mage/cards/p/PureReflection.java +++ b/Mage.Sets/src/mage/cards/p/PureReflection.java @@ -44,7 +44,7 @@ public final class PureReflection extends CardImpl { public PureReflectionEffect() { super(Outcome.Benefit); - staticText = "destroy all Reflections. Then that player creates an X/X white Reflection creature token, where X is the converted mana cost of that spell."; + staticText = "destroy all Reflections. Then that player creates an X/X white Reflection creature token, where X is the mana value of that spell."; } public PureReflectionEffect(PureReflectionEffect effect) { @@ -74,7 +74,7 @@ public final class PureReflection extends CardImpl { game.getState().processAction(game); // Then that player creates an X/X white Reflection creature token, where X is the converted mana cost of that spell. - ReflectionPureToken token = new ReflectionPureToken(spell.getConvertedManaCost()); + ReflectionPureToken token = new ReflectionPureToken(spell.getManaValue()); token.putOntoBattlefield(1, game, source, spell.getControllerId()); return true; diff --git a/Mage.Sets/src/mage/cards/p/PutridCyclops.java b/Mage.Sets/src/mage/cards/p/PutridCyclops.java index 670f356d56e..6d0f8254d9f 100644 --- a/Mage.Sets/src/mage/cards/p/PutridCyclops.java +++ b/Mage.Sets/src/mage/cards/p/PutridCyclops.java @@ -53,7 +53,7 @@ class PutridCyclopEffect extends OneShotEffect { public PutridCyclopEffect() { super(Outcome.Detriment); - this.staticText = "scry 1, then reveal the top card of your library. {this} gets -X/-X until end of turn, where X is that card's converted mana cost" + this.staticText = "scry 1, then reveal the top card of your library. {this} gets -X/-X until end of turn, where X is that card's mana value" + " (To scry 1, look at the top card of your library, then you may put that card on the bottom of your library.)"; } @@ -75,7 +75,7 @@ class PutridCyclopEffect extends OneShotEffect { Card card = controller.getLibrary().getFromTop(game); if (card != null) { controller.revealCards(sourceObject.getIdName(), new CardsImpl(card), game); - int unboost = card.getConvertedManaCost() * -1; + int unboost = card.getManaValue() * -1; ContinuousEffect effect = new BoostSourceEffect(unboost, unboost, Duration.EndOfTurn); game.addEffect(effect, source); } diff --git a/Mage.Sets/src/mage/cards/p/PyreOfHeroes.java b/Mage.Sets/src/mage/cards/p/PyreOfHeroes.java index cf9f1d7cce3..515f4d42b5d 100644 --- a/Mage.Sets/src/mage/cards/p/PyreOfHeroes.java +++ b/Mage.Sets/src/mage/cards/p/PyreOfHeroes.java @@ -16,7 +16,7 @@ import mage.constants.Outcome; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.StaticFilters; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.filter.predicate.mageobject.SharesCreatureTypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -60,8 +60,8 @@ class PyreOfHeroesEffect extends OneShotEffect { PyreOfHeroesEffect() { super(Outcome.Benefit); - staticText = "Search your library for a creature card that shares a creature type with the sacrificed creature and has converted mana cost equal to 1 " + - "plus that creature's converted mana cost. Put that card " + + staticText = "Search your library for a creature card that shares a creature type with the sacrificed creature and has mana value equal to 1 " + + "plus that creature's mana value. Put that card " + "onto the battlefield, then shuffle your library"; } @@ -85,9 +85,9 @@ class PyreOfHeroesEffect extends OneShotEffect { if (sacrificedPermanent == null || controller == null) { return false; } - int newConvertedCost = sacrificedPermanent.getConvertedManaCost() + 1; - FilterCard filter = new FilterCard("creature card with converted mana cost " + newConvertedCost); - filter.add(new ConvertedManaCostPredicate(ComparisonType.EQUAL_TO, newConvertedCost)); + int newConvertedCost = sacrificedPermanent.getManaValue() + 1; + FilterCard filter = new FilterCard("creature card with mana value " + newConvertedCost); + filter.add(new ManaValuePredicate(ComparisonType.EQUAL_TO, newConvertedCost)); filter.add(CardType.CREATURE.getPredicate()); filter.add(new SharesCreatureTypePredicate(sacrificedPermanent)); TargetCardInLibrary target = new TargetCardInLibrary(filter); diff --git a/Mage.Sets/src/mage/cards/p/PyrostaticPillar.java b/Mage.Sets/src/mage/cards/p/PyrostaticPillar.java index 67d42381b6b..3517b2831e9 100644 --- a/Mage.Sets/src/mage/cards/p/PyrostaticPillar.java +++ b/Mage.Sets/src/mage/cards/p/PyrostaticPillar.java @@ -11,7 +11,6 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; -import mage.game.events.GameEvent.EventType; import mage.game.stack.Spell; import mage.target.targetpointer.FixedTarget; @@ -64,7 +63,7 @@ class PyrostaticPillarTriggeredAbility extends TriggeredAbilityImpl { @Override public boolean checkTrigger(GameEvent event, Game game) { Spell spell = game.getStack().getSpell(event.getTargetId()); - if (spell != null && spell.getConvertedManaCost() <= 3){ + if (spell != null && spell.getManaValue() <= 3){ for (Effect effect : this.getEffects()) { effect.setTargetPointer(new FixedTarget(event.getPlayerId())); } @@ -75,6 +74,6 @@ class PyrostaticPillarTriggeredAbility extends TriggeredAbilityImpl { @Override public String getRule() { - return "Whenever a player casts a spell with converted mana cost 3 or less, {this} deals 2 damage to that player."; + return "Whenever a player casts a spell with mana value 3 or less, {this} deals 2 damage to that player."; } } \ No newline at end of file diff --git a/Mage.Sets/src/mage/cards/q/QuillmaneBaku.java b/Mage.Sets/src/mage/cards/q/QuillmaneBaku.java index 3351ec79323..ddf247111fe 100644 --- a/Mage.Sets/src/mage/cards/q/QuillmaneBaku.java +++ b/Mage.Sets/src/mage/cards/q/QuillmaneBaku.java @@ -21,7 +21,7 @@ import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.StaticFilters; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -74,8 +74,8 @@ enum QuillmaneBakuAdjuster implements TargetAdjuster { } } ability.getTargets().clear(); - FilterCreaturePermanent newFilter = new FilterCreaturePermanent("creature with converted mana cost " + maxConvManaCost + " or less"); - newFilter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, maxConvManaCost + 1)); + FilterCreaturePermanent newFilter = new FilterCreaturePermanent("creature with mana value " + maxConvManaCost + " or less"); + newFilter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, maxConvManaCost + 1)); TargetCreaturePermanent target = new TargetCreaturePermanent(newFilter); ability.getTargets().add(target); } @@ -85,7 +85,7 @@ class QuillmaneBakuReturnEffect extends OneShotEffect { public QuillmaneBakuReturnEffect() { super(Outcome.ReturnToHand); - this.staticText = "Return target creature with converted mana cost X or less to its owner's hand"; + this.staticText = "Return target creature with mana value X or less to its owner's hand"; } public QuillmaneBakuReturnEffect(final QuillmaneBakuReturnEffect effect) { diff --git a/Mage.Sets/src/mage/cards/r/RageExtractor.java b/Mage.Sets/src/mage/cards/r/RageExtractor.java index 365b2b5c657..bf6432c59e3 100644 --- a/Mage.Sets/src/mage/cards/r/RageExtractor.java +++ b/Mage.Sets/src/mage/cards/r/RageExtractor.java @@ -13,7 +13,6 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; -import mage.game.events.GameEvent.EventType; import mage.game.stack.Spell; import mage.target.common.TargetAnyTarget; @@ -66,7 +65,7 @@ class RageExtractorTriggeredAbility extends TriggeredAbilityImpl { if (spell != null) { for (ManaCost cost : spell.getCard().getManaCost()) { if (cost instanceof PhyrexianManaCost) { - ((DamageTargetEffect)getEffects().get(0)).setAmount(StaticValue.get(spell.getConvertedManaCost())); + ((DamageTargetEffect)getEffects().get(0)).setAmount(StaticValue.get(spell.getManaValue())); return true; } } @@ -77,6 +76,6 @@ class RageExtractorTriggeredAbility extends TriggeredAbilityImpl { @Override public String getRule() { - return "Whenever you cast a spell with p in its mana cost, {this} deals damage equal to that spell's converted mana cost to any target."; + return "Whenever you cast a spell with p in its mana cost, {this} deals damage equal to that spell's mana value to any target."; } } diff --git a/Mage.Sets/src/mage/cards/r/RallyTheAncestors.java b/Mage.Sets/src/mage/cards/r/RallyTheAncestors.java index 8a880a9e044..383876fabc3 100644 --- a/Mage.Sets/src/mage/cards/r/RallyTheAncestors.java +++ b/Mage.Sets/src/mage/cards/r/RallyTheAncestors.java @@ -16,7 +16,7 @@ import mage.constants.ComparisonType; import mage.constants.Outcome; import mage.constants.Zone; import mage.filter.common.FilterCreatureCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -56,7 +56,7 @@ class RallyTheAncestorsEffect extends OneShotEffect { RallyTheAncestorsEffect() { super(Outcome.PutCreatureInPlay); - this.staticText = "Return each creature card with converted mana cost X or less from your graveyard to the battlefield. Exile those creatures at the beginning of your next upkeep"; + this.staticText = "Return each creature card with mana value X or less from your graveyard to the battlefield. Exile those creatures at the beginning of your next upkeep"; } RallyTheAncestorsEffect(final RallyTheAncestorsEffect effect) { @@ -74,7 +74,7 @@ class RallyTheAncestorsEffect extends OneShotEffect { if (player != null) { int xValue = source.getManaCostsToPay().getX(); FilterCreatureCard filter = new FilterCreatureCard(); - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, xValue + 1)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, xValue + 1)); Set cards = player.getGraveyard().getCards(filter, game); player.moveCards(cards, Zone.BATTLEFIELD, source, game); List toExile = new ArrayList<>(cards.size()); diff --git a/Mage.Sets/src/mage/cards/r/RamosianCaptain.java b/Mage.Sets/src/mage/cards/r/RamosianCaptain.java index 4b870e2839f..ab8a8957fb9 100644 --- a/Mage.Sets/src/mage/cards/r/RamosianCaptain.java +++ b/Mage.Sets/src/mage/cards/r/RamosianCaptain.java @@ -17,7 +17,7 @@ import mage.constants.ComparisonType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterPermanentCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.target.common.TargetCardInLibrary; /** @@ -26,11 +26,11 @@ import mage.target.common.TargetCardInLibrary; */ public final class RamosianCaptain extends CardImpl { - private static final FilterPermanentCard filter = new FilterPermanentCard("Rebel permanent card with converted mana cost 4 or less"); + private static final FilterPermanentCard filter = new FilterPermanentCard("Rebel permanent card with mana value 4 or less"); static { filter.add(SubType.REBEL.getPredicate()); - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 5)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 5)); } public RamosianCaptain(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RamosianCommander.java b/Mage.Sets/src/mage/cards/r/RamosianCommander.java index c18585e7770..e4aedc29a53 100644 --- a/Mage.Sets/src/mage/cards/r/RamosianCommander.java +++ b/Mage.Sets/src/mage/cards/r/RamosianCommander.java @@ -16,7 +16,7 @@ import mage.constants.ComparisonType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterPermanentCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.target.common.TargetCardInLibrary; /** @@ -25,11 +25,11 @@ import mage.target.common.TargetCardInLibrary; */ public final class RamosianCommander extends CardImpl { - private static final FilterPermanentCard filter = new FilterPermanentCard("Rebel permanent card with converted mana cost 5 or less"); + private static final FilterPermanentCard filter = new FilterPermanentCard("Rebel permanent card with mana value 5 or less"); static { filter.add(SubType.REBEL.getPredicate()); - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 6)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 6)); } public RamosianCommander(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RamosianLieutenant.java b/Mage.Sets/src/mage/cards/r/RamosianLieutenant.java index 24df05f87b8..c61ecd3474a 100644 --- a/Mage.Sets/src/mage/cards/r/RamosianLieutenant.java +++ b/Mage.Sets/src/mage/cards/r/RamosianLieutenant.java @@ -16,7 +16,7 @@ import mage.constants.ComparisonType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterPermanentCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.target.common.TargetCardInLibrary; /** @@ -25,11 +25,11 @@ import mage.target.common.TargetCardInLibrary; */ public final class RamosianLieutenant extends CardImpl { - private static final FilterPermanentCard filter = new FilterPermanentCard("Rebel permanent card with converted mana cost 3 or less"); + private static final FilterPermanentCard filter = new FilterPermanentCard("Rebel permanent card with mana value 3 or less"); static { filter.add(SubType.REBEL.getPredicate()); - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 4)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 4)); } public RamosianLieutenant(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RamosianRevivalist.java b/Mage.Sets/src/mage/cards/r/RamosianRevivalist.java index 51ddfddc55a..bfda4bedcbc 100644 --- a/Mage.Sets/src/mage/cards/r/RamosianRevivalist.java +++ b/Mage.Sets/src/mage/cards/r/RamosianRevivalist.java @@ -15,7 +15,7 @@ import mage.constants.ComparisonType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterPermanentCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.target.common.TargetCardInYourGraveyard; /** @@ -24,11 +24,11 @@ import mage.target.common.TargetCardInYourGraveyard; */ public final class RamosianRevivalist extends CardImpl { - private static final FilterPermanentCard filter = new FilterPermanentCard("Rebel permanent card with converted mana cost 5 or less from your graveyard"); + private static final FilterPermanentCard filter = new FilterPermanentCard("Rebel permanent card with mana value 5 or less from your graveyard"); static { filter.add(SubType.REBEL.getPredicate()); - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 6)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 6)); } public RamosianRevivalist(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RamosianSergeant.java b/Mage.Sets/src/mage/cards/r/RamosianSergeant.java index 2429bbd3b2a..09d3e449dec 100644 --- a/Mage.Sets/src/mage/cards/r/RamosianSergeant.java +++ b/Mage.Sets/src/mage/cards/r/RamosianSergeant.java @@ -16,7 +16,7 @@ import mage.constants.ComparisonType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterPermanentCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.target.common.TargetCardInLibrary; /** @@ -24,11 +24,11 @@ import mage.target.common.TargetCardInLibrary; */ public final class RamosianSergeant extends CardImpl { - private static final FilterPermanentCard filter = new FilterPermanentCard("Rebel permanent card with converted mana cost 2 or less"); + private static final FilterPermanentCard filter = new FilterPermanentCard("Rebel permanent card with mana value 2 or less"); static { filter.add(SubType.REBEL.getPredicate()); - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 3)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 3)); } public RamosianSergeant(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RamosianSkyMarshal.java b/Mage.Sets/src/mage/cards/r/RamosianSkyMarshal.java index 0e4dceff84a..8031972d07e 100644 --- a/Mage.Sets/src/mage/cards/r/RamosianSkyMarshal.java +++ b/Mage.Sets/src/mage/cards/r/RamosianSkyMarshal.java @@ -16,7 +16,7 @@ import mage.constants.ComparisonType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterPermanentCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.target.common.TargetCardInLibrary; /** @@ -25,11 +25,11 @@ import mage.target.common.TargetCardInLibrary; */ public final class RamosianSkyMarshal extends CardImpl { - private static final FilterPermanentCard filter = new FilterPermanentCard("Rebel permanent card with converted mana cost 6 or less"); + private static final FilterPermanentCard filter = new FilterPermanentCard("Rebel permanent card with mana value 6 or less"); static { filter.add(SubType.REBEL.getPredicate()); - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 7)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 7)); } public RamosianSkyMarshal(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RangerCaptainOfEos.java b/Mage.Sets/src/mage/cards/r/RangerCaptainOfEos.java index a124319640d..60736bcc15c 100644 --- a/Mage.Sets/src/mage/cards/r/RangerCaptainOfEos.java +++ b/Mage.Sets/src/mage/cards/r/RangerCaptainOfEos.java @@ -14,7 +14,7 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterCard; import mage.filter.common.FilterCreatureCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.players.Player; @@ -28,10 +28,10 @@ import java.util.UUID; public final class RangerCaptainOfEos extends CardImpl { private static final FilterCard filter - = new FilterCreatureCard("a creature card with converted mana cost 1 or less"); + = new FilterCreatureCard("a creature card with mana value 1 or less"); static { - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 2)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 2)); } public RangerCaptainOfEos(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RangerOfEos.java b/Mage.Sets/src/mage/cards/r/RangerOfEos.java index 276a189738e..c1cf9ebc0c8 100644 --- a/Mage.Sets/src/mage/cards/r/RangerOfEos.java +++ b/Mage.Sets/src/mage/cards/r/RangerOfEos.java @@ -12,7 +12,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.ComparisonType; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.target.common.TargetCardInLibrary; /** @@ -21,11 +21,11 @@ import mage.target.common.TargetCardInLibrary; */ public final class RangerOfEos extends CardImpl { - private static final FilterCard filter = new FilterCard("creature cards with converted mana cost 1 or less"); + private static final FilterCard filter = new FilterCard("creature cards with mana value 1 or less"); static { filter.add(CardType.CREATURE.getPredicate()); - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 2)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 2)); } public RangerOfEos(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RashmiEternitiesCrafter.java b/Mage.Sets/src/mage/cards/r/RashmiEternitiesCrafter.java index 3a27e87027d..3cf90fbf805 100644 --- a/Mage.Sets/src/mage/cards/r/RashmiEternitiesCrafter.java +++ b/Mage.Sets/src/mage/cards/r/RashmiEternitiesCrafter.java @@ -78,7 +78,7 @@ class RashmiEternitiesCrafterTriggeredAbility extends SpellCastControllerTrigger Spell spell = game.getStack().getSpell(event.getTargetId()); if (spell != null) { for (Effect effect : getEffects()) { - effect.setValue("RashmiEternitiesCrafterCMC", spell.getConvertedManaCost()); + effect.setValue("RashmiEternitiesCrafterCMC", spell.getManaValue()); } return true; } @@ -102,7 +102,7 @@ class RashmiEternitiesCrafterEffect extends OneShotEffect { RashmiEternitiesCrafterEffect() { super(Outcome.PlayForFree); this.staticText = "reveal the top card of your library. If it's a nonland" - + " card with converted mana cost less than that spell's, you may " + + " card with mana value less than that spell's, you may " + "cast it without paying its mana cost. If you don't cast the " + "revealed card, put it into your hand"; } @@ -130,7 +130,7 @@ class RashmiEternitiesCrafterEffect extends OneShotEffect { } Object cmcObject = this.getValue("RashmiEternitiesCrafterCMC"); if (cmcObject != null - && card.getConvertedManaCost() < (int) cmcObject + && card.getManaValue() < (int) cmcObject && controller.chooseUse(Outcome.PlayForFree, "Cast " + card.getName() + " without paying its mana cost?", source, game)) { game.getState().setValue("PlayFromNotOwnHandZone" + card.getId(), Boolean.TRUE); diff --git a/Mage.Sets/src/mage/cards/r/RatchetBomb.java b/Mage.Sets/src/mage/cards/r/RatchetBomb.java index ae3598d4979..43efd7acff5 100644 --- a/Mage.Sets/src/mage/cards/r/RatchetBomb.java +++ b/Mage.Sets/src/mage/cards/r/RatchetBomb.java @@ -49,7 +49,7 @@ public final class RatchetBomb extends CardImpl { public RatchetBombEffect() { super(Outcome.DestroyPermanent); - staticText = "Destroy each nonland permanent with converted mana cost equal to the number of charge counters on {this}"; + staticText = "Destroy each nonland permanent with mana value equal to the number of charge counters on {this}"; } public RatchetBombEffect(final RatchetBombEffect effect) { @@ -68,7 +68,7 @@ public final class RatchetBomb extends CardImpl { int count = p.getCounters(game).getCount(CounterType.CHARGE); for (Permanent perm: game.getBattlefield().getAllActivePermanents()) { - if (perm.getConvertedManaCost() == count && !(perm.isLand())) { + if (perm.getManaValue() == count && !(perm.isLand())) { perm.destroy(source, game, false); } } diff --git a/Mage.Sets/src/mage/cards/r/RathiAssassin.java b/Mage.Sets/src/mage/cards/r/RathiAssassin.java index a3d75739a19..266d6c55468 100644 --- a/Mage.Sets/src/mage/cards/r/RathiAssassin.java +++ b/Mage.Sets/src/mage/cards/r/RathiAssassin.java @@ -21,7 +21,7 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterPermanentCard; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetCardInLibrary; import mage.target.common.TargetCreaturePermanent; @@ -32,12 +32,12 @@ import mage.target.common.TargetCreaturePermanent; */ public final class RathiAssassin extends CardImpl { - private static final FilterPermanentCard filter = new FilterPermanentCard("Mercenary permanent card with converted mana cost 3 or less"); + private static final FilterPermanentCard filter = new FilterPermanentCard("Mercenary permanent card with mana value 3 or less"); private static final FilterCreaturePermanent destroyFilter = new FilterCreaturePermanent("tapped nonblack creature"); static { filter.add(SubType.MERCENARY.getPredicate()); - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 4)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 4)); destroyFilter.add(TappedPredicate.instance); destroyFilter.add(Predicates.not(new ColorPredicate(ObjectColor.BLACK))); } diff --git a/Mage.Sets/src/mage/cards/r/RathiFiend.java b/Mage.Sets/src/mage/cards/r/RathiFiend.java index b5fda654ce4..288abb93a72 100644 --- a/Mage.Sets/src/mage/cards/r/RathiFiend.java +++ b/Mage.Sets/src/mage/cards/r/RathiFiend.java @@ -17,7 +17,7 @@ import mage.constants.ComparisonType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterPermanentCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.target.common.TargetCardInLibrary; /** @@ -26,11 +26,11 @@ import mage.target.common.TargetCardInLibrary; */ public final class RathiFiend extends CardImpl { - private static final FilterPermanentCard filter = new FilterPermanentCard("Mercenary permanent card with converted mana cost 3 or less"); + private static final FilterPermanentCard filter = new FilterPermanentCard("Mercenary permanent card with mana value 3 or less"); static { filter.add(SubType.MERCENARY.getPredicate()); - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 4)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 4)); } public RathiFiend(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RathiIntimidator.java b/Mage.Sets/src/mage/cards/r/RathiIntimidator.java index 58a2286725b..b5c282d24fc 100644 --- a/Mage.Sets/src/mage/cards/r/RathiIntimidator.java +++ b/Mage.Sets/src/mage/cards/r/RathiIntimidator.java @@ -16,7 +16,7 @@ import mage.constants.ComparisonType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterPermanentCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.target.common.TargetCardInLibrary; /** @@ -25,11 +25,11 @@ import mage.target.common.TargetCardInLibrary; */ public final class RathiIntimidator extends CardImpl { - private static final FilterPermanentCard filter = new FilterPermanentCard("Mercenary permanent card with converted mana cost 2 or less"); + private static final FilterPermanentCard filter = new FilterPermanentCard("Mercenary permanent card with mana value 2 or less"); static { filter.add(SubType.MERCENARY.getPredicate()); - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 3)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 3)); } public RathiIntimidator(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RazorHippogriff.java b/Mage.Sets/src/mage/cards/r/RazorHippogriff.java index 4974aefeb33..fe71f9a1de4 100644 --- a/Mage.Sets/src/mage/cards/r/RazorHippogriff.java +++ b/Mage.Sets/src/mage/cards/r/RazorHippogriff.java @@ -58,7 +58,7 @@ public final class RazorHippogriff extends CardImpl { public RazorHippogriffGainLifeEffect() { super(Outcome.GainLife); - staticText = "you gain life equal to that card's converted mana cost."; + staticText = "you gain life equal to that card's mana value."; } public RazorHippogriffGainLifeEffect(final RazorHippogriffGainLifeEffect effect) { @@ -79,7 +79,7 @@ public final class RazorHippogriff extends CardImpl { card = (Card)game.getLastKnownInformation(source.getFirstTarget(), Zone.GRAVEYARD); } if (card != null) { - player.gainLife(card.getConvertedManaCost(), game, source); + player.gainLife(card.getManaValue(), game, source); } } return true; diff --git a/Mage.Sets/src/mage/cards/r/Reanimate.java b/Mage.Sets/src/mage/cards/r/Reanimate.java index 551035fafc3..8b136ada50d 100644 --- a/Mage.Sets/src/mage/cards/r/Reanimate.java +++ b/Mage.Sets/src/mage/cards/r/Reanimate.java @@ -2,7 +2,7 @@ package mage.cards.r; import java.util.UUID; -import mage.abilities.dynamicvalue.common.TargetConvertedManaCost; +import mage.abilities.dynamicvalue.common.TargetManaValue; import mage.abilities.effects.Effect; import mage.abilities.effects.common.LoseLifeSourceControllerEffect; import mage.abilities.effects.common.ReturnFromGraveyardToBattlefieldTargetEffect; @@ -25,8 +25,8 @@ public final class Reanimate extends CardImpl { // Put target creature card from a graveyard onto the battlefield under your control. You lose life equal to its converted mana cost. getSpellAbility().addTarget(new TargetCardInGraveyard(new FilterCreatureCard("creature card from a graveyard"))); getSpellAbility().addEffect(new ReturnFromGraveyardToBattlefieldTargetEffect()); - Effect effect = new LoseLifeSourceControllerEffect(TargetConvertedManaCost.instance); - effect.setText("You lose life equal to its converted mana cost"); + Effect effect = new LoseLifeSourceControllerEffect(TargetManaValue.instance); + effect.setText("You lose life equal to its mana value"); getSpellAbility().addEffect(effect); } diff --git a/Mage.Sets/src/mage/cards/r/RebbecArchitectOfAscension.java b/Mage.Sets/src/mage/cards/r/RebbecArchitectOfAscension.java index dbbb495ff28..1720c48f8c3 100644 --- a/Mage.Sets/src/mage/cards/r/RebbecArchitectOfAscension.java +++ b/Mage.Sets/src/mage/cards/r/RebbecArchitectOfAscension.java @@ -27,7 +27,7 @@ import java.util.UUID; public final class RebbecArchitectOfAscension extends CardImpl { private static final FilterCard filter - = new FilterCard("each converted mana cost among artifacts you control"); + = new FilterCard("each mana value among artifacts you control"); static { filter.add(RebbecArchitectOfAscensionPredicate.instance); @@ -73,7 +73,7 @@ enum RebbecArchitectOfAscensionPredicate implements ObjectSourcePlayerPredicate< game.getControllerId(input.getSourceId()), input.getSourceId(), game ).stream() .filter(Objects::nonNull) - .mapToInt(MageObject::getConvertedManaCost) - .anyMatch(n -> input.getObject().getConvertedManaCost() == n); + .mapToInt(MageObject::getManaValue) + .anyMatch(n -> input.getObject().getManaValue() == n); } } diff --git a/Mage.Sets/src/mage/cards/r/RefuseCooperate.java b/Mage.Sets/src/mage/cards/r/RefuseCooperate.java index a1022fdaae0..92c6de21674 100644 --- a/Mage.Sets/src/mage/cards/r/RefuseCooperate.java +++ b/Mage.Sets/src/mage/cards/r/RefuseCooperate.java @@ -52,7 +52,7 @@ class RefuseEffect extends OneShotEffect { public RefuseEffect() { super(Outcome.Damage); - staticText = "Refuse deals damage to target spell's controller equal to that spell's converted mana cost"; + staticText = "Refuse deals damage to target spell's controller equal to that spell's mana value"; } public RefuseEffect(final RefuseEffect effect) { @@ -72,7 +72,7 @@ class RefuseEffect extends OneShotEffect { if (spell != null) { Player spellController = game.getPlayer(spell.getControllerId()); if (spellController != null) { - spellController.damage(spell.getConvertedManaCost(), source.getSourceId(), source, game); + spellController.damage(spell.getManaValue(), source.getSourceId(), source, game); return true; } } diff --git a/Mage.Sets/src/mage/cards/r/ReidaneGodOfTheWorthy.java b/Mage.Sets/src/mage/cards/r/ReidaneGodOfTheWorthy.java index 4acef9309df..a8d2bd400ec 100644 --- a/Mage.Sets/src/mage/cards/r/ReidaneGodOfTheWorthy.java +++ b/Mage.Sets/src/mage/cards/r/ReidaneGodOfTheWorthy.java @@ -121,7 +121,7 @@ class ReidaneGodOfTheWorthyCostEffect extends CostModificationEffectImpl { ReidaneGodOfTheWorthyCostEffect() { super(Duration.WhileOnBattlefield, Outcome.Benefit, CostModificationType.INCREASE_COST); - staticText = "Noncreature spells your opponents cast with converted mana cost 4 or greater cost {2} more to cast"; + staticText = "Noncreature spells your opponents cast with mana value 4 or greater cost {2} more to cast"; } private ReidaneGodOfTheWorthyCostEffect(ReidaneGodOfTheWorthyCostEffect effect) { @@ -142,7 +142,7 @@ class ReidaneGodOfTheWorthyCostEffect extends CostModificationEffectImpl { return false; } Card spellCard = ((SpellAbility) abilityToModify).getCharacteristics(game); - return spellCard != null && !spellCard.isCreature() && spellCard.getConvertedManaCost() >= 4; + return spellCard != null && !spellCard.isCreature() && spellCard.getManaValue() >= 4; } @Override diff --git a/Mage.Sets/src/mage/cards/r/Reinterpret.java b/Mage.Sets/src/mage/cards/r/Reinterpret.java index b5a54f80b25..3f8276acb85 100644 --- a/Mage.Sets/src/mage/cards/r/Reinterpret.java +++ b/Mage.Sets/src/mage/cards/r/Reinterpret.java @@ -59,7 +59,7 @@ class ReinterpretEffect extends OneShotEffect { if (spell == null) { return false; } - int manaValue = spell.getConvertedManaCost(); + int manaValue = spell.getManaValue(); spell.counter(source, game); new CastWithoutPayingManaCostEffect(manaValue).apply(game, source); return true; diff --git a/Mage.Sets/src/mage/cards/r/RelentlessDead.java b/Mage.Sets/src/mage/cards/r/RelentlessDead.java index f08c7b57a8d..b248eeaf51e 100644 --- a/Mage.Sets/src/mage/cards/r/RelentlessDead.java +++ b/Mage.Sets/src/mage/cards/r/RelentlessDead.java @@ -14,7 +14,7 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.AnotherCardPredicate; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCardInYourGraveyard; @@ -57,7 +57,7 @@ class RelentlessDeadEffect extends OneShotEffect { public RelentlessDeadEffect() { super(Outcome.PutCardInPlay); - this.staticText = "you may pay {X}. If you do, return another target Zombie creature card with converted mana cost X from your graveyard to the battlefield"; + this.staticText = "you may pay {X}. If you do, return another target Zombie creature card with mana value X from your graveyard to the battlefield"; } public RelentlessDeadEffect(final RelentlessDeadEffect effect) { @@ -76,9 +76,9 @@ class RelentlessDeadEffect extends OneShotEffect { if (controller.chooseUse(Outcome.Benefit, "Do you want to pay {X} to return zombie?", source, game)) { int payCount = ManaUtil.playerPaysXGenericMana(true, "Relentless Dead", controller, source, game); // can be 0 - FilterCard filter = new FilterCard("Another target Zombie card with converted mana cost {" + payCount + "}"); + FilterCard filter = new FilterCard("Another target Zombie card with mana value {" + payCount + "}"); filter.add(SubType.ZOMBIE.getPredicate()); - filter.add(new ConvertedManaCostPredicate(ComparisonType.EQUAL_TO, payCount)); + filter.add(new ManaValuePredicate(ComparisonType.EQUAL_TO, payCount)); filter.add(new AnotherCardPredicate()); TargetCardInYourGraveyard target = new TargetCardInYourGraveyard(filter); if (controller.chooseTarget(outcome, target, source, game)) { diff --git a/Mage.Sets/src/mage/cards/r/RendingVines.java b/Mage.Sets/src/mage/cards/r/RendingVines.java index f11e269b710..10ad200f452 100644 --- a/Mage.Sets/src/mage/cards/r/RendingVines.java +++ b/Mage.Sets/src/mage/cards/r/RendingVines.java @@ -49,7 +49,7 @@ class RendingVinesEffect extends OneShotEffect { public RendingVinesEffect() { super(Outcome.DestroyPermanent); - this.staticText = "Destroy target artifact or enchantment if its converted mana cost is less than or equal to the number of cards in your hand"; + this.staticText = "Destroy target artifact or enchantment if its mana value is less than or equal to the number of cards in your hand"; } public RendingVinesEffect(final RendingVinesEffect effect) { @@ -66,7 +66,7 @@ class RendingVinesEffect extends OneShotEffect { Player controller = game.getPlayer(source.getControllerId()); Permanent permanent = game.getPermanent(getTargetPointer().getFirst(game, source)); if (controller != null) { - if (permanent.getConvertedManaCost() <= controller.getHand().size()) { + if (permanent.getManaValue() <= controller.getHand().size()) { return permanent.destroy(source, game, false); } } diff --git a/Mage.Sets/src/mage/cards/r/RenegadeRallier.java b/Mage.Sets/src/mage/cards/r/RenegadeRallier.java index 6fb75d765a7..655ccb7de04 100644 --- a/Mage.Sets/src/mage/cards/r/RenegadeRallier.java +++ b/Mage.Sets/src/mage/cards/r/RenegadeRallier.java @@ -15,7 +15,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.ComparisonType; import mage.filter.common.FilterPermanentCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.target.common.TargetCardInYourGraveyard; import mage.watchers.common.RevoltWatcher; @@ -25,10 +25,10 @@ import mage.watchers.common.RevoltWatcher; */ public final class RenegadeRallier extends CardImpl { - private static final FilterPermanentCard filter = new FilterPermanentCard("permanent card with converted mana cost 2 or less from your graveyard"); + private static final FilterPermanentCard filter = new FilterPermanentCard("permanent card with mana value 2 or less from your graveyard"); static { - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 3)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 3)); } public RenegadeRallier(UUID ownerId, CardSetInfo setInfo) { @@ -44,7 +44,7 @@ public final class RenegadeRallier extends CardImpl { Ability ability = new ConditionalInterveningIfTriggeredAbility(new EntersBattlefieldTriggeredAbility( new ReturnFromGraveyardToBattlefieldTargetEffect(), false), RevoltCondition.instance, "Revolt — When {this} enters the battlefield, if a permanent you controlled left" - + " the battlefield this turn, return target permanent card with converted mana cost 2 or less from your graveyard to your battlefield."); + + " the battlefield this turn, return target permanent card with mana value 2 or less from your graveyard to your battlefield."); ability.setAbilityWord(AbilityWord.REVOLT); ability.addTarget(new TargetCardInYourGraveyard(filter)); ability.addWatcher(new RevoltWatcher()); diff --git a/Mage.Sets/src/mage/cards/r/Repeal.java b/Mage.Sets/src/mage/cards/r/Repeal.java index 097bf7c2c16..c62b6f84fd7 100644 --- a/Mage.Sets/src/mage/cards/r/Repeal.java +++ b/Mage.Sets/src/mage/cards/r/Repeal.java @@ -9,7 +9,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.ComparisonType; import mage.filter.common.FilterNonlandPermanent; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.target.TargetPermanent; import mage.target.common.TargetNonlandPermanent; @@ -26,7 +26,7 @@ public final class Repeal extends CardImpl { // Return target nonland permanent with converted mana cost X to its owner's hand. this.getSpellAbility().addEffect(new ReturnToHandTargetEffect()); - this.getSpellAbility().addTarget(new TargetPermanent(new FilterNonlandPermanent("nonland permanent with converted mana cost X"))); + this.getSpellAbility().addTarget(new TargetPermanent(new FilterNonlandPermanent("nonland permanent with mana value X"))); this.getSpellAbility().setTargetAdjuster(RepealAdjuster.instance); // Draw a card. @@ -50,8 +50,8 @@ enum RepealAdjuster implements TargetAdjuster { public void adjustTargets(Ability ability, Game game) { ability.getTargets().clear(); int xValue = ability.getManaCostsToPay().getX(); - FilterNonlandPermanent filter = new FilterNonlandPermanent("nonland permanent with converted mana cost " + xValue); - filter.add(new ConvertedManaCostPredicate(ComparisonType.EQUAL_TO, xValue)); + FilterNonlandPermanent filter = new FilterNonlandPermanent("nonland permanent with mana value " + xValue); + filter.add(new ManaValuePredicate(ComparisonType.EQUAL_TO, xValue)); ability.addTarget(new TargetNonlandPermanent(filter)); } } diff --git a/Mage.Sets/src/mage/cards/r/Rethink.java b/Mage.Sets/src/mage/cards/r/Rethink.java index c1cb49241f4..0337ad7836b 100644 --- a/Mage.Sets/src/mage/cards/r/Rethink.java +++ b/Mage.Sets/src/mage/cards/r/Rethink.java @@ -42,7 +42,7 @@ class RethinkEffect extends OneShotEffect { RethinkEffect() { super(Outcome.Detriment); - this.staticText = "Counter target spell unless that player pays {X}, where X is its converted mana cost"; + this.staticText = "Counter target spell unless that player pays {X}, where X is its mana value"; } RethinkEffect(final RethinkEffect effect) { @@ -60,7 +60,7 @@ class RethinkEffect extends OneShotEffect { if (spell != null) { Player player = game.getPlayer(spell.getControllerId()); if (player != null) { - Cost cost = ManaUtil.createManaCost(spell.getConvertedManaCost(), true); + Cost cost = ManaUtil.createManaCost(spell.getManaValue(), true); if (!cost.pay(source, game, source, player.getId(), false)) { game.getStack().counter(spell.getId(), source, game); } diff --git a/Mage.Sets/src/mage/cards/r/ReturnToTheRanks.java b/Mage.Sets/src/mage/cards/r/ReturnToTheRanks.java index 90802fa7a79..a2189dbc05d 100644 --- a/Mage.Sets/src/mage/cards/r/ReturnToTheRanks.java +++ b/Mage.Sets/src/mage/cards/r/ReturnToTheRanks.java @@ -10,7 +10,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.ComparisonType; import mage.filter.common.FilterCreatureCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.target.common.TargetCardInYourGraveyard; import mage.target.targetadjustment.TargetAdjuster; @@ -30,7 +30,7 @@ public final class ReturnToTheRanks extends CardImpl { // Return X target creature cards with converted mana cost 2 or less from your graveyard to the battlefield. Effect effect = new ReturnFromGraveyardToBattlefieldTargetEffect(); - effect.setText("Return X target creature cards with converted mana cost 2 or less from your graveyard to the battlefield"); + effect.setText("Return X target creature cards with mana value 2 or less from your graveyard to the battlefield"); this.getSpellAbility().addEffect(effect); this.getSpellAbility().setTargetAdjuster(ReturnToTheRanksAdjuster.instance); } @@ -47,10 +47,10 @@ public final class ReturnToTheRanks extends CardImpl { enum ReturnToTheRanksAdjuster implements TargetAdjuster { instance; - private static final FilterCreatureCard filter = new FilterCreatureCard("creature cards with converted mana cost 2 or less from your graveyard"); + private static final FilterCreatureCard filter = new FilterCreatureCard("creature cards with mana value 2 or less from your graveyard"); static { - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 3)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 3)); } @Override diff --git a/Mage.Sets/src/mage/cards/r/RevivalRevenge.java b/Mage.Sets/src/mage/cards/r/RevivalRevenge.java index b2c530e8cc0..c17ae5534ca 100644 --- a/Mage.Sets/src/mage/cards/r/RevivalRevenge.java +++ b/Mage.Sets/src/mage/cards/r/RevivalRevenge.java @@ -11,7 +11,7 @@ import mage.constants.Outcome; import mage.constants.SpellAbilityType; import mage.filter.FilterCard; import mage.filter.common.FilterCreatureCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCardInYourGraveyard; @@ -25,10 +25,10 @@ import java.util.UUID; public final class RevivalRevenge extends SplitCard { private static final FilterCard filter - = new FilterCreatureCard("creature card with converted mana cost 3 or less from your graveyard"); + = new FilterCreatureCard("creature card with mana value 3 or less from your graveyard"); static { - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 4)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 4)); } public RevivalRevenge(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RevivingVapors.java b/Mage.Sets/src/mage/cards/r/RevivingVapors.java index 112fac99b40..8acd1dcc264 100644 --- a/Mage.Sets/src/mage/cards/r/RevivingVapors.java +++ b/Mage.Sets/src/mage/cards/r/RevivingVapors.java @@ -40,7 +40,7 @@ class RevivingVaporsEffect extends OneShotEffect { public RevivingVaporsEffect() { super(Outcome.Benefit); - staticText = "Reveal the top three cards of your library and put one of them into your hand. You gain life equal to that card's converted mana cost. Put all other cards revealed this way into your graveyard"; + staticText = "Reveal the top three cards of your library and put one of them into your hand. You gain life equal to that card's mana value. Put all other cards revealed this way into your graveyard"; } public RevivingVaporsEffect(final RevivingVaporsEffect effect) { @@ -75,7 +75,7 @@ class RevivingVaporsEffect extends OneShotEffect { controller.moveCards(card, Zone.HAND, source, game); // You gain life equal to that card's converted mana cost - controller.gainLife(card.getConvertedManaCost(), game, source); + controller.gainLife(card.getManaValue(), game, source); } // Put all other cards revealed this way into your graveyard diff --git a/Mage.Sets/src/mage/cards/r/RewardTheFaithful.java b/Mage.Sets/src/mage/cards/r/RewardTheFaithful.java index c067c1c8567..dd925af7414 100644 --- a/Mage.Sets/src/mage/cards/r/RewardTheFaithful.java +++ b/Mage.Sets/src/mage/cards/r/RewardTheFaithful.java @@ -2,7 +2,7 @@ package mage.cards.r; import java.util.UUID; -import mage.abilities.dynamicvalue.common.HighestConvertedManaCostValue; +import mage.abilities.dynamicvalue.common.HighestManaValueCount; import mage.abilities.effects.common.GainLifeTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -19,8 +19,8 @@ public final class RewardTheFaithful extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{W}"); // Any number of target players each gain life equal to the highest converted mana cost among permanents you control. - this.getSpellAbility().addEffect(new GainLifeTargetEffect(new HighestConvertedManaCostValue()) - .setText("Any number of target players each gain life equal to the highest converted mana cost among permanents you control.")); + this.getSpellAbility().addEffect(new GainLifeTargetEffect(new HighestManaValueCount()) + .setText("Any number of target players each gain life equal to the highest mana value among permanents you control.")); this.getSpellAbility().addTarget(new TargetPlayer(0, Integer.MAX_VALUE, false)); } diff --git a/Mage.Sets/src/mage/cards/r/Rey.java b/Mage.Sets/src/mage/cards/r/Rey.java index 19b9183566b..33a70ca6463 100644 --- a/Mage.Sets/src/mage/cards/r/Rey.java +++ b/Mage.Sets/src/mage/cards/r/Rey.java @@ -60,7 +60,7 @@ class ReyEffect extends OneShotEffect { public ReyEffect() { super(Outcome.Detriment); - staticText = "reveal the top card of target player's library. You gain life equal to that card's converted mana cost"; + staticText = "reveal the top card of target player's library. You gain life equal to that card's mana value"; } public ReyEffect(final ReyEffect effect) { @@ -86,7 +86,7 @@ class ReyEffect extends OneShotEffect { // You gain life equal to that card's converted mana cost. if (topCard != null) { - controller.gainLife(topCard.getConvertedManaCost(), game, source); + controller.gainLife(topCard.getManaValue(), game, source); } } diff --git a/Mage.Sets/src/mage/cards/r/RiddleOfLightning.java b/Mage.Sets/src/mage/cards/r/RiddleOfLightning.java index 43964e4b246..04e0288b4ec 100644 --- a/Mage.Sets/src/mage/cards/r/RiddleOfLightning.java +++ b/Mage.Sets/src/mage/cards/r/RiddleOfLightning.java @@ -47,7 +47,7 @@ class RiddleOfLightningEffect extends OneShotEffect { public RiddleOfLightningEffect() { super(Outcome.Damage); - this.staticText = ", then reveal the top card of your library. {this} deals damage equal to that card's converted mana cost to that permanent or player"; + this.staticText = ", then reveal the top card of your library. {this} deals damage equal to that card's mana value to that permanent or player"; } public RiddleOfLightningEffect(final RiddleOfLightningEffect effect) { @@ -69,12 +69,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.getConvertedManaCost(), source.getSourceId(), source, game, false, true); + targetCreature.damage(card.getManaValue(), source.getSourceId(), source, game, false, true); return true; } Player targetPlayer = game.getPlayer(this.getTargetPointer().getFirst(game, source)); if (targetPlayer != null) { - targetPlayer.damage(card.getConvertedManaCost(), source.getSourceId(), source, game); + targetPlayer.damage(card.getManaValue(), source.getSourceId(), source, game); return true; } } diff --git a/Mage.Sets/src/mage/cards/r/RitualOfSoot.java b/Mage.Sets/src/mage/cards/r/RitualOfSoot.java index 0a2b9d209df..143d34e0841 100644 --- a/Mage.Sets/src/mage/cards/r/RitualOfSoot.java +++ b/Mage.Sets/src/mage/cards/r/RitualOfSoot.java @@ -8,7 +8,7 @@ import mage.constants.CardType; import mage.constants.ComparisonType; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; /** * @@ -16,10 +16,10 @@ import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; */ public final class RitualOfSoot extends CardImpl { - private static final FilterPermanent filter = new FilterCreaturePermanent("creatures with converted mana cost 3 or less"); + private static final FilterPermanent filter = new FilterCreaturePermanent("creatures with mana value 3 or less"); static { - filter.add(new ConvertedManaCostPredicate( + filter.add(new ManaValuePredicate( ComparisonType.FEWER_THAN, 4 )); } diff --git a/Mage.Sets/src/mage/cards/r/RuinRaider.java b/Mage.Sets/src/mage/cards/r/RuinRaider.java index 0f4efc98fa6..7459f2518ba 100644 --- a/Mage.Sets/src/mage/cards/r/RuinRaider.java +++ b/Mage.Sets/src/mage/cards/r/RuinRaider.java @@ -34,7 +34,7 @@ public final class RuinRaider extends CardImpl { RaidCondition.instance, "Raid — At the beginning of your end step, if you attacked this turn, " + "reveal the top card of your library and put that card into your hand. " - + "You lose life equal to the card's converted mana cost."); + + "You lose life equal to the card's mana value."); ability.setAbilityWord(AbilityWord.RAID); ability.addHint(RaidHint.instance); this.addAbility(ability, new PlayerAttackedWatcher()); @@ -54,7 +54,7 @@ class RuinRaiderEffect extends OneShotEffect { RuinRaiderEffect() { super(Outcome.DrawCard); - this.staticText = "reveal the top card of your library and put that card into your hand. You lose life equal to its converted mana cost"; + this.staticText = "reveal the top card of your library and put that card into your hand. You lose life equal to its mana value"; } RuinRaiderEffect(final RuinRaiderEffect effect) { @@ -71,7 +71,7 @@ class RuinRaiderEffect extends OneShotEffect { Cards cards = new CardsImpl(card); controller.revealCards(source, cards, game); controller.moveCards(card, Zone.HAND, source, game); - controller.loseLife(card.getConvertedManaCost(), game, source, false); + controller.loseLife(card.getManaValue(), game, source, false); } return true; } diff --git a/Mage.Sets/src/mage/cards/r/RushOfKnowledge.java b/Mage.Sets/src/mage/cards/r/RushOfKnowledge.java index cc4caee959e..d271dced86b 100644 --- a/Mage.Sets/src/mage/cards/r/RushOfKnowledge.java +++ b/Mage.Sets/src/mage/cards/r/RushOfKnowledge.java @@ -2,7 +2,7 @@ package mage.cards.r; import java.util.UUID; -import mage.abilities.dynamicvalue.common.HighestConvertedManaCostValue; +import mage.abilities.dynamicvalue.common.HighestManaValueCount; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -18,8 +18,8 @@ public final class RushOfKnowledge extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{4}{U}"); // Draw cards equal to the highest converted mana cost among permanents you control. - DrawCardSourceControllerEffect effect = new DrawCardSourceControllerEffect(new HighestConvertedManaCostValue()); - effect.setText("Draw cards equal to the highest converted mana cost among permanents you control"); + DrawCardSourceControllerEffect effect = new DrawCardSourceControllerEffect(new HighestManaValueCount()); + effect.setText("Draw cards equal to the highest mana value among permanents you control"); this.getSpellAbility().addEffect(effect); } diff --git a/Mage.Sets/src/mage/cards/r/RushedRebirth.java b/Mage.Sets/src/mage/cards/r/RushedRebirth.java index af4f6794e13..b4d79618f31 100644 --- a/Mage.Sets/src/mage/cards/r/RushedRebirth.java +++ b/Mage.Sets/src/mage/cards/r/RushedRebirth.java @@ -88,7 +88,7 @@ class RushedRebirthDelayedTriggeredAbility extends DelayedTriggeredAbility { @Override public boolean apply(Card input, Game game) { - return input.getConvertedManaCost() < permanent.getConvertedManaCost(); + return input.getManaValue() < permanent.getManaValue(); } } diff --git a/Mage.Sets/src/mage/cards/s/Sacrifice.java b/Mage.Sets/src/mage/cards/s/Sacrifice.java index 061885b961f..9824e920dff 100644 --- a/Mage.Sets/src/mage/cards/s/Sacrifice.java +++ b/Mage.Sets/src/mage/cards/s/Sacrifice.java @@ -25,7 +25,7 @@ public final class Sacrifice extends CardImpl { this.getSpellAbility().addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(FILTER_CONTROLLED_CREATURE_SHORT_TEXT))); // Add an amount of {B} equal to the sacrificed creature's converted mana cost. this.getSpellAbility().addEffect(new DynamicManaEffect(Mana.BlackMana(1), new SacrificeCostConvertedMana("creature"), - "add an amount of {B} equal to the sacrificed creature's converted mana cost")); + "add an amount of {B} equal to the sacrificed creature's mana value")); } private Sacrifice(final Sacrifice card) { diff --git a/Mage.Sets/src/mage/cards/s/SaheelisDirective.java b/Mage.Sets/src/mage/cards/s/SaheelisDirective.java index 70b52465786..4ec7f52a28e 100644 --- a/Mage.Sets/src/mage/cards/s/SaheelisDirective.java +++ b/Mage.Sets/src/mage/cards/s/SaheelisDirective.java @@ -14,7 +14,7 @@ import mage.constants.Outcome; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.common.FilterArtifactCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.players.Player; import mage.target.TargetCard; @@ -51,7 +51,7 @@ class SaheelisDirectiveEffect extends OneShotEffect { super(Outcome.PutCardInPlay); staticText = "Reveal the top X cards of your library. " + "You may put any number of artifact cards with " - + "converted mana cost X or less from among them onto the battlefield. " + + "mana value X or less from among them onto the battlefield. " + "Then put all cards revealed this way that weren't " + "put onto the battlefield into your graveyard."; } @@ -70,8 +70,8 @@ class SaheelisDirectiveEffect extends OneShotEffect { Cards cards = new CardsImpl(controller.getLibrary().getTopCards(game, xValue)); if (!cards.isEmpty()) { controller.revealCards(source, cards, game); - FilterCard filter = new FilterArtifactCard("artifact cards with converted mana cost " + xValue + " or less to put onto the battlefield"); - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, xValue + 1)); + FilterCard filter = new FilterArtifactCard("artifact cards with mana value " + xValue + " or less to put onto the battlefield"); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, xValue + 1)); TargetCard target1 = new TargetCard(0, Integer.MAX_VALUE, Zone.LIBRARY, filter); target1.setNotTarget(true); controller.choose(Outcome.PutCardInPlay, cards, target1, game); diff --git a/Mage.Sets/src/mage/cards/s/SaiTok.java b/Mage.Sets/src/mage/cards/s/SaiTok.java index fb5387db8a2..69684d40f9e 100644 --- a/Mage.Sets/src/mage/cards/s/SaiTok.java +++ b/Mage.Sets/src/mage/cards/s/SaiTok.java @@ -8,7 +8,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.ComparisonType; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.target.TargetPermanent; /** @@ -17,12 +17,12 @@ import mage.target.TargetPermanent; */ public final class SaiTok extends CardImpl { - private static final FilterPermanent filter = new FilterPermanent("creature or planeswalker if it has converted mana cost 4 or less"); + private static final FilterPermanent filter = new FilterPermanent("creature or planeswalker if it has mana value 4 or less"); static { filter.add(CardType.CREATURE.getPredicate()); filter.add(CardType.PLANESWALKER.getPredicate()); - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 5)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 5)); } public SaiTok(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SalvageTrader.java b/Mage.Sets/src/mage/cards/s/SalvageTrader.java index f3233e42a57..76e21c7352f 100644 --- a/Mage.Sets/src/mage/cards/s/SalvageTrader.java +++ b/Mage.Sets/src/mage/cards/s/SalvageTrader.java @@ -34,7 +34,7 @@ public final class SalvageTrader extends CardImpl { // {T}: Exchange control of target artifact you control and target artifact an opponent controls with the same converted mana cost. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExchangeControlTargetEffect(Duration.EndOfGame, - "Exchange control of target artifact you control and target artifact an opponent controls with the same converted mana cost", false, true), + "Exchange control of target artifact you control and target artifact an opponent controls with the same mana value", false, true), new TapSourceCost()); FilterArtifactPermanent filterYou = new FilterArtifactPermanent("artifact you control"); filterYou.add(TargetController.YOU.getControllerPredicate()); @@ -71,7 +71,7 @@ class SameCastingCostPredicate implements ObjectSourcePlayerPredicate 2) { + if (spell == null || !spell.isInstantOrSorcery() || spell.getManaValue() > 2) { return false; } for (Effect effect : this.getEffects()) { @@ -101,7 +101,7 @@ class SeaGateStormcallerDelayedTriggeredAbility extends DelayedTriggeredAbility @Override public String getRule() { - return "When you cast your next instant or sorcery spell this turn with converted mana cost 2 or less, " + + return "When you cast your next instant or sorcery spell this turn with mana value 2 or less, " + "copy that spell" + (twice ? " twice" : "") + ". You may choose new targets for the cop" + (twice ? "ies" : "y") + "."; } diff --git a/Mage.Sets/src/mage/cards/s/SeasonsPast.java b/Mage.Sets/src/mage/cards/s/SeasonsPast.java index d478fb5ecb0..efdc6f6abc5 100644 --- a/Mage.Sets/src/mage/cards/s/SeasonsPast.java +++ b/Mage.Sets/src/mage/cards/s/SeasonsPast.java @@ -47,7 +47,7 @@ class SeasonsPastEffect extends OneShotEffect { public SeasonsPastEffect() { super(Outcome.ReturnToHand); - this.staticText = "Return any number of cards with different converted mana costs from your graveyard to your hand"; + this.staticText = "Return any number of cards with different mana values from your graveyard to your hand"; } public SeasonsPastEffect(final SeasonsPastEffect effect) { @@ -75,7 +75,7 @@ class SeasonsPastEffect extends OneShotEffect { class SeasonsPastTarget extends TargetCardInYourGraveyard { public SeasonsPastTarget() { - super(0, Integer.MAX_VALUE, new FilterCard("cards with different converted mana costs from your graveyard")); + super(0, Integer.MAX_VALUE, new FilterCard("cards with different mana values from your graveyard")); } public SeasonsPastTarget(SeasonsPastTarget target) { @@ -88,14 +88,14 @@ class SeasonsPastTarget extends TargetCardInYourGraveyard { for (UUID targetId : this.getTargets()) { Card card = game.getCard(targetId); if (card != null) { - usedCMC.add(card.getConvertedManaCost()); + usedCMC.add(card.getManaValue()); } } 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.getConvertedManaCost())) { + if (card != null && !usedCMC.contains(card.getManaValue())) { leftPossibleTargets.add(targetId); } } @@ -109,11 +109,11 @@ class SeasonsPastTarget extends TargetCardInYourGraveyard { for (UUID targetId : this.getTargets()) { Card card = game.getCard(targetId); if (card != null) { - usedCMC.add(card.getConvertedManaCost()); + usedCMC.add(card.getManaValue()); } } Card card = game.getCard(objectId); - return card != null && !usedCMC.contains(card.getConvertedManaCost()); + return card != null && !usedCMC.contains(card.getManaValue()); } return false; } diff --git a/Mage.Sets/src/mage/cards/s/SeedsOfInnocence.java b/Mage.Sets/src/mage/cards/s/SeedsOfInnocence.java index 9cd97377469..51f2ff6deee 100644 --- a/Mage.Sets/src/mage/cards/s/SeedsOfInnocence.java +++ b/Mage.Sets/src/mage/cards/s/SeedsOfInnocence.java @@ -41,7 +41,7 @@ class SeedsOfInnocenceEffect extends OneShotEffect { public SeedsOfInnocenceEffect() { super(Outcome.DestroyPermanent); - this.staticText = "Destroy all artifacts. They can't be regenerated. The controller of each of those artifacts gains life equal to its converted mana cost"; + this.staticText = "Destroy all artifacts. They can't be regenerated. The controller of each of those artifacts gains life equal to its mana value"; } public SeedsOfInnocenceEffect(final SeedsOfInnocenceEffect effect) { @@ -59,7 +59,7 @@ class SeedsOfInnocenceEffect extends OneShotEffect { if (controller != null) { for (Permanent artifact : game.getState().getBattlefield().getActivePermanents(new FilterArtifactPermanent(), controller.getId(), game)) { Player artifactController = game.getPlayer(artifact.getControllerId()); - int cmc = artifact.getConvertedManaCost(); + int cmc = artifact.getManaValue(); if (artifact.destroy(source, game, true)) { if(artifactController != null) { artifactController.gainLife(cmc, game, source); diff --git a/Mage.Sets/src/mage/cards/s/SequenceEngine.java b/Mage.Sets/src/mage/cards/s/SequenceEngine.java index 70d5c14049a..675c0b248d2 100644 --- a/Mage.Sets/src/mage/cards/s/SequenceEngine.java +++ b/Mage.Sets/src/mage/cards/s/SequenceEngine.java @@ -12,7 +12,7 @@ import mage.constants.CardType; import mage.constants.ComparisonType; import mage.filter.FilterCard; import mage.filter.common.FilterCreatureCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.game.permanent.token.QuandrixToken; import mage.target.common.TargetCardInGraveyard; @@ -60,7 +60,7 @@ enum SequenceEngineAdjuster implements TargetAdjuster { int xValue = ability.getManaCostsToPay().getX(); ability.getTargets().clear(); FilterCard filter = new FilterCreatureCard("creature card with mana value " + xValue); - filter.add(new ConvertedManaCostPredicate(ComparisonType.EQUAL_TO, xValue)); + filter.add(new ManaValuePredicate(ComparisonType.EQUAL_TO, xValue)); ability.addTarget(new TargetCardInGraveyard(filter)); } } diff --git a/Mage.Sets/src/mage/cards/s/SereneOffering.java b/Mage.Sets/src/mage/cards/s/SereneOffering.java index 905aeaecae9..13905b1e1a2 100644 --- a/Mage.Sets/src/mage/cards/s/SereneOffering.java +++ b/Mage.Sets/src/mage/cards/s/SereneOffering.java @@ -2,7 +2,7 @@ package mage.cards.s; import java.util.UUID; -import mage.abilities.dynamicvalue.common.TargetConvertedManaCost; +import mage.abilities.dynamicvalue.common.TargetManaValue; import mage.abilities.effects.Effect; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.effects.common.GainLifeEffect; @@ -22,8 +22,8 @@ public final class SereneOffering extends CardImpl { // Destroy target enchantment. You gain life equal to its converted mana cost. this.getSpellAbility().addEffect(new DestroyTargetEffect()); - Effect effect = new GainLifeEffect(TargetConvertedManaCost.instance); - effect.setText("You gain life equal to its converted mana cost"); + Effect effect = new GainLifeEffect(TargetManaValue.instance); + effect.setText("You gain life equal to its mana value"); this.getSpellAbility().addEffect(effect); this.getSpellAbility().addTarget(new TargetEnchantmentPermanent()); } diff --git a/Mage.Sets/src/mage/cards/s/SevinnesReclamation.java b/Mage.Sets/src/mage/cards/s/SevinnesReclamation.java index 002de9b2aa2..e60c3d23784 100644 --- a/Mage.Sets/src/mage/cards/s/SevinnesReclamation.java +++ b/Mage.Sets/src/mage/cards/s/SevinnesReclamation.java @@ -10,7 +10,7 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterCard; import mage.filter.common.FilterPermanentCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.game.stack.Spell; import mage.players.Player; @@ -24,10 +24,10 @@ import java.util.UUID; public final class SevinnesReclamation extends CardImpl { private static final FilterCard filter - = new FilterPermanentCard("permanent card with converted mana cost 3 or less from your graveyard"); + = new FilterPermanentCard("permanent card with mana value 3 or less from your graveyard"); static { - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 4)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 4)); } public SevinnesReclamation(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/ShadowsVerdict.java b/Mage.Sets/src/mage/cards/s/ShadowsVerdict.java index e0f9a253caf..cafcdc0dd85 100644 --- a/Mage.Sets/src/mage/cards/s/ShadowsVerdict.java +++ b/Mage.Sets/src/mage/cards/s/ShadowsVerdict.java @@ -16,7 +16,7 @@ import mage.filter.FilterPermanent; import mage.filter.common.FilterCreatureOrPlaneswalkerPermanent; import mage.filter.predicate.Predicate; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.players.Player; @@ -51,7 +51,7 @@ class ShadowsVerdictEffect extends OneShotEffect { private static final FilterPermanent filter = new FilterCreatureOrPlaneswalkerPermanent(); private static final FilterCard filter2 = new FilterCard(); private static final Predicate predicate - = new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 4); + = new ManaValuePredicate(ComparisonType.FEWER_THAN, 4); static { filter.add(predicate); @@ -64,8 +64,8 @@ class ShadowsVerdictEffect extends OneShotEffect { ShadowsVerdictEffect() { super(Outcome.Benefit); - staticText = "exile all creatures and all planeswalkers with converted mana cost 3 or less from the battlefield " + - "and all creature and planeswalker cards with converted mana cost 3 or less from all graveyards"; + staticText = "exile all creatures and all planeswalkers with mana value 3 or less from the battlefield " + + "and all creature and planeswalker cards with mana value 3 or less from all graveyards"; } private ShadowsVerdictEffect(final ShadowsVerdictEffect effect) { diff --git a/Mage.Sets/src/mage/cards/s/SharkTyphoon.java b/Mage.Sets/src/mage/cards/s/SharkTyphoon.java index 4462becf5de..cb4c2dc9c60 100644 --- a/Mage.Sets/src/mage/cards/s/SharkTyphoon.java +++ b/Mage.Sets/src/mage/cards/s/SharkTyphoon.java @@ -55,7 +55,7 @@ class SharkTyphoonCastEffect extends OneShotEffect { SharkTyphoonCastEffect() { super(Outcome.Benefit); - staticText = "create an X/X blue Shark creature token with flying, where X is that spell's converted mana cost"; + staticText = "create an X/X blue Shark creature token with flying, where X is that spell's mana value"; } private SharkTyphoonCastEffect(final SharkTyphoonCastEffect effect) { @@ -72,7 +72,7 @@ class SharkTyphoonCastEffect extends OneShotEffect { Spell spell = game.getSpellOrLKIStack(getTargetPointer().getFirst(game, source)); int xValue = 0; if (spell != null) { - xValue = spell.getConvertedManaCost(); + xValue = spell.getManaValue(); } return new SharkToken(xValue).putOntoBattlefield(1, game, source, source.getControllerId()); } diff --git a/Mage.Sets/src/mage/cards/s/ShepherdOfTheCosmos.java b/Mage.Sets/src/mage/cards/s/ShepherdOfTheCosmos.java index 720d7d14d07..c3e67d8cd43 100644 --- a/Mage.Sets/src/mage/cards/s/ShepherdOfTheCosmos.java +++ b/Mage.Sets/src/mage/cards/s/ShepherdOfTheCosmos.java @@ -13,7 +13,7 @@ import mage.constants.ComparisonType; import mage.constants.SubType; import mage.filter.FilterCard; import mage.filter.common.FilterPermanentCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.target.common.TargetCardInYourGraveyard; import java.util.UUID; @@ -24,11 +24,11 @@ import java.util.UUID; public final class ShepherdOfTheCosmos extends CardImpl { private static final FilterCard filter = new FilterPermanentCard( - "permanent card with converted mana cost 2 or less from your graveyard" + "permanent card with mana value 2 or less from your graveyard" ); static { - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 3)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 3)); } public ShepherdOfTheCosmos(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/ShiningShoal.java b/Mage.Sets/src/mage/cards/s/ShiningShoal.java index 53a0c47f04d..f918585c71a 100644 --- a/Mage.Sets/src/mage/cards/s/ShiningShoal.java +++ b/Mage.Sets/src/mage/cards/s/ShiningShoal.java @@ -38,7 +38,7 @@ public final class ShiningShoal extends CardImpl { this.subtype.add(SubType.ARCANE); // You may exile a white card with converted mana cost X from your hand rather than pay Shining Shoal's mana cost - FilterOwnedCard filter = new FilterOwnedCard("a white card with converted mana cost X from your hand"); + FilterOwnedCard filter = new FilterOwnedCard("a white card with mana value X from your hand"); filter.add(new ColorPredicate(ObjectColor.WHITE)); filter.add(Predicates.not(new CardIdPredicate(this.getId()))); // the exile cost can never be paid with the card itself this.addAbility(new AlternativeCostSourceAbility(new ExileFromHandCost(new TargetCardInHand(filter), true))); diff --git a/Mage.Sets/src/mage/cards/s/SickeningShoal.java b/Mage.Sets/src/mage/cards/s/SickeningShoal.java index 9c4f6ce122f..20a19d76676 100644 --- a/Mage.Sets/src/mage/cards/s/SickeningShoal.java +++ b/Mage.Sets/src/mage/cards/s/SickeningShoal.java @@ -34,7 +34,7 @@ public final class SickeningShoal extends CardImpl { // You may exile a black card with converted mana cost X from your hand rather than pay Sickening Shoal's mana cost. - FilterOwnedCard filter = new FilterOwnedCard("a black card with converted mana cost X from your hand"); + FilterOwnedCard filter = new FilterOwnedCard("a black card with mana value X from your hand"); filter.add(new ColorPredicate(ObjectColor.BLACK)); filter.add(Predicates.not(new CardIdPredicate(this.getId()))); // the exile cost can never be paid with the card itself this.addAbility(new AlternativeCostSourceAbility(new ExileFromHandCost(new TargetCardInHand(filter), true))); diff --git a/Mage.Sets/src/mage/cards/s/SifterWurm.java b/Mage.Sets/src/mage/cards/s/SifterWurm.java index 665c95e5bda..d5915ffbdc0 100644 --- a/Mage.Sets/src/mage/cards/s/SifterWurm.java +++ b/Mage.Sets/src/mage/cards/s/SifterWurm.java @@ -54,7 +54,7 @@ class SifterWurmEffect extends OneShotEffect { public SifterWurmEffect() { super(Outcome.DrawCard); - this.staticText = "scry 3, then reveal the top card of your library. You gain life equal to that card's converted mana cost."; + this.staticText = "scry 3, then reveal the top card of your library. You gain life equal to that card's mana value."; } public SifterWurmEffect(final SifterWurmEffect effect) { @@ -79,7 +79,7 @@ class SifterWurmEffect extends OneShotEffect { Cards cards = new CardsImpl(); cards.add(card); controller.revealCards(sourceObject.getIdName(), cards, game); - controller.gainLife(card.getConvertedManaCost(), game, source); + controller.gainLife(card.getManaValue(), game, source); } return true; } diff --git a/Mage.Sets/src/mage/cards/s/Silkwrap.java b/Mage.Sets/src/mage/cards/s/Silkwrap.java index d23697fd50c..ad197d354ae 100644 --- a/Mage.Sets/src/mage/cards/s/Silkwrap.java +++ b/Mage.Sets/src/mage/cards/s/Silkwrap.java @@ -15,7 +15,7 @@ import mage.constants.ComparisonType; import mage.constants.Outcome; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.TargetPermanent; @@ -27,10 +27,10 @@ import mage.util.CardUtil; */ public final class Silkwrap extends CardImpl { - private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with converted mana cost 3 or less an opponent controls"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with mana value 3 or less an opponent controls"); static { - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 4)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 4)); filter.add(TargetController.OPPONENT.getControllerPredicate()); } @@ -59,7 +59,7 @@ class SilkwrapEffect extends OneShotEffect { public SilkwrapEffect() { super(Outcome.Neutral); - this.staticText = "exile target creature with converted mana cost 3 or less an opponent controls until {this} leaves the battlefield. (That creature returns under its owner's control.)"; + this.staticText = "exile target creature with mana value 3 or less an opponent controls until {this} leaves the battlefield. (That creature returns under its owner's control.)"; } public SilkwrapEffect(final SilkwrapEffect effect) { diff --git a/Mage.Sets/src/mage/cards/s/SilverquillCommand.java b/Mage.Sets/src/mage/cards/s/SilverquillCommand.java index e97aa1fcec8..4543da487ee 100644 --- a/Mage.Sets/src/mage/cards/s/SilverquillCommand.java +++ b/Mage.Sets/src/mage/cards/s/SilverquillCommand.java @@ -16,7 +16,7 @@ import mage.constants.Duration; import mage.filter.FilterCard; import mage.filter.StaticFilters; import mage.filter.common.FilterCreatureCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.target.TargetPlayer; import mage.target.common.TargetCardInYourGraveyard; import mage.target.common.TargetCreaturePermanent; @@ -33,7 +33,7 @@ public final class SilverquillCommand extends CardImpl { = new FilterCreatureCard("creature card with mana value 2 or less from your graveyard"); static { - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 3)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 3)); } public SilverquillCommand(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SinProdder.java b/Mage.Sets/src/mage/cards/s/SinProdder.java index afc9f90c73e..965e931652d 100644 --- a/Mage.Sets/src/mage/cards/s/SinProdder.java +++ b/Mage.Sets/src/mage/cards/s/SinProdder.java @@ -49,7 +49,7 @@ class SinProdderEffect extends OneShotEffect { public SinProdderEffect() { super(Outcome.DrawCard); this.staticText = "reveal the top card of your library. Any opponent may have you put that card into your graveyard. If a player does, " - + "{this} deals damage to that player equal to that card's converted mana cost. Otherwise, put that card into your hand"; + + "{this} deals damage to that player equal to that card's mana value. Otherwise, put that card into your hand"; } public SinProdderEffect(final SinProdderEffect effect) { @@ -74,7 +74,7 @@ class SinProdderEffect extends OneShotEffect { Player opponent = game.getPlayer(opponentUuid); if (opponent != null && !putInGraveyard && opponent.chooseUse(Outcome.Damage, message, source, game)) { putInGraveyard = true; - opponent.damage(card.getConvertedManaCost(), source.getSourceId(), source, game); + opponent.damage(card.getManaValue(), source.getSourceId(), source, game); // 4/8/2016: Each opponent in turn order, starting with the one after you in turn order, may choose to have you put that card into your graveyard. // Once a player does so, Sin Prodder deals damage equal to that card's converted mana cost to that player immediately // and Sin Prodder's trigger has no further action. diff --git a/Mage.Sets/src/mage/cards/s/SingeMindOgre.java b/Mage.Sets/src/mage/cards/s/SingeMindOgre.java index 3ddefba0e3a..6a4bd783333 100644 --- a/Mage.Sets/src/mage/cards/s/SingeMindOgre.java +++ b/Mage.Sets/src/mage/cards/s/SingeMindOgre.java @@ -53,7 +53,7 @@ class SingeMindOgreEffect extends OneShotEffect { public SingeMindOgreEffect() { super(Outcome.LoseLife); - this.staticText = "target player reveals a card at random from their hand, then loses life equal to that card's converted mana cost"; + this.staticText = "target player reveals a card at random from their hand, then loses life equal to that card's mana value"; } public SingeMindOgreEffect(final SingeMindOgreEffect effect) { @@ -74,7 +74,7 @@ class SingeMindOgreEffect extends OneShotEffect { if (card != null) { revealed.add(card); targetPlayer.revealCards("Singe-Mind Ogre", revealed, game); - targetPlayer.loseLife(card.getConvertedManaCost(), game, source, false); + targetPlayer.loseLife(card.getManaValue(), game, source, false); return true; } } diff --git a/Mage.Sets/src/mage/cards/s/SisayWeatherlightCaptain.java b/Mage.Sets/src/mage/cards/s/SisayWeatherlightCaptain.java index 08f7634c3ad..120de0618f6 100644 --- a/Mage.Sets/src/mage/cards/s/SisayWeatherlightCaptain.java +++ b/Mage.Sets/src/mage/cards/s/SisayWeatherlightCaptain.java @@ -17,7 +17,7 @@ import mage.constants.*; import mage.filter.FilterCard; import mage.filter.StaticFilters; import mage.filter.common.FilterPermanentCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetCardInLibrary; @@ -98,7 +98,7 @@ class SisayWeatherlightCaptainEffect extends OneShotEffect { SisayWeatherlightCaptainEffect() { super(Outcome.Benefit); - staticText = "Search your library for a legendary permanent card with converted mana cost " + + staticText = "Search your library for a legendary permanent card with mana value " + "less than {this}'s power, put that card onto the battlefield, then shuffle your library."; } @@ -118,9 +118,9 @@ class SisayWeatherlightCaptainEffect extends OneShotEffect { return false; } int power = permanent.getPower().getValue(); - FilterCard filter = new FilterPermanentCard("legendary permanent card with converted mana cost less than " + power); + FilterCard filter = new FilterPermanentCard("legendary permanent card with mana value less than " + power); filter.add(SuperType.LEGENDARY.getPredicate()); - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, power)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, power)); return new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter)).apply(game, source); } } \ No newline at end of file diff --git a/Mage.Sets/src/mage/cards/s/SkyclaveApparition.java b/Mage.Sets/src/mage/cards/s/SkyclaveApparition.java index 12b70ecc408..55e68f277ca 100644 --- a/Mage.Sets/src/mage/cards/s/SkyclaveApparition.java +++ b/Mage.Sets/src/mage/cards/s/SkyclaveApparition.java @@ -13,7 +13,7 @@ import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.common.FilterNonlandPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.ExileZone; import mage.game.Game; @@ -33,13 +33,13 @@ import java.util.UUID; public final class SkyclaveApparition extends CardImpl { private static final FilterPermanent filter = new FilterNonlandPermanent( - "nonland, nontoken permanent you don't control with converted mana cost 4 or less" + "nonland, nontoken permanent you don't control with mana value 4 or less" ); static { filter.add(Predicates.not(TokenPredicate.instance)); filter.add(TargetController.NOT_YOU.getControllerPredicate()); - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 5)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 5)); } public SkyclaveApparition(UUID ownerId, CardSetInfo setInfo) { @@ -74,7 +74,7 @@ class SkyclaveApparitionEffect extends OneShotEffect { SkyclaveApparitionEffect() { super(Outcome.Benefit); staticText = "the exiled card's owner creates an X/X blue Illusion creature token, " + - "where X is the converted mana cost of the exiled card"; + "where X is the mana value of the exiled card"; } private SkyclaveApparitionEffect(final SkyclaveApparitionEffect effect) { @@ -107,7 +107,7 @@ class SkyclaveApparitionEffect extends OneShotEffect { .stream() .filter(Objects::nonNull) .map(card -> owners.add(card.getOwnerId()) ? card : card) - .mapToInt(MageObject::getConvertedManaCost) + .mapToInt(MageObject::getManaValue) .sum(); for (UUID playerId : owners) { new CustomIllusionToken(totalCMC).putOntoBattlefield(1, game, source, playerId); diff --git a/Mage.Sets/src/mage/cards/s/SkyfireKirin.java b/Mage.Sets/src/mage/cards/s/SkyfireKirin.java index 75483091431..aee7bfba358 100644 --- a/Mage.Sets/src/mage/cards/s/SkyfireKirin.java +++ b/Mage.Sets/src/mage/cards/s/SkyfireKirin.java @@ -14,7 +14,7 @@ import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.StaticFilters; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.game.stack.Spell; @@ -67,10 +67,10 @@ enum SkyfireKirinAdjuster implements TargetAdjuster { public void adjustTargets(Ability ability, Game game) { Spell spell = game.getStack().getSpell(ability.getEffects().get(0).getTargetPointer().getFirst(game, ability)); if (spell != null) { - int cmc = spell.getConvertedManaCost(); + int cmc = spell.getManaValue(); ability.getTargets().clear(); - FilterPermanent filter = new FilterCreaturePermanent("creature with converted mana cost " + cmc); - filter.add(new ConvertedManaCostPredicate(ComparisonType.EQUAL_TO, cmc)); + FilterPermanent filter = new FilterCreaturePermanent("creature with mana value " + cmc); + filter.add(new ManaValuePredicate(ComparisonType.EQUAL_TO, cmc)); ability.addTarget(new TargetPermanent(filter)); } } @@ -80,7 +80,7 @@ class SkyfireKirinEffect extends OneShotEffect { public SkyfireKirinEffect() { super(Outcome.Detriment); - this.staticText = "you may gain control of target creature with that spell's converted mana cost until end of turn"; + this.staticText = "you may gain control of target creature with that spell's mana value until end of turn"; } public SkyfireKirinEffect(final SkyfireKirinEffect effect) { diff --git a/Mage.Sets/src/mage/cards/s/SlumberingTora.java b/Mage.Sets/src/mage/cards/s/SlumberingTora.java index 6923cf64827..0a3d9795181 100644 --- a/Mage.Sets/src/mage/cards/s/SlumberingTora.java +++ b/Mage.Sets/src/mage/cards/s/SlumberingTora.java @@ -54,7 +54,7 @@ public final class SlumberingTora extends CardImpl { private SlumberingToraEffect() { super(Duration.EndOfTurn, Outcome.BecomeCreature); staticText = "{this} becomes an X/X Cat artifact creature until end of turn, " + - "where X is the discarded card's converted mana cost"; + "where X is the discarded card's mana value"; } private SlumberingToraEffect(final SlumberingToraEffect effect) { @@ -71,7 +71,7 @@ public final class SlumberingTora extends CardImpl { super.init(source, game); for (Cost cost : source.getCosts()) { if (cost instanceof DiscardTargetCost && !((DiscardTargetCost) cost).getCards().isEmpty()) { - convManaCosts = ((DiscardTargetCost) cost).getCards().get(0).getConvertedManaCost(); + convManaCosts = ((DiscardTargetCost) cost).getCards().get(0).getManaValue(); return; } } diff --git a/Mage.Sets/src/mage/cards/s/Smother.java b/Mage.Sets/src/mage/cards/s/Smother.java index 53a0dc0b246..05b6892795a 100644 --- a/Mage.Sets/src/mage/cards/s/Smother.java +++ b/Mage.Sets/src/mage/cards/s/Smother.java @@ -8,7 +8,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.ComparisonType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -17,10 +17,10 @@ import mage.target.common.TargetCreaturePermanent; */ public final class Smother extends CardImpl { - private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with converted mana cost 3 or less"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with mana value 3 or less"); static { - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 4)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 4)); } public Smother(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SoldeviAdnate.java b/Mage.Sets/src/mage/cards/s/SoldeviAdnate.java index 03c1d9ceb95..f3efd81b6a4 100644 --- a/Mage.Sets/src/mage/cards/s/SoldeviAdnate.java +++ b/Mage.Sets/src/mage/cards/s/SoldeviAdnate.java @@ -41,7 +41,7 @@ public final class SoldeviAdnate extends CardImpl { // {T}, Sacrifice a black or artifact creature: Add an amount of {B} equal to the sacrificed creature's converted mana cost. Ability ability = new DynamicManaAbility(Mana.BlackMana(1), new SacrificeCostConvertedMana("creature"), new TapSourceCost(), - "add an amount of {B} equal to the sacrificed creature's converted mana cost" , false, + "add an amount of {B} equal to the sacrificed creature's mana value" , false, new HighestCMCOfPermanentValue(filter, true)); ability.addCost(new SacrificeTargetCost(new TargetControlledPermanent(filter))); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SorinGrimNemesis.java b/Mage.Sets/src/mage/cards/s/SorinGrimNemesis.java index 059024dccc5..1d5ce2eeac4 100644 --- a/Mage.Sets/src/mage/cards/s/SorinGrimNemesis.java +++ b/Mage.Sets/src/mage/cards/s/SorinGrimNemesis.java @@ -57,7 +57,7 @@ class SorinGrimNemesisRevealEffect extends OneShotEffect { public SorinGrimNemesisRevealEffect() { super(Outcome.DrawCard); - this.staticText = "reveal the top card of your library and put that card into your hand. Each opponent loses life equal to that card's converted mana cost"; + this.staticText = "reveal the top card of your library and put that card into your hand. Each opponent loses life equal to that card's mana value"; } public SorinGrimNemesisRevealEffect(final SorinGrimNemesisRevealEffect effect) { @@ -85,10 +85,10 @@ class SorinGrimNemesisRevealEffect extends OneShotEffect { if (controller.moveCards(card, Zone.HAND, source, game)) { for (UUID playerId : game.getOpponents(source.getControllerId())) { - if (card.getConvertedManaCost() > 0) { + if (card.getManaValue() > 0) { Player opponent = game.getPlayer(playerId); if (opponent != null) { - opponent.loseLife(card.getConvertedManaCost(), game, source, false); + opponent.loseLife(card.getManaValue(), game, source, false); } } } diff --git a/Mage.Sets/src/mage/cards/s/SorinVengefulBloodlord.java b/Mage.Sets/src/mage/cards/s/SorinVengefulBloodlord.java index 526d6c4f767..a19cba0367f 100644 --- a/Mage.Sets/src/mage/cards/s/SorinVengefulBloodlord.java +++ b/Mage.Sets/src/mage/cards/s/SorinVengefulBloodlord.java @@ -20,7 +20,7 @@ import mage.constants.*; import mage.filter.FilterCard; import mage.filter.StaticFilters; import mage.filter.common.FilterCreatureCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetCardInYourGraveyard; @@ -57,7 +57,7 @@ public final class SorinVengefulBloodlord extends CardImpl { // -X: Return target creature card with converted mana cost X from your graveyard to the battlefield. That creature is a vampire in addition to its other types. ability = new LoyaltyAbility(new ReturnFromGraveyardToBattlefieldTargetEffect().setText( - "Return target creature card with converted mana cost X from your graveyard to the battlefield" + "Return target creature card with mana value X from your graveyard to the battlefield" )); ability.addEffect(new SorinVengefulBloodlordEffect()); ability.setTargetAdjuster(SorinVengefulBloodlordAdjuster.instance); @@ -85,8 +85,8 @@ enum SorinVengefulBloodlordAdjuster implements TargetAdjuster { xValue = ((PayVariableLoyaltyCost) cost).getAmount(); } } - FilterCard filter = new FilterCreatureCard("creature card with converted mana cost " + xValue + " or less"); - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, xValue + 1)); + FilterCard filter = new FilterCreatureCard("creature card with mana value " + xValue + " or less"); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, xValue + 1)); ability.getTargets().clear(); ability.addTarget(new TargetCardInYourGraveyard(filter)); } diff --git a/Mage.Sets/src/mage/cards/s/SoulFoundry.java b/Mage.Sets/src/mage/cards/s/SoulFoundry.java index 1ff9fb7213b..0b897eb5fb0 100644 --- a/Mage.Sets/src/mage/cards/s/SoulFoundry.java +++ b/Mage.Sets/src/mage/cards/s/SoulFoundry.java @@ -68,7 +68,7 @@ enum SoulFoundryAdjuster implements CostAdjuster { Card imprinted = game.getCard(sourcePermanent.getImprinted().get(0)); if (imprinted != null) { ability.getManaCostsToPay().clear(); - ability.getManaCostsToPay().add(0, new GenericManaCost(imprinted.getConvertedManaCost())); + ability.getManaCostsToPay().add(0, new GenericManaCost(imprinted.getManaValue())); } } } @@ -134,7 +134,7 @@ class SoulFoundryEffect extends OneShotEffect { SoulFoundryEffect() { super(Outcome.PutCreatureInPlay); - this.staticText = "Create a token that's a copy of the exiled card. X is the converted mana cost of that card"; + this.staticText = "Create a token that's a copy of the exiled card. X is the mana value of that card"; } private SoulFoundryEffect(final SoulFoundryEffect effect) { diff --git a/Mage.Sets/src/mage/cards/s/SoulShatter.java b/Mage.Sets/src/mage/cards/s/SoulShatter.java index aa88352af94..60ec94f3a53 100644 --- a/Mage.Sets/src/mage/cards/s/SoulShatter.java +++ b/Mage.Sets/src/mage/cards/s/SoulShatter.java @@ -22,7 +22,7 @@ import java.util.UUID; public final class SoulShatter extends CardImpl { private static final FilterPermanent filter = new FilterCreatureOrPlaneswalkerPermanent( - "creature or planeswalker with the highest converted mana cost " + + "creature or planeswalker with the highest mana value " + "among creatures and planeswalkers they control" ); @@ -62,9 +62,9 @@ enum SoulShatterPredicate implements ObjectPlayerPredicate= cmc; + return input.getObject().getManaValue() >= cmc; } } diff --git a/Mage.Sets/src/mage/cards/s/SoulTithe.java b/Mage.Sets/src/mage/cards/s/SoulTithe.java index 251f520e014..33286023435 100644 --- a/Mage.Sets/src/mage/cards/s/SoulTithe.java +++ b/Mage.Sets/src/mage/cards/s/SoulTithe.java @@ -26,7 +26,7 @@ import java.util.UUID; */ public final class SoulTithe extends CardImpl { - static final String rule = "At the beginning of the upkeep of enchanted permanent's controller, that player sacrifices it unless they pay {X}, where X is its converted mana cost"; + static final String rule = "At the beginning of the upkeep of enchanted permanent's controller, that player sacrifices it unless they pay {X}, where X is its mana value"; public SoulTithe(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{1}{W}"); @@ -59,7 +59,7 @@ class SoulTitheEffect extends OneShotEffect { public SoulTitheEffect() { super(Outcome.Sacrifice); - staticText = "that player sacrifices it unless they pay {X}, where X is its converted mana cost"; + staticText = "that player sacrifices it unless they pay {X}, where X is its mana value"; } public SoulTitheEffect(final SoulTitheEffect effect) { @@ -74,7 +74,7 @@ class SoulTitheEffect extends OneShotEffect { if (permanent != null) { Player player = game.getPlayer(permanent.getControllerId()); if (player != null) { - Cost cost = ManaUtil.createManaCost(permanent.getConvertedManaCost(), true); + Cost cost = ManaUtil.createManaCost(permanent.getManaValue(), true); if (player.chooseUse(Outcome.Benefit, "Pay " + cost.getText() + " for " + permanent.getName() + "? (otherwise you sacrifice it)", source, game)) { if (cost.pay(source, game, source, player.getId(), false, null)) { return true; diff --git a/Mage.Sets/src/mage/cards/s/SoulfireEruption.java b/Mage.Sets/src/mage/cards/s/SoulfireEruption.java index e23cf249d2f..9b04b7aee81 100644 --- a/Mage.Sets/src/mage/cards/s/SoulfireEruption.java +++ b/Mage.Sets/src/mage/cards/s/SoulfireEruption.java @@ -47,7 +47,7 @@ class SoulfireEruptionEffect extends OneShotEffect { super(Outcome.Benefit); staticText = "choose any number of target creatures, planeswalkers, and/or players. " + "For each of them, exile the top card of your library, " + - "then {this} deals damage equal to that card's converted mana cost to that permanent or player. " + + "then {this} deals damage equal to that card's mana value to that permanent or player. " + "You may play the exiled cards until the end of your next turn"; } @@ -83,14 +83,14 @@ class SoulfireEruptionEffect extends OneShotEffect { } controller.moveCards(card, Zone.EXILED, source, game); game.addEffect(new SoulfireEruptionCastEffect().setTargetPointer(new FixedTarget(card, game)), source); - if (card.getConvertedManaCost() < 1) { + if (card.getManaValue() < 1) { continue; } if (permanent != null) { - permanent.damage(card.getConvertedManaCost(), source.getSourceId(), source, game); + permanent.damage(card.getManaValue(), source.getSourceId(), source, game); } if (player != null) { - player.damage(card.getConvertedManaCost(), source.getSourceId(), source, game); + player.damage(card.getManaValue(), source.getSourceId(), source, game); } } return true; diff --git a/Mage.Sets/src/mage/cards/s/SparkOfCreativity.java b/Mage.Sets/src/mage/cards/s/SparkOfCreativity.java index 1f5d0f000a8..fff863fea9f 100644 --- a/Mage.Sets/src/mage/cards/s/SparkOfCreativity.java +++ b/Mage.Sets/src/mage/cards/s/SparkOfCreativity.java @@ -48,7 +48,7 @@ class SparkOfCreativityEffect extends OneShotEffect { public SparkOfCreativityEffect() { super(Outcome.Benefit); - this.staticText = "Choose target creature. Exile the top card of your library. You may have Spark of Creativity deal damage to that creature equal to the converted mana cost of the exiled card. If you don't, you may play that card until end of turn"; + this.staticText = "Choose target creature. Exile the top card of your library. You may have Spark of Creativity deal damage to that creature equal to the mana value of the exiled card. If you don't, you may play that card until end of turn"; } public SparkOfCreativityEffect(final SparkOfCreativityEffect effect) { @@ -71,7 +71,7 @@ class SparkOfCreativityEffect extends OneShotEffect { // You may have Spark of Creativity deal damage to that creature equal to the converted mana cost of the exiled card. Permanent targetCreature = game.getPermanent(getTargetPointer().getFirst(game, source)); if (targetCreature != null) { - int cmc = card.getManaCost().convertedManaCost(); + int cmc = card.getManaCost().manaValue(); if (controller.chooseUse(outcome, "Let " + sourceObject.getLogName() + " deal " + cmc + " damage to " + targetCreature.getLogName() + '?', source, game)) { targetCreature.damage(cmc, source.getSourceId(), source, game, false, true); return true; diff --git a/Mage.Sets/src/mage/cards/s/SpectacleMage.java b/Mage.Sets/src/mage/cards/s/SpectacleMage.java index 1eb5e8f3b36..746bb6589ff 100644 --- a/Mage.Sets/src/mage/cards/s/SpectacleMage.java +++ b/Mage.Sets/src/mage/cards/s/SpectacleMage.java @@ -11,7 +11,7 @@ import mage.constants.ComparisonType; import mage.constants.SubType; import mage.filter.FilterCard; import mage.filter.common.FilterInstantOrSorceryCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import java.util.UUID; @@ -23,7 +23,7 @@ public final class SpectacleMage extends CardImpl { private static final FilterCard filter = new FilterInstantOrSorceryCard("instant and sorcery spells"); static { - filter.add(new ConvertedManaCostPredicate(ComparisonType.MORE_THAN, 4)); + filter.add(new ManaValuePredicate(ComparisonType.MORE_THAN, 4)); } public SpectacleMage(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SpellBlast.java b/Mage.Sets/src/mage/cards/s/SpellBlast.java index 0d2503d792c..692ae53a1ed 100644 --- a/Mage.Sets/src/mage/cards/s/SpellBlast.java +++ b/Mage.Sets/src/mage/cards/s/SpellBlast.java @@ -8,7 +8,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.ComparisonType; import mage.filter.FilterSpell; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.target.TargetSpell; import mage.target.targetadjustment.TargetAdjuster; @@ -24,7 +24,7 @@ public final class SpellBlast extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{X}{U}"); // Counter target spell with converted mana cost X. - this.getSpellAbility().addEffect(new CounterTargetEffect().setText("counter target spell with converted mana cost X")); + this.getSpellAbility().addEffect(new CounterTargetEffect().setText("counter target spell with mana value X")); this.getSpellAbility().setTargetAdjuster(SpellBlastAdjuster.instance); } @@ -45,8 +45,8 @@ enum SpellBlastAdjuster implements TargetAdjuster { public void adjustTargets(Ability ability, Game game) { int xValue = ability.getManaCostsToPay().getX(); ability.getTargets().clear(); - FilterSpell filter = new FilterSpell("spell with converted mana cost " + xValue); - filter.add(new ConvertedManaCostPredicate(ComparisonType.EQUAL_TO, xValue)); + FilterSpell filter = new FilterSpell("spell with mana value " + xValue); + filter.add(new ManaValuePredicate(ComparisonType.EQUAL_TO, xValue)); ability.addTarget(new TargetSpell(filter)); } } \ No newline at end of file diff --git a/Mage.Sets/src/mage/cards/s/SpellBurst.java b/Mage.Sets/src/mage/cards/s/SpellBurst.java index 389e23b7c9d..f6599e6f6d6 100644 --- a/Mage.Sets/src/mage/cards/s/SpellBurst.java +++ b/Mage.Sets/src/mage/cards/s/SpellBurst.java @@ -9,7 +9,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.ComparisonType; import mage.filter.FilterSpell; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.target.TargetSpell; import mage.target.targetadjustment.TargetAdjuster; @@ -28,7 +28,7 @@ public final class SpellBurst extends CardImpl { this.addAbility(new BuybackAbility("{3}")); // Counter target spell with converted mana cost X. - this.getSpellAbility().addEffect(new CounterTargetEffect().setText("counter target spell with converted mana cost X")); + this.getSpellAbility().addEffect(new CounterTargetEffect().setText("counter target spell with mana value X")); this.getSpellAbility().setTargetAdjuster(SpellBurstAdjuster.instance); } @@ -49,8 +49,8 @@ enum SpellBurstAdjuster implements TargetAdjuster { public void adjustTargets(Ability ability, Game game) { int xValue = ability.getManaCostsToPay().getX(); ability.getTargets().clear(); - FilterSpell filter = new FilterSpell("spell with converted mana cost " + xValue); - filter.add(new ConvertedManaCostPredicate(ComparisonType.EQUAL_TO, xValue)); + FilterSpell filter = new FilterSpell("spell with mana value " + xValue); + filter.add(new ManaValuePredicate(ComparisonType.EQUAL_TO, xValue)); ability.addTarget(new TargetSpell(filter)); } } diff --git a/Mage.Sets/src/mage/cards/s/SpellQueller.java b/Mage.Sets/src/mage/cards/s/SpellQueller.java index ff481aa5886..70a2a9e74a5 100644 --- a/Mage.Sets/src/mage/cards/s/SpellQueller.java +++ b/Mage.Sets/src/mage/cards/s/SpellQueller.java @@ -21,7 +21,7 @@ import mage.constants.ComparisonType; import mage.constants.Outcome; import mage.constants.SubType; import mage.filter.FilterSpell; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.ExileZone; import mage.game.Game; import mage.game.permanent.Permanent; @@ -37,10 +37,10 @@ import org.apache.log4j.Logger; */ public final class SpellQueller extends CardImpl { - private static final FilterSpell filter = new FilterSpell("spell with converted mana cost 4 or less"); + private static final FilterSpell filter = new FilterSpell("spell with mana value 4 or less"); static { - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 5)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 5)); } public SpellQueller(UUID ownerId, CardSetInfo setInfo) { @@ -77,7 +77,7 @@ class SpellQuellerEntersEffect extends OneShotEffect { public SpellQuellerEntersEffect() { super(Outcome.Benefit); - this.staticText = "exile target spell with converted mana cost 4 or less"; + this.staticText = "exile target spell with mana value 4 or less"; } public SpellQuellerEntersEffect(final SpellQuellerEntersEffect effect) { diff --git a/Mage.Sets/src/mage/cards/s/SpellSnare.java b/Mage.Sets/src/mage/cards/s/SpellSnare.java index baaba2a16b2..b1135ddf038 100644 --- a/Mage.Sets/src/mage/cards/s/SpellSnare.java +++ b/Mage.Sets/src/mage/cards/s/SpellSnare.java @@ -8,7 +8,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.ComparisonType; import mage.filter.FilterSpell; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.target.TargetSpell; /** @@ -17,10 +17,10 @@ import mage.target.TargetSpell; */ public final class SpellSnare extends CardImpl { - private static final FilterSpell filter = new FilterSpell("spell with converted mana cost 2"); + private static final FilterSpell filter = new FilterSpell("spell with mana value 2"); static { - filter.add(new ConvertedManaCostPredicate(ComparisonType.EQUAL_TO, 2)); + filter.add(new ManaValuePredicate(ComparisonType.EQUAL_TO, 2)); } public SpellSnare(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SpellSwindle.java b/Mage.Sets/src/mage/cards/s/SpellSwindle.java index a10f87beded..b224891a194 100644 --- a/Mage.Sets/src/mage/cards/s/SpellSwindle.java +++ b/Mage.Sets/src/mage/cards/s/SpellSwindle.java @@ -42,7 +42,7 @@ class SpellSwindleEffect extends OneShotEffect { public SpellSwindleEffect() { super(Outcome.Detriment); - staticText = "Counter target spell. Create X colorless Treasure artifact tokens, where X is that spell's converted mana cost. " + staticText = "Counter target spell. Create X colorless Treasure artifact tokens, where X is that spell's mana value. " + "They have \"{T}, Sacrifice this artifact: Add one mana of any color.\""; } @@ -60,7 +60,7 @@ class SpellSwindleEffect extends OneShotEffect { StackObject stackObject = game.getStack().getStackObject(targetPointer.getFirst(game, source)); if (stackObject != null) { game.getStack().counter(source.getFirstTarget(), source, game); - return new CreateTokenEffect(new TreasureToken(), stackObject.getConvertedManaCost()).apply(game, source); + return new CreateTokenEffect(new TreasureToken(), stackObject.getManaValue()).apply(game, source); } return false; } diff --git a/Mage.Sets/src/mage/cards/s/SpellboundDragon.java b/Mage.Sets/src/mage/cards/s/SpellboundDragon.java index 8f3bd0e16a9..5e1ea5767c6 100644 --- a/Mage.Sets/src/mage/cards/s/SpellboundDragon.java +++ b/Mage.Sets/src/mage/cards/s/SpellboundDragon.java @@ -54,7 +54,7 @@ class SpellboundDragonEffect extends OneShotEffect { public SpellboundDragonEffect() { super(Outcome.BoostCreature); - staticText = "draw a card, then discard a card. Spellbound Dragon gets +X/+0 until end of turn, where X is the discarded card's converted mana cost"; + staticText = "draw a card, then discard a card. Spellbound Dragon gets +X/+0 until end of turn, where X is the discarded card's mana value"; } public SpellboundDragonEffect(final SpellboundDragonEffect effect) { @@ -76,7 +76,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, false, source, game)) { - int cmc = card.getConvertedManaCost(); + int cmc = card.getManaValue(); if (dragon != null) { game.addEffect(new BoostSourceEffect(cmc, 0, Duration.EndOfTurn), source); return true; diff --git a/Mage.Sets/src/mage/cards/s/Spellseeker.java b/Mage.Sets/src/mage/cards/s/Spellseeker.java index 2273e3776b3..24ab0d1121e 100644 --- a/Mage.Sets/src/mage/cards/s/Spellseeker.java +++ b/Mage.Sets/src/mage/cards/s/Spellseeker.java @@ -11,7 +11,7 @@ import mage.constants.CardType; import mage.constants.ComparisonType; import mage.constants.SubType; import mage.filter.common.FilterInstantOrSorceryCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.target.common.TargetCardInLibrary; /** @@ -20,10 +20,10 @@ import mage.target.common.TargetCardInLibrary; */ public final class Spellseeker extends CardImpl { - private static final FilterInstantOrSorceryCard filter = new FilterInstantOrSorceryCard("an instant or sorcery card with converted mana cost 2 or less"); + private static final FilterInstantOrSorceryCard filter = new FilterInstantOrSorceryCard("an instant or sorcery card with mana value 2 or less"); static { - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 3)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 3)); } public Spellseeker(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SpellstutterSprite.java b/Mage.Sets/src/mage/cards/s/SpellstutterSprite.java index 6e94e1f9333..ad378de75b5 100644 --- a/Mage.Sets/src/mage/cards/s/SpellstutterSprite.java +++ b/Mage.Sets/src/mage/cards/s/SpellstutterSprite.java @@ -26,7 +26,7 @@ import java.util.UUID; */ public final class SpellstutterSprite extends CardImpl { - private static final FilterSpell filter = new FilterSpell("spell with converted mana cost X or less, where X is the number of Faeries you control"); + private static final FilterSpell filter = new FilterSpell("spell with mana value X or less, where X is the number of Faeries you control"); static { filter.add(SpellstutterSpritePredicate.instance); @@ -72,7 +72,7 @@ enum SpellstutterSpritePredicate implements ObjectSourcePlayerPredicate input, Game game) { - return input.getObject().getConvertedManaCost() <= + return input.getObject().getManaValue() <= game.getBattlefield().countAll(filter, game.getControllerId(input.getSourceId()), game); } } \ No newline at end of file diff --git a/Mage.Sets/src/mage/cards/s/StarfieldOfNyx.java b/Mage.Sets/src/mage/cards/s/StarfieldOfNyx.java index 66046ec62c3..0ee86cc2455 100644 --- a/Mage.Sets/src/mage/cards/s/StarfieldOfNyx.java +++ b/Mage.Sets/src/mage/cards/s/StarfieldOfNyx.java @@ -28,7 +28,7 @@ public final class StarfieldOfNyx extends CardImpl { private static final String rule1 = "As long as you control five or more enchantments, " + "each other non-Aura enchantment you control is a creature in addition to its other types " - + "and has base power and base toughness each equal to its converted mana cost."; + + "and has base power and base toughness each equal to its mana value."; private static final FilterCard filterGraveyardEnchantment = new FilterCard("enchantment card from your graveyard"); @@ -87,7 +87,7 @@ public final class StarfieldOfNyx extends CardImpl { super(Duration.WhileOnBattlefield, Outcome.BecomeCreature); staticText = "Each other non-Aura enchantment you control is a creature " + "in addition to its other types and has base power and " - + "toughness each equal to its converted mana cost"; + + "toughness each equal to its mana value"; this.dependendToTypes.add(DependencyType.EnchantmentAddingRemoving); // Enchanted Evening this.dependendToTypes.add(DependencyType.AuraAddingRemoving); // Cloudform @@ -128,7 +128,7 @@ public final class StarfieldOfNyx extends CardImpl { if (sublayer == SubLayer.SetPT_7b && permanent.isCreature() && !permanent.hasSubtype(SubType.AURA, game)) { - int manaCost = permanent.getConvertedManaCost(); + int manaCost = permanent.getManaValue(); permanent.getPower().setValue(manaCost); permanent.getToughness().setValue(manaCost); } diff --git a/Mage.Sets/src/mage/cards/s/SteelHellkite.java b/Mage.Sets/src/mage/cards/s/SteelHellkite.java index 64a7520e1ed..4cc764abbe6 100644 --- a/Mage.Sets/src/mage/cards/s/SteelHellkite.java +++ b/Mage.Sets/src/mage/cards/s/SteelHellkite.java @@ -18,7 +18,7 @@ import mage.filter.FilterPermanent; import mage.filter.common.FilterNonlandPermanent; import mage.filter.predicate.Predicate; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.filter.predicate.permanent.ControllerIdPredicate; import mage.game.Game; import mage.game.events.DamagedEvent; @@ -70,7 +70,7 @@ class SteelHellkiteDestroyEffect extends OneShotEffect { public SteelHellkiteDestroyEffect() { super(Outcome.DestroyPermanent); - staticText = "Destroy each nonland permanent with converted mana cost X whose controller was dealt combat damage by {this} this turn"; + staticText = "Destroy each nonland permanent with mana value X whose controller was dealt combat damage by {this} this turn"; } public SteelHellkiteDestroyEffect(final SteelHellkiteDestroyEffect effect) { @@ -93,7 +93,7 @@ class SteelHellkiteDestroyEffect extends OneShotEffect { predicateSet.add(new ControllerIdPredicate(playerId)); } FilterPermanent filter = new FilterNonlandPermanent(); - filter.add(new ConvertedManaCostPredicate(ComparisonType.EQUAL_TO, source.getManaCostsToPay().getX())); + filter.add(new ManaValuePredicate(ComparisonType.EQUAL_TO, source.getManaCostsToPay().getX())); filter.add(Predicates.or(predicateSet)); return new DestroyAllEffect(filter).apply(game, source); } diff --git a/Mage.Sets/src/mage/cards/s/StingingStudy.java b/Mage.Sets/src/mage/cards/s/StingingStudy.java index 90bc3e5d914..250ed39c8cd 100644 --- a/Mage.Sets/src/mage/cards/s/StingingStudy.java +++ b/Mage.Sets/src/mage/cards/s/StingingStudy.java @@ -65,7 +65,7 @@ class StingingStudyEffect extends OneShotEffect { } Set manaValues = new HashSet<>(); for (Card commander : game.getCommanderCardsFromAnyZones(player, CommanderCardType.ANY)) { - manaValues.add(commander.getConvertedManaCost()); + manaValues.add(commander.getManaValue()); } int chosenValue = 0; if (manaValues.size() > 1) { diff --git a/Mage.Sets/src/mage/cards/s/StirTheGrave.java b/Mage.Sets/src/mage/cards/s/StirTheGrave.java index ea58debdae0..4e1abc9ec2a 100644 --- a/Mage.Sets/src/mage/cards/s/StirTheGrave.java +++ b/Mage.Sets/src/mage/cards/s/StirTheGrave.java @@ -9,7 +9,7 @@ import mage.constants.CardType; import mage.constants.ComparisonType; import mage.filter.FilterCard; import mage.filter.common.FilterCreatureCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.target.common.TargetCardInYourGraveyard; import mage.target.targetadjustment.TargetAdjuster; @@ -25,7 +25,7 @@ public final class StirTheGrave extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{X}{B}"); // Return target creature card with converted mana cost X or less from your graveyard to the battlefield. - this.getSpellAbility().addEffect(new ReturnFromGraveyardToBattlefieldTargetEffect().setText("return target creature card with converted mana cost X or less from your graveyard to the battlefield")); + this.getSpellAbility().addEffect(new ReturnFromGraveyardToBattlefieldTargetEffect().setText("return target creature card with mana value X or less from your graveyard to the battlefield")); this.getSpellAbility().setTargetAdjuster(StirTheGraveAdjuster.instance); } @@ -46,8 +46,8 @@ enum StirTheGraveAdjuster implements TargetAdjuster { public void adjustTargets(Ability ability, Game game) { ability.getTargets().clear(); int xValue = ability.getManaCostsToPay().getX(); - FilterCard filter = new FilterCreatureCard("creature card with converted mana cost " + xValue + " or less from your graveyard"); - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, xValue + 1)); + FilterCard filter = new FilterCreatureCard("creature card with mana value " + xValue + " or less from your graveyard"); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, xValue + 1)); ability.getTargets().add(new TargetCardInYourGraveyard(filter)); } } \ No newline at end of file diff --git a/Mage.Sets/src/mage/cards/s/StolenByTheFae.java b/Mage.Sets/src/mage/cards/s/StolenByTheFae.java index 9c6668ab56a..9f3dc2733d2 100644 --- a/Mage.Sets/src/mage/cards/s/StolenByTheFae.java +++ b/Mage.Sets/src/mage/cards/s/StolenByTheFae.java @@ -9,7 +9,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.ComparisonType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.game.permanent.token.FaerieToken; import mage.target.common.TargetCreaturePermanent; @@ -27,7 +27,7 @@ public final class StolenByTheFae extends CardImpl { // Return target creature with converted mana cost X to its owner's hand. You create X 1/1 blue Faerie creature tokens with flying. this.getSpellAbility().addEffect(new ReturnToHandTargetEffect() - .setText("Return target creature with converted mana cost X to its owner's hand")); + .setText("Return target creature with mana value X to its owner's hand")); this.getSpellAbility().addEffect(new CreateTokenEffect(new FaerieToken(), ManacostVariableValue.instance) .setText("You create X 1/1 blue Faerie creature tokens with flying")); this.getSpellAbility().setTargetAdjuster(StolenByTheFaeAdjuster.instance); @@ -50,8 +50,8 @@ enum StolenByTheFaeAdjuster implements TargetAdjuster { public void adjustTargets(Ability ability, Game game) { ability.getTargets().clear(); int xValue = ability.getManaCostsToPay().getX(); - FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with converted mana cost " + xValue); - filter.add(new ConvertedManaCostPredicate(ComparisonType.EQUAL_TO, xValue)); + FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with mana value " + xValue); + filter.add(new ManaValuePredicate(ComparisonType.EQUAL_TO, xValue)); ability.addTarget(new TargetCreaturePermanent(filter)); } } \ No newline at end of file diff --git a/Mage.Sets/src/mage/cards/s/StormchaserChimera.java b/Mage.Sets/src/mage/cards/s/StormchaserChimera.java index 46d3a0d1375..bab134f8061 100644 --- a/Mage.Sets/src/mage/cards/s/StormchaserChimera.java +++ b/Mage.Sets/src/mage/cards/s/StormchaserChimera.java @@ -59,7 +59,7 @@ class StormchaserChimeraEffect extends OneShotEffect { public StormchaserChimeraEffect() { super(Outcome.Benefit); - this.staticText = ", then reveal the top card of your library. Stormchaser Chimera gets +X/+0 until end of turn, where X is that card's converted mana cost"; + this.staticText = ", then reveal the top card of your library. Stormchaser Chimera gets +X/+0 until end of turn, where X is that card's mana value"; } public StormchaserChimeraEffect(final StormchaserChimeraEffect effect) { @@ -79,7 +79,7 @@ class StormchaserChimeraEffect extends OneShotEffect { player.revealCards(sourcePermanent.getName(), cards, game); if (card != null) { - game.addEffect(new BoostSourceEffect(card.getConvertedManaCost(), 0, Duration.EndOfTurn), source); + game.addEffect(new BoostSourceEffect(card.getManaValue(), 0, Duration.EndOfTurn), source); return true; } } diff --git a/Mage.Sets/src/mage/cards/s/StrongholdGambit.java b/Mage.Sets/src/mage/cards/s/StrongholdGambit.java index d70c68cdbe1..33c9d58f812 100644 --- a/Mage.Sets/src/mage/cards/s/StrongholdGambit.java +++ b/Mage.Sets/src/mage/cards/s/StrongholdGambit.java @@ -46,7 +46,7 @@ class StrongholdGambitEffect extends OneShotEffect { public StrongholdGambitEffect() { super(Outcome.PutCreatureInPlay); - this.staticText = "Each player chooses a card in their hand. Then each player reveals their chosen card. The owner of each creature card revealed this way with the lowest converted mana cost puts it onto the battlefield"; + this.staticText = "Each player chooses a card in their hand. Then each player reveals their chosen card. The owner of each creature card revealed this way with the lowest mana value puts it onto the battlefield"; } public StrongholdGambitEffect(final StrongholdGambitEffect effect) { @@ -82,8 +82,8 @@ class StrongholdGambitEffect extends OneShotEffect { Cards cardsToReveal = new CardsImpl(card); player.revealCards(sourceObject.getIdName() + " (" + player.getName() + ')', cardsToReveal, game); if (card.isCreature() - && lowestCMC > card.getConvertedManaCost()) { - lowestCMC = card.getConvertedManaCost(); + && lowestCMC > card.getManaValue()) { + lowestCMC = card.getManaValue(); } } } @@ -96,7 +96,7 @@ class StrongholdGambitEffect extends OneShotEffect { Card card = game.getCard(choosenCard.get(playerId)); if (card != null) { if (card.isCreature() - && lowestCMC == card.getConvertedManaCost()) { + && lowestCMC == card.getManaValue()) { creaturesToBattlefield.add(card); } } diff --git a/Mage.Sets/src/mage/cards/s/Subdue.java b/Mage.Sets/src/mage/cards/s/Subdue.java index 92c81de6580..18345d5ae9e 100644 --- a/Mage.Sets/src/mage/cards/s/Subdue.java +++ b/Mage.Sets/src/mage/cards/s/Subdue.java @@ -3,7 +3,7 @@ package mage.cards.s; import java.util.UUID; import mage.abilities.dynamicvalue.common.StaticValue; -import mage.abilities.dynamicvalue.common.TargetConvertedManaCost; +import mage.abilities.dynamicvalue.common.TargetManaValue; import mage.abilities.effects.common.PreventDamageByTargetEffect; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.cards.CardImpl; @@ -24,8 +24,8 @@ public final class Subdue extends CardImpl { // Prevent all combat damage that would be dealt by target creature this turn. That creature gets +0/+X until end of turn, where X is its converted mana cost. this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new PreventDamageByTargetEffect(Duration.EndOfTurn, true)); - this.getSpellAbility().addEffect(new BoostTargetEffect(StaticValue.get(0), TargetConvertedManaCost.instance, Duration.EndOfTurn, true) - .setText("That creature gets +0/+X until end of turn, where X is its converted mana cost")); + this.getSpellAbility().addEffect(new BoostTargetEffect(StaticValue.get(0), TargetManaValue.instance, Duration.EndOfTurn, true) + .setText("That creature gets +0/+X until end of turn, where X is its mana value")); } private Subdue(final Subdue card) { diff --git a/Mage.Sets/src/mage/cards/s/SunTitan.java b/Mage.Sets/src/mage/cards/s/SunTitan.java index eda171b247b..0b05acc9d6a 100644 --- a/Mage.Sets/src/mage/cards/s/SunTitan.java +++ b/Mage.Sets/src/mage/cards/s/SunTitan.java @@ -13,7 +13,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.ComparisonType; import mage.filter.common.FilterPermanentCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.target.common.TargetCardInYourGraveyard; /** @@ -22,10 +22,10 @@ import mage.target.common.TargetCardInYourGraveyard; */ public final class SunTitan extends CardImpl { - private static final FilterPermanentCard filter = new FilterPermanentCard("permanent card with converted mana cost 3 or less from your graveyard"); + private static final FilterPermanentCard filter = new FilterPermanentCard("permanent card with mana value 3 or less from your graveyard"); static { - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 4)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 4)); } public SunTitan(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SunbirdsInvocation.java b/Mage.Sets/src/mage/cards/s/SunbirdsInvocation.java index fdd8e5eec1c..83d6e0e0321 100644 --- a/Mage.Sets/src/mage/cards/s/SunbirdsInvocation.java +++ b/Mage.Sets/src/mage/cards/s/SunbirdsInvocation.java @@ -18,7 +18,7 @@ import mage.constants.Outcome; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.common.FilterNonlandCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.stack.Spell; @@ -89,9 +89,9 @@ class SunbirdsInvocationTriggeredAbility extends SpellCastControllerTriggeredAbi public String getRule() { return "Whenever you cast a spell from your hand, " + "reveal the top X cards of your library, " - + "where X is that spell's converted mana cost. " + + "where X is that spell's mana value. " + "You may cast a card revealed this way with " - + "converted mana cost X or less without paying its mana cost." + + "mana value X or less without paying its mana cost." + " Put the rest on the bottom of your library in a random order."; } } @@ -101,8 +101,8 @@ class SunbirdsInvocationEffect extends OneShotEffect { public SunbirdsInvocationEffect() { super(Outcome.PutCardInPlay); staticText = "reveal the top X cards of your library, where X is that " - + "spell's converted mana cost. You may cast a card revealed this " - + "way with converted mana cost X or less without paying its mana cost. " + + "spell's mana value. You may cast a card revealed this " + + "way with mana value X or less without paying its mana cost. " + "Put the rest on the bottom of your library in a random order"; } @@ -122,13 +122,13 @@ class SunbirdsInvocationEffect extends OneShotEffect { if (spell == null) { return false; } - int xValue = spell.getConvertedManaCost(); + int xValue = spell.getManaValue(); Cards cards = new CardsImpl(controller.getLibrary().getTopCards(game, xValue)); if (!cards.isEmpty()) { controller.revealCards(sourceObject.getIdName(), cards, game); - FilterCard filter = new FilterNonlandCard("card revealed this way with converted mana cost " + xValue + " or less"); - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, xValue + 1)); + FilterCard filter = new FilterNonlandCard("card revealed this way with mana value " + xValue + " or less"); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, xValue + 1)); TargetCard target = new TargetCard(1, Zone.LIBRARY, filter); if (controller.chooseTarget(Outcome.PlayForFree, cards, target, source, game)) { diff --git a/Mage.Sets/src/mage/cards/s/Sunforger.java b/Mage.Sets/src/mage/cards/s/Sunforger.java index 6b2d32dee74..fd8554d7539 100644 --- a/Mage.Sets/src/mage/cards/s/Sunforger.java +++ b/Mage.Sets/src/mage/cards/s/Sunforger.java @@ -27,7 +27,7 @@ import mage.filter.FilterCard; import mage.filter.predicate.Predicate; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -75,7 +75,7 @@ class SunforgerEffect extends OneShotEffect { public SunforgerEffect() { super(Outcome.PlayForFree); staticText = "Search your library for a red or white instant " - + "card with converted mana cost 4 or less and cast that " + + "card with mana value 4 or less and cast that " + "card without paying its mana cost. Then shuffle your library"; } @@ -99,13 +99,13 @@ class SunforgerEffect extends OneShotEffect { * it). If you can't find a cast-able card (or choose not to), * nothing happens and you shuffle your library. */ - FilterCard filter = new FilterCard("red or white instant card with converted mana cost 4 or less"); + FilterCard filter = new FilterCard("red or white instant card with mana value 4 or less"); TargetCardInLibrary target = new TargetCardInLibrary(filter); filter.add(Predicates.or( new ColorPredicate(ObjectColor.RED), new ColorPredicate(ObjectColor.WHITE))); filter.add(CardType.INSTANT.getPredicate()); - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 5)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 5)); filter.add(new CardCanBeCastPredicate(source.getControllerId())); if (controller.searchLibrary(target, source, game, controller.getId())) { UUID targetId = target.getFirstTarget(); diff --git a/Mage.Sets/src/mage/cards/s/SunstrikeLegionnaire.java b/Mage.Sets/src/mage/cards/s/SunstrikeLegionnaire.java index 8a3280081e3..df4bcfcaec4 100644 --- a/Mage.Sets/src/mage/cards/s/SunstrikeLegionnaire.java +++ b/Mage.Sets/src/mage/cards/s/SunstrikeLegionnaire.java @@ -18,7 +18,7 @@ import mage.constants.SubType; import mage.constants.ComparisonType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.common.TargetCreaturePermanent; @@ -29,11 +29,11 @@ import mage.target.common.TargetCreaturePermanent; public final class SunstrikeLegionnaire extends CardImpl { private static final FilterCreaturePermanent untapFilter = new FilterCreaturePermanent("another creature"); - private static final FilterCreaturePermanent tapFilter = new FilterCreaturePermanent("creature with converted mana cost 3 or less"); + private static final FilterCreaturePermanent tapFilter = new FilterCreaturePermanent("creature with mana value 3 or less"); static { untapFilter.add(AnotherPredicate.instance); - tapFilter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 4)); + tapFilter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 4)); } public SunstrikeLegionnaire(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SupremeLeaderSnoke.java b/Mage.Sets/src/mage/cards/s/SupremeLeaderSnoke.java index 368adc6c566..e8eb5c303de 100644 --- a/Mage.Sets/src/mage/cards/s/SupremeLeaderSnoke.java +++ b/Mage.Sets/src/mage/cards/s/SupremeLeaderSnoke.java @@ -25,7 +25,7 @@ import mage.counters.Counter; import mage.counters.CounterType; import mage.filter.StaticFilters; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; @@ -55,7 +55,7 @@ public final class SupremeLeaderSnoke extends CardImpl { // -X: Gain control of target creature with converted mana cost X. Untap that creature. It gains haste. Sacrifice that creature at the beginning of the next end step. Ability ability3 = new LoyaltyAbility(new GainControlTargetEffect(Duration.WhileOnBattlefield) - .setText("Gain control of target creature with converted mana cost X")); + .setText("Gain control of target creature with mana value X")); ability3.addEffect(new UntapTargetEffect().setText("Untap that creature")); ability3.addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield).setText("It gains haste")); ability3.addEffect(new GainAbilityTargetEffect(new AtTheBeginOfNextEndStepDelayedTriggeredAbility(new SacrificeSourceEffect()), Duration.WhileOnBattlefield) @@ -86,7 +86,7 @@ enum SupremeLeaderSnokeAdjuster implements TargetAdjuster { } } FilterCreaturePermanent newFilter = StaticFilters.FILTER_PERMANENT_CREATURE.copy(); - newFilter.add(new ConvertedManaCostPredicate(ComparisonType.EQUAL_TO, cmc)); + newFilter.add(new ManaValuePredicate(ComparisonType.EQUAL_TO, cmc)); ability.getTargets().clear(); ability.addTarget(new TargetCreaturePermanent(newFilter)); } diff --git a/Mage.Sets/src/mage/cards/s/SurgeOfStrength.java b/Mage.Sets/src/mage/cards/s/SurgeOfStrength.java index 21668262317..56163776790 100644 --- a/Mage.Sets/src/mage/cards/s/SurgeOfStrength.java +++ b/Mage.Sets/src/mage/cards/s/SurgeOfStrength.java @@ -5,7 +5,7 @@ import java.util.UUID; import mage.ObjectColor; import mage.abilities.costs.common.DiscardTargetCost; import mage.abilities.dynamicvalue.common.StaticValue; -import mage.abilities.dynamicvalue.common.TargetConvertedManaCost; +import mage.abilities.dynamicvalue.common.TargetManaValue; import mage.abilities.effects.Effect; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.abilities.effects.common.continuous.GainAbilityTargetEffect; @@ -41,8 +41,8 @@ public final class SurgeOfStrength extends CardImpl { Effect effect = new GainAbilityTargetEffect(TrampleAbility.getInstance(), Duration.EndOfTurn); effect.setText("Target creature gains trample"); this.getSpellAbility().addEffect(effect); - effect = new BoostTargetEffect(TargetConvertedManaCost.instance, StaticValue.get(0), Duration.EndOfTurn, true); - effect.setText("and gets +X/+0 until end of turn, where X is that creature's converted mana cost"); + effect = new BoostTargetEffect(TargetManaValue.instance, StaticValue.get(0), Duration.EndOfTurn, true); + effect.setText("and gets +X/+0 until end of turn, where X is that creature's mana value"); this.getSpellAbility().addEffect(effect); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } diff --git a/Mage.Sets/src/mage/cards/s/SwiftWarkite.java b/Mage.Sets/src/mage/cards/s/SwiftWarkite.java index fcd8fa7d4c3..cf410941e49 100644 --- a/Mage.Sets/src/mage/cards/s/SwiftWarkite.java +++ b/Mage.Sets/src/mage/cards/s/SwiftWarkite.java @@ -24,7 +24,7 @@ import mage.constants.Duration; import mage.constants.Outcome; import mage.constants.Zone; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -65,16 +65,16 @@ public final class SwiftWarkite extends CardImpl { class SwiftWarkiteEffect extends OneShotEffect { - private static final FilterCard filter = new FilterCard("creature card with converted mana cost 3 or less from your hand or graveyard"); + private static final FilterCard filter = new FilterCard("creature card with mana value 3 or less from your hand or graveyard"); static { filter.add(CardType.CREATURE.getPredicate()); - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 4)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 4)); } SwiftWarkiteEffect() { super(Outcome.PutCardInPlay); - this.staticText = "you may put a creature card with converted mana cost 3 or less from your hand or graveyard onto the battlefield. That creature gains haste. Return it to your hand at the beginning of the next end step"; + this.staticText = "you may put a creature card with mana value 3 or less from your hand or graveyard onto the battlefield. That creature gains haste. Return it to your hand at the beginning of the next end step"; } SwiftWarkiteEffect(final SwiftWarkiteEffect effect) { diff --git a/Mage.Sets/src/mage/cards/s/SydriGalvanicGenius.java b/Mage.Sets/src/mage/cards/s/SydriGalvanicGenius.java index d6b92c3e1d0..9b4a4cd9bee 100644 --- a/Mage.Sets/src/mage/cards/s/SydriGalvanicGenius.java +++ b/Mage.Sets/src/mage/cards/s/SydriGalvanicGenius.java @@ -72,7 +72,7 @@ class SydriGalvanicGeniusEffect extends ContinuousEffectImpl { public SydriGalvanicGeniusEffect() { super(Duration.EndOfTurn, Outcome.BecomeCreature); - staticText = "Target noncreature artifact becomes an artifact creature with power and toughness each equal to its converted mana cost until end of turn"; + staticText = "Target noncreature artifact becomes an artifact creature with power and toughness each equal to its mana value until end of turn"; } public SydriGalvanicGeniusEffect(final SydriGalvanicGeniusEffect effect) { @@ -104,7 +104,7 @@ class SydriGalvanicGeniusEffect extends ContinuousEffectImpl { case PTChangingEffects_7: if (sublayer == SubLayer.SetPT_7b) { - int cmc = artifact.getConvertedManaCost(); + int cmc = artifact.getManaValue(); artifact.getPower().setValue(cmc); artifact.getToughness().setValue(cmc); } diff --git a/Mage.Sets/src/mage/cards/t/TajNarSwordsmith.java b/Mage.Sets/src/mage/cards/t/TajNarSwordsmith.java index cc070a822ed..1435f321567 100644 --- a/Mage.Sets/src/mage/cards/t/TajNarSwordsmith.java +++ b/Mage.Sets/src/mage/cards/t/TajNarSwordsmith.java @@ -12,7 +12,7 @@ import mage.constants.ComparisonType; import mage.constants.Outcome; import mage.constants.SubType; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCardInLibrary; @@ -50,7 +50,7 @@ class TajNarSwordsmithEffect extends OneShotEffect { TajNarSwordsmithEffect() { super(Outcome.Benefit); - this.staticText = "you may pay {X}. If you do, search your library for an Equipment card with converted mana cost X or less and put that card onto the battlefield. Then shuffle your library"; + this.staticText = "you may pay {X}. If you do, search your library for an Equipment card with mana value X or less and put that card onto the battlefield. Then shuffle your library"; } TajNarSwordsmithEffect(final TajNarSwordsmithEffect effect) { @@ -68,9 +68,9 @@ class TajNarSwordsmithEffect extends OneShotEffect { if (player != null && player.chooseUse(Outcome.Benefit, "Do you want to pay {X} to search and put Equipment?", source, game)) { // can be zero int payCount = ManaUtil.playerPaysXGenericMana(true, "Taj-Nar Swordsmith", player, source, game); - FilterCard filter = new FilterCard("Equipment card with converted mana cost {" + payCount + "} or less"); + FilterCard filter = new FilterCard("Equipment card with mana value {" + payCount + "} or less"); filter.add(SubType.EQUIPMENT.getPredicate()); - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, payCount + 1)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, payCount + 1)); new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(0, 1, filter), false, true).apply(game, source); return true; } diff --git a/Mage.Sets/src/mage/cards/t/Tariff.java b/Mage.Sets/src/mage/cards/t/Tariff.java index 21d02bca5d5..1eb0f279514 100644 --- a/Mage.Sets/src/mage/cards/t/Tariff.java +++ b/Mage.Sets/src/mage/cards/t/Tariff.java @@ -51,7 +51,7 @@ class TariffEffect extends OneShotEffect { public TariffEffect() { super(Outcome.DestroyPermanent); - this.staticText = "Each player sacrifices the creature they control with the highest converted mana cost unless they pay that creature's mana cost. If two or more creatures a player controls are tied for highest cost, that player chooses one."; + this.staticText = "Each player sacrifices the creature they control with the highest mana value unless they pay that creature's mana cost. If two or more creatures a player controls are tied for highest cost, that player chooses one."; } public TariffEffect(final TariffEffect effect) { @@ -103,13 +103,13 @@ class TariffEffect extends OneShotEffect { List permanents = game.getBattlefield().getAllActivePermanents(filter, playerId, game); int highestCMC = -1; for (Permanent permanent : permanents) { - if (highestCMC < permanent.getConvertedManaCost()) { - highestCMC = permanent.getConvertedManaCost(); + if (highestCMC < permanent.getManaValue()) { + highestCMC = permanent.getManaValue(); } } List result = new ArrayList<>(); for (Permanent permanent : permanents) { - if (permanent.getConvertedManaCost() == highestCMC) { + if (permanent.getManaValue() == highestCMC) { result.add(permanent); } } diff --git a/Mage.Sets/src/mage/cards/t/TayamLuminousEnigma.java b/Mage.Sets/src/mage/cards/t/TayamLuminousEnigma.java index 7f2977ecff8..7f3b35592dd 100644 --- a/Mage.Sets/src/mage/cards/t/TayamLuminousEnigma.java +++ b/Mage.Sets/src/mage/cards/t/TayamLuminousEnigma.java @@ -20,7 +20,7 @@ import mage.counters.CounterType; import mage.filter.FilterCard; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterPermanentCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.filter.predicate.permanent.CounterAnyPredicate; import mage.game.Game; import mage.game.events.EntersTheBattlefieldEvent; @@ -160,15 +160,15 @@ class TayamLuminousEnigmaCost extends RemoveCounterCost { class TayamLuminousEnigmaEffect extends OneShotEffect { - private static final FilterCard filter = new FilterPermanentCard("permanent card in your graveyard with converted mana cost 3 or less"); + private static final FilterCard filter = new FilterPermanentCard("permanent card in your graveyard with mana value 3 or less"); static { - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 4)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 4)); } TayamLuminousEnigmaEffect() { super(Outcome.Benefit); - staticText = ", then return a permanent card with converted mana cost 3 or less from your graveyard to the battlefield"; + staticText = ", then return a permanent card with mana value 3 or less from your graveyard to the battlefield"; } private TayamLuminousEnigmaEffect(TayamLuminousEnigmaEffect effect) { diff --git a/Mage.Sets/src/mage/cards/t/TemptedByTheOriq.java b/Mage.Sets/src/mage/cards/t/TemptedByTheOriq.java index 5a5e52027e8..8eff4f25d7c 100644 --- a/Mage.Sets/src/mage/cards/t/TemptedByTheOriq.java +++ b/Mage.Sets/src/mage/cards/t/TemptedByTheOriq.java @@ -9,7 +9,7 @@ import mage.constants.ComparisonType; import mage.constants.Duration; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreatureOrPlaneswalkerPermanent; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.filter.predicate.permanent.ControllerIdPredicate; import mage.game.Game; import mage.players.Player; @@ -60,7 +60,7 @@ enum TemptedByTheOriqAdjuster implements TargetAdjuster { "creature or planeswalker " + opponent.getName() + " controls with mana value 3 or less" ); filter.add(new ControllerIdPredicate(opponentId)); - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 4)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 4)); ability.addTarget(new TargetPermanent(0, 1, filter, false)); } } diff --git a/Mage.Sets/src/mage/cards/t/TerashisGrasp.java b/Mage.Sets/src/mage/cards/t/TerashisGrasp.java index 8e8a210f83e..174101c1b50 100644 --- a/Mage.Sets/src/mage/cards/t/TerashisGrasp.java +++ b/Mage.Sets/src/mage/cards/t/TerashisGrasp.java @@ -47,7 +47,7 @@ public final class TerashisGrasp extends CardImpl { public TerashisGraspEffect() { super(Outcome.DestroyPermanent); - staticText = "You gain life equal to its converted mana cost"; + staticText = "You gain life equal to its mana value"; } public TerashisGraspEffect(TerashisGraspEffect effect) { @@ -58,7 +58,7 @@ public final class TerashisGrasp extends CardImpl { public boolean apply(Game game, Ability source) { Permanent targetPermanent = getTargetPointer().getFirstTargetPermanentOrLKI(game, source); if (targetPermanent != null) { - int cost = targetPermanent.getConvertedManaCost(); + int cost = targetPermanent.getManaValue(); Player player = game.getPlayer(source.getControllerId()); if (player != null) { player.gainLife(cost, game, source); diff --git a/Mage.Sets/src/mage/cards/t/TesharAncestorsApostle.java b/Mage.Sets/src/mage/cards/t/TesharAncestorsApostle.java index cfe5898c04f..3942479468a 100644 --- a/Mage.Sets/src/mage/cards/t/TesharAncestorsApostle.java +++ b/Mage.Sets/src/mage/cards/t/TesharAncestorsApostle.java @@ -16,7 +16,7 @@ import mage.constants.SuperType; import mage.filter.FilterCard; import mage.filter.common.FilterCreatureCard; import mage.filter.common.FilterHistoricSpell; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.target.common.TargetCardInYourGraveyard; /** @@ -25,10 +25,10 @@ import mage.target.common.TargetCardInYourGraveyard; */ public final class TesharAncestorsApostle extends CardImpl { - private static final FilterCard filter = new FilterCreatureCard("creature card with converted mana cost 3 or less from your graveyard"); + private static final FilterCard filter = new FilterCreatureCard("creature card with mana value 3 or less from your graveyard"); static { - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 4)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 4)); filter.add(CardType.CREATURE.getPredicate()); } @@ -45,7 +45,7 @@ public final class TesharAncestorsApostle extends CardImpl { // Whenever you cast a historic spell, return target creature card with converted mana cost 3 or less from your graveyard to the battlefield. Ability ability = new SpellCastControllerTriggeredAbility(new ReturnFromGraveyardToBattlefieldTargetEffect() - .setText("return target creature card with converted mana cost 3 or less from your graveyard to the battlefield. " + .setText("return target creature card with mana value 3 or less from your graveyard to the battlefield. " + "(Artifacts, legendaries, and Sagas are historic.)"), new FilterHistoricSpell("a historic spell"), false); ability.addTarget(new TargetCardInYourGraveyard(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/TethmosHighPriest.java b/Mage.Sets/src/mage/cards/t/TethmosHighPriest.java index 7d278fda99a..0749e8f6ad5 100644 --- a/Mage.Sets/src/mage/cards/t/TethmosHighPriest.java +++ b/Mage.Sets/src/mage/cards/t/TethmosHighPriest.java @@ -12,7 +12,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.ComparisonType; import mage.filter.common.FilterCreatureCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.target.Target; import mage.target.common.TargetCardInYourGraveyard; @@ -22,10 +22,10 @@ import mage.target.common.TargetCardInYourGraveyard; */ public final class TethmosHighPriest extends CardImpl { - private static final FilterCreatureCard filter = new FilterCreatureCard("creature card with converted mana cost 2 or less from your graveyard"); + private static final FilterCreatureCard filter = new FilterCreatureCard("creature card with mana value 2 or less from your graveyard"); static { - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 3)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 3)); } public TethmosHighPriest(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/t/TezzeretTheSeeker.java b/Mage.Sets/src/mage/cards/t/TezzeretTheSeeker.java index 05432166eee..d1c6df0db73 100644 --- a/Mage.Sets/src/mage/cards/t/TezzeretTheSeeker.java +++ b/Mage.Sets/src/mage/cards/t/TezzeretTheSeeker.java @@ -17,7 +17,7 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterArtifactCard; import mage.filter.common.FilterArtifactPermanent; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -61,7 +61,7 @@ class TezzeretTheSeekerEffect2 extends OneShotEffect { public TezzeretTheSeekerEffect2() { super(Outcome.DrawCard); - this.staticText = "Search your library for an artifact card with converted mana cost X or less and put it onto the battlefield. Then shuffle your library"; + this.staticText = "Search your library for an artifact card with mana value X or less and put it onto the battlefield. Then shuffle your library"; } public TezzeretTheSeekerEffect2(final TezzeretTheSeekerEffect2 effect) { @@ -87,8 +87,8 @@ class TezzeretTheSeekerEffect2 extends OneShotEffect { } } - FilterArtifactCard filter = new FilterArtifactCard("artifact card with converted mana cost " + cmc + " or less"); - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, cmc + 1)); + FilterArtifactCard filter = new FilterArtifactCard("artifact card with mana value " + cmc + " or less"); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, cmc + 1)); TargetCardInLibrary target = new TargetCardInLibrary(filter); if (controller.searchLibrary(target, source, game)) { diff --git a/Mage.Sets/src/mage/cards/t/ThievingSkydiver.java b/Mage.Sets/src/mage/cards/t/ThievingSkydiver.java index cc9370f7416..e58c14ff18b 100644 --- a/Mage.Sets/src/mage/cards/t/ThievingSkydiver.java +++ b/Mage.Sets/src/mage/cards/t/ThievingSkydiver.java @@ -15,7 +15,7 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.common.FilterArtifactPermanent; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.TargetPermanent; @@ -51,7 +51,7 @@ public final class ThievingSkydiver extends CardImpl { Ability ability = new ConditionalInterveningIfTriggeredAbility( new EntersBattlefieldTriggeredAbility(new GainControlTargetEffect(Duration.Custom), false), KickedCondition.instance, "When {this} enters the battlefield, if it was kicked, " + - "gain control of target artifact with converted mana cost X or less. " + + "gain control of target artifact with mana value X or less. " + "If that artifact is an Equipment, attach it to {this}." ); ability.addEffect(new ThievingSkydiverEffect()); @@ -76,9 +76,9 @@ enum ThievingSkydiverAdjuster implements TargetAdjuster { public void adjustTargets(Ability ability, Game game) { int xValue = GetKickerXValue.instance.calculate(game, ability, null); FilterPermanent filter = new FilterArtifactPermanent( - "artifact with converted mana cost " + xValue + " or less" + "artifact with mana value " + xValue + " or less" ); - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, xValue + 1)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, xValue + 1)); ability.getTargets().clear(); ability.addTarget(new TargetPermanent(filter)); } diff --git a/Mage.Sets/src/mage/cards/t/ThoughtPrison.java b/Mage.Sets/src/mage/cards/t/ThoughtPrison.java index caf26fd9c5d..8e830a6915d 100644 --- a/Mage.Sets/src/mage/cards/t/ThoughtPrison.java +++ b/Mage.Sets/src/mage/cards/t/ThoughtPrison.java @@ -17,7 +17,6 @@ import mage.filter.FilterSpell; import mage.filter.predicate.Predicates; import mage.game.Game; import mage.game.events.GameEvent; -import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; import mage.game.stack.Spell; import mage.players.Player; @@ -151,8 +150,8 @@ class ThoughtPrisonTriggeredAbility extends TriggeredAbilityImpl { matches = true; } // Check if spell's CMC matches the imprinted card - int cmc = spell.getConvertedManaCost(); - int imprintedCmc = imprintedCard.getConvertedManaCost(); + int cmc = spell.getManaValue(); + int imprintedCmc = imprintedCard.getManaValue(); if (cmc == imprintedCmc) { matches = true; } @@ -172,7 +171,7 @@ class ThoughtPrisonTriggeredAbility extends TriggeredAbilityImpl { @Override public String getRule() { - return "Whenever a player casts a spell that shares a color or converted mana cost with the exiled card, " + super.getRule(); + return "Whenever a player casts a spell that shares a color or mana value with the exiled card, " + super.getRule(); } } diff --git a/Mage.Sets/src/mage/cards/t/Thoughtbind.java b/Mage.Sets/src/mage/cards/t/Thoughtbind.java index 47cb274647b..fa61c2bc1be 100644 --- a/Mage.Sets/src/mage/cards/t/Thoughtbind.java +++ b/Mage.Sets/src/mage/cards/t/Thoughtbind.java @@ -9,7 +9,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.ComparisonType; import mage.filter.FilterSpell; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.target.TargetSpell; /** @@ -17,10 +17,10 @@ import mage.target.TargetSpell; */ public final class Thoughtbind extends CardImpl { - private static final FilterSpell filter = new FilterSpell("spell with converted mana cost 4 or less"); + private static final FilterSpell filter = new FilterSpell("spell with mana value 4 or less"); static { - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 5)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 5)); } public Thoughtbind(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/t/ThreadsOfDisloyalty.java b/Mage.Sets/src/mage/cards/t/ThreadsOfDisloyalty.java index 7568aede4d8..4e634833649 100644 --- a/Mage.Sets/src/mage/cards/t/ThreadsOfDisloyalty.java +++ b/Mage.Sets/src/mage/cards/t/ThreadsOfDisloyalty.java @@ -16,7 +16,7 @@ import mage.constants.ComparisonType; import mage.constants.Outcome; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; @@ -26,10 +26,10 @@ import mage.target.common.TargetCreaturePermanent; */ public final class ThreadsOfDisloyalty extends CardImpl { - private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with converted mana cost 2 or less"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with mana value 2 or less"); static { - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 3)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 3)); } public ThreadsOfDisloyalty(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/t/ThryxTheSuddenStorm.java b/Mage.Sets/src/mage/cards/t/ThryxTheSuddenStorm.java index 422f71966b2..a1d068a5724 100644 --- a/Mage.Sets/src/mage/cards/t/ThryxTheSuddenStorm.java +++ b/Mage.Sets/src/mage/cards/t/ThryxTheSuddenStorm.java @@ -14,7 +14,7 @@ import mage.constants.*; import mage.filter.FilterCard; import mage.filter.FilterSpell; import mage.filter.predicate.Predicate; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; /** * @author TheElk801 @@ -25,7 +25,7 @@ public final class ThryxTheSuddenStorm extends CardImpl { private static final FilterSpell filter2 = new FilterSpell(); static { - Predicate predicate = new ConvertedManaCostPredicate(ComparisonType.MORE_THAN, 4); + Predicate predicate = new ManaValuePredicate(ComparisonType.MORE_THAN, 4); filter.add(predicate); filter2.add(predicate); } @@ -47,7 +47,7 @@ public final class ThryxTheSuddenStorm extends CardImpl { // Spells you cast with converted mana cost 5 or greater cost {1} less to cast and can't be countered. Ability ability = new SimpleStaticAbility(new SpellsCostReductionControllerEffect(filter, 1) - .setText("spells you cast with converted mana cost 5 or greater cost {1} less to cast")); + .setText("spells you cast with mana value 5 or greater cost {1} less to cast")); ability.addEffect(new CantBeCounteredControlledEffect( filter2, null, Duration.WhileOnBattlefield ).setText("and can't be countered")); diff --git a/Mage.Sets/src/mage/cards/t/ThunderousSnapper.java b/Mage.Sets/src/mage/cards/t/ThunderousSnapper.java index 2a54b4a2950..d057be3bc00 100644 --- a/Mage.Sets/src/mage/cards/t/ThunderousSnapper.java +++ b/Mage.Sets/src/mage/cards/t/ThunderousSnapper.java @@ -9,7 +9,7 @@ import mage.constants.CardType; import mage.constants.ComparisonType; import mage.constants.SubType; import mage.filter.FilterSpell; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import java.util.UUID; @@ -18,10 +18,10 @@ import java.util.UUID; */ public final class ThunderousSnapper extends CardImpl { - private static final FilterSpell filter = new FilterSpell("a spell with converted mana cost 5 or greater"); + private static final FilterSpell filter = new FilterSpell("a spell with mana value 5 or greater"); static { - filter.add(new ConvertedManaCostPredicate(ComparisonType.MORE_THAN, 4)); + filter.add(new ManaValuePredicate(ComparisonType.MORE_THAN, 4)); } public ThunderousSnapper(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/t/TimelyHordemate.java b/Mage.Sets/src/mage/cards/t/TimelyHordemate.java index b51afe606f4..b34056c5a54 100644 --- a/Mage.Sets/src/mage/cards/t/TimelyHordemate.java +++ b/Mage.Sets/src/mage/cards/t/TimelyHordemate.java @@ -14,7 +14,7 @@ import mage.constants.CardType; import mage.constants.ComparisonType; import mage.constants.SubType; import mage.filter.common.FilterCreatureCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.target.common.TargetCardInYourGraveyard; import mage.watchers.common.PlayerAttackedWatcher; @@ -25,10 +25,10 @@ import java.util.UUID; */ public final class TimelyHordemate extends CardImpl { - private static final FilterCreatureCard filter = new FilterCreatureCard("creature card with converted mana cost 2 or less from your graveyard"); + private static final FilterCreatureCard filter = new FilterCreatureCard("creature card with mana value 2 or less from your graveyard"); static { - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 3)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 3)); } public TimelyHordemate(UUID ownerId, CardSetInfo setInfo) { @@ -41,7 +41,7 @@ public final class TimelyHordemate extends CardImpl { // Raid — When Timely Hordemate enters the battlefield, if you attacked this turn, return target creature card with converted mana cost 2 or less from your graveyard to the battlefield. Ability ability = new ConditionalInterveningIfTriggeredAbility(new EntersBattlefieldTriggeredAbility(new ReturnFromGraveyardToBattlefieldTargetEffect()), RaidCondition.instance, - "Raid — When {this} enters the battlefield, if you attacked this turn, return target creature card with converted mana cost 2 or less from your graveyard to the battlefield."); + "Raid — When {this} enters the battlefield, if you attacked this turn, return target creature card with mana value 2 or less from your graveyard to the battlefield."); ability.addTarget(new TargetCardInYourGraveyard(filter)); ability.setAbilityWord(AbilityWord.RAID); ability.addHint(RaidHint.instance); diff --git a/Mage.Sets/src/mage/cards/t/Timesifter.java b/Mage.Sets/src/mage/cards/t/Timesifter.java index 9ff62044f80..ed6e5bbb6b1 100644 --- a/Mage.Sets/src/mage/cards/t/Timesifter.java +++ b/Mage.Sets/src/mage/cards/t/Timesifter.java @@ -46,7 +46,7 @@ class TimesifterEffect extends OneShotEffect { TimesifterEffect() { super(Outcome.ExtraTurn); - this.staticText = "each player exiles the top card of their library. The player who exiled the card with the highest converted mana cost takes an extra turn after this one. If two or more players' cards are tied for highest cost, the tied players repeat this process until the tie is broken"; + this.staticText = "each player exiles the top card of their library. The player who exiled the card with the highest mana value takes an extra turn after this one. If two or more players' cards are tied for highest cost, the tied players repeat this process until the tie is broken"; } TimesifterEffect(final TimesifterEffect effect) { @@ -69,7 +69,7 @@ class TimesifterEffect extends OneShotEffect { if (player != null) { Card card = player.getLibrary().getFromTop(game); if (card != null) { - int cardCMC = card.getConvertedManaCost(); + int cardCMC = card.getManaValue(); player.moveCardsToExile(card, source, game, true, null, ""); if (cardCMC > highestCMC) { highestCMC = cardCMC; diff --git a/Mage.Sets/src/mage/cards/t/TitaniasSong.java b/Mage.Sets/src/mage/cards/t/TitaniasSong.java index fada1936ba2..00ff36cf502 100644 --- a/Mage.Sets/src/mage/cards/t/TitaniasSong.java +++ b/Mage.Sets/src/mage/cards/t/TitaniasSong.java @@ -55,7 +55,7 @@ class TitaniasSongEffect extends ContinuousEffectImpl { public TitaniasSongEffect(Duration duration) { super(duration, Outcome.BecomeCreature); - staticText = "Each noncreature artifact loses its abilities and is an artifact creature with power and toughness each equal to its converted mana cost"; + staticText = "Each noncreature artifact loses its abilities and is an artifact creature with power and toughness each equal to its mana value"; } public TitaniasSongEffect(final TitaniasSongEffect effect) { @@ -94,7 +94,7 @@ class TitaniasSongEffect extends ContinuousEffectImpl { for (Iterator it = affectedObjectList.iterator(); it.hasNext();) { Permanent permanent = it.next().getPermanent(game); if (permanent != null) { - int manaCost = permanent.getConvertedManaCost(); + int manaCost = permanent.getManaValue(); permanent.getPower().setValue(manaCost); permanent.getToughness().setValue(manaCost); } diff --git a/Mage.Sets/src/mage/cards/t/TorrentOfFire.java b/Mage.Sets/src/mage/cards/t/TorrentOfFire.java index d0a161c5523..ad3183cc199 100644 --- a/Mage.Sets/src/mage/cards/t/TorrentOfFire.java +++ b/Mage.Sets/src/mage/cards/t/TorrentOfFire.java @@ -2,7 +2,7 @@ package mage.cards.t; import java.util.UUID; -import mage.abilities.dynamicvalue.common.HighestConvertedManaCostValue; +import mage.abilities.dynamicvalue.common.HighestManaValueCount; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -19,8 +19,8 @@ public final class TorrentOfFire extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{3}{R}{R}"); // Torrent of Fire deals damage equal to the highest converted mana cost among permanents you control to any target. - this.getSpellAbility().addEffect(new DamageTargetEffect(new HighestConvertedManaCostValue()) - .setText("{this} deals damage to any target equal to the highest converted mana cost among permanents you control.") + this.getSpellAbility().addEffect(new DamageTargetEffect(new HighestManaValueCount()) + .setText("{this} deals damage to any target equal to the highest mana value among permanents you control.") ); this.getSpellAbility().addTarget(new TargetAnyTarget()); } diff --git a/Mage.Sets/src/mage/cards/t/TorrentSculptor.java b/Mage.Sets/src/mage/cards/t/TorrentSculptor.java index 0f58344eb30..9ac297f97be 100644 --- a/Mage.Sets/src/mage/cards/t/TorrentSculptor.java +++ b/Mage.Sets/src/mage/cards/t/TorrentSculptor.java @@ -94,7 +94,7 @@ class TorrentSculptorEffect extends OneShotEffect { if (card == null) { return false; } - int counters = card.getConvertedManaCost(); + int counters = card.getManaValue(); counters = Math.floorDiv(counters, 2) + counters % 2; player.moveCards(card, Zone.EXILED, source, game); Permanent permanent = source.getSourcePermanentIfItStillExists(game); @@ -141,7 +141,7 @@ class FlamethrowerSonataEffect extends OneShotEffect { return true; } ReflexiveTriggeredAbility ability = new ReflexiveTriggeredAbility( - new DamageTargetEffect(card.getConvertedManaCost()), + new DamageTargetEffect(card.getManaValue()), false, "{this} deals damage equal to that card's mana value " + "to target creature or planeswalker you don't control" ); diff --git a/Mage.Sets/src/mage/cards/t/Toymaker.java b/Mage.Sets/src/mage/cards/t/Toymaker.java index 9dfac87f04c..075479dd3c6 100644 --- a/Mage.Sets/src/mage/cards/t/Toymaker.java +++ b/Mage.Sets/src/mage/cards/t/Toymaker.java @@ -65,7 +65,7 @@ class ToymakerEffect extends ContinuousEffectImpl { public ToymakerEffect() { super(Duration.EndOfTurn, Outcome.BecomeCreature); - staticText = "Target noncreature artifact becomes an artifact creature with power and toughness each equal to its converted mana cost until end of turn"; + staticText = "Target noncreature artifact becomes an artifact creature with power and toughness each equal to its mana value until end of turn"; } public ToymakerEffect(final ToymakerEffect effect) { @@ -97,7 +97,7 @@ class ToymakerEffect extends ContinuousEffectImpl { case PTChangingEffects_7: if (sublayer == SubLayer.SetPT_7b) { - int cmc = artifact.getConvertedManaCost(); + int cmc = artifact.getManaValue(); artifact.getPower().setValue(cmc); artifact.getToughness().setValue(cmc); } diff --git a/Mage.Sets/src/mage/cards/t/TransgressTheMind.java b/Mage.Sets/src/mage/cards/t/TransgressTheMind.java index 27ef719a3c7..7a4088d9385 100644 --- a/Mage.Sets/src/mage/cards/t/TransgressTheMind.java +++ b/Mage.Sets/src/mage/cards/t/TransgressTheMind.java @@ -10,7 +10,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.ComparisonType; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.target.TargetPlayer; /** @@ -19,10 +19,10 @@ import mage.target.TargetPlayer; */ public final class TransgressTheMind extends CardImpl { - private static final FilterCard filter = new FilterCard("a card from it with converted mana cost 3 or greater"); + private static final FilterCard filter = new FilterCard("a card from it with mana value 3 or greater"); static { - filter.add(new ConvertedManaCostPredicate(ComparisonType.MORE_THAN, 2)); + filter.add(new ManaValuePredicate(ComparisonType.MORE_THAN, 2)); } public TransgressTheMind(UUID ownerId, CardSetInfo setInfo) { @@ -33,7 +33,7 @@ public final class TransgressTheMind extends CardImpl { // Target player reveals their hand. You may choose a card from it with converted mana cost 3 or greater and exile that card. Effect effect = new ExileCardYouChooseTargetOpponentEffect(filter); - effect.setText("Target player reveals their hand. You may choose a card from it with converted mana cost 3 or greater and exile that card"); + effect.setText("Target player reveals their hand. You may choose a card from it with mana value 3 or greater and exile that card"); this.getSpellAbility().addEffect(effect); this.getSpellAbility().addTarget(new TargetPlayer()); } diff --git a/Mage.Sets/src/mage/cards/t/TransmuteArtifact.java b/Mage.Sets/src/mage/cards/t/TransmuteArtifact.java index bd08b432153..cc171eecede 100644 --- a/Mage.Sets/src/mage/cards/t/TransmuteArtifact.java +++ b/Mage.Sets/src/mage/cards/t/TransmuteArtifact.java @@ -46,7 +46,7 @@ class TransmuteArtifactEffect extends SearchEffect { public TransmuteArtifactEffect() { super(new TargetCardInLibrary(new FilterArtifactCard()), Outcome.PutCardInPlay); - staticText = "Sacrifice an artifact. If you do, search your library for an artifact card. 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 it's greater, you may pay {X}, where X is the difference. If you do, put it onto the battlefield. If you don't, put it into its owner's graveyard. Then shuffle your library"; + staticText = "Sacrifice an artifact. If you do, search your library for an artifact card. If that card's mana value is less than or equal to the sacrificed artifact's mana value, put it onto the battlefield. If it's greater, you may pay {X}, where X is the difference. If you do, put it onto the battlefield. If you don't, put it into its owner's graveyard. Then shuffle your library"; } public TransmuteArtifactEffect(final TransmuteArtifactEffect effect) { @@ -65,13 +65,13 @@ class TransmuteArtifactEffect extends SearchEffect { return false; } //Sacrifice an artifact. - int convertedManaCost = 0; + int manaValue = 0; boolean sacrifice = false; TargetControlledPermanent targetArtifact = new TargetControlledPermanent(new FilterControlledArtifactPermanent()); if (controller.chooseTarget(Outcome.Sacrifice, targetArtifact, source, game)) { Permanent permanent = game.getPermanent(targetArtifact.getFirstTarget()); if (permanent != null) { - convertedManaCost = permanent.getConvertedManaCost(); + manaValue = permanent.getManaValue(); sacrifice = permanent.sacrifice(source, game); } } else { @@ -84,11 +84,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.getConvertedManaCost() <= convertedManaCost) { + if (card.getManaValue() <= manaValue) { 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. - Cost cost = ManaUtil.createManaCost(card.getConvertedManaCost() - convertedManaCost, true); + Cost cost = ManaUtil.createManaCost(card.getManaValue() - manaValue, true); boolean payed = false; if (controller.chooseUse(Outcome.Benefit, "Do you want to pay " + cost.getText() + " to put it onto the battlefield?", source, game) && cost.pay(source, game, source, source.getControllerId(), false)) { diff --git a/Mage.Sets/src/mage/cards/t/TreasureKeeper.java b/Mage.Sets/src/mage/cards/t/TreasureKeeper.java index 620bf8e9fd3..2302070739b 100644 --- a/Mage.Sets/src/mage/cards/t/TreasureKeeper.java +++ b/Mage.Sets/src/mage/cards/t/TreasureKeeper.java @@ -49,7 +49,7 @@ class TreasureKeeperEffect extends OneShotEffect { public TreasureKeeperEffect() { super(Outcome.PlayForFree); this.staticText = "reveal cards from the top of your library until you reveal a " - + "nonland card with converted mana cost 3 or less. " + + "nonland card with mana value 3 or less. " + "You may cast that card without paying its mana cost. Put all revealed " + "cards not cast this way on the bottom of your library in a random order"; } @@ -67,7 +67,7 @@ class TreasureKeeperEffect extends OneShotEffect { Card nonLandCard = null; for (Card card : controller.getLibrary().getCards(game)) { toReveal.add(card); - if (!card.isLand() && card.getConvertedManaCost() < 4) { + if (!card.isLand() && card.getManaValue() < 4) { nonLandCard = card; break; } diff --git a/Mage.Sets/src/mage/cards/t/TreasureMage.java b/Mage.Sets/src/mage/cards/t/TreasureMage.java index f7c492ccd9c..ac3db080b1a 100644 --- a/Mage.Sets/src/mage/cards/t/TreasureMage.java +++ b/Mage.Sets/src/mage/cards/t/TreasureMage.java @@ -13,7 +13,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.ComparisonType; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.target.common.TargetCardInLibrary; /** @@ -22,11 +22,11 @@ import mage.target.common.TargetCardInLibrary; */ public final class TreasureMage extends CardImpl { - private static final FilterCard filter = new FilterCard("an artifact card with converted mana cost 6 or more"); + private static final FilterCard filter = new FilterCard("an artifact card with mana value 6 or more"); static { filter.add(CardType.ARTIFACT.getPredicate()); - filter.add(new ConvertedManaCostPredicate(ComparisonType.MORE_THAN, 5)); + filter.add(new ManaValuePredicate(ComparisonType.MORE_THAN, 5)); } public TreasureMage (UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/t/TributeMage.java b/Mage.Sets/src/mage/cards/t/TributeMage.java index 23aef5d8e71..2b62f0b0943 100644 --- a/Mage.Sets/src/mage/cards/t/TributeMage.java +++ b/Mage.Sets/src/mage/cards/t/TributeMage.java @@ -9,7 +9,7 @@ import mage.constants.CardType; import mage.constants.ComparisonType; import mage.constants.SubType; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.target.common.TargetCardInLibrary; import java.util.UUID; @@ -19,11 +19,11 @@ import java.util.UUID; */ public final class TributeMage extends CardImpl { - private static final FilterCard filter = new FilterCard("an artifact card with converted mana cost 2"); + private static final FilterCard filter = new FilterCard("an artifact card with mana value 2"); static { filter.add(CardType.ARTIFACT.getPredicate()); - filter.add(new ConvertedManaCostPredicate(ComparisonType.EQUAL_TO, 2)); + filter.add(new ManaValuePredicate(ComparisonType.EQUAL_TO, 2)); } public TributeMage(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/t/Trinisphere.java b/Mage.Sets/src/mage/cards/t/Trinisphere.java index 1024282a147..8685396ece4 100644 --- a/Mage.Sets/src/mage/cards/t/Trinisphere.java +++ b/Mage.Sets/src/mage/cards/t/Trinisphere.java @@ -53,7 +53,7 @@ class TrinisphereEffect extends CostModificationEffectImpl { @Override public boolean apply(Game game, Ability source, Ability abilityToModify) { - int manaCost = abilityToModify.getManaCostsToPay().convertedManaCost(); + int manaCost = abilityToModify.getManaCostsToPay().manaValue(); if (manaCost < 3) { CardUtil.increaseCost(abilityToModify, 3 - manaCost); } diff --git a/Mage.Sets/src/mage/cards/t/TrinketMage.java b/Mage.Sets/src/mage/cards/t/TrinketMage.java index c446896f7dc..16ae9dc2579 100644 --- a/Mage.Sets/src/mage/cards/t/TrinketMage.java +++ b/Mage.Sets/src/mage/cards/t/TrinketMage.java @@ -12,7 +12,7 @@ import mage.constants.CardType; import mage.constants.ComparisonType; import mage.constants.SubType; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.target.common.TargetCardInLibrary; import java.util.UUID; @@ -22,11 +22,11 @@ import java.util.UUID; */ public final class TrinketMage extends CardImpl { - private static final FilterCard filter = new FilterCard("an artifact card with converted mana cost 1 or less"); + private static final FilterCard filter = new FilterCard("an artifact card with mana value 1 or less"); static { filter.add(CardType.ARTIFACT.getPredicate()); - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 2)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 2)); } public TrinketMage(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/t/TrophyMage.java b/Mage.Sets/src/mage/cards/t/TrophyMage.java index d5b0a26a745..ef63fefacd9 100644 --- a/Mage.Sets/src/mage/cards/t/TrophyMage.java +++ b/Mage.Sets/src/mage/cards/t/TrophyMage.java @@ -11,7 +11,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.ComparisonType; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.target.common.TargetCardInLibrary; /** @@ -20,11 +20,11 @@ import mage.target.common.TargetCardInLibrary; */ public final class TrophyMage extends CardImpl { - private static final FilterCard filter = new FilterCard("an artifact card with converted mana cost 3"); + private static final FilterCard filter = new FilterCard("an artifact card with mana value 3"); static { filter.add(CardType.ARTIFACT.getPredicate()); - filter.add(new ConvertedManaCostPredicate(ComparisonType.EQUAL_TO, 3)); + filter.add(new ManaValuePredicate(ComparisonType.EQUAL_TO, 3)); } public TrophyMage(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/t/TroveWarden.java b/Mage.Sets/src/mage/cards/t/TroveWarden.java index fa962c88e77..d51cc28b24e 100644 --- a/Mage.Sets/src/mage/cards/t/TroveWarden.java +++ b/Mage.Sets/src/mage/cards/t/TroveWarden.java @@ -12,7 +12,7 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterCard; import mage.filter.common.FilterPermanentCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.ExileZone; import mage.game.Game; import mage.game.permanent.Permanent; @@ -28,10 +28,10 @@ import java.util.UUID; public final class TroveWarden extends CardImpl { private static final FilterCard filter - = new FilterPermanentCard("permanent card with converted mana cost 3 or less from your graveyard"); + = new FilterPermanentCard("permanent card with mana value 3 or less from your graveyard"); static { - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 4)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 4)); } public TroveWarden(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/t/TurntimberSymbiosis.java b/Mage.Sets/src/mage/cards/t/TurntimberSymbiosis.java index 611a4d3053c..373c8fe9953 100644 --- a/Mage.Sets/src/mage/cards/t/TurntimberSymbiosis.java +++ b/Mage.Sets/src/mage/cards/t/TurntimberSymbiosis.java @@ -70,7 +70,7 @@ class TurntimberSymbiosisEffect extends OneShotEffect { TurntimberSymbiosisEffect() { super(Outcome.Benefit); staticText = "Look at the top seven cards of your library. You may put a creature card " + - "from among them onto the battlefield. If that card has converted mana cost 3 or less, " + + "from among them onto the battlefield. If that card has mana value 3 or less, " + "it enters with three additional +1/+1 counters on it. " + "Put the rest on the bottom of your library in a random order"; } @@ -102,7 +102,7 @@ class TurntimberSymbiosisEffect extends OneShotEffect { return true; } - boolean small = card.getConvertedManaCost() <= 3; + boolean small = card.getManaValue() <= 3; player.moveCards(card, Zone.BATTLEFIELD, source, game); Permanent permanent = game.getPermanent(card.getId()); if (permanent == null || !small) { diff --git a/Mage.Sets/src/mage/cards/t/TwilightProphet.java b/Mage.Sets/src/mage/cards/t/TwilightProphet.java index c8944eae6b9..b449319217d 100644 --- a/Mage.Sets/src/mage/cards/t/TwilightProphet.java +++ b/Mage.Sets/src/mage/cards/t/TwilightProphet.java @@ -45,7 +45,7 @@ public final class TwilightProphet extends CardImpl { this.addAbility(new ConditionalInterveningIfTriggeredAbility(new BeginningOfUpkeepTriggeredAbility( new TwilightProphetEffect(), TargetController.YOU, false), CitysBlessingCondition.instance, "At the beginning of your upkeep, if you have the city's blessing, reveal the top card of your library and put it into your hand." - + "Each opponent loses X life and you gain X life, where X is that card's converted mana cost.") + + "Each opponent loses X life and you gain X life, where X is that card's mana value.") .addHint(CitysBlessingHint.instance)); } @@ -65,7 +65,7 @@ class TwilightProphetEffect extends OneShotEffect { public TwilightProphetEffect() { super(Outcome.Benefit); this.staticText = "if you have the city's blessing, reveal the top card of your library and put it into your hand. " - + "Each opponent loses X life and you gain X life, where X is that card's converted mana cost."; + + "Each opponent loses X life and you gain X life, where X is that card's mana value."; } public TwilightProphetEffect(final TwilightProphetEffect effect) { @@ -87,7 +87,7 @@ class TwilightProphetEffect extends OneShotEffect { controller.revealCards(sourceObject.getIdName(), new CardsImpl(card), game); controller.moveCards(card, Zone.HAND, source, game); game.getState().processAction(game); - int amount = card.getConvertedManaCost(); + int amount = card.getManaValue(); if (amount > 0) { new LoseLifeOpponentsEffect(amount).apply(game, source); controller.gainLife(amount, game, source); diff --git a/Mage.Sets/src/mage/cards/t/TyrantsScorn.java b/Mage.Sets/src/mage/cards/t/TyrantsScorn.java index 0b082c94788..b1b4b663ed2 100644 --- a/Mage.Sets/src/mage/cards/t/TyrantsScorn.java +++ b/Mage.Sets/src/mage/cards/t/TyrantsScorn.java @@ -9,7 +9,7 @@ import mage.constants.CardType; import mage.constants.ComparisonType; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; @@ -21,10 +21,10 @@ import java.util.UUID; public final class TyrantsScorn extends CardImpl { private static final FilterPermanent filter - = new FilterCreaturePermanent("creature with converted mana cost 3 or less"); + = new FilterCreaturePermanent("creature with mana value 3 or less"); static { - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 4)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 4)); } public TyrantsScorn(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/u/UginTheSpiritDragon.java b/Mage.Sets/src/mage/cards/u/UginTheSpiritDragon.java index c6194a71429..b8170dd9fc9 100644 --- a/Mage.Sets/src/mage/cards/u/UginTheSpiritDragon.java +++ b/Mage.Sets/src/mage/cards/u/UginTheSpiritDragon.java @@ -25,7 +25,7 @@ import mage.filter.FilterPermanent; import mage.filter.common.FilterPermanentCard; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorlessPredicate; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCardInHand; @@ -72,7 +72,7 @@ class UginTheSpiritDragonEffect2 extends OneShotEffect { public UginTheSpiritDragonEffect2() { super(Outcome.Exile); - this.staticText = "exile each permanent with converted mana cost X or less that's one or more colors"; + this.staticText = "exile each permanent with mana value X or less that's one or more colors"; } public UginTheSpiritDragonEffect2(final UginTheSpiritDragonEffect2 effect) { @@ -98,8 +98,8 @@ class UginTheSpiritDragonEffect2 extends OneShotEffect { } } - FilterPermanent filter = new FilterPermanent("permanent with converted mana cost X or less that's one or more colors"); - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, cmc + 1)); + FilterPermanent filter = new FilterPermanent("permanent with mana value X or less that's one or more colors"); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, cmc + 1)); filter.add(Predicates.not(ColorlessPredicate.instance)); Set permanentsToExile = new HashSet<>(); permanentsToExile.addAll(game.getBattlefield().getActivePermanents(filter, source.getControllerId(), source.getSourceId(), game)); diff --git a/Mage.Sets/src/mage/cards/u/UginsInsight.java b/Mage.Sets/src/mage/cards/u/UginsInsight.java index 6f035570957..e506edba62a 100644 --- a/Mage.Sets/src/mage/cards/u/UginsInsight.java +++ b/Mage.Sets/src/mage/cards/u/UginsInsight.java @@ -3,7 +3,7 @@ package mage.cards.u; import java.util.UUID; import mage.abilities.Ability; -import mage.abilities.dynamicvalue.common.HighestConvertedManaCostValue; +import mage.abilities.dynamicvalue.common.HighestManaValueCount; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -39,7 +39,7 @@ class UginsInsightEffect extends OneShotEffect { public UginsInsightEffect() { super(Outcome.DrawCard); - this.staticText = "Scry X, where X is the highest converted mana cost among permanents you control, then draw three cards"; + this.staticText = "Scry X, where X is the highest mana value among permanents you control, then draw three cards"; } public UginsInsightEffect(final UginsInsightEffect effect) { @@ -55,7 +55,7 @@ class UginsInsightEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { Player controller = game.getPlayer(source.getControllerId()); if (controller != null) { - int highCMC = new HighestConvertedManaCostValue().calculate(game, source, this); + int highCMC = new HighestManaValueCount().calculate(game, source, this); if (highCMC > 0) { controller.scry(highCMC, source, game); } diff --git a/Mage.Sets/src/mage/cards/u/UncageTheMenagerie.java b/Mage.Sets/src/mage/cards/u/UncageTheMenagerie.java index 6681c4ae204..8c0a00a9f56 100644 --- a/Mage.Sets/src/mage/cards/u/UncageTheMenagerie.java +++ b/Mage.Sets/src/mage/cards/u/UncageTheMenagerie.java @@ -46,7 +46,7 @@ class UncageTheMenagerieEffect extends OneShotEffect { public UncageTheMenagerieEffect() { super(Outcome.DrawCard); - this.staticText = "Search your library for up to X creature cards with different names that each have converted mana cost X, reveal them, put them into your hand, then shuffle your library."; + this.staticText = "Search your library for up to X creature cards with different names that each have mana value X, reveal them, put them into your hand, then shuffle your library."; } public UncageTheMenagerieEffect(final UncageTheMenagerieEffect effect) { @@ -94,7 +94,7 @@ class UncageTheMenagerieTarget extends TargetCardInLibrary { private int xValue; public UncageTheMenagerieTarget(int xValue) { - super(0, xValue, new FilterCreatureCard(xValue + " creature cards with different names with converted mana cost " + xValue)); + super(0, xValue, new FilterCreatureCard(xValue + " creature cards with different names with mana value " + xValue)); this.xValue = xValue; } @@ -119,7 +119,7 @@ class UncageTheMenagerieTarget extends TargetCardInLibrary { } } - if (!(card.isCreature() && card.getConvertedManaCost() == xValue)) { + if (!(card.isCreature() && card.getManaValue() == xValue)) { return false; } diff --git a/Mage.Sets/src/mage/cards/u/UndyingFlames.java b/Mage.Sets/src/mage/cards/u/UndyingFlames.java index f05ebadf475..79e434cd03d 100644 --- a/Mage.Sets/src/mage/cards/u/UndyingFlames.java +++ b/Mage.Sets/src/mage/cards/u/UndyingFlames.java @@ -47,7 +47,7 @@ class UndyingFlamesEffect extends OneShotEffect { public UndyingFlamesEffect() { super(Outcome.Benefit); - staticText = "Exile cards from the top of your library until you exile a nonland card. {this} deals damage to any target equal to that card's converted mana cost"; + staticText = "Exile cards from the top of your library until you exile a nonland card. {this} deals damage to any target equal to that card's mana value"; } public UndyingFlamesEffect(final UndyingFlamesEffect effect) { @@ -64,7 +64,7 @@ class UndyingFlamesEffect extends OneShotEffect { if (card != null) { controller.moveCards(card, Zone.EXILED, source, game); if (!card.isLand()) { - new DamageTargetEffect(card.getConvertedManaCost()).apply(game, source); + new DamageTargetEffect(card.getManaValue()).apply(game, source); break; } } diff --git a/Mage.Sets/src/mage/cards/u/Unearth.java b/Mage.Sets/src/mage/cards/u/Unearth.java index e31ada62bf5..a764d042f4b 100644 --- a/Mage.Sets/src/mage/cards/u/Unearth.java +++ b/Mage.Sets/src/mage/cards/u/Unearth.java @@ -11,7 +11,7 @@ import mage.constants.CardType; import mage.constants.ComparisonType; import mage.filter.FilterCard; import mage.filter.common.FilterCreatureCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.target.common.TargetCardInYourGraveyard; /** @@ -20,10 +20,10 @@ import mage.target.common.TargetCardInYourGraveyard; */ public final class Unearth extends CardImpl { - private static final FilterCard filter = new FilterCreatureCard("creature card with converted mana cost 3 or less from your graveyard"); + private static final FilterCard filter = new FilterCreatureCard("creature card with mana value 3 or less from your graveyard"); static { - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 4)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 4)); } public Unearth(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/v/VadrokApexOfThunder.java b/Mage.Sets/src/mage/cards/v/VadrokApexOfThunder.java index 51df9251111..fe4d5059d37 100644 --- a/Mage.Sets/src/mage/cards/v/VadrokApexOfThunder.java +++ b/Mage.Sets/src/mage/cards/v/VadrokApexOfThunder.java @@ -15,7 +15,7 @@ import mage.constants.SubType; import mage.constants.SuperType; import mage.filter.FilterCard; import mage.filter.common.FilterNoncreatureCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.target.common.TargetCardInYourGraveyard; import java.util.UUID; @@ -26,11 +26,11 @@ import java.util.UUID; public final class VadrokApexOfThunder extends CardImpl { private static final FilterCard filter = new FilterNoncreatureCard( - "noncreature card with converted mana cost 3 or less from your graveyard" + "noncreature card with mana value 3 or less from your graveyard" ); static { - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 4)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 4)); } public VadrokApexOfThunder(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/v/ValkiGodOfLies.java b/Mage.Sets/src/mage/cards/v/ValkiGodOfLies.java index 39fb1bf00f2..8d2d2538ac2 100644 --- a/Mage.Sets/src/mage/cards/v/ValkiGodOfLies.java +++ b/Mage.Sets/src/mage/cards/v/ValkiGodOfLies.java @@ -25,7 +25,7 @@ import mage.cards.CardSetInfo; import mage.cards.Cards; import mage.filter.FilterCard; import mage.filter.StaticFilters; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.ExileZone; import mage.game.Game; import mage.game.command.emblems.TibaltCosmicImpostorEmblem; @@ -218,7 +218,7 @@ class ValkiGodOfLiesCopyExiledEffect extends OneShotEffect { public ValkiGodOfLiesCopyExiledEffect() { super(Outcome.Benefit); - this.staticText = "Choose a creature card exiled with Valki with converted mana cost X. Valki becomes a copy of that card."; + this.staticText = "Choose a creature card exiled with Valki with mana value X. Valki becomes a copy of that card."; } public ValkiGodOfLiesCopyExiledEffect(final ValkiGodOfLiesCopyExiledEffect effect) { @@ -238,7 +238,7 @@ class ValkiGodOfLiesCopyExiledEffect extends OneShotEffect { && Valki != null) { UUID exileId = CardUtil.getExileZoneId(source.getSourceId().toString() + (Valki.getZoneChangeCounter(game)), game); FilterCard filter = new FilterCard(); - filter.add(new ConvertedManaCostPredicate(ComparisonType.EQUAL_TO, source.getManaCostsToPay().getX())); + filter.add(new ManaValuePredicate(ComparisonType.EQUAL_TO, source.getManaCostsToPay().getX())); TargetCardInExile target = new TargetCardInExile(filter, exileId); Cards cards = game.getExile().getExileZone(exileId); if (cards != null diff --git a/Mage.Sets/src/mage/cards/v/VeiledSentry.java b/Mage.Sets/src/mage/cards/v/VeiledSentry.java index 7481a2f557a..f8b69de88ed 100644 --- a/Mage.Sets/src/mage/cards/v/VeiledSentry.java +++ b/Mage.Sets/src/mage/cards/v/VeiledSentry.java @@ -28,7 +28,7 @@ public final class VeiledSentry extends CardImpl { // When an opponent casts a spell, if Veiled Sentry is an enchantment, Veiled Sentry becomes an Illusion creature with power and toughness each equal to that spell's converted mana cost. TriggeredAbility ability = new SpellCastOpponentTriggeredAbility(Zone.BATTLEFIELD, new VeiledSentryEffect(), new FilterSpell(), false, SetTargetPointer.SPELL); this.addAbility(new ConditionalInterveningIfTriggeredAbility(ability, new SourceMatchesFilterCondition(StaticFilters.FILTER_ENCHANTMENT_PERMANENT), - "Whenever an opponent casts a spell, if Veiled Sentry is an enchantment, Veil Sentry becomes an Illusion creature with power and toughness equal to that spell's converted mana cost.")); + "Whenever an opponent casts a spell, if Veiled Sentry is an enchantment, Veil Sentry becomes an Illusion creature with power and toughness equal to that spell's mana value.")); } @@ -46,7 +46,7 @@ class VeiledSentryEffect extends ContinuousEffectImpl { public VeiledSentryEffect() { super(Duration.Custom, Outcome.BecomeCreature); - staticText = "{this} becomes an Illusion creature with power and toughness equal to that spell's converted mana cost"; + staticText = "{this} becomes an Illusion creature with power and toughness equal to that spell's mana value"; } public VeiledSentryEffect(final VeiledSentryEffect effect) { @@ -63,7 +63,7 @@ class VeiledSentryEffect extends ContinuousEffectImpl { Permanent veiledSentry = game.getPermanent(source.getSourceId()); Spell spellCast = game.getSpell(targetPointer.getFirst(game, source)); if (spellCast != null) { - game.getState().setValue(source + "cmcSpell", spellCast.getConvertedManaCost()); + game.getState().setValue(source + "cmcSpell", spellCast.getManaValue()); } if (veiledSentry == null) { return false; diff --git a/Mage.Sets/src/mage/cards/v/VelomachusLorehold.java b/Mage.Sets/src/mage/cards/v/VelomachusLorehold.java index e5444c0a9f6..1e3e42c0fad 100644 --- a/Mage.Sets/src/mage/cards/v/VelomachusLorehold.java +++ b/Mage.Sets/src/mage/cards/v/VelomachusLorehold.java @@ -12,7 +12,7 @@ import mage.cards.*; import mage.constants.*; import mage.filter.FilterCard; import mage.filter.common.FilterInstantOrSorceryCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -89,7 +89,7 @@ class VelomachusLoreholdEffect extends OneShotEffect { FilterCard filter = new FilterInstantOrSorceryCard( "instant or sorcery card with mana value " + permanent.getPower().getValue() + " or less" ); - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, permanent.getPower().getValue() + 1)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, permanent.getPower().getValue() + 1)); TargetCard target = new TargetCardInLibrary(0, 1, filter); controller.choose(Outcome.PlayForFree, cards, target, game); Card card = controller.getLibrary().getCard(target.getFirstTarget(), game); diff --git a/Mage.Sets/src/mage/cards/v/VenarianGlimmer.java b/Mage.Sets/src/mage/cards/v/VenarianGlimmer.java index 9d612593afb..e8ae651d73f 100644 --- a/Mage.Sets/src/mage/cards/v/VenarianGlimmer.java +++ b/Mage.Sets/src/mage/cards/v/VenarianGlimmer.java @@ -14,7 +14,7 @@ import mage.constants.Outcome; import mage.constants.TargetController; import mage.filter.FilterCard; import mage.filter.common.FilterNonlandCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.players.Player; import mage.target.TargetPlayer; @@ -47,7 +47,7 @@ class VenarianGlimmerEffect extends OneShotEffect { public VenarianGlimmerEffect() { super(Outcome.Discard); - this.staticText = "Target player reveals their hand. You choose a nonland card with converted mana cost X or less from it. That player discards that card"; + this.staticText = "Target player reveals their hand. You choose a nonland card with mana value X or less from it. That player discards that card"; } public VenarianGlimmerEffect(final VenarianGlimmerEffect effect) { @@ -64,7 +64,7 @@ class VenarianGlimmerEffect extends OneShotEffect { Player player = game.getPlayer(targetPointer.getFirst(game, source)); if (player != null) { FilterCard filter = new FilterNonlandCard(); - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, source.getManaCostsToPay().getX() + 1)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, source.getManaCostsToPay().getX() + 1)); Effect effect = new DiscardCardYouChooseTargetEffect(filter, TargetController.ANY); effect.setTargetPointer(targetPointer); effect.apply(game, source); diff --git a/Mage.Sets/src/mage/cards/v/VenerableWarsinger.java b/Mage.Sets/src/mage/cards/v/VenerableWarsinger.java index 2216b83480e..269eb2ba72a 100644 --- a/Mage.Sets/src/mage/cards/v/VenerableWarsinger.java +++ b/Mage.Sets/src/mage/cards/v/VenerableWarsinger.java @@ -13,7 +13,7 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.common.FilterCreatureCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.game.events.DamagedEvent; import mage.game.events.GameEvent; @@ -86,7 +86,7 @@ class VenerableWarsingerTriggeredAbility extends TriggeredAbilityImpl { FilterCard filter = new FilterCreatureCard( "creature card with mana value " + event.getAmount() + " less from your graveyard" ); - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, event.getAmount() + 1)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, event.getAmount() + 1)); this.getTargets().clear(); this.addTarget(new TargetCardInYourGraveyard(filter)); return true; diff --git a/Mage.Sets/src/mage/cards/v/VengefulRebirth.java b/Mage.Sets/src/mage/cards/v/VengefulRebirth.java index e45dc1c07db..06e7d9d34f6 100644 --- a/Mage.Sets/src/mage/cards/v/VengefulRebirth.java +++ b/Mage.Sets/src/mage/cards/v/VengefulRebirth.java @@ -50,7 +50,7 @@ class VengefulRebirthEffect extends OneShotEffect { super(Outcome.DrawCard); staticText = "Return target card from your graveyard to your hand. " + "If you return a nonland card to your hand this way, " + - "{this} deals damage equal to that card's converted mana cost to any target"; + "{this} deals damage equal to that card's mana value to any target"; } public VengefulRebirthEffect(final VengefulRebirthEffect effect) { @@ -75,7 +75,7 @@ class VengefulRebirthEffect extends OneShotEffect { if (card.isLand()) { return true; } - int damage = card.getConvertedManaCost(); + int damage = card.getManaValue(); Permanent permanent = game.getPermanent(source.getTargets().get(1).getFirstTarget()); if (permanent != null) { permanent.damage(damage, source.getSourceId(), source, game, false, true); diff --git a/Mage.Sets/src/mage/cards/v/VialSmasherTheFierce.java b/Mage.Sets/src/mage/cards/v/VialSmasherTheFierce.java index 8767426e2bb..4c842b52364 100644 --- a/Mage.Sets/src/mage/cards/v/VialSmasherTheFierce.java +++ b/Mage.Sets/src/mage/cards/v/VialSmasherTheFierce.java @@ -84,7 +84,7 @@ class VialSmasherTheFierceTriggeredAbility extends SpellCastControllerTriggeredA Spell spell = game.getStack().getSpell(event.getTargetId()); if (spell != null) { for (Effect effect : getEffects()) { - effect.setValue("VialSmasherTheFierceCMC", spell.getConvertedManaCost()); + effect.setValue("VialSmasherTheFierceCMC", spell.getManaValue()); } return true; } @@ -97,7 +97,7 @@ class VialSmasherTheFierceTriggeredAbility extends SpellCastControllerTriggeredA @Override public String getRule() { return "Whenever you cast your first spell each turn, choose an opponent at random. " - + "{this} deals damage equal to that spell's converted mana cost to that player or a planeswalker that player controls."; + + "{this} deals damage equal to that spell's mana value to that player or a planeswalker that player controls."; } } @@ -105,7 +105,7 @@ class VialSmasherTheFierceEffect extends OneShotEffect { public VialSmasherTheFierceEffect() { super(Outcome.Damage); - this.staticText = "{this} choose an opponent at random. {this} deals damage equal to that spell's converted mana cost to that player or a planeswalker that player controls"; + this.staticText = "{this} choose an opponent at random. {this} deals damage equal to that spell's mana value to that player or a planeswalker that player controls"; } public VialSmasherTheFierceEffect(final VialSmasherTheFierceEffect effect) { diff --git a/Mage.Sets/src/mage/cards/v/ViashinoHeretic.java b/Mage.Sets/src/mage/cards/v/ViashinoHeretic.java index 65f534b6d86..4c6d85ead97 100644 --- a/Mage.Sets/src/mage/cards/v/ViashinoHeretic.java +++ b/Mage.Sets/src/mage/cards/v/ViashinoHeretic.java @@ -70,7 +70,7 @@ class ViashinoHereticEffect extends OneShotEffect { Permanent permanent = game.getPermanent(source.getFirstTarget()); if (permanent != null) { - int couvertedManaCost = permanent.getConvertedManaCost(); + int couvertedManaCost = permanent.getManaValue(); Player player = game.getPlayer(permanent.getControllerId()); permanent.destroy(source, game, false); if (player != null) { @@ -83,6 +83,6 @@ class ViashinoHereticEffect extends OneShotEffect { @Override public String getText(Mode mode) { - return "Destroy target artifact. Viashino Heretic deals damage to that artifact's controller equal to the artifact's converted mana cost"; + return "Destroy target artifact. Viashino Heretic deals damage to that artifact's controller equal to the artifact's mana value"; } } \ No newline at end of file diff --git a/Mage.Sets/src/mage/cards/v/VillainousWealth.java b/Mage.Sets/src/mage/cards/v/VillainousWealth.java index 4b8443432de..97f078d8586 100644 --- a/Mage.Sets/src/mage/cards/v/VillainousWealth.java +++ b/Mage.Sets/src/mage/cards/v/VillainousWealth.java @@ -10,7 +10,7 @@ import mage.constants.Outcome; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.common.FilterNonlandCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCardInExile; @@ -50,7 +50,7 @@ class VillainousWealthEffect extends OneShotEffect { public VillainousWealthEffect() { super(Outcome.PlayForFree); this.staticText = "Target opponent exiles the top X cards of their library. " - + "You may cast any number of spells with converted mana cost X " + + "You may cast any number of spells with mana value X " + "or less from among them without paying their mana costs"; } @@ -70,7 +70,7 @@ class VillainousWealthEffect extends OneShotEffect { if (controller != null && mageObject != null) { Player player = game.getPlayer(targetPointer.getFirst(game, source)); FilterCard filter = new FilterNonlandCard(); - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, source.getManaCostsToPay().getX() + 1)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, source.getManaCostsToPay().getX() + 1)); UUID exileId = CardUtil.getCardExileZoneId(game, source); if (player != null) { Cards cardsToExile = new CardsImpl(); diff --git a/Mage.Sets/src/mage/cards/v/VivienMonstersAdvocate.java b/Mage.Sets/src/mage/cards/v/VivienMonstersAdvocate.java index 05c32853046..66456d113e1 100644 --- a/Mage.Sets/src/mage/cards/v/VivienMonstersAdvocate.java +++ b/Mage.Sets/src/mage/cards/v/VivienMonstersAdvocate.java @@ -18,7 +18,7 @@ import mage.constants.*; import mage.counters.CounterType; import mage.filter.FilterCard; import mage.filter.common.FilterCreatureCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; @@ -142,9 +142,9 @@ class VivienMonstersAdvocateTriggeredAbility extends DelayedTriggeredAbility { Spell spell = game.getSpell(event.getTargetId()); if (spell != null && spell.isCreature()) { - int cmc = spell.getConvertedManaCost(); - FilterCard filter = new FilterCreatureCard("creature card with converted mana cost less than " + cmc); - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, cmc)); + int cmc = spell.getManaValue(); + FilterCard filter = new FilterCreatureCard("creature card with mana value less than " + cmc); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, cmc)); this.getEffects().clear(); this.getEffects().add(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter))); return true; @@ -160,7 +160,7 @@ class VivienMonstersAdvocateTriggeredAbility extends DelayedTriggeredAbility { @Override public String getRule() { return "When you cast your next creature spell this turn, " - + "search your library for a creature card with lesser converted mana cost, " + + "search your library for a creature card with lesser mana value, " + "put it onto the battlefield, then shuffle your library."; } } diff --git a/Mage.Sets/src/mage/cards/v/ViviensArkbow.java b/Mage.Sets/src/mage/cards/v/ViviensArkbow.java index 1ebf9debe05..98cc6246800 100644 --- a/Mage.Sets/src/mage/cards/v/ViviensArkbow.java +++ b/Mage.Sets/src/mage/cards/v/ViviensArkbow.java @@ -10,7 +10,7 @@ import mage.cards.*; import mage.constants.*; import mage.filter.FilterCard; import mage.filter.common.FilterCreatureCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.players.Player; import mage.target.TargetCard; @@ -52,7 +52,7 @@ class ViviensArkbowEffect extends OneShotEffect { ViviensArkbowEffect() { super(Outcome.PutCardInPlay); staticText = "Look at the top X cards of your library. " + - "You may put a creature card with converted mana cost X or less " + + "You may put a creature card with mana value X or less " + "from among them onto the battlefield. Put the rest on the bottom of your library in a random order."; } @@ -75,8 +75,8 @@ class ViviensArkbowEffect extends OneShotEffect { Cards cards = new CardsImpl(player.getLibrary().getTopCards(game, xValue)); player.lookAtCards(source, null, cards, game); - FilterCard filter = new FilterCreatureCard("creature card with converted mana cost " + xValue + " or less"); - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, xValue + 1)); + FilterCard filter = new FilterCreatureCard("creature card with mana value " + xValue + " or less"); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, xValue + 1)); TargetCard target = new TargetCardInLibrary(0, 1, filter); if (player.choose(outcome, cards, target, game)) { diff --git a/Mage.Sets/src/mage/cards/v/Void.java b/Mage.Sets/src/mage/cards/v/Void.java index 4dd460d4679..56b1ba6e110 100644 --- a/Mage.Sets/src/mage/cards/v/Void.java +++ b/Mage.Sets/src/mage/cards/v/Void.java @@ -10,7 +10,7 @@ import mage.constants.ComparisonType; import mage.constants.Outcome; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -45,7 +45,7 @@ class VoidEffect extends OneShotEffect { VoidEffect() { super(Outcome.DestroyPermanent); - this.staticText = "Choose a number. Destroy all artifacts and creatures with converted mana cost equal to that number. Then target player reveals their hand and discards all nonland cards with converted mana cost equal to the number"; + this.staticText = "Choose a number. Destroy all artifacts and creatures with mana value equal to that number. Then target player reveals their hand and discards all nonland cards with mana value equal to the number"; } private VoidEffect(final VoidEffect effect) { @@ -69,12 +69,12 @@ class VoidEffect extends OneShotEffect { for (Permanent permanent : game.getBattlefield().getActivePermanents(source.getControllerId(), game)) { if ((permanent.isArtifact() || permanent.isCreature()) - && permanent.getConvertedManaCost() == number) { + && permanent.getManaValue() == number) { permanent.destroy(source, game, false); } } FilterCard filterCard = new FilterCard(); - filterCard.add(new ConvertedManaCostPredicate(ComparisonType.EQUAL_TO, number)); + filterCard.add(new ManaValuePredicate(ComparisonType.EQUAL_TO, number)); filterCard.add(Predicates.not(CardType.LAND.getPredicate())); Player targetPlayer = game.getPlayer(targetPointer.getFirst(game, source)); diff --git a/Mage.Sets/src/mage/cards/v/VoidWinnower.java b/Mage.Sets/src/mage/cards/v/VoidWinnower.java index 6dcaa9dad7d..16c0efe7357 100644 --- a/Mage.Sets/src/mage/cards/v/VoidWinnower.java +++ b/Mage.Sets/src/mage/cards/v/VoidWinnower.java @@ -11,7 +11,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.game.Game; import mage.game.events.GameEvent; -import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; import mage.game.stack.Spell; @@ -50,7 +49,7 @@ class VoidWinnowerCantCastEffect extends ContinuousRuleModifyingEffectImpl { public VoidWinnowerCantCastEffect() { super(Duration.WhileOnBattlefield, Outcome.Benefit); - staticText = "Your opponent can't cast spells with even converted mana costs. (Zero is even.)"; + staticText = "Your opponent can't cast spells with even mana values. (Zero is even.)"; } public VoidWinnowerCantCastEffect(final VoidWinnowerCantCastEffect effect) { @@ -71,7 +70,7 @@ class VoidWinnowerCantCastEffect extends ContinuousRuleModifyingEffectImpl { public String getInfoMessage(Ability source, GameEvent event, Game game) { MageObject mageObject = game.getObject(source.getSourceId()); if (mageObject != null) { - return "You can't cast spells with even converted mana costs (" + mageObject.getIdName() + ")."; + return "You can't cast spells with even mana values (" + mageObject.getIdName() + ")."; } return null; } @@ -87,7 +86,7 @@ class VoidWinnowerCantCastEffect extends ContinuousRuleModifyingEffectImpl { Spell spell = game.getStack().getSpell(event.getTargetId()); if (spell != null) { // the low bit will always be set on an odd number. - return (spell.getConvertedManaCost() & 1) == 0; + return (spell.getManaValue() & 1) == 0; } } return false; @@ -98,7 +97,7 @@ class VoidWinnowerCantBlockEffect extends RestrictionEffect { public VoidWinnowerCantBlockEffect() { super(Duration.WhileOnBattlefield); - staticText = "Your opponents can't block with creatures with even converted mana costs"; + staticText = "Your opponents can't block with creatures with even mana values"; } public VoidWinnowerCantBlockEffect(final VoidWinnowerCantBlockEffect effect) { @@ -114,7 +113,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.getConvertedManaCost() & 1) == 0; + return (permanent.getManaValue() & 1) == 0; } return false; } diff --git a/Mage.Sets/src/mage/cards/v/VolcanicVision.java b/Mage.Sets/src/mage/cards/v/VolcanicVision.java index f7a6595b3b6..252f5bb9750 100644 --- a/Mage.Sets/src/mage/cards/v/VolcanicVision.java +++ b/Mage.Sets/src/mage/cards/v/VolcanicVision.java @@ -54,7 +54,7 @@ class VolcanicVisionReturnToHandTargetEffect extends OneShotEffect { public VolcanicVisionReturnToHandTargetEffect() { super(Outcome.ReturnToHand); - staticText = "Return target instant or sorcery card from your graveyard to your hand. {this} deals damage equal to that card's converted mana cost to each creature your opponents control"; + staticText = "Return target instant or sorcery card from your graveyard to your hand. {this} deals damage equal to that card's mana value to each creature your opponents control"; } public VolcanicVisionReturnToHandTargetEffect(final VolcanicVisionReturnToHandTargetEffect effect) { @@ -78,7 +78,7 @@ class VolcanicVisionReturnToHandTargetEffect extends OneShotEffect { Card card = game.getCard(targetId); if (card != null) { controller.moveCards(card, Zone.HAND, source, game); - int damage = card.getConvertedManaCost(); + int damage = card.getManaValue(); if (damage > 0) { for (Permanent creature : game.getBattlefield().getActivePermanents(filter, source.getControllerId(), source.getSourceId(), game)) { creature.damage(damage, source.getSourceId(), source, game, false, true); diff --git a/Mage.Sets/src/mage/cards/v/VolrathTheFallen.java b/Mage.Sets/src/mage/cards/v/VolrathTheFallen.java index bcda2e8a5ed..f104a610a1c 100644 --- a/Mage.Sets/src/mage/cards/v/VolrathTheFallen.java +++ b/Mage.Sets/src/mage/cards/v/VolrathTheFallen.java @@ -34,7 +34,7 @@ public final class VolrathTheFallen extends CardImpl { // {1}{B}, Discard a creature card: // Volrath the Fallen gets +X/+X until end of turn, where X is the discarded card's converted mana cost. Effect effect = new BoostSourceEffect(DiscardCostCardConvertedMana.instance, DiscardCostCardConvertedMana.instance, Duration.EndOfTurn); - effect.setText("{this} gets +X/+X until end of turn, where X is the discarded card's converted mana cost"); + effect.setText("{this} gets +X/+X until end of turn, where X is the discarded card's mana value"); Ability ability = new SimpleActivatedAbility( Zone.BATTLEFIELD, diff --git a/Mage.Sets/src/mage/cards/v/VraskaGolgariQueen.java b/Mage.Sets/src/mage/cards/v/VraskaGolgariQueen.java index 658de83b6e1..209f27da528 100644 --- a/Mage.Sets/src/mage/cards/v/VraskaGolgariQueen.java +++ b/Mage.Sets/src/mage/cards/v/VraskaGolgariQueen.java @@ -19,7 +19,7 @@ import mage.constants.SuperType; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterNonlandPermanent; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.command.emblems.VraskaGolgariQueenEmblem; import mage.target.TargetPermanent; @@ -34,11 +34,11 @@ public final class VraskaGolgariQueen extends CardImpl { private static final FilterControlledPermanent filter1 = new FilterControlledPermanent("another permanent"); private static final FilterPermanent filter2 - = new FilterNonlandPermanent("nonland permanent with converted mana cost 3 or less"); + = new FilterNonlandPermanent("nonland permanent with mana value 3 or less"); static { filter1.add(AnotherPredicate.instance); - filter2.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 4)); + filter2.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 4)); } public VraskaGolgariQueen(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/w/WandOfIth.java b/Mage.Sets/src/mage/cards/w/WandOfIth.java index bc852fb6aab..8b4032d7512 100644 --- a/Mage.Sets/src/mage/cards/w/WandOfIth.java +++ b/Mage.Sets/src/mage/cards/w/WandOfIth.java @@ -49,7 +49,7 @@ class WandOfIthEffect extends OneShotEffect { public WandOfIthEffect() { super(Outcome.Discard); - staticText = "Target player reveals a card at random from their hand. If it's a land card, that player discards it unless they pay 1 life. If it isn't a land card, the player discards it unless they pay life equal to its converted mana cost"; + staticText = "Target player reveals a card at random from their hand. If it's a land card, that player discards it unless they pay 1 life. If it isn't a land card, the player discards it unless they pay life equal to its mana value"; } public WandOfIthEffect(final WandOfIthEffect effect) { @@ -66,7 +66,7 @@ class WandOfIthEffect extends OneShotEffect { if (card != null) { revealed.add(card); player.revealCards(sourcePermanent.getName(), revealed, game); - int lifeToPay = card.isLand() ? 1 : card.getConvertedManaCost(); + int lifeToPay = card.isLand() ? 1 : card.getManaValue(); PayLifeCost cost = new PayLifeCost(lifeToPay); if (cost.canPay(source, source, player.getId(), game) && player.chooseUse(outcome, "Pay " + lifeToPay + " life to prevent discarding " + card.getLogName() + "?", source, game) diff --git a/Mage.Sets/src/mage/cards/w/WaveOfTerror.java b/Mage.Sets/src/mage/cards/w/WaveOfTerror.java index f992a32a349..7d218498b06 100644 --- a/Mage.Sets/src/mage/cards/w/WaveOfTerror.java +++ b/Mage.Sets/src/mage/cards/w/WaveOfTerror.java @@ -16,7 +16,7 @@ import mage.constants.Outcome; import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -50,7 +50,7 @@ class WaveOfTerrorEffect extends OneShotEffect { WaveOfTerrorEffect() { super(Outcome.DestroyPermanent); - this.staticText = "destroy each creature with converted mana cost equal to the number of age counters on {this}. They can't be regenerated."; + this.staticText = "destroy each creature with mana value equal to the number of age counters on {this}. They can't be regenerated."; } WaveOfTerrorEffect(final WaveOfTerrorEffect effect) { @@ -69,7 +69,7 @@ class WaveOfTerrorEffect extends OneShotEffect { return false; } FilterCreaturePermanent filter = new FilterCreaturePermanent(); - filter.add(new ConvertedManaCostPredicate( + filter.add(new ManaValuePredicate( ComparisonType.EQUAL_TO, permanent.getCounters(game).getCount(CounterType.AGE) )); diff --git a/Mage.Sets/src/mage/cards/w/WisdomOfTheJedi.java b/Mage.Sets/src/mage/cards/w/WisdomOfTheJedi.java index 75da31c129f..d764e71ed49 100644 --- a/Mage.Sets/src/mage/cards/w/WisdomOfTheJedi.java +++ b/Mage.Sets/src/mage/cards/w/WisdomOfTheJedi.java @@ -14,7 +14,7 @@ import mage.constants.CardType; import mage.constants.ComparisonType; import mage.constants.Duration; import mage.filter.FilterSpell; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.target.TargetSpell; import mage.target.common.TargetControlledCreaturePermanent; @@ -24,10 +24,10 @@ import mage.target.common.TargetControlledCreaturePermanent; */ public final class WisdomOfTheJedi extends CardImpl { - private static final FilterSpell filterSpell = new FilterSpell("spell with converted mana cost of 3 or less"); + private static final FilterSpell filterSpell = new FilterSpell("spell with mana value of 3 or less"); static { - filterSpell.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 4)); + filterSpell.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 4)); } public WisdomOfTheJedi(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/w/WitherbloomCommand.java b/Mage.Sets/src/mage/cards/w/WitherbloomCommand.java index 12c8c06b65c..8ebc8f61768 100644 --- a/Mage.Sets/src/mage/cards/w/WitherbloomCommand.java +++ b/Mage.Sets/src/mage/cards/w/WitherbloomCommand.java @@ -19,7 +19,7 @@ import mage.filter.FilterPermanent; import mage.filter.StaticFilters; import mage.filter.common.FilterNonlandPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.players.Player; import mage.target.TargetCard; @@ -41,7 +41,7 @@ public final class WitherbloomCommand extends CardImpl { static { filter.add(Predicates.not(CardType.CREATURE.getPredicate())); - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 3)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 3)); } public WitherbloomCommand(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/w/WolfOfDevilsBreach.java b/Mage.Sets/src/mage/cards/w/WolfOfDevilsBreach.java index 628b3eccb49..f09250fcc5d 100644 --- a/Mage.Sets/src/mage/cards/w/WolfOfDevilsBreach.java +++ b/Mage.Sets/src/mage/cards/w/WolfOfDevilsBreach.java @@ -41,9 +41,9 @@ public final class WolfOfDevilsBreach extends CardImpl { toPay.add(new ManaCostsImpl<>("{1}{R}")); toPay.add(new DiscardCardCost()); Ability ability = new AttacksTriggeredAbility(new DoIfCostPaid(new DamageTargetEffect(new WolfOfDevilsBreachDiscardCostCardConvertedMana()), toPay, - "Pay {1}{R} and discard a card to let {this} do damage to target creature or planeswalker equal to the discarded card's converted mana cost?", true), false, + "Pay {1}{R} and discard a card to let {this} do damage to target creature or planeswalker equal to the discarded card's mana value?", true), false, "Whenever {this} attacks you may pay {1}{R} and discard a card. If you do, {this} deals damage to target creature or planeswalker " - + "equal to the discarded card's converted mana cost."); + + "equal to the discarded card's mana value."); ability.addTarget(new TargetCreatureOrPlaneswalker()); this.addAbility(ability); } @@ -72,7 +72,7 @@ class WolfOfDevilsBreachDiscardCostCardConvertedMana implements DynamicValue { DiscardCardCost discardCost = (DiscardCardCost) cost; int cmc = 0; for (Card card : discardCost.getCards()) { - cmc += card.getConvertedManaCost(); + cmc += card.getManaValue(); } return cmc; } @@ -95,6 +95,6 @@ class WolfOfDevilsBreachDiscardCostCardConvertedMana implements DynamicValue { @Override public String getMessage() { - return "the discarded card's converted mana cost"; + return "the discarded card's mana value"; } } diff --git a/Mage.Sets/src/mage/cards/w/WoodlandBellower.java b/Mage.Sets/src/mage/cards/w/WoodlandBellower.java index f33e3e546c7..c9ce0419247 100644 --- a/Mage.Sets/src/mage/cards/w/WoodlandBellower.java +++ b/Mage.Sets/src/mage/cards/w/WoodlandBellower.java @@ -19,7 +19,7 @@ import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCardInLibrary; @@ -54,7 +54,7 @@ class WoodlandBellowerEffect extends OneShotEffect { WoodlandBellowerEffect() { super(Outcome.PutCreatureInPlay); - staticText = "Search your library for a nonlegendary green creature card with converted mana cost 3 or less, put it onto the battlefield, then shuffle your library"; + staticText = "Search your library for a nonlegendary green creature card with mana value 3 or less, put it onto the battlefield, then shuffle your library"; } WoodlandBellowerEffect(final WoodlandBellowerEffect effect) { @@ -67,11 +67,11 @@ class WoodlandBellowerEffect extends OneShotEffect { if (controller == null) { return false; } - FilterCard filter = new FilterCard("nonlegendary green creature card with converted mana cost 3 or less"); + FilterCard filter = new FilterCard("nonlegendary green creature card with mana value 3 or less"); filter.add(new ColorPredicate(ObjectColor.GREEN)); filter.add(CardType.CREATURE.getPredicate()); filter.add(Predicates.not(SuperType.LEGENDARY.getPredicate())); - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 4)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 4)); TargetCardInLibrary target = new TargetCardInLibrary(filter); if (controller.searchLibrary(target, source, game)) { if (!target.getTargets().isEmpty()) { diff --git a/Mage.Sets/src/mage/cards/w/WordOfBlasting.java b/Mage.Sets/src/mage/cards/w/WordOfBlasting.java index f8ebdb26dfc..0ba5e875a09 100644 --- a/Mage.Sets/src/mage/cards/w/WordOfBlasting.java +++ b/Mage.Sets/src/mage/cards/w/WordOfBlasting.java @@ -2,7 +2,7 @@ package mage.cards.w; import java.util.UUID; -import mage.abilities.dynamicvalue.common.TargetConvertedManaCost; +import mage.abilities.dynamicvalue.common.TargetManaValue; import mage.abilities.effects.Effect; import mage.abilities.effects.common.DamageTargetControllerEffect; import mage.abilities.effects.common.DestroyTargetEffect; @@ -30,8 +30,8 @@ public final class WordOfBlasting extends CardImpl { // Destroy target Wall. It can't be regenerated. Word of Blasting deals damage equal to that Wall's converted mana cost to the Wall's controller. this.getSpellAbility().addEffect(new DestroyTargetEffect(true)); - Effect effect = new DamageTargetControllerEffect(TargetConvertedManaCost.instance); - effect.setText("{this} deals damage equal to that Wall's converted mana cost to the Wall's controller"); + Effect effect = new DamageTargetControllerEffect(TargetManaValue.instance); + effect.setText("{this} deals damage equal to that Wall's mana value to the Wall's controller"); this.getSpellAbility().addEffect(effect); this.getSpellAbility().addTarget(new TargetPermanent(filter)); } diff --git a/Mage.Sets/src/mage/cards/x/XenicPoltergeist.java b/Mage.Sets/src/mage/cards/x/XenicPoltergeist.java index b9f12027b29..fba8185af5b 100644 --- a/Mage.Sets/src/mage/cards/x/XenicPoltergeist.java +++ b/Mage.Sets/src/mage/cards/x/XenicPoltergeist.java @@ -68,7 +68,7 @@ class XenicPoltergeistEffect extends ContinuousEffectImpl { public XenicPoltergeistEffect() { super(Duration.Custom, Outcome.BecomeCreature); - staticText = "Until your next upkeep, target noncreature artifact becomes an artifact creature with power and toughness each equal to its converted mana cost"; + staticText = "Until your next upkeep, target noncreature artifact becomes an artifact creature with power and toughness each equal to its mana value"; } public XenicPoltergeistEffect(final XenicPoltergeistEffect effect) { @@ -113,7 +113,7 @@ class XenicPoltergeistEffect extends ContinuousEffectImpl { UUID permanentId = targetPointer.getFirst(game, source); Permanent permanent = game.getPermanentOrLKIBattlefield(permanentId); if (permanent != null) { - int manaCost = permanent.getConvertedManaCost(); + int manaCost = permanent.getManaValue(); permanent.getPower().setValue(manaCost); permanent.getToughness().setValue(manaCost); } diff --git a/Mage.Sets/src/mage/cards/y/YennettCrypticSovereign.java b/Mage.Sets/src/mage/cards/y/YennettCrypticSovereign.java index 723368e56cb..0caca766001 100644 --- a/Mage.Sets/src/mage/cards/y/YennettCrypticSovereign.java +++ b/Mage.Sets/src/mage/cards/y/YennettCrypticSovereign.java @@ -66,7 +66,7 @@ class YennettCrypticSovereignEffect extends OneShotEffect { super(Outcome.Benefit); this.staticText = "reveal the top card of your library. " + "You may cast it without paying its mana cost " + - "if its converted mana cost is odd. " + + "if its mana value is odd. " + "If you don't cast it, draw a card."; } @@ -90,7 +90,7 @@ class YennettCrypticSovereignEffect extends OneShotEffect { return false; } player.revealCards(source, new CardsImpl(card), game); - if (card.getConvertedManaCost() % 2 == 1) { + if (card.getManaValue() % 2 == 1) { if (player.chooseUse(outcome, "Cast " + card.getLogName() + " without paying its mana cost?", source, game)) { player.cast(card.getSpellAbility(), game, true, new ApprovingObject(source, game)); } else { diff --git a/Mage.Sets/src/mage/cards/y/YisanTheWandererBard.java b/Mage.Sets/src/mage/cards/y/YisanTheWandererBard.java index 36aa367d50a..0ab1e4c7336 100644 --- a/Mage.Sets/src/mage/cards/y/YisanTheWandererBard.java +++ b/Mage.Sets/src/mage/cards/y/YisanTheWandererBard.java @@ -20,7 +20,7 @@ import mage.constants.SuperType; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -62,7 +62,7 @@ class YisanTheWandererBardEffect extends OneShotEffect { public YisanTheWandererBardEffect() { super(Outcome.Benefit); - this.staticText = "Search your library for a creature card with converted mana cost equal to the number of verse counters on {this}, put it onto the battlefield, then shuffle your library"; + this.staticText = "Search your library for a creature card with mana value equal to the number of verse counters on {this}, put it onto the battlefield, then shuffle your library"; } public YisanTheWandererBardEffect(final YisanTheWandererBardEffect effect) { @@ -80,8 +80,8 @@ class YisanTheWandererBardEffect extends OneShotEffect { Permanent sourcePermanent = game.getPermanentOrLKIBattlefield(source.getSourceId()); if (sourcePermanent != null && controller != null) { int newConvertedCost = sourcePermanent.getCounters(game).getCount(CounterType.VERSE); - FilterCard filter = new FilterCard("creature card with converted mana cost " + newConvertedCost); - filter.add(new ConvertedManaCostPredicate(ComparisonType.EQUAL_TO, newConvertedCost)); + FilterCard filter = new FilterCard("creature card with mana value " + newConvertedCost); + filter.add(new ManaValuePredicate(ComparisonType.EQUAL_TO, newConvertedCost)); filter.add(CardType.CREATURE.getPredicate()); TargetCardInLibrary target = new TargetCardInLibrary(filter); if (controller.searchLibrary(target, source, game)) { diff --git a/Mage.Sets/src/mage/cards/y/YurikoTheTigersShadow.java b/Mage.Sets/src/mage/cards/y/YurikoTheTigersShadow.java index ab27d1a9f63..1fd2058ebf0 100644 --- a/Mage.Sets/src/mage/cards/y/YurikoTheTigersShadow.java +++ b/Mage.Sets/src/mage/cards/y/YurikoTheTigersShadow.java @@ -71,7 +71,7 @@ class YurikoTheTigersShadowEffect extends OneShotEffect { super(Outcome.Benefit); this.staticText = "reveal the top card of your library " + "and put that card into your hand. Each opponent loses life " - + "equal to that card's converted mana cost"; + + "equal to that card's mana value"; } public YurikoTheTigersShadowEffect(final YurikoTheTigersShadowEffect effect) { @@ -96,7 +96,7 @@ class YurikoTheTigersShadowEffect extends OneShotEffect { player.revealCards(source, new CardsImpl(card), game); player.moveCards(card, Zone.HAND, source, game); return new LoseLifeOpponentsEffect( - card.getConvertedManaCost() + card.getManaValue() ).apply(game, source); } } diff --git a/Mage.Sets/src/mage/cards/z/ZaffaiThunderConductor.java b/Mage.Sets/src/mage/cards/z/ZaffaiThunderConductor.java index 0e00e13480b..3e1e797fbd7 100644 --- a/Mage.Sets/src/mage/cards/z/ZaffaiThunderConductor.java +++ b/Mage.Sets/src/mage/cards/z/ZaffaiThunderConductor.java @@ -72,11 +72,11 @@ class ZaffaiThunderConductorEffect extends OneShotEffect { } player.scry(1, source, game); Spell spell = (Spell) getValue(MagecraftAbility.SPELL_KEY); - if (spell == null || spell.getConvertedManaCost() < 5) { + if (spell == null || spell.getManaValue() < 5) { return false; } new PrismariToken().putOntoBattlefield(1, game, source, source.getControllerId()); - if (spell.getConvertedManaCost() < 10) { + if (spell.getManaValue() < 10) { return true; } TargetOpponent target = new TargetOpponent(true); diff --git a/Mage.Sets/src/mage/cards/z/ZurTheEnchanter.java b/Mage.Sets/src/mage/cards/z/ZurTheEnchanter.java index 73d9e05d2c1..776e894fad8 100644 --- a/Mage.Sets/src/mage/cards/z/ZurTheEnchanter.java +++ b/Mage.Sets/src/mage/cards/z/ZurTheEnchanter.java @@ -13,7 +13,7 @@ import mage.constants.ComparisonType; import mage.constants.SubType; import mage.constants.SuperType; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.target.common.TargetCardInLibrary; /** @@ -22,11 +22,11 @@ import mage.target.common.TargetCardInLibrary; */ public final class ZurTheEnchanter extends CardImpl { - private static final FilterCard filter = new FilterCard("enchantment card with converted mana cost 3 or less"); + private static final FilterCard filter = new FilterCard("enchantment card with mana value 3 or less"); static { filter.add(CardType.ENCHANTMENT.getPredicate()); - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 4)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 4)); } public ZurTheEnchanter(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/copy/PhantasmalImageTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/copy/PhantasmalImageTest.java index 12e66f80fb1..2b432ee1f3f 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/copy/PhantasmalImageTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/copy/PhantasmalImageTest.java @@ -292,7 +292,7 @@ public class PhantasmalImageTest extends CardTestPlayerBase { attack(4, playerB, "Steel Hellkite"); - activateAbility(4, PhaseStep.POSTCOMBAT_MAIN, playerB, "{X}: Destroy each nonland permanent with converted mana cost X whose controller was dealt combat damage by {this} this turn. Activate this ability only once each turn."); + activateAbility(4, PhaseStep.POSTCOMBAT_MAIN, playerB, "{X}: Destroy each nonland permanent with mana value X whose controller was dealt combat damage by {this} this turn. Activate this ability only once each turn."); setChoice(playerB, "X=0"); setStopAt(4, PhaseStep.END_TURN); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/copy/VolrathsShapshifterTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/copy/VolrathsShapshifterTest.java index 904dfefaf49..f8019431907 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/copy/VolrathsShapshifterTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/copy/VolrathsShapshifterTest.java @@ -116,7 +116,7 @@ public class VolrathsShapshifterTest extends CardTestPlayerBase { SimpleActivatedAbility simpleActivatedAbility = (SimpleActivatedAbility) ability; return simpleActivatedAbility.getZone() == Zone.BATTLEFIELD && simpleActivatedAbility.getEffects().size() == 1 && simpleActivatedAbility.getEffects().get(0) instanceof DiscardControllerEffect && simpleActivatedAbility.getManaCosts().size() == 1 - && simpleActivatedAbility.getManaCosts().get(0) instanceof GenericManaCost && simpleActivatedAbility.getManaCosts().get(0).convertedManaCost() == 2; + && simpleActivatedAbility.getManaCosts().get(0) instanceof GenericManaCost && simpleActivatedAbility.getManaCosts().get(0).manaValue() == 2; } } 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 f4ada32f016..9bfa63818a7 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 @@ -41,7 +41,7 @@ public class UginTest extends CardTestPlayerBase { attack(3, playerA, "Silvercoat Lion"); 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"); + activateAbility(3, PhaseStep.POSTCOMBAT_MAIN, playerA, "-X: Exile each permanent with mana value X or less that's one or more colors"); setChoice(playerA, "X=3"); setStopAt(3, PhaseStep.END_TURN); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/ths/AshiokNightmareWaeverTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/ths/AshiokNightmareWaeverTest.java index 3e668eb6f39..4ad535a8301 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/ths/AshiokNightmareWaeverTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/ths/AshiokNightmareWaeverTest.java @@ -51,7 +51,7 @@ public class AshiokNightmareWaeverTest extends CardTestPlayerBase { skipInitShuffling(); activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "+2: Exile the top three cards of target opponent's library.", playerB); - activateAbility(3, PhaseStep.PRECOMBAT_MAIN, playerA, "-X: Put a creature card with converted mana cost X exiled with {this} onto the battlefield under your control. That creature is a Nightmare in addition to its other types."); + activateAbility(3, PhaseStep.PRECOMBAT_MAIN, playerA, "-X: Put a creature card with mana value X exiled with {this} onto the battlefield under your control. That creature is a Nightmare in addition to its other types."); setChoice(playerA, "X=5"); addTarget(playerA, "Prophet of Kruphix"); diff --git a/Mage.Tests/src/test/java/org/mage/test/player/RandomPlayer.java b/Mage.Tests/src/test/java/org/mage/test/player/RandomPlayer.java index c805400875a..d65201b1319 100644 --- a/Mage.Tests/src/test/java/org/mage/test/player/RandomPlayer.java +++ b/Mage.Tests/src/test/java/org/mage/test/player/RandomPlayer.java @@ -90,7 +90,7 @@ public class RandomPlayer extends ComputerPlayer { } } if (!ability.getManaCosts().getVariableCosts().isEmpty()) { - int amount = getAvailableManaProducers(game).size() - ability.getManaCosts().convertedManaCost(); + int amount = getAvailableManaProducers(game).size() - ability.getManaCosts().manaValue(); if (amount > 0) { ability = ability.copy(); ability.getManaCostsToPay().add(new GenericManaCost(RandomUtil.nextInt(amount))); diff --git a/Mage/src/main/java/mage/MageObject.java b/Mage/src/main/java/mage/MageObject.java index 49a8827b0b5..b95615cb15d 100644 --- a/Mage/src/main/java/mage/MageObject.java +++ b/Mage/src/main/java/mage/MageObject.java @@ -96,7 +96,7 @@ public interface MageObject extends MageItem, Serializable { return symbols; } - int getConvertedManaCost(); + int getManaValue(); MageInt getPower(); diff --git a/Mage/src/main/java/mage/MageObjectImpl.java b/Mage/src/main/java/mage/MageObjectImpl.java index d6c50fd6795..ea5f0c98038 100644 --- a/Mage/src/main/java/mage/MageObjectImpl.java +++ b/Mage/src/main/java/mage/MageObjectImpl.java @@ -233,9 +233,9 @@ public abstract class MageObjectImpl implements MageObject { } @Override - public int getConvertedManaCost() { + public int getManaValue() { if (manaCost != null) { - return manaCost.convertedManaCost(); + return manaCost.manaValue(); } return 0; } diff --git a/Mage/src/main/java/mage/abilities/condition/common/ControlsPermanentGreatestCMCCondition.java b/Mage/src/main/java/mage/abilities/condition/common/ControlsPermanentGreatestCMCCondition.java index 47f4ebc8e0f..291ec51fa2c 100644 --- a/Mage/src/main/java/mage/abilities/condition/common/ControlsPermanentGreatestCMCCondition.java +++ b/Mage/src/main/java/mage/abilities/condition/common/ControlsPermanentGreatestCMCCondition.java @@ -34,7 +34,7 @@ public class ControlsPermanentGreatestCMCCondition implements Condition { List permanents = game.getBattlefield().getActivePermanents(filter, source.getControllerId(), source.getSourceId(), game); for (Permanent permanent : permanents) { - int cmc = permanent.getManaCost().convertedManaCost(); + int cmc = permanent.getManaCost().manaValue(); if (maxCMC == null || cmc > maxCMC) { maxCMC = cmc; controllers.clear(); @@ -48,7 +48,7 @@ public class ControlsPermanentGreatestCMCCondition implements Condition { @Override public String toString() { - return "you control the " + filter.getMessage() + " with the highest converted mana cost or tied for the highest converted mana cost"; + return "you control the " + filter.getMessage() + " with the highest mana value or tied for the highest mana value"; } } 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 e7e5d58bed3..b937c39c19f 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/ExileFromHandCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/ExileFromHandCost.java @@ -58,7 +58,7 @@ public class ExileFromHandCost extends CostImpl { if (card == null) { return false; } - cmc += card.getConvertedManaCost(); + cmc += card.getManaValue(); 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 1ab24181ba5..12c206a2f4b 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/RevealTargetFromHandCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/RevealTargetFromHandCost.java @@ -21,7 +21,7 @@ import mage.target.common.TargetCardInHand; */ public class RevealTargetFromHandCost extends CostImpl { - public int convertedManaCosts = 0; + public int manaValues = 0; protected int numberCardsRevealed = 0; protected List revealedCards; @@ -33,7 +33,7 @@ public class RevealTargetFromHandCost extends CostImpl { public RevealTargetFromHandCost(final RevealTargetFromHandCost cost) { super(cost); - this.convertedManaCosts = cost.convertedManaCosts; + this.manaValues = cost.manaValues; this.numberCardsRevealed = cost.numberCardsRevealed; this.revealedCards = new ArrayList<>(cost.revealedCards); } @@ -41,14 +41,14 @@ public class RevealTargetFromHandCost extends CostImpl { @Override public boolean pay(Ability ability, Game game, Ability source, UUID controllerId, boolean noMana, Cost costToPay) { if (targets.choose(Outcome.Benefit, controllerId, source.getSourceId(), game)) { - convertedManaCosts = 0; + manaValues = 0; numberCardsRevealed = 0; Player player = game.getPlayer(controllerId); Cards cards = new CardsImpl(); for (UUID targetId : targets.get(0).getTargets()) { Card card = player.getHand().get(targetId, game); if (card != null) { - convertedManaCosts += card.getConvertedManaCost(); + manaValues += card.getManaValue(); numberCardsRevealed++; cards.add(card); revealedCards.add(card); @@ -68,7 +68,7 @@ public class RevealTargetFromHandCost extends CostImpl { } public int getConvertedCosts() { - return convertedManaCosts; + return manaValues; } public int getNumberRevealedCards() { diff --git a/Mage/src/main/java/mage/abilities/costs/mana/ColoredManaCost.java b/Mage/src/main/java/mage/abilities/costs/mana/ColoredManaCost.java index 9d4f8cdd571..87319e0172a 100644 --- a/Mage/src/main/java/mage/abilities/costs/mana/ColoredManaCost.java +++ b/Mage/src/main/java/mage/abilities/costs/mana/ColoredManaCost.java @@ -24,7 +24,7 @@ public class ColoredManaCost extends ManaCostImpl { } @Override - public int convertedManaCost() { + public int manaValue() { return 1; } diff --git a/Mage/src/main/java/mage/abilities/costs/mana/ColorlessManaCost.java b/Mage/src/main/java/mage/abilities/costs/mana/ColorlessManaCost.java index 038e6dc3f4c..2715cb0702c 100644 --- a/Mage/src/main/java/mage/abilities/costs/mana/ColorlessManaCost.java +++ b/Mage/src/main/java/mage/abilities/costs/mana/ColorlessManaCost.java @@ -32,7 +32,7 @@ public class ColorlessManaCost extends ManaCostImpl { } @Override - public int convertedManaCost() { + public int manaValue() { return mana; } diff --git a/Mage/src/main/java/mage/abilities/costs/mana/GenericManaCost.java b/Mage/src/main/java/mage/abilities/costs/mana/GenericManaCost.java index 579ad25699b..4310ab67c15 100644 --- a/Mage/src/main/java/mage/abilities/costs/mana/GenericManaCost.java +++ b/Mage/src/main/java/mage/abilities/costs/mana/GenericManaCost.java @@ -30,7 +30,7 @@ public class GenericManaCost extends ManaCostImpl { } @Override - public int convertedManaCost() { + public int manaValue() { return mana; } diff --git a/Mage/src/main/java/mage/abilities/costs/mana/HybridManaCost.java b/Mage/src/main/java/mage/abilities/costs/mana/HybridManaCost.java index 0db245fa8db..9c2193aa565 100644 --- a/Mage/src/main/java/mage/abilities/costs/mana/HybridManaCost.java +++ b/Mage/src/main/java/mage/abilities/costs/mana/HybridManaCost.java @@ -31,7 +31,7 @@ public class HybridManaCost extends ManaCostImpl { } @Override - public int convertedManaCost() { + public int manaValue() { return 1; } diff --git a/Mage/src/main/java/mage/abilities/costs/mana/ManaCost.java b/Mage/src/main/java/mage/abilities/costs/mana/ManaCost.java index 67067177823..9f5a3ed02db 100644 --- a/Mage/src/main/java/mage/abilities/costs/mana/ManaCost.java +++ b/Mage/src/main/java/mage/abilities/costs/mana/ManaCost.java @@ -13,7 +13,7 @@ import mage.players.ManaPool; public interface ManaCost extends Cost { - int convertedManaCost(); + int manaValue(); Mana getMana(); diff --git a/Mage/src/main/java/mage/abilities/costs/mana/ManaCostsImpl.java b/Mage/src/main/java/mage/abilities/costs/mana/ManaCostsImpl.java index 853900ffe24..165fe43e8a4 100644 --- a/Mage/src/main/java/mage/abilities/costs/mana/ManaCostsImpl.java +++ b/Mage/src/main/java/mage/abilities/costs/mana/ManaCostsImpl.java @@ -63,10 +63,10 @@ public class ManaCostsImpl extends ArrayList implements M } @Override - public int convertedManaCost() { + public int manaValue() { int total = 0; for (ManaCost cost : this) { - total += cost.convertedManaCost(); + total += cost.manaValue(); } return total; } diff --git a/Mage/src/main/java/mage/abilities/costs/mana/MonoHybridManaCost.java b/Mage/src/main/java/mage/abilities/costs/mana/MonoHybridManaCost.java index 4ef23fa3963..ca60adc144f 100644 --- a/Mage/src/main/java/mage/abilities/costs/mana/MonoHybridManaCost.java +++ b/Mage/src/main/java/mage/abilities/costs/mana/MonoHybridManaCost.java @@ -35,7 +35,7 @@ public class MonoHybridManaCost extends ManaCostImpl { } @Override - public int convertedManaCost() { + public int manaValue() { // from wiki: A card with monocolored hybrid mana symbols in its mana cost has a converted mana cost equal to // the highest possible cost it could be played for. Its converted mana cost never changes. return Math.max(manaGeneric, 1); diff --git a/Mage/src/main/java/mage/abilities/costs/mana/SnowManaCost.java b/Mage/src/main/java/mage/abilities/costs/mana/SnowManaCost.java index 3dca3c698aa..7ba708f458d 100644 --- a/Mage/src/main/java/mage/abilities/costs/mana/SnowManaCost.java +++ b/Mage/src/main/java/mage/abilities/costs/mana/SnowManaCost.java @@ -28,7 +28,7 @@ public class SnowManaCost extends ManaCostImpl { } @Override - public int convertedManaCost() { + public int manaValue() { return 1; } diff --git a/Mage/src/main/java/mage/abilities/costs/mana/VariableManaCost.java b/Mage/src/main/java/mage/abilities/costs/mana/VariableManaCost.java index 8aa8749c363..bd77f3c076e 100644 --- a/Mage/src/main/java/mage/abilities/costs/mana/VariableManaCost.java +++ b/Mage/src/main/java/mage/abilities/costs/mana/VariableManaCost.java @@ -51,7 +51,7 @@ public final class VariableManaCost extends ManaCostImpl implements VariableCost } @Override - public int convertedManaCost() { + public int manaValue() { return 0; } 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 03e750bcc39..241451d8fe2 100644 --- a/Mage/src/main/java/mage/abilities/dynamicvalue/common/DiscardCostCardConvertedMana.java +++ b/Mage/src/main/java/mage/abilities/dynamicvalue/common/DiscardCostCardConvertedMana.java @@ -19,7 +19,7 @@ public enum DiscardCostCardConvertedMana implements DynamicValue { for (Cost cost : sourceAbility.getCosts()) { if (cost instanceof DiscardTargetCost) { DiscardTargetCost discardCost = (DiscardTargetCost) cost; - return discardCost.getCards().stream().mapToInt(Card::getConvertedManaCost).sum(); + return discardCost.getCards().stream().mapToInt(Card::getManaValue).sum(); } } return 0; @@ -37,6 +37,6 @@ public enum DiscardCostCardConvertedMana implements DynamicValue { @Override public String getMessage() { - return "the discarded card's converted mana cost"; + return "the discarded card's mana value"; } } 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 48bba827662..087b567287c 100644 --- a/Mage/src/main/java/mage/abilities/dynamicvalue/common/ExileFromHandCostCardConvertedMana.java +++ b/Mage/src/main/java/mage/abilities/dynamicvalue/common/ExileFromHandCostCardConvertedMana.java @@ -25,7 +25,7 @@ public enum ExileFromHandCostCardConvertedMana implements DynamicValue { if (cost.isPaid() && cost instanceof ExileFromHandCost) { int xValue = 0; for (Card card : ((ExileFromHandCost) cost).getCards()) { - xValue += card.getConvertedManaCost(); + xValue += card.getManaValue(); } return xValue; } diff --git a/Mage/src/main/java/mage/abilities/dynamicvalue/common/HighestCMCOfPermanentValue.java b/Mage/src/main/java/mage/abilities/dynamicvalue/common/HighestCMCOfPermanentValue.java index 97b966afd81..338e4b9b51f 100644 --- a/Mage/src/main/java/mage/abilities/dynamicvalue/common/HighestCMCOfPermanentValue.java +++ b/Mage/src/main/java/mage/abilities/dynamicvalue/common/HighestCMCOfPermanentValue.java @@ -36,8 +36,8 @@ public class HighestCMCOfPermanentValue implements DynamicValue { for (Permanent permanent : game.getBattlefield() .getActivePermanents(filter, sourceAbility.getControllerId(), sourceAbility.getSourceId(), game)) { if ((!onlyIfCanBeSacrificed || controller.canPaySacrificeCost(permanent, sourceAbility, sourceAbility.getControllerId(), game)) - && permanent.getConvertedManaCost() > value) { - value = permanent.getConvertedManaCost(); + && permanent.getManaValue() > value) { + value = permanent.getManaValue(); } } diff --git a/Mage/src/main/java/mage/abilities/dynamicvalue/common/HighestConvertedManaCostValue.java b/Mage/src/main/java/mage/abilities/dynamicvalue/common/HighestManaValueCount.java similarity index 72% rename from Mage/src/main/java/mage/abilities/dynamicvalue/common/HighestConvertedManaCostValue.java rename to Mage/src/main/java/mage/abilities/dynamicvalue/common/HighestManaValueCount.java index 6e99dfaf8f3..c5892210fc6 100644 --- a/Mage/src/main/java/mage/abilities/dynamicvalue/common/HighestConvertedManaCostValue.java +++ b/Mage/src/main/java/mage/abilities/dynamicvalue/common/HighestManaValueCount.java @@ -13,19 +13,19 @@ import mage.players.Player; * * @author nigelzor */ -public class HighestConvertedManaCostValue implements DynamicValue { +public class HighestManaValueCount implements DynamicValue { private final FilterPermanent filter; - public HighestConvertedManaCostValue() { + public HighestManaValueCount() { this(StaticFilters.FILTER_PERMANENTS); } - public HighestConvertedManaCostValue(FilterPermanent filter) { + public HighestManaValueCount(FilterPermanent filter) { this.filter = filter; } - public HighestConvertedManaCostValue(final HighestConvertedManaCostValue dynamicValue){ + public HighestManaValueCount(final HighestManaValueCount dynamicValue){ super(); this.filter = dynamicValue.filter.copy(); } @@ -38,7 +38,7 @@ public class HighestConvertedManaCostValue implements DynamicValue { } int highCMC = 0; for (Permanent permanent : game.getBattlefield().getAllActivePermanents(filter, controller.getId(), game)) { - int cmc = permanent.getConvertedManaCost(); + int cmc = permanent.getManaValue(); highCMC = Math.max(highCMC, cmc); } return highCMC; @@ -46,12 +46,12 @@ public class HighestConvertedManaCostValue implements DynamicValue { @Override public DynamicValue copy() { - return new HighestConvertedManaCostValue(this); + return new HighestManaValueCount(this); } @Override public String getMessage() { - return "the highest converted mana cost among permanents you control"; + return "the highest mana value among permanents you control"; } @Override diff --git a/Mage/src/main/java/mage/abilities/dynamicvalue/common/ManaSpentToCastCount.java b/Mage/src/main/java/mage/abilities/dynamicvalue/common/ManaSpentToCastCount.java index 9ca01238b51..7bf9db05fa0 100644 --- a/Mage/src/main/java/mage/abilities/dynamicvalue/common/ManaSpentToCastCount.java +++ b/Mage/src/main/java/mage/abilities/dynamicvalue/common/ManaSpentToCastCount.java @@ -26,7 +26,7 @@ public enum ManaSpentToCastCount implements DynamicValue { } if (spell != null) { // NOT the cmc of the spell on the stack - return spell.getSpellAbility().getManaCostsToPay().convertedManaCost(); + return spell.getSpellAbility().getManaCostsToPay().manaValue(); } return 0; } 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 e15fd81dffb..d12a859e251 100644 --- a/Mage/src/main/java/mage/abilities/dynamicvalue/common/SacrificeCostConvertedMana.java +++ b/Mage/src/main/java/mage/abilities/dynamicvalue/common/SacrificeCostConvertedMana.java @@ -31,7 +31,7 @@ public class SacrificeCostConvertedMana implements DynamicValue { SacrificeTargetCost sacrificeCost = (SacrificeTargetCost) cost; int totalCMC = 0; for(Permanent permanent : sacrificeCost.getPermanents()) { - totalCMC += permanent.getConvertedManaCost(); + totalCMC += permanent.getManaValue(); } return totalCMC; } @@ -51,6 +51,6 @@ public class SacrificeCostConvertedMana implements DynamicValue { @Override public String getMessage() { - return "the sacrificed " + type + "'s converted mana cost"; + return "the sacrificed " + type + "'s mana value"; } } diff --git a/Mage/src/main/java/mage/abilities/dynamicvalue/common/TargetConvertedManaCost.java b/Mage/src/main/java/mage/abilities/dynamicvalue/common/TargetManaValue.java similarity index 75% rename from Mage/src/main/java/mage/abilities/dynamicvalue/common/TargetConvertedManaCost.java rename to Mage/src/main/java/mage/abilities/dynamicvalue/common/TargetManaValue.java index f6a5995854e..efa3dbb8e88 100644 --- a/Mage/src/main/java/mage/abilities/dynamicvalue/common/TargetConvertedManaCost.java +++ b/Mage/src/main/java/mage/abilities/dynamicvalue/common/TargetManaValue.java @@ -10,20 +10,20 @@ import mage.game.Game; /** * @author North */ -public enum TargetConvertedManaCost implements DynamicValue { +public enum TargetManaValue implements DynamicValue { instance; @Override public int calculate(Game game, Ability sourceAbility, Effect effect) { Card card = game.getCard(sourceAbility.getFirstTarget()); if (card != null) { - return card.getConvertedManaCost(); + return card.getManaValue(); } return 0; } @Override - public TargetConvertedManaCost copy() { + public TargetManaValue copy() { return instance; } @@ -34,6 +34,6 @@ public enum TargetConvertedManaCost implements DynamicValue { @Override public String getMessage() { - return "that card's converted mana cost"; + return "that card's mana value"; } } diff --git a/Mage/src/main/java/mage/abilities/effects/PayCostToAttackBlockEffectImpl.java b/Mage/src/main/java/mage/abilities/effects/PayCostToAttackBlockEffectImpl.java index e000fabd618..70adc3b8c4f 100644 --- a/Mage/src/main/java/mage/abilities/effects/PayCostToAttackBlockEffectImpl.java +++ b/Mage/src/main/java/mage/abilities/effects/PayCostToAttackBlockEffectImpl.java @@ -154,7 +154,7 @@ public abstract class PayCostToAttackBlockEffectImpl extends ReplacementEffectIm @Override public boolean isCostless(GameEvent event, Ability source, Game game) { ManaCosts currentManaCosts = getManaCostToPay(event, source, game); - if (currentManaCosts != null && currentManaCosts.convertedManaCost() > 0) { + if (currentManaCosts != null && currentManaCosts.manaValue() > 0) { return false; } return getOtherCostToPay(event, source, game) == null; 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 b4c03d3009a..0cfdb3838f0 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/ClashEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/ClashEffect.java @@ -116,7 +116,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.getConvertedManaCost(); + cmcController = cardController.getManaValue(); message.append(" (").append(cmcController).append(')'); } else { message.append(" no card"); @@ -127,7 +127,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.getConvertedManaCost(); + cmcOpponent = cardOpponent.getManaValue(); message.append(" (").append(cmcOpponent).append(')'); } else { message.append(" no card"); diff --git a/Mage/src/main/java/mage/abilities/effects/common/cost/CastWithoutPayingManaCostEffect.java b/Mage/src/main/java/mage/abilities/effects/common/cost/CastWithoutPayingManaCostEffect.java index 400db1679e0..55569283147 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/cost/CastWithoutPayingManaCostEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/cost/CastWithoutPayingManaCostEffect.java @@ -10,7 +10,7 @@ import mage.constants.ComparisonType; import mage.constants.Outcome; import mage.filter.FilterCard; import mage.filter.common.FilterNonlandCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.players.Player; import mage.target.Target; @@ -39,7 +39,7 @@ public class CastWithoutPayingManaCostEffect extends OneShotEffect { public CastWithoutPayingManaCostEffect(DynamicValue maxCost) { super(Outcome.PlayForFree); this.manaCost = maxCost; - this.staticText = "you may cast a card with converted mana cost " + this.staticText = "you may cast a card with mana value " + maxCost + " or less from your hand without paying its mana cost"; } @@ -56,13 +56,13 @@ public class CastWithoutPayingManaCostEffect extends OneShotEffect { return false; } int cmc = manaCost.calculate(game, source, this); - FilterCard filter = new FilterNonlandCard("card with converted mana cost " + FilterCard filter = new FilterNonlandCard("card with mana value " + cmc + " or less from your hand"); - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, cmc + 1)); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, cmc + 1)); Target target = new TargetCardInHand(filter); if (target.canChoose(source.getSourceId(), controller.getId(), game) - && controller.chooseUse(Outcome.PlayForFree, "Cast a card with converted mana cost " + cmc + && controller.chooseUse(Outcome.PlayForFree, "Cast a card with mana value " + cmc + " or less from your hand without paying its mana cost?", source, game)) { Card cardToCast = null; boolean cancel = false; diff --git a/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryGraveyardWithLessCMCPutIntoPlay.java b/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryGraveyardWithLessMVPutIntoPlay.java similarity index 73% rename from Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryGraveyardWithLessCMCPutIntoPlay.java rename to Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryGraveyardWithLessMVPutIntoPlay.java index 9a37206fe45..3395f4cb6f2 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryGraveyardWithLessCMCPutIntoPlay.java +++ b/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryGraveyardWithLessMVPutIntoPlay.java @@ -9,7 +9,7 @@ import mage.cards.CardsImpl; import mage.constants.Outcome; import mage.constants.Zone; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.players.Player; import mage.target.TargetCard; @@ -19,28 +19,28 @@ import mage.target.common.TargetCardInLibrary; * * @author antoni-g */ -public class SearchLibraryGraveyardWithLessCMCPutIntoPlay extends OneShotEffect { +public class SearchLibraryGraveyardWithLessMVPutIntoPlay extends OneShotEffect { private final FilterCard filter; - public SearchLibraryGraveyardWithLessCMCPutIntoPlay() { + public SearchLibraryGraveyardWithLessMVPutIntoPlay() { this(new FilterCard()); } - public SearchLibraryGraveyardWithLessCMCPutIntoPlay(FilterCard filter) { + public SearchLibraryGraveyardWithLessMVPutIntoPlay(FilterCard filter) { super(Outcome.PutCreatureInPlay); this.filter = filter; - staticText = "Search your library or graveyard for a " + filter.getMessage() + " with converted mana cost X or less, put it onto the battlefield, then shuffle your library"; + staticText = "Search your library or graveyard for a " + filter.getMessage() + " with mana value X or less, put it onto the battlefield, then shuffle your library"; } - public SearchLibraryGraveyardWithLessCMCPutIntoPlay(final SearchLibraryGraveyardWithLessCMCPutIntoPlay effect) { + public SearchLibraryGraveyardWithLessMVPutIntoPlay(final SearchLibraryGraveyardWithLessMVPutIntoPlay effect) { super(effect); this.filter = effect.filter; } @Override - public SearchLibraryGraveyardWithLessCMCPutIntoPlay copy() { - return new SearchLibraryGraveyardWithLessCMCPutIntoPlay(this); + public SearchLibraryGraveyardWithLessMVPutIntoPlay copy() { + return new SearchLibraryGraveyardWithLessMVPutIntoPlay(this); } @Override @@ -51,9 +51,9 @@ public class SearchLibraryGraveyardWithLessCMCPutIntoPlay extends OneShotEffect if (controller != null && sourceObject != null) { // create x cost filter FilterCard advancedFilter = filter.copy(); // never change static objects so copy the object here before - advancedFilter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, source.getManaCostsToPay().getX() + 1)); + advancedFilter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, source.getManaCostsToPay().getX() + 1)); - if (controller.chooseUse(outcome, "Search your library for a " + filter.getMessage() + " with CMC X or less" + '?', source, game)) { + if (controller.chooseUse(outcome, "Search your library for a " + filter.getMessage() + " with mana value X or less" + '?', source, game)) { TargetCardInLibrary target = new TargetCardInLibrary(advancedFilter); target.clearChosen(); if (controller.searchLibrary(target, source, game)) { @@ -64,7 +64,7 @@ public class SearchLibraryGraveyardWithLessCMCPutIntoPlay extends OneShotEffect controller.shuffleLibrary(source, game); } - if (cardFound == null && controller.chooseUse(outcome, "Search your graveyard for a " + filter.getMessage() + " with CMC X or less" + '?', source, game)) { + if (cardFound == null && controller.chooseUse(outcome, "Search your graveyard for a " + filter.getMessage() + " with mana value X or less" + '?', source, game)) { TargetCard target = new TargetCard(0, 1, Zone.GRAVEYARD, advancedFilter); target.clearChosen(); if (controller.choose(outcome, controller.getGraveyard(), target, game)) { diff --git a/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryWithLessCMCPutInPlayEffect.java b/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryWithLessCMCPutInPlayEffect.java index 8f4bb5f1055..72d6b6c9d04 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryWithLessCMCPutInPlayEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryWithLessCMCPutInPlayEffect.java @@ -8,7 +8,7 @@ import mage.cards.Card; import mage.constants.Outcome; import mage.constants.Zone; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCardInLibrary; @@ -28,7 +28,7 @@ public class SearchLibraryWithLessCMCPutInPlayEffect extends OneShotEffect { public SearchLibraryWithLessCMCPutInPlayEffect(FilterCard filter) { super(Outcome.PutCreatureInPlay); this.filter = filter; - staticText = "Search your library for a " + filter.getMessage() + " with converted mana cost X or less, put it onto the battlefield, then shuffle your library"; + staticText = "Search your library for a " + filter.getMessage() + " with mana value X or less, put it onto the battlefield, then shuffle your library"; } public SearchLibraryWithLessCMCPutInPlayEffect(final SearchLibraryWithLessCMCPutInPlayEffect effect) { @@ -41,7 +41,7 @@ public class SearchLibraryWithLessCMCPutInPlayEffect extends OneShotEffect { Player controller = game.getPlayer(source.getControllerId()); if (controller != null) { FilterCard advancedFilter = filter.copy(); // never change static objects so copy the object here before - advancedFilter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, source.getManaCostsToPay().getX() + 1)); + advancedFilter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, source.getManaCostsToPay().getX() + 1)); TargetCardInLibrary target = new TargetCardInLibrary(advancedFilter); if (controller.searchLibrary(target, source, game)) { if (!target.getTargets().isEmpty()) { diff --git a/Mage/src/main/java/mage/abilities/keyword/BuybackAbility.java b/Mage/src/main/java/mage/abilities/keyword/BuybackAbility.java index c13c08c62e2..44bab1cb43b 100644 --- a/Mage/src/main/java/mage/abilities/keyword/BuybackAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/BuybackAbility.java @@ -79,13 +79,13 @@ public class BuybackAbility extends StaticAbility implements OptionalAdditionalS if (cost instanceof ManaCostsImpl) { for (Object c : (ManaCostsImpl) cost) { if (c instanceof GenericManaCost) { - int newCostCMC = ((GenericManaCost) c).convertedManaCost() - amountToReduceBy - genericManaToReduce; + int newCostCMC = ((GenericManaCost) c).manaValue() - amountToReduceBy - genericManaToReduce; foundCostToReduce = true; if (newCostCMC > 0) { amountToReduceBy += genericManaToReduce; } else { - amountToReduce = ((GenericManaCost) c).convertedManaCost() - amountToReduceBy; - amountToReduceBy = ((GenericManaCost) c).convertedManaCost(); + amountToReduce = ((GenericManaCost) c).manaValue() - amountToReduceBy; + amountToReduceBy = ((GenericManaCost) c).manaValue(); } } } diff --git a/Mage/src/main/java/mage/abilities/keyword/CascadeAbility.java b/Mage/src/main/java/mage/abilities/keyword/CascadeAbility.java index 7a9322d4064..43fd54a88db 100644 --- a/Mage/src/main/java/mage/abilities/keyword/CascadeAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/CascadeAbility.java @@ -49,9 +49,9 @@ public class CascadeAbility extends TriggeredAbilityImpl { private static final String REMINDERTEXT = " (When you cast this spell, " + "exile cards from the top of your library until you exile a " - + "nonland card whose converted mana cost is less than this spell's converted mana cost. " + + "nonland card whose mana value is less than this spell's mana value. " + "You may cast that spell without paying its mana cost " - + "if its converted mana cost is less than this spell's converted mana cost. " + + "if its mana value is less than this spell's mana value. " + "Then put all cards exiled this way that weren't cast on the bottom of your library in a random order.)"; private final boolean withReminder; @@ -120,11 +120,11 @@ class CascadeEffect extends OneShotEffect { // exile cards from the top of your library until you exile a nonland card whose converted mana cost is less than this spell's converted mana cost Cards cardsToExile = new CardsImpl(); - int sourceCost = sourceCard.getConvertedManaCost(); + int sourceCost = sourceCard.getManaValue(); Card cardToCast = null; for (Card card : controller.getLibrary().getCards(game)) { cardsToExile.add(card); - if (!card.isLand() && card.getConvertedManaCost() < sourceCost) { + if (!card.isLand() && card.getManaValue() < sourceCost) { cardToCast = card; break; } @@ -162,7 +162,7 @@ class CascadeEffect extends OneShotEffect { partsToCast.add(cardToCast); } // remove too big cmc - partsToCast.removeIf(card -> card.getConvertedManaCost() >= sourceCost); + partsToCast.removeIf(card -> card.getManaValue() >= sourceCost); // remove non spells partsToCast.removeIf(card -> card.getSpellAbility() == null); } diff --git a/Mage/src/main/java/mage/abilities/keyword/EmergeAbility.java b/Mage/src/main/java/mage/abilities/keyword/EmergeAbility.java index e5dadd0373e..8de7be818ff 100644 --- a/Mage/src/main/java/mage/abilities/keyword/EmergeAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/EmergeAbility.java @@ -53,7 +53,7 @@ public class EmergeAbility extends SpellAbility { if (controller != null) { for (Permanent creature : game.getBattlefield().getActivePermanents( new FilterControlledCreaturePermanent(), this.getControllerId(), this.getSourceId(), game)) { - ManaCost costToPay = CardUtil.reduceCost(emergeCost.copy(), creature.getConvertedManaCost()); + ManaCost costToPay = CardUtil.reduceCost(emergeCost.copy(), creature.getManaValue()); if (costToPay.canPay(this, this, this.getControllerId(), game)) { return ActivationStatus.getTrue(this, game); } @@ -67,7 +67,7 @@ public class EmergeAbility extends SpellAbility { public ManaOptions getMinimumCostToActivate(UUID playerId, Game game) { int maxCMC = 0; for (Permanent creature : game.getBattlefield().getActivePermanents(new FilterControlledCreaturePermanent(), playerId, this.getSourceId(), game)) { - int cmc = creature.getConvertedManaCost(); + int cmc = creature.getManaValue(); if (cmc > maxCMC) { maxCMC = cmc; } @@ -91,7 +91,7 @@ public class EmergeAbility extends SpellAbility { if (controller.choose(Outcome.Sacrifice, target, this.getSourceId(), game)) { Permanent creature = game.getPermanent(target.getFirstTarget()); if (creature != null) { - CardUtil.reduceCost(this, creature.getConvertedManaCost()); + CardUtil.reduceCost(this, creature.getManaValue()); if (super.activate(game, false)) { if (creature.sacrifice(this, game)) { return true; @@ -117,6 +117,6 @@ public class EmergeAbility extends SpellAbility { @Override public String getRule() { - return "Emerge " + emergeCost.getText() + " (You may cast this spell by sacrificing a creature and paying the emerge cost reduced by that creature's converted mana cost.)"; + return "Emerge " + emergeCost.getText() + " (You may cast this spell by sacrificing a creature and paying the emerge cost reduced by that creature's mana value.)"; } } diff --git a/Mage/src/main/java/mage/abilities/keyword/SoulshiftAbility.java b/Mage/src/main/java/mage/abilities/keyword/SoulshiftAbility.java index b9464286144..5d3e24cde6f 100644 --- a/Mage/src/main/java/mage/abilities/keyword/SoulshiftAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/SoulshiftAbility.java @@ -9,7 +9,7 @@ import mage.abilities.dynamicvalue.common.StaticValue; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.constants.SubType; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.target.common.TargetCardInYourGraveyard; @@ -50,8 +50,8 @@ public class SoulshiftAbility extends DiesSourceTriggeredAbility { public void trigger(Game game, UUID controllerId, GameEvent triggeringEvent) { this.getTargets().clear(); int intValue = amount.calculate(game, this, null); - FilterCard filter = new FilterCard("Spirit card with converted mana cost " + intValue + " or less from your graveyard"); - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, intValue + 1)); + FilterCard filter = new FilterCard("Spirit card with mana value " + intValue + " or less from your graveyard"); + filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, intValue + 1)); filter.add(SubType.SPIRIT.getPredicate()); this.addTarget(new TargetCardInYourGraveyard(filter)); super.trigger(game, controllerId, triggeringEvent); //To change body of generated methods, choose Tools | Templates. @@ -65,10 +65,10 @@ public class SoulshiftAbility extends DiesSourceTriggeredAbility { @Override public String getRule() { if (amount instanceof StaticValue) { - return "Soulshift " + amount.toString() + " (When this creature dies, you may return target Spirit card with converted mana cost " + amount.toString() + " or less from your graveyard to your hand.)"; + return "Soulshift " + amount.toString() + " (When this creature dies, you may return target Spirit card with mana value " + amount.toString() + " or less from your graveyard to your hand.)"; } else { return "{this} has soulshift X, where X is the number of " + amount.getMessage() + - ". (When this creature dies, you may return target Spirit card with converted mana cost X or less from your graveyard to your hand.)"; + ". (When this creature dies, you may return target Spirit card with mana value X or less from your graveyard to your hand.)"; } } diff --git a/Mage/src/main/java/mage/abilities/keyword/TransmuteAbility.java b/Mage/src/main/java/mage/abilities/keyword/TransmuteAbility.java index 7a4c9770b2b..b889796ec30 100644 --- a/Mage/src/main/java/mage/abilities/keyword/TransmuteAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/TransmuteAbility.java @@ -13,7 +13,7 @@ import mage.constants.Outcome; import mage.constants.TimingRule; import mage.constants.Zone; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCardInLibrary; @@ -57,7 +57,7 @@ public class TransmuteAbility extends SimpleActivatedAbility { public String getRule() { return new StringBuilder("Transmute ").append(this.getManaCosts().getText()) .append(" (").append(this.getManaCosts().getText()) - .append(", Discard this card: Search your library for a card with the same converted mana cost as this card, reveal it, and put it into your hand. Then shuffle your library. Transmute only as a sorcery.)").toString(); + .append(", Discard this card: Search your library for a card with the same mana value as this card, reveal it, and put it into your hand. Then shuffle your library. Transmute only as a sorcery.)").toString(); } } @@ -77,8 +77,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.getConvertedManaCost()); - filter.add(new ConvertedManaCostPredicate(ComparisonType.EQUAL_TO, sourceObject.getConvertedManaCost())); + FilterCard filter = new FilterCard("card with mana value " + sourceObject.getManaValue()); + filter.add(new ManaValuePredicate(ComparisonType.EQUAL_TO, sourceObject.getManaValue())); TargetCardInLibrary target = new TargetCardInLibrary(1, filter); if (controller.searchLibrary(target, source, game)) { if (!target.getTargets().isEmpty()) { diff --git a/Mage/src/main/java/mage/cards/MeldCard.java b/Mage/src/main/java/mage/cards/MeldCard.java index 168b1ade2a5..05355ec5ab2 100644 --- a/Mage/src/main/java/mage/cards/MeldCard.java +++ b/Mage/src/main/java/mage/cards/MeldCard.java @@ -94,12 +94,12 @@ public abstract class MeldCard extends CardImpl { } @Override - public int getConvertedManaCost() { + public int getManaValue() { if (this.isCopy()) { return 0; } else { - return (this.topHalfCard != null ? this.topHalfCard.getConvertedManaCost() : 0) - + (this.bottomHalfCard != null ? this.bottomHalfCard.getConvertedManaCost() : 0); + return (this.topHalfCard != null ? this.topHalfCard.getManaValue() : 0) + + (this.bottomHalfCard != null ? this.bottomHalfCard.getManaValue() : 0); } } diff --git a/Mage/src/main/java/mage/cards/ModalDoubleFacesCard.java b/Mage/src/main/java/mage/cards/ModalDoubleFacesCard.java index 8932ce9a103..9aca8948c6b 100644 --- a/Mage/src/main/java/mage/cards/ModalDoubleFacesCard.java +++ b/Mage/src/main/java/mage/cards/ModalDoubleFacesCard.java @@ -327,7 +327,7 @@ public abstract class ModalDoubleFacesCard extends CardImpl { } @Override - public int getConvertedManaCost() { + public int getManaValue() { // Rules: // The converted mana cost of a modal double-faced card is based on the characteristics of the // face that’s being considered. On the stack and battlefield, consider whichever face is up. @@ -335,7 +335,7 @@ public abstract class ModalDoubleFacesCard extends CardImpl { // mana cost of a transforming double-faced card is determined. // on stack or battlefield it must be half card with own cost - return leftHalfCard.getConvertedManaCost(); + return leftHalfCard.getManaValue(); } @Override diff --git a/Mage/src/main/java/mage/cards/SplitCard.java b/Mage/src/main/java/mage/cards/SplitCard.java index 3c7f3170cfb..b1d0c9a1763 100644 --- a/Mage/src/main/java/mage/cards/SplitCard.java +++ b/Mage/src/main/java/mage/cards/SplitCard.java @@ -204,13 +204,13 @@ public abstract class SplitCard extends CardImpl { } @Override - public int getConvertedManaCost() { + public int getManaValue() { // 202.3d The converted mana cost of a split card not on the stack or of a fused split spell on the // stack is determined from the combined mana costs of its halves. Otherwise, while a split card is // on the stack, the converted mana cost of the spell is determined by the mana cost of the half // that was chosen to be cast. See rule 708, “Split Cards.” // split card and it's halfes contains own mana costs, so no need to rewrite logic - return super.getConvertedManaCost(); + return super.getManaValue(); } } diff --git a/Mage/src/main/java/mage/cards/decks/exporter/XmageInfoDeckExporter.java b/Mage/src/main/java/mage/cards/decks/exporter/XmageInfoDeckExporter.java index 09d3278925b..052be059628 100644 --- a/Mage/src/main/java/mage/cards/decks/exporter/XmageInfoDeckExporter.java +++ b/Mage/src/main/java/mage/cards/decks/exporter/XmageInfoDeckExporter.java @@ -63,7 +63,7 @@ public class XmageInfoDeckExporter extends DeckExporter { out.printf("%d [%s:%s] %s%n\n", amount.get("M@" + card.getCardKey()), card.getSetCode(), card.getCardNum(), card.getCardName()); } else { out.printf("%d [%s:%s] %s ;; %s ;; %s ;; %d %n", amount.get("M@" + card.getCardKey()), card.getSetCode(), card.getCardNum(), card.getCardName(), - cardInfo.getColor().getDescription(), cardInfo.getTypes().toString(), cardInfo.getConvertedManaCost()); + cardInfo.getColor().getDescription(), cardInfo.getTypes().toString(), cardInfo.getManaValue()); } } @@ -73,7 +73,7 @@ public class XmageInfoDeckExporter extends DeckExporter { out.printf("SB: %d [%s:%s] %s%n\n", amount.get("S@" + card.getCardKey()), card.getSetCode(), card.getCardNum(), card.getCardName()); } else { out.printf("SB: %d [%s:%s] %s ;; %s ;; %s ;; %d %n", amount.get("S@" + card.getCardKey()), card.getSetCode(), card.getCardNum(), card.getCardName(), - cardInfo.getColor().getDescription(), cardInfo.getTypes().toString(), cardInfo.getConvertedManaCost()); + cardInfo.getColor().getDescription(), cardInfo.getTypes().toString(), cardInfo.getManaValue()); } } diff --git a/Mage/src/main/java/mage/cards/mock/MockCard.java b/Mage/src/main/java/mage/cards/mock/MockCard.java index 629a26d2d70..d4dbe077238 100644 --- a/Mage/src/main/java/mage/cards/mock/MockCard.java +++ b/Mage/src/main/java/mage/cards/mock/MockCard.java @@ -35,7 +35,7 @@ public class MockCard extends CardImpl { protected List manaCostStr; protected String adventureSpellName; protected boolean isModalDoubleFacesCard; - protected int convertedManaCost; + protected int manaValue; public MockCard(CardInfo card) { super(null, card.getName()); @@ -54,7 +54,7 @@ public class MockCard extends CardImpl { this.manaCostLeftStr = card.getManaCosts(CardInfo.ManaCostSide.LEFT); this.manaCostRightStr = card.getManaCosts(CardInfo.ManaCostSide.RIGHT); this.manaCostStr = card.getManaCosts(CardInfo.ManaCostSide.ALL); - this.convertedManaCost = card.getConvertedManaCost(); + this.manaValue = card.getManaValue(); this.color = card.getColor(); @@ -107,7 +107,7 @@ public class MockCard extends CardImpl { this.manaCostStr = new ArrayList<>(card.manaCostStr); this.adventureSpellName = card.adventureSpellName; this.isModalDoubleFacesCard = card.isModalDoubleFacesCard; - this.convertedManaCost = card.convertedManaCost; + this.manaValue = card.manaValue; } @Override @@ -133,8 +133,8 @@ public class MockCard extends CardImpl { } @Override - public int getConvertedManaCost() { - return this.convertedManaCost; + public int getManaValue() { + return this.manaValue; } public List getManaCostStr(CardInfo.ManaCostSide manaCostSide) { diff --git a/Mage/src/main/java/mage/cards/repository/CardCriteria.java b/Mage/src/main/java/mage/cards/repository/CardCriteria.java index cb8ec259fd9..94d73d0da28 100644 --- a/Mage/src/main/java/mage/cards/repository/CardCriteria.java +++ b/Mage/src/main/java/mage/cards/repository/CardCriteria.java @@ -34,7 +34,7 @@ public class CardCriteria { private boolean red; private boolean white; private boolean colorless; - private Integer convertedManaCost; + private Integer manaValue; private String sortBy; private Long start; private Long count; @@ -167,8 +167,8 @@ public class CardCriteria { return this; } - public CardCriteria convertedManaCost(Integer convertedManaCost) { - this.convertedManaCost = convertedManaCost; + public CardCriteria manaValue(Integer manaValue) { + this.manaValue = manaValue; return this; } @@ -265,8 +265,8 @@ public class CardCriteria { clausesCount++; } - if (convertedManaCost != null) { - where.eq("convertedManaCost", convertedManaCost); + if (manaValue != null) { + where.eq("manaValue", manaValue); clausesCount++; } @@ -433,8 +433,8 @@ public class CardCriteria { return colorless; } - public Integer getConvertedManaCost() { - return convertedManaCost; + public Integer getManaValue() { + return manaValue; } public String getSortBy() { diff --git a/Mage/src/main/java/mage/cards/repository/CardInfo.java b/Mage/src/main/java/mage/cards/repository/CardInfo.java index 071b0e6daa7..fd750f9443d 100644 --- a/Mage/src/main/java/mage/cards/repository/CardInfo.java +++ b/Mage/src/main/java/mage/cards/repository/CardInfo.java @@ -53,7 +53,7 @@ public class CardInfo { @DatabaseField protected String startingLoyalty; @DatabaseField - protected int convertedManaCost; + protected int manaValue; @DatabaseField(dataType = DataType.ENUM_STRING) protected Rarity rarity; @DatabaseField @@ -126,7 +126,7 @@ public class CardInfo { this.className = card.getClass().getCanonicalName(); this.power = card.getPower().toString(); this.toughness = card.getToughness().toString(); - this.convertedManaCost = card.getConvertedManaCost(); + this.manaValue = card.getManaValue(); this.rarity = card.getRarity(); this.splitCard = card instanceof SplitCard; this.splitCardFuse = card.getSpellAbility() != null && card.getSpellAbility().getSpellAbilityType() == SpellAbilityType.SPLIT_FUSED; @@ -335,8 +335,8 @@ public class CardInfo { this.types = sb.toString(); } - public int getConvertedManaCost() { - return convertedManaCost; + public int getManaValue() { + return manaValue; } public final List getManaCosts(ManaCostSide manaCostSide) { diff --git a/Mage/src/main/java/mage/designations/Designation.java b/Mage/src/main/java/mage/designations/Designation.java index 30263940c51..a89cf4e6fee 100644 --- a/Mage/src/main/java/mage/designations/Designation.java +++ b/Mage/src/main/java/mage/designations/Designation.java @@ -196,7 +196,7 @@ public abstract class Designation implements MageObject, Copyable { } @Override - public int getConvertedManaCost() { + public int getManaValue() { return 0; } diff --git a/Mage/src/main/java/mage/filter/predicate/mageobject/ConvertedManaCostParityPredicate.java b/Mage/src/main/java/mage/filter/predicate/mageobject/ManaValueParityPredicate.java similarity index 60% rename from Mage/src/main/java/mage/filter/predicate/mageobject/ConvertedManaCostParityPredicate.java rename to Mage/src/main/java/mage/filter/predicate/mageobject/ManaValueParityPredicate.java index 273f01e087a..d26e3edd742 100644 --- a/Mage/src/main/java/mage/filter/predicate/mageobject/ConvertedManaCostParityPredicate.java +++ b/Mage/src/main/java/mage/filter/predicate/mageobject/ManaValueParityPredicate.java @@ -7,21 +7,21 @@ import mage.game.Game; /** * @author TheElk801 */ -public enum ConvertedManaCostParityPredicate implements Predicate { +public enum ManaValueParityPredicate implements Predicate { EVEN(0), ODD(1); private final int parity; - ConvertedManaCostParityPredicate(int parity) { + ManaValueParityPredicate(int parity) { this.parity = parity; } @Override public boolean apply(MageObject input, Game game) { - return input.getConvertedManaCost() % 2 == parity; + return input.getManaValue() % 2 == parity; } @Override public String toString() { - return "ConvertedManaCostParity" + super.toString(); + return "ManaValueParity" + super.toString(); }} diff --git a/Mage/src/main/java/mage/filter/predicate/mageobject/ConvertedManaCostPredicate.java b/Mage/src/main/java/mage/filter/predicate/mageobject/ManaValuePredicate.java similarity index 57% rename from Mage/src/main/java/mage/filter/predicate/mageobject/ConvertedManaCostPredicate.java rename to Mage/src/main/java/mage/filter/predicate/mageobject/ManaValuePredicate.java index e199ea9c18f..d1114444da3 100644 --- a/Mage/src/main/java/mage/filter/predicate/mageobject/ConvertedManaCostPredicate.java +++ b/Mage/src/main/java/mage/filter/predicate/mageobject/ManaValuePredicate.java @@ -9,19 +9,19 @@ import mage.filter.predicate.IntComparePredicate; * * @author North */ -public class ConvertedManaCostPredicate extends IntComparePredicate { +public class ManaValuePredicate extends IntComparePredicate { - public ConvertedManaCostPredicate(ComparisonType type, int value) { + public ManaValuePredicate(ComparisonType type, int value) { super(type, value); } @Override protected int getInputValue(MageObject input) { - return input.getConvertedManaCost(); + return input.getManaValue(); } @Override public String toString() { - return "ConvertedManaCost" + super.toString(); + return "ManaValue" + super.toString(); } } diff --git a/Mage/src/main/java/mage/game/command/Commander.java b/Mage/src/main/java/mage/game/command/Commander.java index 1e21c63979f..9dcb2af84f0 100644 --- a/Mage/src/main/java/mage/game/command/Commander.java +++ b/Mage/src/main/java/mage/game/command/Commander.java @@ -249,8 +249,8 @@ public class Commander implements CommandObject { } @Override - public int getConvertedManaCost() { - return sourceObject.getConvertedManaCost(); + public int getManaValue() { + return sourceObject.getManaValue(); } @Override diff --git a/Mage/src/main/java/mage/game/command/Emblem.java b/Mage/src/main/java/mage/game/command/Emblem.java index 2d42604bd9d..2d1532a0b3c 100644 --- a/Mage/src/main/java/mage/game/command/Emblem.java +++ b/Mage/src/main/java/mage/game/command/Emblem.java @@ -204,7 +204,7 @@ public class Emblem implements CommandObject { } @Override - public int getConvertedManaCost() { + public int getManaValue() { return 0; } diff --git a/Mage/src/main/java/mage/game/command/Plane.java b/Mage/src/main/java/mage/game/command/Plane.java index 98e75d83d7f..cd2e4bf8165 100644 --- a/Mage/src/main/java/mage/game/command/Plane.java +++ b/Mage/src/main/java/mage/game/command/Plane.java @@ -213,7 +213,7 @@ public class Plane implements CommandObject { } @Override - public int getConvertedManaCost() { + public int getManaValue() { return 0; } diff --git a/Mage/src/main/java/mage/game/command/emblems/MomirEmblem.java b/Mage/src/main/java/mage/game/command/emblems/MomirEmblem.java index fb07e4d0d89..62db3b11138 100644 --- a/Mage/src/main/java/mage/game/command/emblems/MomirEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/MomirEmblem.java @@ -52,7 +52,7 @@ class MomirEffect extends OneShotEffect { public MomirEffect(MomirEffect effect) { super(effect); - staticText = "Create a token that's a copy of a creature card with converted mana cost X chosen at random"; + staticText = "Create a token that's a copy of a creature card with mana value X chosen at random"; } @Override @@ -70,10 +70,10 @@ class MomirEffect extends OneShotEffect { return true; } // should this be random across card names - CardCriteria criteria = new CardCriteria().types(CardType.CREATURE).convertedManaCost(value); + CardCriteria criteria = new CardCriteria().types(CardType.CREATURE).manaValue(value); List options = CardRepository.instance.findCards(criteria); if (options == null || options.isEmpty()) { - game.informPlayers("No random creature card with converted mana cost of " + value + " was found."); + game.informPlayers("No random creature card with mana value of " + value + " was found."); return false; } diff --git a/Mage/src/main/java/mage/game/command/planes/FeedingGroundsPlane.java b/Mage/src/main/java/mage/game/command/planes/FeedingGroundsPlane.java index 553e7ce747e..f88d7bc3b18 100644 --- a/Mage/src/main/java/mage/game/command/planes/FeedingGroundsPlane.java +++ b/Mage/src/main/java/mage/game/command/planes/FeedingGroundsPlane.java @@ -10,7 +10,7 @@ import mage.abilities.common.ActivateIfConditionActivatedAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.MainPhaseStackEmptyCondition; import mage.abilities.costs.mana.GenericManaCost; -import mage.abilities.dynamicvalue.common.TargetConvertedManaCost; +import mage.abilities.dynamicvalue.common.TargetManaValue; import mage.abilities.effects.Effect; import mage.abilities.effects.common.RollPlanarDieEffect; import mage.abilities.effects.common.cost.CostModificationEffectImpl; @@ -37,7 +37,7 @@ import mage.watchers.common.PlanarRollWatcher; public class FeedingGroundsPlane extends Plane { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("a creature"); - private static final String rule = "put X +1/+1 counters on target creature, where X is that creature's converted mana cost"; + private static final String rule = "put X +1/+1 counters on target creature, where X is that creature's mana value"; public FeedingGroundsPlane() { this.setPlaneType(Planes.PLANE_FEEDING_GROUNDS); @@ -48,7 +48,7 @@ public class FeedingGroundsPlane extends Plane { this.getAbilities().add(ability); // Active player can roll the planar die: Whenever you roll {CHAOS}, target red or green creature gets X +1/+1 counters - Effect chaosEffect = new AddCountersTargetEffect(CounterType.P1P1.createInstance(), TargetConvertedManaCost.instance); + Effect chaosEffect = new AddCountersTargetEffect(CounterType.P1P1.createInstance(), TargetManaValue.instance); Target chaosTarget = new TargetCreaturePermanent(1, 1, filter, false); List chaosEffects = new ArrayList<>(); diff --git a/Mage/src/main/java/mage/game/draft/RateCard.java b/Mage/src/main/java/mage/game/draft/RateCard.java index f1ea86e5f96..36737997783 100644 --- a/Mage/src/main/java/mage/game/draft/RateCard.java +++ b/Mage/src/main/java/mage/game/draft/RateCard.java @@ -317,7 +317,7 @@ public final class RateCard { * @return */ private static int getManaCostScore(Card card, List allowedColors) { - int converted = card.getConvertedManaCost(); + int converted = card.getManaValue(); if (allowedColors == null) { int colorPenalty = 0; for (String symbol : card.getManaCostSymbols()) { diff --git a/Mage/src/main/java/mage/game/permanent/PermanentCard.java b/Mage/src/main/java/mage/game/permanent/PermanentCard.java index 54efa8c9cc2..50d286c5df1 100644 --- a/Mage/src/main/java/mage/game/permanent/PermanentCard.java +++ b/Mage/src/main/java/mage/game/permanent/PermanentCard.java @@ -184,18 +184,18 @@ public class PermanentCard extends PermanentImpl { } @Override - public int getConvertedManaCost() { + public int getManaValue() { 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 getCard().getManaValue(); } if (faceDown) { // game not neccessary - return getManaCost().convertedManaCost(); + return getManaCost().manaValue(); } - return super.getConvertedManaCost(); + return super.getManaValue(); } diff --git a/Mage/src/main/java/mage/game/permanent/PermanentMeld.java b/Mage/src/main/java/mage/game/permanent/PermanentMeld.java index 6b2728d1404..1c7dff31aef 100644 --- a/Mage/src/main/java/mage/game/permanent/PermanentMeld.java +++ b/Mage/src/main/java/mage/game/permanent/PermanentMeld.java @@ -16,11 +16,11 @@ public class PermanentMeld extends PermanentCard { } @Override - public int getConvertedManaCost() { + public int getManaValue() { if (this.isCopy()) { return 0; } else { - return this.getCard().getConvertedManaCost(); + return this.getCard().getManaValue(); } } } diff --git a/Mage/src/main/java/mage/game/permanent/token/ReflectionPureToken.java b/Mage/src/main/java/mage/game/permanent/token/ReflectionPureToken.java index f77b3997040..15ed5bebd33 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ReflectionPureToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ReflectionPureToken.java @@ -16,7 +16,7 @@ public final class ReflectionPureToken extends TokenImpl { } public ReflectionPureToken(int xValue) { - super("Reflection", "X/X white Reflection creature token, where X is the converted mana cost of that spell"); + super("Reflection", "X/X white Reflection creature token, where X is the mana value of that spell"); this.setOriginalExpansionSetCode("INV"); cardType.add(CardType.CREATURE); color.setWhite(true); diff --git a/Mage/src/main/java/mage/game/stack/Spell.java b/Mage/src/main/java/mage/game/stack/Spell.java index 19536f3d993..2dbdf8b1756 100644 --- a/Mage/src/main/java/mage/game/stack/Spell.java +++ b/Mage/src/main/java/mage/game/stack/Spell.java @@ -628,7 +628,7 @@ public class Spell extends StackObjImpl implements Card { * @return */ @Override - public int getConvertedManaCost() { + public int getManaValue() { int cmc = 0; if (faceDown) { return 0; @@ -636,7 +636,7 @@ public class Spell extends StackObjImpl implements Card { for (SpellAbility spellAbility : spellAbilities) { cmc += spellAbility.getConvertedXManaCost(getCard()); } - cmc += getCard().getManaCost().convertedManaCost(); + cmc += getCard().getManaCost().manaValue(); return cmc; } diff --git a/Mage/src/main/java/mage/game/stack/StackAbility.java b/Mage/src/main/java/mage/game/stack/StackAbility.java index c5c4a5d1fdc..bde90677192 100644 --- a/Mage/src/main/java/mage/game/stack/StackAbility.java +++ b/Mage/src/main/java/mage/game/stack/StackAbility.java @@ -274,7 +274,7 @@ public class StackAbility extends StackObjImpl implements Ability { } @Override - public int getConvertedManaCost() { + public int getManaValue() { // Activated abilities have an "activation cost" but they don't have a characteristic related to that while on the stack. // There are certain effects that interact with the cost to activate an ability (e.g., Training Grounds, Power Artifact) // but nothing that looks for that quality of an ability once it's on the stack. diff --git a/Mage/src/main/java/mage/target/targetadjustment/XCMCGraveyardAdjuster.java b/Mage/src/main/java/mage/target/targetadjustment/XCMCGraveyardAdjuster.java index 617da884a1c..57f86272ee9 100644 --- a/Mage/src/main/java/mage/target/targetadjustment/XCMCGraveyardAdjuster.java +++ b/Mage/src/main/java/mage/target/targetadjustment/XCMCGraveyardAdjuster.java @@ -3,7 +3,7 @@ package mage.target.targetadjustment; import mage.abilities.Ability; import mage.constants.ComparisonType; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.target.TargetCard; import mage.target.common.TargetCardInGraveyard; @@ -19,7 +19,7 @@ public enum XCMCGraveyardAdjuster implements TargetAdjuster { public void adjustTargets(Ability ability, Game game) { int xValue = ability.getManaCostsToPay().getX(); FilterCard filterCard = ((TargetCard) ability.getTargets().get(0)).getFilter().copy(); - filterCard.add(new ConvertedManaCostPredicate(ComparisonType.EQUAL_TO, xValue)); + filterCard.add(new ManaValuePredicate(ComparisonType.EQUAL_TO, xValue)); filterCard.setMessage(filterCard.getMessage().replace('X', (char) xValue)); ability.getTargets().clear(); ability.getTargets().add(new TargetCardInGraveyard(filterCard)); diff --git a/Mage/src/main/java/mage/target/targetadjustment/XCMCPermanentAdjuster.java b/Mage/src/main/java/mage/target/targetadjustment/XCMCPermanentAdjuster.java index bc6b2b57717..a23d9e12133 100644 --- a/Mage/src/main/java/mage/target/targetadjustment/XCMCPermanentAdjuster.java +++ b/Mage/src/main/java/mage/target/targetadjustment/XCMCPermanentAdjuster.java @@ -3,7 +3,7 @@ package mage.target.targetadjustment; import mage.abilities.Ability; import mage.constants.ComparisonType; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.target.TargetPermanent; @@ -21,7 +21,7 @@ public enum XCMCPermanentAdjuster implements TargetAdjuster { int minTargets = oldTargetPermanent.getMinNumberOfTargets(); int maxTargets = oldTargetPermanent.getMaxNumberOfTargets(); FilterPermanent permanentFilter = oldTargetPermanent.getFilter().copy(); - permanentFilter.add(new ConvertedManaCostPredicate(ComparisonType.EQUAL_TO, xValue)); + permanentFilter.add(new ManaValuePredicate(ComparisonType.EQUAL_TO, xValue)); ability.getTargets().clear(); ability.getTargets().add(new TargetPermanent(minTargets, maxTargets, permanentFilter, false)); } diff --git a/Mage/src/test/java/mage/cards/decks/importer/samples/testdeck.json b/Mage/src/test/java/mage/cards/decks/importer/samples/testdeck.json index 025e9a47712..70e99295b88 100644 --- a/Mage/src/test/java/mage/cards/decks/importer/samples/testdeck.json +++ b/Mage/src/test/java/mage/cards/decks/importer/samples/testdeck.json @@ -18,7 +18,7 @@ "R", "U" ], - "convertedManaCost": 2.0, + "manaValue": 2.0, "count": 4, "edhrecRank": 626, "flavorText": "\"Result 752: Rapid mass redistribution.\n\"Result 753: Calamitous reverse synthesis.\n\"Result 754: Acute disarrayment.\"\n—Izzet research notes", @@ -165,7 +165,7 @@ }, { "date": "2018-10-05", - "text": "To determine the total cost of a spell, start with the mana cost or alternative cost you’re paying, add any cost increases, then apply any cost reductions. The converted mana cost of the spell remains unchanged, no matter what the total cost to cast it was." + "text": "To determine the total cost of a spell, start with the mana cost or alternative cost you’re paying, add any cost increases, then apply any cost reductions. The mana value of the spell remains unchanged, no matter what the total cost to cast it was." }, { "date": "2018-10-05", @@ -203,7 +203,7 @@ "R", "U" ], - "convertedManaCost": 4.0, + "manaValue": 4.0, "count": 4, "edhrecRank": 2662, "foreignData": [ @@ -368,7 +368,7 @@ "colors": [ "U" ], - "convertedManaCost": 4.0, + "manaValue": 4.0, "count": 2, "edhrecRank": 1050, "flavorText": "Rumors float through the city like crows, alighting on citizens seemingly at random.", @@ -536,7 +536,7 @@ "colors": [ "R" ], - "convertedManaCost": 4.0, + "manaValue": 4.0, "count": 1, "edhrecRank": 10215, "flavorText": "Some storms never blow over.", @@ -708,7 +708,7 @@ "R", "U" ], - "convertedManaCost": 6.0, + "manaValue": 6.0, "count": 2, "edhrecRank": 536, "foreignData": [ @@ -890,7 +890,7 @@ "colors": [ "U" ], - "convertedManaCost": 2.0, + "manaValue": 2.0, "count": 4, "edhrecRank": 1976, "flavorText": "While other pirates prowl for treasure, Captain Parrish plunders secrets.", @@ -1047,7 +1047,7 @@ "colors": [ "R" ], - "convertedManaCost": 2.0, + "manaValue": 2.0, "count": 4, "edhrecRank": 6242, "flavorText": "\"Commander, we caught the Dimir spy and took her ashes into custody.\"\n—Kramm, Wojek security officer", @@ -1212,7 +1212,7 @@ "R", "U" ], - "convertedManaCost": 3.0, + "manaValue": 3.0, "count": 1, "edhrecRank": 4333, "foreignData": [ @@ -1387,7 +1387,7 @@ "colors": [ "U" ], - "convertedManaCost": 1.0, + "manaValue": 1.0, "count": 4, "edhrecRank": 280, "flavorText": "The crystal pulsed with the power of Teferi's planeswalker spark. Had Jhoira given him a blessing or a curse?", @@ -1559,7 +1559,7 @@ "colors": [ "U" ], - "convertedManaCost": 2.0, + "manaValue": 2.0, "count": 4, "edhrecRank": 3422, "flavorText": "Genius is finding the edge of what's possible, then jumping over it.", @@ -1738,7 +1738,7 @@ "colors": [ "R" ], - "convertedManaCost": 1.0, + "manaValue": 1.0, "count": 4, "edhrecRank": 3135, "flavorText": "The tools of invention became the weapons of revolution.", @@ -1920,7 +1920,7 @@ "colors": [ "U" ], - "convertedManaCost": 1.0, + "manaValue": 1.0, "count": 2, "edhrecRank": 5887, "flavorText": "\"Seeing the river is not the same as seeing the fish.\"", @@ -2077,7 +2077,7 @@ "colors": [ "U" ], - "convertedManaCost": 2.0, + "manaValue": 2.0, "count": 1, "edhrecRank": 1693, "foreignData": [ @@ -2229,7 +2229,7 @@ "colors": [ "U" ], - "convertedManaCost": 5.0, + "manaValue": 5.0, "count": 1, "edhrecRank": 1853, "foreignData": [ @@ -2433,7 +2433,7 @@ "U" ], "colors": [], - "convertedManaCost": 0.0, + "manaValue": 0.0, "count": 3, "edhrecRank": 119, "flavorText": "\"We have inherited the mysteries of the Thran, but few of the answers.\"\n—Jhoira", @@ -2588,7 +2588,7 @@ "U" ], "colors": [], - "convertedManaCost": 0.0, + "manaValue": 0.0, "count": 4, "edhrecRank": 312, "flavorText": "Every laboratory buzzes with new experiments, each a piece of Ral's ambitious project.", @@ -2685,7 +2685,7 @@ "U" ], "colors": [], - "convertedManaCost": 0.0, + "manaValue": 0.0, "count": 8, "foreignData": [], "frameVersion": "2015", @@ -2931,7 +2931,7 @@ "R" ], "colors": [], - "convertedManaCost": 0.0, + "manaValue": 0.0, "count": 7, "foreignData": [], "frameVersion": "2015", @@ -3187,7 +3187,7 @@ "colors": [ "U" ], - "convertedManaCost": 5.0, + "manaValue": 5.0, "count": 1, "edhrecRank": 1853, "foreignData": [ @@ -3394,7 +3394,7 @@ "R", "U" ], - "convertedManaCost": 3.0, + "manaValue": 3.0, "count": 1, "edhrecRank": 4333, "foreignData": [ @@ -3569,7 +3569,7 @@ "colors": [ "U" ], - "convertedManaCost": 2.0, + "manaValue": 2.0, "count": 3, "edhrecRank": 56, "flavorText": "\"As one, nature lifts its voice to tell you this: 'No.'\"", @@ -3757,7 +3757,7 @@ "colors": [ "U" ], - "convertedManaCost": 2.0, + "manaValue": 2.0, "count": 3, "edhrecRank": 4848, "flavorText": "The stronger the will, the more bewitching the song.", @@ -3876,7 +3876,7 @@ "manaCost": "{X}{U}{U}", "name": "Entrancing Melody", "number": "55", - "originalText": "Gain control of target creature with converted mana cost X.", + "originalText": "Gain control of target creature with mana value X.", "originalType": "Sorcery", "printings": [ "PXLN", @@ -3906,7 +3906,7 @@ "setCode": "XLN", "subtypes": [], "supertypes": [], - "text": "Gain control of target creature with converted mana cost X.", + "text": "Gain control of target creature with mana value X.", "type": "Sorcery", "types": [ "Sorcery" @@ -3927,7 +3927,7 @@ "colors": [ "R" ], - "convertedManaCost": 3.0, + "manaValue": 3.0, "count": 3, "edhrecRank": 5816, "flavorText": "Wary of the ferocious dinosaurs, the Legion of Dusk built up the walls of their fort—just in time for the pirates to burn them down.", @@ -4083,7 +4083,7 @@ "colors": [ "R" ], - "convertedManaCost": 1.0, + "manaValue": 1.0, "count": 2, "edhrecRank": 8679, "flavorText": "Sometimes Shivan dragons toy with their food. Other times they just cook it.", @@ -4241,7 +4241,7 @@ "colors": [ "U" ], - "convertedManaCost": 2.0, + "manaValue": 2.0, "count": 2, "edhrecRank": 893, "flavorText": "\"Laws apply only to those who lack the vision to see past them.\"", @@ -4363,7 +4363,7 @@ "manaCost": "{1}{U}", "name": "Disdainful Stroke", "number": "37", - "originalText": "Counter target spell with converted mana cost 4 or greater.", + "originalText": "Counter target spell with mana value 4 or greater.", "originalType": "Instant", "printings": [ "C16", @@ -4383,17 +4383,17 @@ "rulings": [ { "date": "2014-09-20", - "text": "A face-down spell has converted mana cost 0 and can’t be targeted by Disdainful Stroke." + "text": "A face-down spell has mana value 0 and can’t be targeted by Disdainful Stroke." }, { "date": "2018-10-05", - "text": "If a spell has {X} in its mana cost, include the value chosen for that X when determining the converted mana cost of that spell." + "text": "If a spell has {X} in its mana cost, include the value chosen for that X when determining the mana value of that spell." } ], "setCode": "GRN", "subtypes": [], "supertypes": [], - "text": "Counter target spell with converted mana cost 4 or greater.", + "text": "Counter target spell with mana value 4 or greater.", "type": "Instant", "types": [ "Instant"