diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/images/DownloadPicturesService.java b/Mage.Client/src/main/java/org/mage/plugins/card/images/DownloadPicturesService.java index 5608550ce1..b84de288d1 100644 --- a/Mage.Client/src/main/java/org/mage/plugins/card/images/DownloadPicturesService.java +++ b/Mage.Client/src/main/java/org/mage/plugins/card/images/DownloadPicturesService.java @@ -515,12 +515,12 @@ public class DownloadPicturesService extends DefaultBoundedRangeModel implements url.setType2(isType2); allCardsUrls.add(url); } - if (card.isModalDoubleFacesCard()) { - if (card.getModalDoubleFacesSecondSideName() == null || card.getModalDoubleFacesSecondSideName().trim().isEmpty()) { + if (card.isModalDoubleFacedCard()) { + if (card.getModalDoubleFacedSecondSideName() == null || card.getModalDoubleFacedSecondSideName().trim().isEmpty()) { throw new IllegalStateException("MDF card can't have empty name."); } CardDownloadData cardDownloadData = new CardDownloadData( - card.getModalDoubleFacesSecondSideName(), + card.getModalDoubleFacedSecondSideName(), card.getSetCode(), card.getCardNumber(), card.usesVariousArt(), diff --git a/Mage.Common/src/main/java/mage/view/CardView.java b/Mage.Common/src/main/java/mage/view/CardView.java index cd8f489f07..215e33f46d 100644 --- a/Mage.Common/src/main/java/mage/view/CardView.java +++ b/Mage.Common/src/main/java/mage/view/CardView.java @@ -109,7 +109,7 @@ public class CardView extends SimpleCardView { protected List rightSplitRules; protected String rightSplitTypeLine; - protected boolean isModalDoubleFacesCard; + protected boolean isModalDoubleFacedCard; protected ArtRect artRect = ArtRect.NORMAL; @@ -217,7 +217,7 @@ public class CardView extends SimpleCardView { this.rightSplitRules = cardView.rightSplitRules == null ? null : new ArrayList<>(cardView.rightSplitRules); this.rightSplitTypeLine = cardView.rightSplitTypeLine; - this.isModalDoubleFacesCard = cardView.isModalDoubleFacesCard; + this.isModalDoubleFacedCard = cardView.isModalDoubleFacedCard; this.artRect = cardView.artRect; this.targets = cardView.targets == null ? null : new ArrayList<>(cardView.targets); @@ -373,9 +373,9 @@ public class CardView extends SimpleCardView { fullCardName = card.getName(); // split card contains full name as normal this.manaCostLeftStr = String.join("", splitCard.getLeftHalfCard().getManaCostSymbols()); this.manaCostRightStr = String.join("", splitCard.getRightHalfCard().getManaCostSymbols()); - } else if (card instanceof ModalDoubleFacesCard) { - this.isModalDoubleFacesCard = true; - ModalDoubleFacesCard mainCard = ((ModalDoubleFacesCard) card); + } else if (card instanceof ModalDoubleFacedCard) { + this.isModalDoubleFacedCard = true; + ModalDoubleFacedCard mainCard = ((ModalDoubleFacedCard) card); fullCardName = mainCard.getLeftHalfCard().getName() + MockCard.MODAL_DOUBLE_FACES_NAME_SEPARATOR + mainCard.getRightHalfCard().getName(); this.manaCostLeftStr = String.join("", mainCard.getLeftHalfCard().getManaCostSymbols()); this.manaCostRightStr = String.join("", mainCard.getRightHalfCard().getManaCostSymbols()); @@ -508,9 +508,9 @@ public class CardView extends SimpleCardView { this.alternateName = card.getFlipCardName(); } - if (card instanceof ModalDoubleFacesCard) { + if (card instanceof ModalDoubleFacedCard) { this.transformable = true; // enable GUI day/night button - ModalDoubleFacesCard mdfCard = (ModalDoubleFacesCard) card; + ModalDoubleFacedCard mdfCard = (ModalDoubleFacedCard) card; this.secondCardFace = new CardView(mdfCard.getRightHalfCard(), game); this.alternateName = mdfCard.getRightHalfCard().getName(); } 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 52d733412d..ac898ab4db 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 @@ -206,9 +206,9 @@ public class TinyLeaders extends Constructed { if (card instanceof SplitCard) { costs.add(((SplitCard) card).getLeftHalfCard().getManaValue()); costs.add(((SplitCard) card).getRightHalfCard().getManaValue()); - } else if (card instanceof ModalDoubleFacesCard) { - costs.add(((ModalDoubleFacesCard) card).getLeftHalfCard().getManaValue()); - costs.add(((ModalDoubleFacesCard) card).getRightHalfCard().getManaValue()); + } else if (card instanceof ModalDoubleFacedCard) { + costs.add(((ModalDoubleFacedCard) card).getLeftHalfCard().getManaValue()); + costs.add(((ModalDoubleFacedCard) card).getRightHalfCard().getManaValue()); } else { costs.add(card.getManaValue()); } 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 e71018ba83..3a9a38c1c6 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 @@ -1257,10 +1257,10 @@ public class HumanPlayer extends PlayerImpl { MageObject object = game.getObject(response.getUUID()); // mdf cards - if (object instanceof ModalDoubleFacesCardHalf) { + if (object instanceof ModalDoubleFacedCardHalf) { if (!Zone.BATTLEFIELD.equals(game.getState().getZone(object.getId())) && !Zone.STACK.equals(game.getState().getZone(object.getId()))) { - return ((ModalDoubleFacesCardHalf) object).getMainCard().getId(); + return ((ModalDoubleFacedCardHalf) object).getMainCard().getId(); } } @@ -2217,7 +2217,7 @@ public class HumanPlayer extends PlayerImpl { if (mainCard != null && !Zone.BATTLEFIELD.equals(game.getState().getZone(mainCard.getId()))) { if (mainCard instanceof SplitCard || mainCard instanceof AdventureCard - || mainCard instanceof ModalDoubleFacesCard) { + || mainCard instanceof ModalDoubleFacedCard) { return false; } } diff --git a/Mage.Sets/src/mage/cards/a/AgadeemsAwakening.java b/Mage.Sets/src/mage/cards/a/AgadeemsAwakening.java index 75944abd32..3e0d09a4bb 100644 --- a/Mage.Sets/src/mage/cards/a/AgadeemsAwakening.java +++ b/Mage.Sets/src/mage/cards/a/AgadeemsAwakening.java @@ -9,7 +9,7 @@ import mage.abilities.effects.common.TapSourceUnlessPaysEffect; import mage.abilities.mana.BlackManaAbility; import mage.cards.Card; import mage.cards.CardSetInfo; -import mage.cards.ModalDoubleFacesCard; +import mage.cards.ModalDoubleFacedCard; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterCard; @@ -25,7 +25,7 @@ import java.util.stream.Collectors; /** * @author JayDi85 */ -public final class AgadeemsAwakening extends ModalDoubleFacesCard { +public final class AgadeemsAwakening extends ModalDoubleFacedCard { public AgadeemsAwakening(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, diff --git a/Mage.Sets/src/mage/cards/a/AkoumWarrior.java b/Mage.Sets/src/mage/cards/a/AkoumWarrior.java index 0e47d1e5b6..92b2222af1 100644 --- a/Mage.Sets/src/mage/cards/a/AkoumWarrior.java +++ b/Mage.Sets/src/mage/cards/a/AkoumWarrior.java @@ -5,7 +5,7 @@ import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.keyword.TrampleAbility; import mage.abilities.mana.RedManaAbility; import mage.cards.CardSetInfo; -import mage.cards.ModalDoubleFacesCard; +import mage.cards.ModalDoubleFacedCard; import mage.constants.CardType; import mage.constants.SubType; @@ -14,7 +14,7 @@ import java.util.UUID; /** * @author JayDi85 */ -public final class AkoumWarrior extends ModalDoubleFacesCard { +public final class AkoumWarrior extends ModalDoubleFacedCard { public AkoumWarrior(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, diff --git a/Mage.Sets/src/mage/cards/a/AlrundGodOfTheCosmos.java b/Mage.Sets/src/mage/cards/a/AlrundGodOfTheCosmos.java index 6b1da3e96e..840bde24bd 100644 --- a/Mage.Sets/src/mage/cards/a/AlrundGodOfTheCosmos.java +++ b/Mage.Sets/src/mage/cards/a/AlrundGodOfTheCosmos.java @@ -31,7 +31,7 @@ import java.util.UUID; /** * @author jeffwadsworth */ -public final class AlrundGodOfTheCosmos extends ModalDoubleFacesCard { +public final class AlrundGodOfTheCosmos extends ModalDoubleFacedCard { public AlrundGodOfTheCosmos(UUID ownerId, CardSetInfo setInfo) { super( diff --git a/Mage.Sets/src/mage/cards/a/AminatousAugury.java b/Mage.Sets/src/mage/cards/a/AminatousAugury.java index 573e5513dc..495a2e795a 100644 --- a/Mage.Sets/src/mage/cards/a/AminatousAugury.java +++ b/Mage.Sets/src/mage/cards/a/AminatousAugury.java @@ -12,8 +12,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.cards.Cards; import mage.cards.CardsImpl; -import mage.cards.ModalDoubleFacesCard; -import mage.cards.ModalDoubleFacesCardHalf; +import mage.cards.ModalDoubleFacedCard; +import mage.cards.ModalDoubleFacedCardHalf; import mage.choices.Choice; import mage.choices.ChoiceImpl; import mage.constants.AsThoughEffectType; @@ -115,8 +115,8 @@ class AminatousAuguryEffect extends OneShotEffect { // TODO staticFilters must be configured to check the main card face (Ex: MDFC card like Sea Gate Restoration does not count as a land if face up) for (Card card : cardsToCast.getCards(game)) { // ex: Sea Gate Restoration bug #9956 - if (card instanceof ModalDoubleFacesCard) { - ModalDoubleFacesCardHalf leftHalfCard = ((ModalDoubleFacesCard) card).getLeftHalfCard(); + if (card instanceof ModalDoubleFacedCard) { + ModalDoubleFacedCardHalf leftHalfCard = ((ModalDoubleFacedCard) card).getLeftHalfCard(); if (leftHalfCard != null && !leftHalfCard.isLand(game)) { AminatousAuguryCastFromExileEffect effect = new AminatousAuguryCastFromExileEffect(); diff --git a/Mage.Sets/src/mage/cards/a/AugmenterPugilist.java b/Mage.Sets/src/mage/cards/a/AugmenterPugilist.java index ea84c18969..8ebf51fc23 100644 --- a/Mage.Sets/src/mage/cards/a/AugmenterPugilist.java +++ b/Mage.Sets/src/mage/cards/a/AugmenterPugilist.java @@ -10,7 +10,7 @@ import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.hint.common.LandsYouControlHint; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardSetInfo; -import mage.cards.ModalDoubleFacesCard; +import mage.cards.ModalDoubleFacedCard; import mage.constants.*; import mage.filter.StaticFilters; import mage.game.Game; @@ -24,7 +24,7 @@ import java.util.UUID; * * @author htrajan */ -public final class AugmenterPugilist extends ModalDoubleFacesCard { +public final class AugmenterPugilist extends ModalDoubleFacedCard { public AugmenterPugilist(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, diff --git a/Mage.Sets/src/mage/cards/b/BalaGedRecovery.java b/Mage.Sets/src/mage/cards/b/BalaGedRecovery.java index a91b2ee056..cbaedb9557 100644 --- a/Mage.Sets/src/mage/cards/b/BalaGedRecovery.java +++ b/Mage.Sets/src/mage/cards/b/BalaGedRecovery.java @@ -4,7 +4,7 @@ import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.effects.common.ReturnFromGraveyardToHandTargetEffect; import mage.abilities.mana.GreenManaAbility; import mage.cards.CardSetInfo; -import mage.cards.ModalDoubleFacesCard; +import mage.cards.ModalDoubleFacedCard; import mage.constants.CardType; import mage.constants.SubType; import mage.target.common.TargetCardInYourGraveyard; @@ -14,7 +14,7 @@ import java.util.UUID; /** * @author JayDi85 */ -public final class BalaGedRecovery extends ModalDoubleFacesCard { +public final class BalaGedRecovery extends ModalDoubleFacedCard { public BalaGedRecovery(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, diff --git a/Mage.Sets/src/mage/cards/b/BarkchannelPathway.java b/Mage.Sets/src/mage/cards/b/BarkchannelPathway.java index 5cea3084e7..b1b270b1e6 100644 --- a/Mage.Sets/src/mage/cards/b/BarkchannelPathway.java +++ b/Mage.Sets/src/mage/cards/b/BarkchannelPathway.java @@ -2,12 +2,10 @@ package mage.cards.b; import java.util.UUID; -import mage.abilities.mana.BlackManaAbility; import mage.abilities.mana.BlueManaAbility; import mage.abilities.mana.GreenManaAbility; -import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.cards.ModalDoubleFacesCard; +import mage.cards.ModalDoubleFacedCard; import mage.constants.CardType; import mage.constants.SubType; @@ -15,7 +13,7 @@ import mage.constants.SubType; * * @author TheElk801 */ -public final class BarkchannelPathway extends ModalDoubleFacesCard { +public final class BarkchannelPathway extends ModalDoubleFacedCard { public BarkchannelPathway(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, diff --git a/Mage.Sets/src/mage/cards/b/BeyeenVeil.java b/Mage.Sets/src/mage/cards/b/BeyeenVeil.java index e75bf2cb55..9516fccdcb 100644 --- a/Mage.Sets/src/mage/cards/b/BeyeenVeil.java +++ b/Mage.Sets/src/mage/cards/b/BeyeenVeil.java @@ -4,7 +4,7 @@ import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.effects.common.continuous.BoostOpponentsEffect; import mage.abilities.mana.BlueManaAbility; import mage.cards.CardSetInfo; -import mage.cards.ModalDoubleFacesCard; +import mage.cards.ModalDoubleFacedCard; import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; @@ -14,7 +14,7 @@ import java.util.UUID; /** * @author JayDi85 */ -public final class BeyeenVeil extends ModalDoubleFacesCard { +public final class BeyeenVeil extends ModalDoubleFacedCard { public BeyeenVeil(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, diff --git a/Mage.Sets/src/mage/cards/b/BirgiGodOfStorytelling.java b/Mage.Sets/src/mage/cards/b/BirgiGodOfStorytelling.java index 7da4842597..a87a273aa4 100644 --- a/Mage.Sets/src/mage/cards/b/BirgiGodOfStorytelling.java +++ b/Mage.Sets/src/mage/cards/b/BirgiGodOfStorytelling.java @@ -10,7 +10,7 @@ import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.ExileTopXMayPlayUntilEndOfTurnEffect; import mage.abilities.keyword.BoastAbility; import mage.cards.CardSetInfo; -import mage.cards.ModalDoubleFacesCard; +import mage.cards.ModalDoubleFacedCard; import mage.constants.*; import mage.game.Game; import mage.players.Player; @@ -20,7 +20,7 @@ import java.util.UUID; /** * @author TheElk801 */ -public final class BirgiGodOfStorytelling extends ModalDoubleFacesCard { +public final class BirgiGodOfStorytelling extends ModalDoubleFacedCard { public BirgiGodOfStorytelling(UUID ownerId, CardSetInfo setInfo) { super( diff --git a/Mage.Sets/src/mage/cards/b/BlackbloomRogue.java b/Mage.Sets/src/mage/cards/b/BlackbloomRogue.java index 6eaf184add..75b67c4faf 100644 --- a/Mage.Sets/src/mage/cards/b/BlackbloomRogue.java +++ b/Mage.Sets/src/mage/cards/b/BlackbloomRogue.java @@ -9,7 +9,7 @@ import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.keyword.MenaceAbility; import mage.abilities.mana.BlackManaAbility; import mage.cards.CardSetInfo; -import mage.cards.ModalDoubleFacesCard; +import mage.cards.ModalDoubleFacedCard; import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; @@ -19,7 +19,7 @@ import java.util.UUID; /** * @author JayDi85 */ -public final class BlackbloomRogue extends ModalDoubleFacesCard { +public final class BlackbloomRogue extends ModalDoubleFacedCard { public BlackbloomRogue(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, diff --git a/Mage.Sets/src/mage/cards/b/BlexVexingPest.java b/Mage.Sets/src/mage/cards/b/BlexVexingPest.java index b6db39dbfd..de1a8609e5 100644 --- a/Mage.Sets/src/mage/cards/b/BlexVexingPest.java +++ b/Mage.Sets/src/mage/cards/b/BlexVexingPest.java @@ -10,7 +10,7 @@ import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; import mage.abilities.effects.common.continuous.BoostControlledEffect; import mage.cards.CardSetInfo; import mage.cards.Cards; -import mage.cards.ModalDoubleFacesCard; +import mage.cards.ModalDoubleFacedCard; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; @@ -22,7 +22,7 @@ import java.util.UUID; /** * @author weirddan455 */ -public final class BlexVexingPest extends ModalDoubleFacesCard { +public final class BlexVexingPest extends ModalDoubleFacedCard { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Pests, Bats, Insects, Snakes, and Spiders"); diff --git a/Mage.Sets/src/mage/cards/b/BlightstepPathway.java b/Mage.Sets/src/mage/cards/b/BlightstepPathway.java index 4cf50872e4..927e9b52b8 100644 --- a/Mage.Sets/src/mage/cards/b/BlightstepPathway.java +++ b/Mage.Sets/src/mage/cards/b/BlightstepPathway.java @@ -3,7 +3,7 @@ package mage.cards.b; import mage.abilities.mana.BlackManaAbility; import mage.abilities.mana.RedManaAbility; import mage.cards.CardSetInfo; -import mage.cards.ModalDoubleFacesCard; +import mage.cards.ModalDoubleFacedCard; import mage.constants.CardType; import mage.constants.SubType; @@ -12,7 +12,7 @@ import java.util.UUID; /** * @author TheElk801 */ -public final class BlightstepPathway extends ModalDoubleFacesCard { +public final class BlightstepPathway extends ModalDoubleFacedCard { public BlightstepPathway(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, diff --git a/Mage.Sets/src/mage/cards/b/BranchloftPathway.java b/Mage.Sets/src/mage/cards/b/BranchloftPathway.java index 1c07c4ce65..4bc238f088 100644 --- a/Mage.Sets/src/mage/cards/b/BranchloftPathway.java +++ b/Mage.Sets/src/mage/cards/b/BranchloftPathway.java @@ -3,7 +3,7 @@ package mage.cards.b; import mage.abilities.mana.GreenManaAbility; import mage.abilities.mana.WhiteManaAbility; import mage.cards.CardSetInfo; -import mage.cards.ModalDoubleFacesCard; +import mage.cards.ModalDoubleFacedCard; import mage.constants.CardType; import mage.constants.SubType; @@ -12,7 +12,7 @@ import java.util.UUID; /** * @author JayDi85 */ -public final class BranchloftPathway extends ModalDoubleFacesCard { +public final class BranchloftPathway extends ModalDoubleFacedCard { public BranchloftPathway(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, diff --git a/Mage.Sets/src/mage/cards/b/BrightclimbPathway.java b/Mage.Sets/src/mage/cards/b/BrightclimbPathway.java index 177ace5d6c..2be29491c6 100644 --- a/Mage.Sets/src/mage/cards/b/BrightclimbPathway.java +++ b/Mage.Sets/src/mage/cards/b/BrightclimbPathway.java @@ -3,7 +3,7 @@ package mage.cards.b; import mage.abilities.mana.BlackManaAbility; import mage.abilities.mana.WhiteManaAbility; import mage.cards.CardSetInfo; -import mage.cards.ModalDoubleFacesCard; +import mage.cards.ModalDoubleFacedCard; import mage.constants.CardType; import mage.constants.SubType; @@ -12,7 +12,7 @@ import java.util.UUID; /** * @author JayDi85 */ -public final class BrightclimbPathway extends ModalDoubleFacesCard { +public final class BrightclimbPathway extends ModalDoubleFacedCard { public BrightclimbPathway(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, diff --git a/Mage.Sets/src/mage/cards/c/ClearwaterPathway.java b/Mage.Sets/src/mage/cards/c/ClearwaterPathway.java index 7a2960bbb4..7b1eb948bc 100644 --- a/Mage.Sets/src/mage/cards/c/ClearwaterPathway.java +++ b/Mage.Sets/src/mage/cards/c/ClearwaterPathway.java @@ -3,7 +3,7 @@ package mage.cards.c; import mage.abilities.mana.BlackManaAbility; import mage.abilities.mana.BlueManaAbility; import mage.cards.CardSetInfo; -import mage.cards.ModalDoubleFacesCard; +import mage.cards.ModalDoubleFacedCard; import mage.constants.CardType; import mage.constants.SubType; @@ -12,7 +12,7 @@ import java.util.UUID; /** * @author JayDi85 */ -public final class ClearwaterPathway extends ModalDoubleFacesCard { +public final class ClearwaterPathway extends ModalDoubleFacedCard { public ClearwaterPathway(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, diff --git a/Mage.Sets/src/mage/cards/c/CosimaGodOfTheVoyage.java b/Mage.Sets/src/mage/cards/c/CosimaGodOfTheVoyage.java index 61822268e7..e667d481c4 100644 --- a/Mage.Sets/src/mage/cards/c/CosimaGodOfTheVoyage.java +++ b/Mage.Sets/src/mage/cards/c/CosimaGodOfTheVoyage.java @@ -28,7 +28,7 @@ import java.util.stream.Collectors; /** * @author TheElk801 */ -public final class CosimaGodOfTheVoyage extends ModalDoubleFacesCard { +public final class CosimaGodOfTheVoyage extends ModalDoubleFacedCard { private static final FilterPermanent filter = new FilterControlledPermanent(SubType.VEHICLE, "a Vehicle you control"); diff --git a/Mage.Sets/src/mage/cards/c/CragcrownPathway.java b/Mage.Sets/src/mage/cards/c/CragcrownPathway.java index efbd3bbc03..4834947b80 100644 --- a/Mage.Sets/src/mage/cards/c/CragcrownPathway.java +++ b/Mage.Sets/src/mage/cards/c/CragcrownPathway.java @@ -4,7 +4,7 @@ import mage.abilities.keyword.TransformAbility; import mage.abilities.mana.GreenManaAbility; import mage.abilities.mana.RedManaAbility; import mage.cards.CardSetInfo; -import mage.cards.ModalDoubleFacesCard; +import mage.cards.ModalDoubleFacedCard; import mage.constants.CardType; import mage.constants.SubType; @@ -13,7 +13,7 @@ import java.util.UUID; /** * @author JayDi85 */ -public final class CragcrownPathway extends ModalDoubleFacesCard { +public final class CragcrownPathway extends ModalDoubleFacedCard { public CragcrownPathway(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, diff --git a/Mage.Sets/src/mage/cards/d/DarkborePathway.java b/Mage.Sets/src/mage/cards/d/DarkborePathway.java index b30460ae59..18e64f1bea 100644 --- a/Mage.Sets/src/mage/cards/d/DarkborePathway.java +++ b/Mage.Sets/src/mage/cards/d/DarkborePathway.java @@ -3,7 +3,7 @@ package mage.cards.d; import mage.abilities.mana.BlackManaAbility; import mage.abilities.mana.GreenManaAbility; import mage.cards.CardSetInfo; -import mage.cards.ModalDoubleFacesCard; +import mage.cards.ModalDoubleFacedCard; import mage.constants.CardType; import mage.constants.SubType; @@ -12,7 +12,7 @@ import java.util.UUID; /** * @author TheElk801 */ -public final class DarkborePathway extends ModalDoubleFacesCard { +public final class DarkborePathway extends ModalDoubleFacedCard { public DarkborePathway(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, diff --git a/Mage.Sets/src/mage/cards/d/DeceiverOfForm.java b/Mage.Sets/src/mage/cards/d/DeceiverOfForm.java index c644f2a129..37b5ff1d33 100644 --- a/Mage.Sets/src/mage/cards/d/DeceiverOfForm.java +++ b/Mage.Sets/src/mage/cards/d/DeceiverOfForm.java @@ -77,9 +77,9 @@ class DeceiverOfFormEffect extends OneShotEffect { for (Permanent permanent : game.getBattlefield().getAllActivePermanents(StaticFilters.FILTER_PERMANENT_CREATURE, controller.getId(), game)) { if (!permanent.getId().equals(sourceObject.getId())) { // handle MDFC - if (cardFromTop instanceof ModalDoubleFacesCard - && ((ModalDoubleFacesCard) cardFromTop).getLeftHalfCard().isCreature(game)) { - copyFromCard = ((ModalDoubleFacesCard) cardFromTop).getLeftHalfCard(); + if (cardFromTop instanceof ModalDoubleFacedCard + && ((ModalDoubleFacedCard) cardFromTop).getLeftHalfCard().isCreature(game)) { + copyFromCard = ((ModalDoubleFacedCard) cardFromTop).getLeftHalfCard(); } Permanent newBluePrint = null; newBluePrint = new PermanentCard(copyFromCard, source.getControllerId(), game); diff --git a/Mage.Sets/src/mage/cards/d/DoubleHeader.java b/Mage.Sets/src/mage/cards/d/DoubleHeader.java index 6bd2c34e73..98ca88409a 100644 --- a/Mage.Sets/src/mage/cards/d/DoubleHeader.java +++ b/Mage.Sets/src/mage/cards/d/DoubleHeader.java @@ -8,7 +8,7 @@ import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.cards.ModalDoubleFacesCard; +import mage.cards.ModalDoubleFacedCard; import mage.cards.SplitCard; import mage.constants.CardType; import mage.constants.SpellAbilityType; @@ -69,8 +69,8 @@ class DoubleHeaderPredicate implements Predicate { String name = input.getName(); if (input instanceof SplitCard) { return hasTwoWords(((SplitCard) input).getLeftHalfCard().getName()) || hasTwoWords(((SplitCard) input).getRightHalfCard().getName()); - } else if (input instanceof ModalDoubleFacesCard) { - return hasTwoWords(((ModalDoubleFacesCard) input).getLeftHalfCard().getName()) || hasTwoWords(((ModalDoubleFacesCard) input).getRightHalfCard().getName()); + } else if (input instanceof ModalDoubleFacedCard) { + return hasTwoWords(((ModalDoubleFacedCard) input).getLeftHalfCard().getName()) || hasTwoWords(((ModalDoubleFacedCard) input).getRightHalfCard().getName()); } else if (input instanceof Spell && ((Spell) input).getSpellAbility().getSpellAbilityType() == SpellAbilityType.SPLIT_FUSED) { SplitCard card = (SplitCard) ((Spell) input).getCard(); return hasTwoWords(card.getLeftHalfCard().getName()) || hasTwoWords(card.getRightHalfCard().getName()); diff --git a/Mage.Sets/src/mage/cards/d/DraugrNecromancer.java b/Mage.Sets/src/mage/cards/d/DraugrNecromancer.java index 458824d5ca..e00459f9a7 100644 --- a/Mage.Sets/src/mage/cards/d/DraugrNecromancer.java +++ b/Mage.Sets/src/mage/cards/d/DraugrNecromancer.java @@ -182,8 +182,8 @@ class DraugrNecromancerSpendAnyManaEffect extends AsThoughEffectImpl implements cardState = game.getLastKnownInformationCard(card.getId(), Zone.EXILED); } else if (card instanceof AdventureCard) { cardState = game.getLastKnownInformationCard(card.getId(), Zone.EXILED); - } else if (card instanceof ModalDoubleFacesCard) { - cardState = game.getLastKnownInformationCard(((ModalDoubleFacesCard) card).getLeftHalfCard().getId(), Zone.EXILED); + } else if (card instanceof ModalDoubleFacedCard) { + cardState = game.getLastKnownInformationCard(((ModalDoubleFacedCard) card).getLeftHalfCard().getId(), Zone.EXILED); } else { cardState = game.getLastKnownInformationCard(card.getId(), Zone.EXILED); } diff --git a/Mage.Sets/src/mage/cards/d/DreamDevourer.java b/Mage.Sets/src/mage/cards/d/DreamDevourer.java index 17d271588e..dfa6dde851 100644 --- a/Mage.Sets/src/mage/cards/d/DreamDevourer.java +++ b/Mage.Sets/src/mage/cards/d/DreamDevourer.java @@ -89,13 +89,13 @@ class DreamDevourerAddAbilityEffect extends ContinuousEffectImpl { String leftHalfCost = CardUtil.reduceCost(((SplitCard) card).getLeftHalfCard().getManaCost(), 2).getText(); String rightHalfCost = CardUtil.reduceCost(((SplitCard) card).getRightHalfCard().getManaCost(), 2).getText(); foretellAbility = new ForetellAbility(card, leftHalfCost, rightHalfCost); - } else if (card instanceof ModalDoubleFacesCard) { - ModalDoubleFacesCardHalf leftHalfCard = ((ModalDoubleFacesCard) card).getLeftHalfCard(); + } else if (card instanceof ModalDoubleFacedCard) { + ModalDoubleFacedCardHalf leftHalfCard = ((ModalDoubleFacedCard) card).getLeftHalfCard(); // If front side of MDFC is land, do nothing as Dream Devourer does not apply to lands // MDFC cards in hand are considered lands if front side is land if (!leftHalfCard.isLand(game)) { String leftHalfCost = CardUtil.reduceCost(leftHalfCard.getManaCost(), 2).getText(); - ModalDoubleFacesCardHalf rightHalfCard = ((ModalDoubleFacesCard) card).getRightHalfCard(); + ModalDoubleFacedCardHalf rightHalfCard = ((ModalDoubleFacedCard) card).getRightHalfCard(); if (rightHalfCard.isLand(game)) { foretellAbility = new ForetellAbility(card, leftHalfCost); } else { diff --git a/Mage.Sets/src/mage/cards/e/EdginLarcenousLutenist.java b/Mage.Sets/src/mage/cards/e/EdginLarcenousLutenist.java index 055c410546..20a122cf63 100644 --- a/Mage.Sets/src/mage/cards/e/EdginLarcenousLutenist.java +++ b/Mage.Sets/src/mage/cards/e/EdginLarcenousLutenist.java @@ -86,13 +86,13 @@ class EdginLarcenousLutenistEffect extends ContinuousEffectImpl { String leftHalfCost = CardUtil.reduceCost(((SplitCard) card).getLeftHalfCard().getManaCost(), 2).getText(); String rightHalfCost = CardUtil.reduceCost(((SplitCard) card).getRightHalfCard().getManaCost(), 2).getText(); foretellAbility = new ForetellAbility(card, leftHalfCost, rightHalfCost); - } else if (card instanceof ModalDoubleFacesCard) { - ModalDoubleFacesCardHalf leftHalfCard = ((ModalDoubleFacesCard) card).getLeftHalfCard(); + } else if (card instanceof ModalDoubleFacedCard) { + ModalDoubleFacedCardHalf leftHalfCard = ((ModalDoubleFacedCard) card).getLeftHalfCard(); // If front side of MDFC is land, do nothing as Dream Devourer does not apply to lands // MDFC cards in hand are considered lands if front side is land if (!leftHalfCard.isLand(game)) { String leftHalfCost = CardUtil.reduceCost(leftHalfCard.getManaCost(), 2).getText(); - ModalDoubleFacesCardHalf rightHalfCard = ((ModalDoubleFacesCard) card).getRightHalfCard(); + ModalDoubleFacedCardHalf rightHalfCard = ((ModalDoubleFacedCard) card).getRightHalfCard(); if (rightHalfCard.isLand(game)) { foretellAbility = new ForetellAbility(card, leftHalfCost); } else { diff --git a/Mage.Sets/src/mage/cards/e/EgonGodOfDeath.java b/Mage.Sets/src/mage/cards/e/EgonGodOfDeath.java index 704fc9f275..e17b7bf36e 100644 --- a/Mage.Sets/src/mage/cards/e/EgonGodOfDeath.java +++ b/Mage.Sets/src/mage/cards/e/EgonGodOfDeath.java @@ -13,7 +13,7 @@ import mage.abilities.effects.common.MillCardsControllerEffect; import mage.abilities.effects.common.SacrificeSourceEffect; import mage.abilities.keyword.DeathtouchAbility; import mage.cards.CardSetInfo; -import mage.cards.ModalDoubleFacesCard; +import mage.cards.ModalDoubleFacedCard; import mage.constants.*; import mage.filter.StaticFilters; import mage.target.common.TargetCardInYourGraveyard; @@ -23,7 +23,7 @@ import java.util.UUID; /** * @author weirddan455 */ -public final class EgonGodOfDeath extends ModalDoubleFacesCard { +public final class EgonGodOfDeath extends ModalDoubleFacedCard { public EgonGodOfDeath(UUID ownerId, CardSetInfo setInfo) { super( diff --git a/Mage.Sets/src/mage/cards/e/EmeriasCall.java b/Mage.Sets/src/mage/cards/e/EmeriasCall.java index 538bfb7973..a8db1e1fd1 100644 --- a/Mage.Sets/src/mage/cards/e/EmeriasCall.java +++ b/Mage.Sets/src/mage/cards/e/EmeriasCall.java @@ -8,7 +8,7 @@ import mage.abilities.effects.common.continuous.GainAbilityAllEffect; import mage.abilities.keyword.IndestructibleAbility; import mage.abilities.mana.WhiteManaAbility; import mage.cards.CardSetInfo; -import mage.cards.ModalDoubleFacesCard; +import mage.cards.ModalDoubleFacedCard; import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; @@ -22,7 +22,7 @@ import java.util.UUID; /** * @author JayDi85 */ -public final class EmeriasCall extends ModalDoubleFacesCard { +public final class EmeriasCall extends ModalDoubleFacedCard { private static final FilterPermanent filter = new FilterControlledCreaturePermanent("Non-Angel creatures you control"); diff --git a/Mage.Sets/src/mage/cards/e/EsikaGodOfTheTree.java b/Mage.Sets/src/mage/cards/e/EsikaGodOfTheTree.java index eb778bb4b3..df50272f61 100644 --- a/Mage.Sets/src/mage/cards/e/EsikaGodOfTheTree.java +++ b/Mage.Sets/src/mage/cards/e/EsikaGodOfTheTree.java @@ -20,7 +20,7 @@ import java.util.UUID; /** * @author weirddan455 */ -public final class EsikaGodOfTheTree extends ModalDoubleFacesCard { +public final class EsikaGodOfTheTree extends ModalDoubleFacedCard { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("legendary creatures"); diff --git a/Mage.Sets/src/mage/cards/e/EtherealValkyrie.java b/Mage.Sets/src/mage/cards/e/EtherealValkyrie.java index 5d051bcc59..98b35cc4c6 100644 --- a/Mage.Sets/src/mage/cards/e/EtherealValkyrie.java +++ b/Mage.Sets/src/mage/cards/e/EtherealValkyrie.java @@ -4,10 +4,8 @@ import java.util.UUID; import mage.MageInt; import mage.MageObjectReference; import mage.abilities.Ability; -import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.EntersBattlefieldOrAttacksSourceTriggeredAbility; import mage.abilities.effects.ContinuousEffect; -import mage.abilities.effects.Effect; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.ForetellAbility; @@ -15,17 +13,15 @@ import mage.cards.AdventureCard; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.cards.ModalDoubleFacesCard; -import mage.cards.ModalDoubleFacesCardHalf; +import mage.cards.ModalDoubleFacedCard; +import mage.cards.ModalDoubleFacedCardHalf; import mage.cards.SplitCard; import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.SubType; -import mage.constants.Zone; import mage.filter.FilterCard; import mage.game.Game; import mage.game.events.GameEvent; -import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCardInHand; import mage.util.CardUtil; @@ -105,12 +101,12 @@ class EtherealValkyrieEffect extends OneShotEffect { game.getState().setValue(exileCard.getMainCard().getId().toString() + "Foretell Cost", leftHalfCost); game.getState().setValue(exileCard.getMainCard().getId().toString() + "Foretell Split Cost", rightHalfCost); foretellAbility = new ForetellAbility(exileCard, leftHalfCost, rightHalfCost); - } else if (exileCard instanceof ModalDoubleFacesCard) { - ModalDoubleFacesCardHalf leftHalfCard = ((ModalDoubleFacesCard) exileCard).getLeftHalfCard(); + } else if (exileCard instanceof ModalDoubleFacedCard) { + ModalDoubleFacedCardHalf leftHalfCard = ((ModalDoubleFacedCard) exileCard).getLeftHalfCard(); if (!leftHalfCard.isLand(game)) { // Only MDFC cards with a left side a land have a land on the right side too String leftHalfCost = CardUtil.reduceCost(leftHalfCard.getManaCost(), 2).getText(); game.getState().setValue(exileCard.getMainCard().getId().toString() + "Foretell Cost", leftHalfCost); - ModalDoubleFacesCardHalf rightHalfCard = ((ModalDoubleFacesCard) exileCard).getRightHalfCard(); + ModalDoubleFacedCardHalf rightHalfCard = ((ModalDoubleFacedCard) exileCard).getRightHalfCard(); if (rightHalfCard.isLand(game)) { foretellAbility = new ForetellAbility(exileCard, leftHalfCost); } else { diff --git a/Mage.Sets/src/mage/cards/e/EvelynTheCovetous.java b/Mage.Sets/src/mage/cards/e/EvelynTheCovetous.java index 491e2327c0..53ce4201db 100644 --- a/Mage.Sets/src/mage/cards/e/EvelynTheCovetous.java +++ b/Mage.Sets/src/mage/cards/e/EvelynTheCovetous.java @@ -174,8 +174,8 @@ class EvelynTheCovetousManaEffect extends AsThoughEffectImpl implements AsThough && EvelynTheCovetousWatcher.checkExile(affectedControllerId, card, game, 0); } CardState cardState; - if (card instanceof ModalDoubleFacesCard) { - cardState = game.getLastKnownInformationCard(((ModalDoubleFacesCard) card).getLeftHalfCard().getId(), Zone.EXILED); + if (card instanceof ModalDoubleFacedCard) { + cardState = game.getLastKnownInformationCard(((ModalDoubleFacedCard) card).getLeftHalfCard().getId(), Zone.EXILED); } else { cardState = game.getLastKnownInformationCard(card.getId(), Zone.EXILED); } diff --git a/Mage.Sets/src/mage/cards/e/EverythingamajigE.java b/Mage.Sets/src/mage/cards/e/EverythingamajigE.java index a45f3cfdc7..acb0e37bed 100644 --- a/Mage.Sets/src/mage/cards/e/EverythingamajigE.java +++ b/Mage.Sets/src/mage/cards/e/EverythingamajigE.java @@ -113,8 +113,8 @@ class UrzasHotTubPredicate implements Predicate { String name = input.getName(); if (input instanceof SplitCard) { return sharesWordWithName(((SplitCard) input).getLeftHalfCard().getName()) || sharesWordWithName(((SplitCard) input).getRightHalfCard().getName()); - } else if (input instanceof ModalDoubleFacesCard) { - return sharesWordWithName(((ModalDoubleFacesCard) input).getLeftHalfCard().getName()) || sharesWordWithName(((ModalDoubleFacesCard) input).getRightHalfCard().getName()); + } else if (input instanceof ModalDoubleFacedCard) { + return sharesWordWithName(((ModalDoubleFacedCard) input).getLeftHalfCard().getName()) || sharesWordWithName(((ModalDoubleFacedCard) input).getRightHalfCard().getName()); } else if (input instanceof Spell && ((Spell) input).getSpellAbility().getSpellAbilityType() == SpellAbilityType.SPLIT_FUSED) { SplitCard card = (SplitCard) ((Spell) input).getCard(); return sharesWordWithName(card.getLeftHalfCard().getName()) || sharesWordWithName(card.getRightHalfCard().getName()); diff --git a/Mage.Sets/src/mage/cards/e/ExtusOriqOverlord.java b/Mage.Sets/src/mage/cards/e/ExtusOriqOverlord.java index d55c4288d1..425a1f2f71 100644 --- a/Mage.Sets/src/mage/cards/e/ExtusOriqOverlord.java +++ b/Mage.Sets/src/mage/cards/e/ExtusOriqOverlord.java @@ -12,7 +12,7 @@ import mage.abilities.effects.common.SacrificeOpponentsEffect; import mage.abilities.effects.common.cost.CostModificationEffectImpl; import mage.abilities.keyword.DoubleStrikeAbility; import mage.cards.CardSetInfo; -import mage.cards.ModalDoubleFacesCard; +import mage.cards.ModalDoubleFacedCard; import mage.constants.*; import mage.filter.FilterCard; import mage.filter.StaticFilters; @@ -28,7 +28,7 @@ import java.util.UUID; /** * @author TheElk801 */ -public final class ExtusOriqOverlord extends ModalDoubleFacesCard { +public final class ExtusOriqOverlord extends ModalDoubleFacedCard { private static final FilterCard filter = new FilterCreatureCard("nonlegendary creature card from your graveyard"); diff --git a/Mage.Sets/src/mage/cards/e/EyeOfTheStorm.java b/Mage.Sets/src/mage/cards/e/EyeOfTheStorm.java index d7aad9803a..b263fdefb6 100644 --- a/Mage.Sets/src/mage/cards/e/EyeOfTheStorm.java +++ b/Mage.Sets/src/mage/cards/e/EyeOfTheStorm.java @@ -129,9 +129,9 @@ class EyeOfTheStormEffect1 extends OneShotEffect { if (card instanceof SplitCard) { copiedCards.add(((SplitCard) card).getLeftHalfCard()); copiedCards.add(((SplitCard) card).getRightHalfCard()); - } else if (card instanceof ModalDoubleFacesCard) { - copiedCards.add(((ModalDoubleFacesCard) card).getLeftHalfCard()); - copiedCards.add(((ModalDoubleFacesCard) card).getRightHalfCard()); + } else if (card instanceof ModalDoubleFacedCard) { + copiedCards.add(((ModalDoubleFacedCard) card).getLeftHalfCard()); + copiedCards.add(((ModalDoubleFacedCard) card).getRightHalfCard()); } else { copiedCards.add(card); } diff --git a/Mage.Sets/src/mage/cards/f/FlamescrollCelebrant.java b/Mage.Sets/src/mage/cards/f/FlamescrollCelebrant.java index 178977860a..79f3acd7c1 100644 --- a/Mage.Sets/src/mage/cards/f/FlamescrollCelebrant.java +++ b/Mage.Sets/src/mage/cards/f/FlamescrollCelebrant.java @@ -13,7 +13,7 @@ import mage.abilities.effects.common.ExileSpellEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.mana.ActivatedManaAbilityImpl; import mage.cards.CardSetInfo; -import mage.cards.ModalDoubleFacesCard; +import mage.cards.ModalDoubleFacedCard; import mage.constants.*; import mage.game.Game; import mage.game.events.GameEvent; @@ -27,7 +27,7 @@ import java.util.UUID; /** * @author TheElk801 */ -public final class FlamescrollCelebrant extends ModalDoubleFacesCard { +public final class FlamescrollCelebrant extends ModalDoubleFacedCard { public FlamescrollCelebrant(UUID ownerId, CardSetInfo setInfo) { super( diff --git a/Mage.Sets/src/mage/cards/g/GlasspoolMimic.java b/Mage.Sets/src/mage/cards/g/GlasspoolMimic.java index 4403b7faf0..1e9bf2ee40 100644 --- a/Mage.Sets/src/mage/cards/g/GlasspoolMimic.java +++ b/Mage.Sets/src/mage/cards/g/GlasspoolMimic.java @@ -8,7 +8,7 @@ import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.effects.common.CopyPermanentEffect; import mage.abilities.mana.BlueManaAbility; import mage.cards.CardSetInfo; -import mage.cards.ModalDoubleFacesCard; +import mage.cards.ModalDoubleFacedCard; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.StaticFilters; @@ -20,7 +20,7 @@ import java.util.UUID; /** * @author JayDi85 */ -public final class GlasspoolMimic extends ModalDoubleFacesCard { +public final class GlasspoolMimic extends ModalDoubleFacedCard { public GlasspoolMimic(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, diff --git a/Mage.Sets/src/mage/cards/g/GodEternalKefnet.java b/Mage.Sets/src/mage/cards/g/GodEternalKefnet.java index 6b5f796580..0cf9aed1b6 100644 --- a/Mage.Sets/src/mage/cards/g/GodEternalKefnet.java +++ b/Mage.Sets/src/mage/cards/g/GodEternalKefnet.java @@ -96,9 +96,9 @@ class GodEternalKefnetDrawCardReplacementEffect extends ReplacementEffectImpl { if (blueprint instanceof SplitCard) { ((SplitCard) blueprint).getLeftHalfCard().addAbility(new SimpleStaticAbility(Zone.ALL, new SpellCostReductionSourceEffect(2))); ((SplitCard) blueprint).getRightHalfCard().addAbility(new SimpleStaticAbility(Zone.ALL, new SpellCostReductionSourceEffect(2))); - } else if (blueprint instanceof ModalDoubleFacesCard) { - ((ModalDoubleFacesCard) blueprint).getLeftHalfCard().addAbility(new SimpleStaticAbility(Zone.ALL, new SpellCostReductionSourceEffect(2))); - ((ModalDoubleFacesCard) blueprint).getRightHalfCard().addAbility(new SimpleStaticAbility(Zone.ALL, new SpellCostReductionSourceEffect(2))); + } else if (blueprint instanceof ModalDoubleFacedCard) { + ((ModalDoubleFacedCard) blueprint).getLeftHalfCard().addAbility(new SimpleStaticAbility(Zone.ALL, new SpellCostReductionSourceEffect(2))); + ((ModalDoubleFacedCard) blueprint).getRightHalfCard().addAbility(new SimpleStaticAbility(Zone.ALL, new SpellCostReductionSourceEffect(2))); } else { blueprint.addAbility(new SimpleStaticAbility(Zone.ALL, new SpellCostReductionSourceEffect(2))); } diff --git a/Mage.Sets/src/mage/cards/h/HagraMauling.java b/Mage.Sets/src/mage/cards/h/HagraMauling.java index 7041fbeb24..11d664119d 100644 --- a/Mage.Sets/src/mage/cards/h/HagraMauling.java +++ b/Mage.Sets/src/mage/cards/h/HagraMauling.java @@ -10,7 +10,7 @@ import mage.abilities.hint.ConditionHint; import mage.abilities.hint.Hint; import mage.abilities.mana.BlackManaAbility; import mage.cards.CardSetInfo; -import mage.cards.ModalDoubleFacesCard; +import mage.cards.ModalDoubleFacedCard; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.SuperType; @@ -26,7 +26,7 @@ import java.util.UUID; /** * @author TheElk801 */ -public final class HagraMauling extends ModalDoubleFacesCard { +public final class HagraMauling extends ModalDoubleFacedCard { private static final Hint hint = new ConditionHint( HagraMaulingCondition.instance, "An opponent controls no basic lands" diff --git a/Mage.Sets/src/mage/cards/h/HalvarGodOfBattle.java b/Mage.Sets/src/mage/cards/h/HalvarGodOfBattle.java index e99136dbd0..fabc853afc 100644 --- a/Mage.Sets/src/mage/cards/h/HalvarGodOfBattle.java +++ b/Mage.Sets/src/mage/cards/h/HalvarGodOfBattle.java @@ -15,7 +15,7 @@ import mage.abilities.keyword.EquipAbility; import mage.abilities.keyword.VigilanceAbility; import mage.cards.Card; import mage.cards.CardSetInfo; -import mage.cards.ModalDoubleFacesCard; +import mage.cards.ModalDoubleFacedCard; import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.StaticFilters; @@ -38,7 +38,7 @@ import java.util.UUID; /** * @author weirddan455 */ -public final class HalvarGodOfBattle extends ModalDoubleFacesCard { +public final class HalvarGodOfBattle extends ModalDoubleFacedCard { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent(); private static final FilterPermanent filter2 = new FilterPermanent("aura or equipment attached to a creature you control"); diff --git a/Mage.Sets/src/mage/cards/h/HengegatePathway.java b/Mage.Sets/src/mage/cards/h/HengegatePathway.java index 7a0db59d74..1d67571254 100644 --- a/Mage.Sets/src/mage/cards/h/HengegatePathway.java +++ b/Mage.Sets/src/mage/cards/h/HengegatePathway.java @@ -3,7 +3,7 @@ package mage.cards.h; import mage.abilities.mana.BlueManaAbility; import mage.abilities.mana.WhiteManaAbility; import mage.cards.CardSetInfo; -import mage.cards.ModalDoubleFacesCard; +import mage.cards.ModalDoubleFacedCard; import mage.constants.CardType; import mage.constants.SubType; @@ -12,7 +12,7 @@ import java.util.UUID; /** * @author TheElk801 */ -public final class HengegatePathway extends ModalDoubleFacesCard { +public final class HengegatePathway extends ModalDoubleFacedCard { public HengegatePathway(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, diff --git a/Mage.Sets/src/mage/cards/i/InvasionOfPyrulea.java b/Mage.Sets/src/mage/cards/i/InvasionOfPyrulea.java index 16fdc1768e..beeee35bd4 100644 --- a/Mage.Sets/src/mage/cards/i/InvasionOfPyrulea.java +++ b/Mage.Sets/src/mage/cards/i/InvasionOfPyrulea.java @@ -67,7 +67,7 @@ class InvasionOfPyruleaEffect extends OneShotEffect { player.scry(3, source, game); Card card = player.getLibrary().getFromTop(game); player.revealCards(source, new CardsImpl(card), game); - if (card != null && (card.isLand(game) || card instanceof ModalDoubleFacesCard || card.getSecondCardFace() != null)) { + if (card != null && (card.isLand(game) || card instanceof ModalDoubleFacedCard || card.getSecondCardFace() != null)) { player.drawCards(1, source, game); } return true; diff --git a/Mage.Sets/src/mage/cards/j/JadziOracleOfArcavios.java b/Mage.Sets/src/mage/cards/j/JadziOracleOfArcavios.java index 21bec7da02..f2adf9761d 100644 --- a/Mage.Sets/src/mage/cards/j/JadziOracleOfArcavios.java +++ b/Mage.Sets/src/mage/cards/j/JadziOracleOfArcavios.java @@ -15,7 +15,7 @@ import mage.abilities.hint.common.LandsYouControlHint; import mage.cards.Card; import mage.cards.CardSetInfo; import mage.cards.CardsImpl; -import mage.cards.ModalDoubleFacesCard; +import mage.cards.ModalDoubleFacedCard; import mage.constants.*; import mage.filter.StaticFilters; import mage.game.Game; @@ -28,7 +28,7 @@ import java.util.UUID; /** * @author TheElk801 */ -public final class JadziOracleOfArcavios extends ModalDoubleFacesCard { +public final class JadziOracleOfArcavios extends ModalDoubleFacedCard { private static final Condition condition = new PermanentsOnTheBattlefieldCondition( StaticFilters.FILTER_CONTROLLED_PERMANENT_LAND, ComparisonType.MORE_THAN, 7 diff --git a/Mage.Sets/src/mage/cards/j/JestersScepter.java b/Mage.Sets/src/mage/cards/j/JestersScepter.java index 2d7c6f8805..806bbebf0a 100644 --- a/Mage.Sets/src/mage/cards/j/JestersScepter.java +++ b/Mage.Sets/src/mage/cards/j/JestersScepter.java @@ -165,9 +165,9 @@ class JestersScepterCost extends CostImpl { if (card instanceof SplitCard) { game.getState().setValue(source.getSourceId() + "_nameOfExiledCardPayment", ((SplitCard) card).getLeftHalfCard().getName()); game.getState().setValue(source.getSourceId() + "_nameOfExiledCardPayment2", ((SplitCard) card).getRightHalfCard().getName()); - } else if (card instanceof ModalDoubleFacesCard) { - game.getState().setValue(source.getSourceId() + "_nameOfExiledCardPayment", ((ModalDoubleFacesCard) card).getLeftHalfCard().getName()); - game.getState().setValue(source.getSourceId() + "_nameOfExiledCardPayment2", ((ModalDoubleFacesCard) card).getRightHalfCard().getName()); + } else if (card instanceof ModalDoubleFacedCard) { + game.getState().setValue(source.getSourceId() + "_nameOfExiledCardPayment", ((ModalDoubleFacedCard) card).getLeftHalfCard().getName()); + game.getState().setValue(source.getSourceId() + "_nameOfExiledCardPayment2", ((ModalDoubleFacedCard) card).getRightHalfCard().getName()); } else { game.getState().setValue(source.getSourceId() + "_nameOfExiledCardPayment", card.getName()); } diff --git a/Mage.Sets/src/mage/cards/j/JornGodOfWinter.java b/Mage.Sets/src/mage/cards/j/JornGodOfWinter.java index 96b4e8a5a2..a907d2bb04 100644 --- a/Mage.Sets/src/mage/cards/j/JornGodOfWinter.java +++ b/Mage.Sets/src/mage/cards/j/JornGodOfWinter.java @@ -12,7 +12,7 @@ import mage.abilities.effects.ReplacementEffectImpl; import mage.abilities.effects.common.UntapAllControllerEffect; import mage.cards.Card; import mage.cards.CardSetInfo; -import mage.cards.ModalDoubleFacesCard; +import mage.cards.ModalDoubleFacedCard; import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.common.FilterPermanentCard; @@ -28,7 +28,7 @@ import java.util.UUID; /** * @author weirddan455 */ -public final class JornGodOfWinter extends ModalDoubleFacesCard { +public final class JornGodOfWinter extends ModalDoubleFacedCard { private static final FilterPermanent filter = new FilterPermanent(); private static final FilterPermanentCard filter2 = new FilterPermanentCard("snow permanent card from your graveyard"); diff --git a/Mage.Sets/src/mage/cards/j/JwariDisruption.java b/Mage.Sets/src/mage/cards/j/JwariDisruption.java index 02ee1e75d7..edf6d2a82a 100644 --- a/Mage.Sets/src/mage/cards/j/JwariDisruption.java +++ b/Mage.Sets/src/mage/cards/j/JwariDisruption.java @@ -5,7 +5,7 @@ import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.CounterUnlessPaysEffect; import mage.abilities.mana.BlueManaAbility; import mage.cards.CardSetInfo; -import mage.cards.ModalDoubleFacesCard; +import mage.cards.ModalDoubleFacedCard; import mage.constants.CardType; import mage.constants.SubType; import mage.target.TargetSpell; @@ -15,7 +15,7 @@ import java.util.UUID; /** * @author JayDi85 */ -public final class JwariDisruption extends ModalDoubleFacesCard { +public final class JwariDisruption extends ModalDoubleFacedCard { public JwariDisruption(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, diff --git a/Mage.Sets/src/mage/cards/k/KabiraTakedown.java b/Mage.Sets/src/mage/cards/k/KabiraTakedown.java index 6958b6c61d..18bfa93be8 100644 --- a/Mage.Sets/src/mage/cards/k/KabiraTakedown.java +++ b/Mage.Sets/src/mage/cards/k/KabiraTakedown.java @@ -7,7 +7,7 @@ import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.hint.ValueHint; import mage.abilities.mana.WhiteManaAbility; import mage.cards.CardSetInfo; -import mage.cards.ModalDoubleFacesCard; +import mage.cards.ModalDoubleFacedCard; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.StaticFilters; @@ -18,7 +18,7 @@ import java.util.UUID; /** * @author JayDi85 */ -public final class KabiraTakedown extends ModalDoubleFacesCard { +public final class KabiraTakedown extends ModalDoubleFacedCard { private static final DynamicValue xValue = new PermanentsOnBattlefieldCount(StaticFilters.FILTER_CONTROLLED_CREATURES); diff --git a/Mage.Sets/src/mage/cards/k/KazanduMammoth.java b/Mage.Sets/src/mage/cards/k/KazanduMammoth.java index e3be7c0d13..0b6b86eb13 100644 --- a/Mage.Sets/src/mage/cards/k/KazanduMammoth.java +++ b/Mage.Sets/src/mage/cards/k/KazanduMammoth.java @@ -6,7 +6,7 @@ import mage.abilities.common.LandfallAbility; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.mana.GreenManaAbility; import mage.cards.CardSetInfo; -import mage.cards.ModalDoubleFacesCard; +import mage.cards.ModalDoubleFacedCard; import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; @@ -16,7 +16,7 @@ import java.util.UUID; /** * @author JayDi85 */ -public final class KazanduMammoth extends ModalDoubleFacesCard { +public final class KazanduMammoth extends ModalDoubleFacedCard { public KazanduMammoth(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, diff --git a/Mage.Sets/src/mage/cards/k/KazuulsFury.java b/Mage.Sets/src/mage/cards/k/KazuulsFury.java index ef23ecda54..9e8913407c 100644 --- a/Mage.Sets/src/mage/cards/k/KazuulsFury.java +++ b/Mage.Sets/src/mage/cards/k/KazuulsFury.java @@ -6,7 +6,7 @@ import mage.abilities.dynamicvalue.common.SacrificeCostCreaturesPower; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.mana.RedManaAbility; import mage.cards.CardSetInfo; -import mage.cards.ModalDoubleFacesCard; +import mage.cards.ModalDoubleFacedCard; import mage.constants.CardType; import mage.constants.SubType; import mage.target.common.TargetAnyTarget; @@ -19,7 +19,7 @@ import static mage.filter.StaticFilters.FILTER_CONTROLLED_CREATURE_SHORT_TEXT; /** * @author JayDi85 */ -public final class KazuulsFury extends ModalDoubleFacesCard { +public final class KazuulsFury extends ModalDoubleFacedCard { public KazuulsFury(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, diff --git a/Mage.Sets/src/mage/cards/k/KhalniAmbush.java b/Mage.Sets/src/mage/cards/k/KhalniAmbush.java index fc1d1f7ac0..83f23c5fa2 100644 --- a/Mage.Sets/src/mage/cards/k/KhalniAmbush.java +++ b/Mage.Sets/src/mage/cards/k/KhalniAmbush.java @@ -4,7 +4,7 @@ import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.effects.common.FightTargetsEffect; import mage.abilities.mana.GreenManaAbility; import mage.cards.CardSetInfo; -import mage.cards.ModalDoubleFacesCard; +import mage.cards.ModalDoubleFacedCard; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.StaticFilters; @@ -16,7 +16,7 @@ import java.util.UUID; /** * @author JayDi85 */ -public final class KhalniAmbush extends ModalDoubleFacesCard { +public final class KhalniAmbush extends ModalDoubleFacedCard { public KhalniAmbush(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, diff --git a/Mage.Sets/src/mage/cards/k/KianneDeanOfSubstance.java b/Mage.Sets/src/mage/cards/k/KianneDeanOfSubstance.java index 8c03e9067a..07c992f934 100644 --- a/Mage.Sets/src/mage/cards/k/KianneDeanOfSubstance.java +++ b/Mage.Sets/src/mage/cards/k/KianneDeanOfSubstance.java @@ -29,7 +29,7 @@ import java.util.stream.Collectors; /** * @author TheElk801 */ -public final class KianneDeanOfSubstance extends ModalDoubleFacesCard { +public final class KianneDeanOfSubstance extends ModalDoubleFacedCard { public KianneDeanOfSubstance(UUID ownerId, CardSetInfo setInfo) { super( diff --git a/Mage.Sets/src/mage/cards/k/KolvoriGodOfKinship.java b/Mage.Sets/src/mage/cards/k/KolvoriGodOfKinship.java index 18778153ad..490962dd8e 100644 --- a/Mage.Sets/src/mage/cards/k/KolvoriGodOfKinship.java +++ b/Mage.Sets/src/mage/cards/k/KolvoriGodOfKinship.java @@ -21,7 +21,7 @@ import mage.abilities.mana.ConditionalColoredManaAbility; import mage.abilities.mana.builder.ConditionalManaBuilder; import mage.abilities.mana.conditional.CreatureCastManaCondition; import mage.cards.CardSetInfo; -import mage.cards.ModalDoubleFacesCard; +import mage.cards.ModalDoubleFacedCard; import mage.constants.*; import mage.filter.common.FilterCreatureCard; import mage.filter.common.FilterCreaturePermanent; @@ -33,7 +33,7 @@ import java.util.UUID; /** * @author weirddan455 */ -public final class KolvoriGodOfKinship extends ModalDoubleFacesCard { +public final class KolvoriGodOfKinship extends ModalDoubleFacedCard { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent(); private static final FilterCreatureCard filter2 = new FilterCreatureCard("a legendary creature card"); diff --git a/Mage.Sets/src/mage/cards/m/MakindiStampede.java b/Mage.Sets/src/mage/cards/m/MakindiStampede.java index dbc0b79d70..68d9aa4348 100644 --- a/Mage.Sets/src/mage/cards/m/MakindiStampede.java +++ b/Mage.Sets/src/mage/cards/m/MakindiStampede.java @@ -4,7 +4,7 @@ import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.effects.common.continuous.BoostControlledEffect; import mage.abilities.mana.WhiteManaAbility; import mage.cards.CardSetInfo; -import mage.cards.ModalDoubleFacesCard; +import mage.cards.ModalDoubleFacedCard; import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; @@ -14,7 +14,7 @@ import java.util.UUID; /** * @author JayDi85 */ -public final class MakindiStampede extends ModalDoubleFacesCard { +public final class MakindiStampede extends ModalDoubleFacedCard { public MakindiStampede(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, diff --git a/Mage.Sets/src/mage/cards/m/MalakirRebirth.java b/Mage.Sets/src/mage/cards/m/MalakirRebirth.java index f0479e0925..a76e563cb3 100644 --- a/Mage.Sets/src/mage/cards/m/MalakirRebirth.java +++ b/Mage.Sets/src/mage/cards/m/MalakirRebirth.java @@ -7,7 +7,7 @@ import mage.abilities.effects.common.ReturnSourceFromGraveyardToBattlefieldEffec import mage.abilities.effects.common.continuous.GainAbilityTargetEffect; import mage.abilities.mana.BlackManaAbility; import mage.cards.CardSetInfo; -import mage.cards.ModalDoubleFacesCard; +import mage.cards.ModalDoubleFacedCard; import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; @@ -18,7 +18,7 @@ import java.util.UUID; /** * @author JayDi85 */ -public final class MalakirRebirth extends ModalDoubleFacesCard { +public final class MalakirRebirth extends ModalDoubleFacedCard { public MalakirRebirth(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, diff --git a/Mage.Sets/src/mage/cards/m/MilaCraftyCompanion.java b/Mage.Sets/src/mage/cards/m/MilaCraftyCompanion.java index fb751f78e4..b09aacac91 100644 --- a/Mage.Sets/src/mage/cards/m/MilaCraftyCompanion.java +++ b/Mage.Sets/src/mage/cards/m/MilaCraftyCompanion.java @@ -14,7 +14,7 @@ import mage.abilities.effects.common.counter.AddCountersAllEffect; import mage.abilities.keyword.HasteAbility; import mage.cards.Card; import mage.cards.CardSetInfo; -import mage.cards.ModalDoubleFacesCard; +import mage.cards.ModalDoubleFacedCard; import mage.constants.*; import mage.counters.CounterType; import mage.filter.StaticFilters; @@ -35,7 +35,7 @@ import static mage.constants.Outcome.Benefit; /** * @author TheElk801 */ -public final class MilaCraftyCompanion extends ModalDoubleFacesCard { +public final class MilaCraftyCompanion extends ModalDoubleFacedCard { public MilaCraftyCompanion(UUID ownerId, CardSetInfo setInfo) { super( diff --git a/Mage.Sets/src/mage/cards/m/MycosynthLattice.java b/Mage.Sets/src/mage/cards/m/MycosynthLattice.java index 8887132667..cef44dfa26 100644 --- a/Mage.Sets/src/mage/cards/m/MycosynthLattice.java +++ b/Mage.Sets/src/mage/cards/m/MycosynthLattice.java @@ -135,9 +135,9 @@ class EverythingIsColorlessEffect extends ContinuousEffectImpl { game.getState().getCreateMageObjectAttribute(card, game).getColor().setColor(colorless); // mdf cards - if (card instanceof ModalDoubleFacesCard) { - ModalDoubleFacesCardHalf leftHalfCard = ((ModalDoubleFacesCard) card).getLeftHalfCard(); - ModalDoubleFacesCardHalf rightHalfCard = ((ModalDoubleFacesCard) card).getRightHalfCard(); + if (card instanceof ModalDoubleFacedCard) { + ModalDoubleFacedCardHalf leftHalfCard = ((ModalDoubleFacedCard) card).getLeftHalfCard(); + ModalDoubleFacedCardHalf rightHalfCard = ((ModalDoubleFacedCard) card).getRightHalfCard(); game.getState().getCreateMageObjectAttribute(leftHalfCard, game).getColor().setColor(colorless); game.getState().getCreateMageObjectAttribute(rightHalfCard, game).getColor().setColor(colorless); } diff --git a/Mage.Sets/src/mage/cards/n/NeedlevergePathway.java b/Mage.Sets/src/mage/cards/n/NeedlevergePathway.java index d43bf194ed..3235808579 100644 --- a/Mage.Sets/src/mage/cards/n/NeedlevergePathway.java +++ b/Mage.Sets/src/mage/cards/n/NeedlevergePathway.java @@ -3,7 +3,7 @@ package mage.cards.n; import mage.abilities.mana.RedManaAbility; import mage.abilities.mana.WhiteManaAbility; import mage.cards.CardSetInfo; -import mage.cards.ModalDoubleFacesCard; +import mage.cards.ModalDoubleFacedCard; import mage.constants.CardType; import mage.constants.SubType; @@ -12,7 +12,7 @@ import java.util.UUID; /** * @author JayDi85 */ -public final class NeedlevergePathway extends ModalDoubleFacesCard { +public final class NeedlevergePathway extends ModalDoubleFacedCard { public NeedlevergePathway(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, diff --git a/Mage.Sets/src/mage/cards/o/OnduInversion.java b/Mage.Sets/src/mage/cards/o/OnduInversion.java index c770172389..a0ef35d970 100644 --- a/Mage.Sets/src/mage/cards/o/OnduInversion.java +++ b/Mage.Sets/src/mage/cards/o/OnduInversion.java @@ -3,9 +3,8 @@ package mage.cards.o; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.effects.common.DestroyAllEffect; import mage.abilities.mana.WhiteManaAbility; -import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.cards.ModalDoubleFacesCard; +import mage.cards.ModalDoubleFacedCard; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.StaticFilters; @@ -15,7 +14,7 @@ import java.util.UUID; /** * @author JayDi85 */ -public final class OnduInversion extends ModalDoubleFacesCard { +public final class OnduInversion extends ModalDoubleFacedCard { public OnduInversion(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, diff --git a/Mage.Sets/src/mage/cards/p/PaintersServant.java b/Mage.Sets/src/mage/cards/p/PaintersServant.java index d88ffcb23d..ae80ed7ab3 100644 --- a/Mage.Sets/src/mage/cards/p/PaintersServant.java +++ b/Mage.Sets/src/mage/cards/p/PaintersServant.java @@ -108,9 +108,9 @@ class PaintersServantEffect extends ContinuousEffectImpl { game.getState().getCreateMageObjectAttribute(card, game).getColor().addColor(color); // mdf cards - if (card instanceof ModalDoubleFacesCard) { - ModalDoubleFacesCardHalf leftHalfCard = ((ModalDoubleFacesCard) card).getLeftHalfCard(); - ModalDoubleFacesCardHalf rightHalfCard = ((ModalDoubleFacesCard) card).getRightHalfCard(); + if (card instanceof ModalDoubleFacedCard) { + ModalDoubleFacedCardHalf leftHalfCard = ((ModalDoubleFacedCard) card).getLeftHalfCard(); + ModalDoubleFacedCardHalf rightHalfCard = ((ModalDoubleFacedCard) card).getRightHalfCard(); game.getState().getCreateMageObjectAttribute(leftHalfCard, game).getColor().addColor(color); game.getState().getCreateMageObjectAttribute(rightHalfCard, game).getColor().addColor(color); } diff --git a/Mage.Sets/src/mage/cards/p/PanopticMirror.java b/Mage.Sets/src/mage/cards/p/PanopticMirror.java index 621ad7b0a1..60856ad9bc 100644 --- a/Mage.Sets/src/mage/cards/p/PanopticMirror.java +++ b/Mage.Sets/src/mage/cards/p/PanopticMirror.java @@ -129,9 +129,9 @@ class PanopticMirrorCastEffect extends OneShotEffect { if (card instanceof SplitCard) { cards.add(((SplitCard) card).getLeftHalfCard()); cards.add(((SplitCard) card).getRightHalfCard()); - } else if (card instanceof ModalDoubleFacesCard) { - cards.add(((ModalDoubleFacesCard) card).getLeftHalfCard()); - cards.add(((ModalDoubleFacesCard) card).getRightHalfCard()); + } else if (card instanceof ModalDoubleFacedCard) { + cards.add(((ModalDoubleFacedCard) card).getLeftHalfCard()); + cards.add(((ModalDoubleFacedCard) card).getRightHalfCard()); } else { cards.add(card); } diff --git a/Mage.Sets/src/mage/cards/p/PelakkaPredation.java b/Mage.Sets/src/mage/cards/p/PelakkaPredation.java index 8c7d186c49..120e3a1041 100644 --- a/Mage.Sets/src/mage/cards/p/PelakkaPredation.java +++ b/Mage.Sets/src/mage/cards/p/PelakkaPredation.java @@ -4,7 +4,7 @@ import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.effects.common.discard.DiscardCardYouChooseTargetEffect; import mage.abilities.mana.BlackManaAbility; import mage.cards.CardSetInfo; -import mage.cards.ModalDoubleFacesCard; +import mage.cards.ModalDoubleFacedCard; import mage.constants.CardType; import mage.constants.ComparisonType; import mage.constants.SubType; @@ -17,7 +17,7 @@ import java.util.UUID; /** * @author JayDi85 */ -public final class PelakkaPredation extends ModalDoubleFacesCard { +public final class PelakkaPredation extends ModalDoubleFacedCard { private static final FilterCard filter = new FilterCard("a card from it with mana value 3 or greater"); diff --git a/Mage.Sets/src/mage/cards/p/PestilentCauldron.java b/Mage.Sets/src/mage/cards/p/PestilentCauldron.java index 30ae4c1caa..a4f32d8bce 100644 --- a/Mage.Sets/src/mage/cards/p/PestilentCauldron.java +++ b/Mage.Sets/src/mage/cards/p/PestilentCauldron.java @@ -9,7 +9,7 @@ import mage.abilities.dynamicvalue.common.ControllerGotLifeCount; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.*; import mage.cards.CardSetInfo; -import mage.cards.ModalDoubleFacesCard; +import mage.cards.ModalDoubleFacedCard; import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.SubType; @@ -29,7 +29,7 @@ import java.util.UUID; /** * @author TheElk801 */ -public final class PestilentCauldron extends ModalDoubleFacesCard { +public final class PestilentCauldron extends ModalDoubleFacedCard { private static final FilterCard filter = new FilterCard("creature, land, and/or planeswalker cards from your graveyard"); diff --git a/Mage.Sets/src/mage/cards/p/PlarggDeanOfChaos.java b/Mage.Sets/src/mage/cards/p/PlarggDeanOfChaos.java index 895a8899ee..5891aadb21 100644 --- a/Mage.Sets/src/mage/cards/p/PlarggDeanOfChaos.java +++ b/Mage.Sets/src/mage/cards/p/PlarggDeanOfChaos.java @@ -16,7 +16,7 @@ import mage.abilities.effects.common.continuous.BoostAllEffect; import mage.cards.Card; import mage.cards.CardSetInfo; import mage.cards.CardsImpl; -import mage.cards.ModalDoubleFacesCard; +import mage.cards.ModalDoubleFacedCard; import mage.constants.*; import mage.filter.StaticFilters; import mage.filter.common.FilterControlledCreaturePermanent; @@ -32,7 +32,7 @@ import java.util.UUID; /** * @author htrajan */ -public final class PlarggDeanOfChaos extends ModalDoubleFacesCard { +public final class PlarggDeanOfChaos extends ModalDoubleFacedCard { private static final FilterCreaturePermanent tappedFilter = new FilterCreaturePermanent("tapped creatures you control"); private static final FilterCreaturePermanent untappedFilter = new FilterCreaturePermanent("untapped creatures you control"); diff --git a/Mage.Sets/src/mage/cards/r/ReidaneGodOfTheWorthy.java b/Mage.Sets/src/mage/cards/r/ReidaneGodOfTheWorthy.java index 433a191a2a..89b364664a 100644 --- a/Mage.Sets/src/mage/cards/r/ReidaneGodOfTheWorthy.java +++ b/Mage.Sets/src/mage/cards/r/ReidaneGodOfTheWorthy.java @@ -14,7 +14,7 @@ import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.VigilanceAbility; import mage.cards.Card; import mage.cards.CardSetInfo; -import mage.cards.ModalDoubleFacesCard; +import mage.cards.ModalDoubleFacedCard; import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.common.FilterLandPermanent; @@ -30,7 +30,7 @@ import java.util.UUID; /** * @author TheElk801 */ -public final class ReidaneGodOfTheWorthy extends ModalDoubleFacesCard { +public final class ReidaneGodOfTheWorthy extends ModalDoubleFacedCard { private static final FilterPermanent filter = new FilterLandPermanent("snow lands your opponents control"); diff --git a/Mage.Sets/src/mage/cards/r/RiverglidePathway.java b/Mage.Sets/src/mage/cards/r/RiverglidePathway.java index 870c910504..6d019666f6 100644 --- a/Mage.Sets/src/mage/cards/r/RiverglidePathway.java +++ b/Mage.Sets/src/mage/cards/r/RiverglidePathway.java @@ -3,7 +3,7 @@ package mage.cards.r; import mage.abilities.mana.BlueManaAbility; import mage.abilities.mana.RedManaAbility; import mage.cards.CardSetInfo; -import mage.cards.ModalDoubleFacesCard; +import mage.cards.ModalDoubleFacedCard; import mage.constants.CardType; import mage.constants.SubType; @@ -12,7 +12,7 @@ import java.util.UUID; /** * @author JayDi85 */ -public final class RiverglidePathway extends ModalDoubleFacesCard { +public final class RiverglidePathway extends ModalDoubleFacedCard { public RiverglidePathway(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, diff --git a/Mage.Sets/src/mage/cards/r/RowanScholarOfSparks.java b/Mage.Sets/src/mage/cards/r/RowanScholarOfSparks.java index fd48f95779..44048a0368 100644 --- a/Mage.Sets/src/mage/cards/r/RowanScholarOfSparks.java +++ b/Mage.Sets/src/mage/cards/r/RowanScholarOfSparks.java @@ -16,7 +16,7 @@ import mage.abilities.hint.Hint; import mage.cards.CardSetInfo; import mage.cards.Cards; import mage.cards.CardsImpl; -import mage.cards.ModalDoubleFacesCard; +import mage.cards.ModalDoubleFacedCard; import mage.constants.*; import mage.filter.FilterCard; import mage.filter.StaticFilters; @@ -38,7 +38,7 @@ import java.util.stream.Collectors; /** * @author TheElk801 */ -public final class RowanScholarOfSparks extends ModalDoubleFacesCard { +public final class RowanScholarOfSparks extends ModalDoubleFacedCard { private static final FilterCard filter = new FilterInstantOrSorceryCard("instant and sorcery spells"); diff --git a/Mage.Sets/src/mage/cards/s/SeaGateRestoration.java b/Mage.Sets/src/mage/cards/s/SeaGateRestoration.java index 82418ca74c..8809e0fe13 100644 --- a/Mage.Sets/src/mage/cards/s/SeaGateRestoration.java +++ b/Mage.Sets/src/mage/cards/s/SeaGateRestoration.java @@ -11,7 +11,7 @@ import mage.abilities.effects.common.TapSourceUnlessPaysEffect; import mage.abilities.effects.common.continuous.MaximumHandSizeControllerEffect; import mage.abilities.mana.BlueManaAbility; import mage.cards.CardSetInfo; -import mage.cards.ModalDoubleFacesCard; +import mage.cards.ModalDoubleFacedCard; import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; @@ -21,7 +21,7 @@ import java.util.UUID; /** * @author JayDi85 */ -public final class SeaGateRestoration extends ModalDoubleFacesCard { +public final class SeaGateRestoration extends ModalDoubleFacedCard { private static final DynamicValue xValue = new AdditiveDynamicValue(CardsInControllerHandCount.instance, StaticValue.get(1)); diff --git a/Mage.Sets/src/mage/cards/s/SejiriShelter.java b/Mage.Sets/src/mage/cards/s/SejiriShelter.java index 57dba98827..92d8391f58 100644 --- a/Mage.Sets/src/mage/cards/s/SejiriShelter.java +++ b/Mage.Sets/src/mage/cards/s/SejiriShelter.java @@ -3,9 +3,8 @@ package mage.cards.s; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.effects.common.continuous.GainProtectionFromColorTargetEffect; import mage.abilities.mana.WhiteManaAbility; -import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.cards.ModalDoubleFacesCard; +import mage.cards.ModalDoubleFacedCard; import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; @@ -16,7 +15,7 @@ import java.util.UUID; /** * @author JayDi85 */ -public final class SejiriShelter extends ModalDoubleFacesCard { +public final class SejiriShelter extends ModalDoubleFacedCard { public SejiriShelter(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, diff --git a/Mage.Sets/src/mage/cards/s/SelflessGlyphweaver.java b/Mage.Sets/src/mage/cards/s/SelflessGlyphweaver.java index 2efa24a8c8..b3740d8c77 100644 --- a/Mage.Sets/src/mage/cards/s/SelflessGlyphweaver.java +++ b/Mage.Sets/src/mage/cards/s/SelflessGlyphweaver.java @@ -8,7 +8,7 @@ import mage.abilities.effects.common.DestroyAllEffect; import mage.abilities.effects.common.continuous.GainAbilityControlledEffect; import mage.abilities.keyword.IndestructibleAbility; import mage.cards.CardSetInfo; -import mage.cards.ModalDoubleFacesCard; +import mage.cards.ModalDoubleFacedCard; import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Outcome; @@ -28,7 +28,7 @@ import java.util.UUID; /** * @author htrajan */ -public final class SelflessGlyphweaver extends ModalDoubleFacesCard { +public final class SelflessGlyphweaver extends ModalDoubleFacedCard { public SelflessGlyphweaver(UUID ownerId, CardSetInfo setInfo) { super( diff --git a/Mage.Sets/src/mage/cards/s/ShaileDeanOfRadiance.java b/Mage.Sets/src/mage/cards/s/ShaileDeanOfRadiance.java index abb409661c..a825384c49 100644 --- a/Mage.Sets/src/mage/cards/s/ShaileDeanOfRadiance.java +++ b/Mage.Sets/src/mage/cards/s/ShaileDeanOfRadiance.java @@ -11,7 +11,7 @@ import mage.abilities.effects.common.counter.AddCountersTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardSetInfo; -import mage.cards.ModalDoubleFacesCard; +import mage.cards.ModalDoubleFacedCard; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.SuperType; @@ -31,7 +31,7 @@ import java.util.UUID; /** * @author htrajan */ -public final class ShaileDeanOfRadiance extends ModalDoubleFacesCard { +public final class ShaileDeanOfRadiance extends ModalDoubleFacedCard { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("another target creature"); private static final FilterPermanent shaileFilter = new FilterControlledCreaturePermanent("creature that entered the battlefield under your control this turn"); diff --git a/Mage.Sets/src/mage/cards/s/ShatterskullSmashing.java b/Mage.Sets/src/mage/cards/s/ShatterskullSmashing.java index 5bc05b8a63..3cbf82a195 100644 --- a/Mage.Sets/src/mage/cards/s/ShatterskullSmashing.java +++ b/Mage.Sets/src/mage/cards/s/ShatterskullSmashing.java @@ -12,7 +12,7 @@ import mage.abilities.effects.common.DamageMultiEffect; import mage.abilities.effects.common.TapSourceUnlessPaysEffect; import mage.abilities.mana.RedManaAbility; import mage.cards.CardSetInfo; -import mage.cards.ModalDoubleFacesCard; +import mage.cards.ModalDoubleFacedCard; import mage.constants.CardType; import mage.constants.SubType; import mage.game.Game; @@ -25,7 +25,7 @@ import java.util.UUID; /** * @author TheElk801 */ -public final class ShatterskullSmashing extends ModalDoubleFacesCard { +public final class ShatterskullSmashing extends ModalDoubleFacedCard { private static final DynamicValue xValue = new MultipliedValue(ManacostVariableValue.REGULAR, 2); diff --git a/Mage.Sets/src/mage/cards/s/SilundiVision.java b/Mage.Sets/src/mage/cards/s/SilundiVision.java index 3e6eae3287..ed013f056a 100644 --- a/Mage.Sets/src/mage/cards/s/SilundiVision.java +++ b/Mage.Sets/src/mage/cards/s/SilundiVision.java @@ -4,7 +4,7 @@ import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; import mage.abilities.mana.BlueManaAbility; import mage.cards.CardSetInfo; -import mage.cards.ModalDoubleFacesCard; +import mage.cards.ModalDoubleFacedCard; import mage.constants.CardType; import mage.constants.PutCards; import mage.constants.SubType; @@ -15,7 +15,7 @@ import java.util.UUID; /** * @author TheElk801 */ -public final class SilundiVision extends ModalDoubleFacesCard { +public final class SilundiVision extends ModalDoubleFacedCard { public SilundiVision(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, diff --git a/Mage.Sets/src/mage/cards/s/SkyclaveCleric.java b/Mage.Sets/src/mage/cards/s/SkyclaveCleric.java index d58df53c6b..889885126c 100644 --- a/Mage.Sets/src/mage/cards/s/SkyclaveCleric.java +++ b/Mage.Sets/src/mage/cards/s/SkyclaveCleric.java @@ -5,9 +5,8 @@ import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.GainLifeEffect; import mage.abilities.mana.WhiteManaAbility; -import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.cards.ModalDoubleFacesCard; +import mage.cards.ModalDoubleFacedCard; import mage.constants.CardType; import mage.constants.SubType; @@ -16,7 +15,7 @@ import java.util.UUID; /** * @author JayDi85 */ -public final class SkyclaveCleric extends ModalDoubleFacesCard { +public final class SkyclaveCleric extends ModalDoubleFacedCard { public SkyclaveCleric(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, diff --git a/Mage.Sets/src/mage/cards/s/SongMadTreachery.java b/Mage.Sets/src/mage/cards/s/SongMadTreachery.java index 4091bccdf6..52ef60741e 100644 --- a/Mage.Sets/src/mage/cards/s/SongMadTreachery.java +++ b/Mage.Sets/src/mage/cards/s/SongMadTreachery.java @@ -7,7 +7,7 @@ import mage.abilities.effects.common.continuous.GainControlTargetEffect; import mage.abilities.keyword.HasteAbility; import mage.abilities.mana.RedManaAbility; import mage.cards.CardSetInfo; -import mage.cards.ModalDoubleFacesCard; +import mage.cards.ModalDoubleFacedCard; import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; @@ -18,7 +18,7 @@ import java.util.UUID; /** * @author JayDi85 */ -public final class SongMadTreachery extends ModalDoubleFacesCard { +public final class SongMadTreachery extends ModalDoubleFacedCard { public SongMadTreachery(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, diff --git a/Mage.Sets/src/mage/cards/s/SpikefieldHazard.java b/Mage.Sets/src/mage/cards/s/SpikefieldHazard.java index 878e6126fd..6058569a2b 100644 --- a/Mage.Sets/src/mage/cards/s/SpikefieldHazard.java +++ b/Mage.Sets/src/mage/cards/s/SpikefieldHazard.java @@ -4,9 +4,8 @@ import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.ExileTargetIfDiesEffect; import mage.abilities.mana.RedManaAbility; -import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.cards.ModalDoubleFacesCard; +import mage.cards.ModalDoubleFacedCard; import mage.constants.CardType; import mage.constants.SubType; import mage.target.common.TargetAnyTarget; @@ -16,7 +15,7 @@ import java.util.UUID; /** * @author JayDi85 */ -public final class SpikefieldHazard extends ModalDoubleFacesCard { +public final class SpikefieldHazard extends ModalDoubleFacedCard { public SpikefieldHazard(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, diff --git a/Mage.Sets/src/mage/cards/t/TangledFlorahedron.java b/Mage.Sets/src/mage/cards/t/TangledFlorahedron.java index c08ce38b7f..8130e4eb36 100644 --- a/Mage.Sets/src/mage/cards/t/TangledFlorahedron.java +++ b/Mage.Sets/src/mage/cards/t/TangledFlorahedron.java @@ -3,9 +3,8 @@ package mage.cards.t; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.mana.GreenManaAbility; -import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.cards.ModalDoubleFacesCard; +import mage.cards.ModalDoubleFacedCard; import mage.constants.CardType; import mage.constants.SubType; @@ -14,7 +13,7 @@ import java.util.UUID; /** * @author JayDi85 */ -public final class TangledFlorahedron extends ModalDoubleFacesCard { +public final class TangledFlorahedron extends ModalDoubleFacedCard { public TangledFlorahedron(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, diff --git a/Mage.Sets/src/mage/cards/t/TergridGodOfFright.java b/Mage.Sets/src/mage/cards/t/TergridGodOfFright.java index 093e12112e..559564ed37 100644 --- a/Mage.Sets/src/mage/cards/t/TergridGodOfFright.java +++ b/Mage.Sets/src/mage/cards/t/TergridGodOfFright.java @@ -10,7 +10,7 @@ import mage.abilities.effects.common.UntapSourceEffect; import mage.abilities.keyword.MenaceAbility; import mage.cards.Card; import mage.cards.CardSetInfo; -import mage.cards.ModalDoubleFacesCard; +import mage.cards.ModalDoubleFacedCard; import mage.choices.Choice; import mage.choices.ChoiceImpl; import mage.constants.*; @@ -31,7 +31,7 @@ import java.util.UUID; /** * @author jeffwadsworth */ -public final class TergridGodOfFright extends ModalDoubleFacesCard { +public final class TergridGodOfFright extends ModalDoubleFacedCard { public TergridGodOfFright(UUID ownerId, CardSetInfo setInfo) { super( diff --git a/Mage.Sets/src/mage/cards/t/ThreefoldSignal.java b/Mage.Sets/src/mage/cards/t/ThreefoldSignal.java index 9310ad93e9..4261df15c3 100644 --- a/Mage.Sets/src/mage/cards/t/ThreefoldSignal.java +++ b/Mage.Sets/src/mage/cards/t/ThreefoldSignal.java @@ -8,10 +8,7 @@ import mage.abilities.effects.common.continuous.EachSpellYouCastHasReplicateEffe import mage.abilities.effects.keyword.ScryEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.cards.ModalDoubleFacesCardHalf; -import mage.cards.SplitCardHalf; import mage.constants.CardType; -import mage.constants.Zone; import mage.filter.FilterSpell; import mage.filter.predicate.Predicate; import mage.game.Game; diff --git a/Mage.Sets/src/mage/cards/t/ToralfGodOfFury.java b/Mage.Sets/src/mage/cards/t/ToralfGodOfFury.java index 06945d5c0e..8ffc1f9bb8 100644 --- a/Mage.Sets/src/mage/cards/t/ToralfGodOfFury.java +++ b/Mage.Sets/src/mage/cards/t/ToralfGodOfFury.java @@ -18,7 +18,7 @@ import mage.abilities.effects.common.continuous.GainAbilityWithAttachmentEffect; import mage.abilities.keyword.EquipAbility; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardSetInfo; -import mage.cards.ModalDoubleFacesCard; +import mage.cards.ModalDoubleFacedCard; import mage.constants.*; import mage.filter.StaticFilters; import mage.filter.common.FilterAnyTarget; @@ -38,7 +38,7 @@ import java.util.UUID; /** * @author TheElk801 */ -public final class ToralfGodOfFury extends ModalDoubleFacesCard { +public final class ToralfGodOfFury extends ModalDoubleFacedCard { private static final Condition condition = new AttachedToMatchesFilterCondition(StaticFilters.FILTER_PERMANENT_LEGENDARY); diff --git a/Mage.Sets/src/mage/cards/t/TorrentSculptor.java b/Mage.Sets/src/mage/cards/t/TorrentSculptor.java index 17aaa98cc1..9ea8e75163 100644 --- a/Mage.Sets/src/mage/cards/t/TorrentSculptor.java +++ b/Mage.Sets/src/mage/cards/t/TorrentSculptor.java @@ -9,7 +9,7 @@ import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.keyword.WardAbility; import mage.cards.Card; import mage.cards.CardSetInfo; -import mage.cards.ModalDoubleFacesCard; +import mage.cards.ModalDoubleFacedCard; import mage.constants.*; import mage.counters.CounterType; import mage.filter.FilterPermanent; @@ -29,7 +29,7 @@ import static mage.constants.Outcome.Benefit; /** * @author TheElk801 */ -public final class TorrentSculptor extends ModalDoubleFacesCard { +public final class TorrentSculptor extends ModalDoubleFacedCard { public TorrentSculptor(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, diff --git a/Mage.Sets/src/mage/cards/t/TurntimberSymbiosis.java b/Mage.Sets/src/mage/cards/t/TurntimberSymbiosis.java index e519c7c6a3..d5859fbd1c 100644 --- a/Mage.Sets/src/mage/cards/t/TurntimberSymbiosis.java +++ b/Mage.Sets/src/mage/cards/t/TurntimberSymbiosis.java @@ -24,7 +24,7 @@ import java.util.UUID; /** * @author TheElk801 */ -public final class TurntimberSymbiosis extends ModalDoubleFacesCard { +public final class TurntimberSymbiosis extends ModalDoubleFacedCard { public TurntimberSymbiosis(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, diff --git a/Mage.Sets/src/mage/cards/u/UmaraWizard.java b/Mage.Sets/src/mage/cards/u/UmaraWizard.java index 44806a3727..b16315de99 100644 --- a/Mage.Sets/src/mage/cards/u/UmaraWizard.java +++ b/Mage.Sets/src/mage/cards/u/UmaraWizard.java @@ -6,9 +6,8 @@ import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.abilities.mana.BlueManaAbility; -import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.cards.ModalDoubleFacesCard; +import mage.cards.ModalDoubleFacedCard; import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; @@ -19,7 +18,7 @@ import java.util.UUID; /** * @author JayDi85 */ -public final class UmaraWizard extends ModalDoubleFacesCard { +public final class UmaraWizard extends ModalDoubleFacedCard { public UmaraWizard(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, diff --git a/Mage.Sets/src/mage/cards/u/UrzasHotTub.java b/Mage.Sets/src/mage/cards/u/UrzasHotTub.java index 2672f1ddba..bb5b43b77a 100644 --- a/Mage.Sets/src/mage/cards/u/UrzasHotTub.java +++ b/Mage.Sets/src/mage/cards/u/UrzasHotTub.java @@ -92,8 +92,8 @@ class UrzasHotTubPredicate implements Predicate { String name = input.getName(); if (input instanceof SplitCard) { return sharesWordWithName(((SplitCard) input).getLeftHalfCard().getName()) || sharesWordWithName(((SplitCard) input).getRightHalfCard().getName()); - } else if (input instanceof ModalDoubleFacesCard) { - return sharesWordWithName(((ModalDoubleFacesCard) input).getLeftHalfCard().getName()) || sharesWordWithName(((ModalDoubleFacesCard) input).getRightHalfCard().getName()); + } else if (input instanceof ModalDoubleFacedCard) { + return sharesWordWithName(((ModalDoubleFacedCard) input).getLeftHalfCard().getName()) || sharesWordWithName(((ModalDoubleFacedCard) input).getRightHalfCard().getName()); } else if (input instanceof Spell && ((Spell) input).getSpellAbility().getSpellAbilityType() == SpellAbilityType.SPLIT_FUSED) { SplitCard card = (SplitCard) ((Spell) input).getCard(); return sharesWordWithName(card.getLeftHalfCard().getName()) || sharesWordWithName(card.getRightHalfCard().getName()); diff --git a/Mage.Sets/src/mage/cards/u/UvildaDeanOfPerfection.java b/Mage.Sets/src/mage/cards/u/UvildaDeanOfPerfection.java index fa53051433..f94c5ff529 100644 --- a/Mage.Sets/src/mage/cards/u/UvildaDeanOfPerfection.java +++ b/Mage.Sets/src/mage/cards/u/UvildaDeanOfPerfection.java @@ -33,7 +33,7 @@ import java.util.UUID; /** * @author TheElk801 */ -public final class UvildaDeanOfPerfection extends ModalDoubleFacesCard { +public final class UvildaDeanOfPerfection extends ModalDoubleFacedCard { public UvildaDeanOfPerfection(UUID ownerId, CardSetInfo setInfo) { super( diff --git a/Mage.Sets/src/mage/cards/v/ValakutAwakening.java b/Mage.Sets/src/mage/cards/v/ValakutAwakening.java index 7319b8f17b..05beff7a95 100644 --- a/Mage.Sets/src/mage/cards/v/ValakutAwakening.java +++ b/Mage.Sets/src/mage/cards/v/ValakutAwakening.java @@ -19,7 +19,7 @@ import java.util.UUID; /** * @author TheElk801 */ -public final class ValakutAwakening extends ModalDoubleFacesCard { +public final class ValakutAwakening extends ModalDoubleFacedCard { public ValakutAwakening(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, diff --git a/Mage.Sets/src/mage/cards/v/ValentinDeanOfTheVein.java b/Mage.Sets/src/mage/cards/v/ValentinDeanOfTheVein.java index 6eb13011ec..60bef3b488 100644 --- a/Mage.Sets/src/mage/cards/v/ValentinDeanOfTheVein.java +++ b/Mage.Sets/src/mage/cards/v/ValentinDeanOfTheVein.java @@ -14,7 +14,7 @@ import mage.abilities.keyword.LifelinkAbility; import mage.abilities.keyword.MenaceAbility; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardSetInfo; -import mage.cards.ModalDoubleFacesCard; +import mage.cards.ModalDoubleFacedCard; import mage.constants.*; import mage.counters.CounterType; import mage.filter.StaticFilters; @@ -29,7 +29,7 @@ import java.util.UUID; /** * @author TheElk801 */ -public final class ValentinDeanOfTheVein extends ModalDoubleFacesCard { +public final class ValentinDeanOfTheVein extends ModalDoubleFacedCard { public ValentinDeanOfTheVein(UUID ownerId, CardSetInfo setInfo) { super( diff --git a/Mage.Sets/src/mage/cards/v/ValkiGodOfLies.java b/Mage.Sets/src/mage/cards/v/ValkiGodOfLies.java index e39f73f3bf..dbb823abe8 100644 --- a/Mage.Sets/src/mage/cards/v/ValkiGodOfLies.java +++ b/Mage.Sets/src/mage/cards/v/ValkiGodOfLies.java @@ -17,7 +17,7 @@ import mage.abilities.effects.common.GetEmblemEffect; import mage.cards.Card; import mage.cards.CardSetInfo; import mage.cards.Cards; -import mage.cards.ModalDoubleFacesCard; +import mage.cards.ModalDoubleFacedCard; import mage.constants.*; import mage.filter.FilterCard; import mage.filter.StaticFilters; @@ -42,7 +42,7 @@ import java.util.UUID; /** * @author jeffwadsworth */ -public final class ValkiGodOfLies extends ModalDoubleFacesCard { +public final class ValkiGodOfLies extends ModalDoubleFacedCard { public ValkiGodOfLies(UUID ownerId, CardSetInfo setInfo) { super( diff --git a/Mage.Sets/src/mage/cards/v/VastwoodFortification.java b/Mage.Sets/src/mage/cards/v/VastwoodFortification.java index ba57b77025..a27f8cf6f3 100644 --- a/Mage.Sets/src/mage/cards/v/VastwoodFortification.java +++ b/Mage.Sets/src/mage/cards/v/VastwoodFortification.java @@ -3,9 +3,8 @@ package mage.cards.v; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.effects.common.counter.AddCountersTargetEffect; import mage.abilities.mana.GreenManaAbility; -import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.cards.ModalDoubleFacesCard; +import mage.cards.ModalDoubleFacedCard; import mage.constants.CardType; import mage.constants.SubType; import mage.counters.CounterType; @@ -16,7 +15,7 @@ import java.util.UUID; /** * @author JayDi85 */ -public final class VastwoodFortification extends ModalDoubleFacesCard { +public final class VastwoodFortification extends ModalDoubleFacedCard { public VastwoodFortification(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, diff --git a/Mage.Sets/src/mage/cards/w/WanderingArchaic.java b/Mage.Sets/src/mage/cards/w/WanderingArchaic.java index d2d5f57a6e..796030d634 100644 --- a/Mage.Sets/src/mage/cards/w/WanderingArchaic.java +++ b/Mage.Sets/src/mage/cards/w/WanderingArchaic.java @@ -22,7 +22,7 @@ import java.util.UUID; /** * @author TheElk801 */ -public final class WanderingArchaic extends ModalDoubleFacesCard { +public final class WanderingArchaic extends ModalDoubleFacedCard { public WanderingArchaic(UUID ownerId, CardSetInfo setInfo) { super( diff --git a/Mage.Sets/src/mage/cards/z/ZiatorasEnvoy.java b/Mage.Sets/src/mage/cards/z/ZiatorasEnvoy.java index e146c3b642..918eca4810 100644 --- a/Mage.Sets/src/mage/cards/z/ZiatorasEnvoy.java +++ b/Mage.Sets/src/mage/cards/z/ZiatorasEnvoy.java @@ -86,8 +86,8 @@ class ZiatorasEnvoyEffect extends OneShotEffect { // TODO: factor this out and reuse for other cards if (player.canPlayLand()) { Set landSet = new HashSet<>(); - if (card instanceof ModalDoubleFacesCard) { - ModalDoubleFacesCard mdfc = (ModalDoubleFacesCard) card; + if (card instanceof ModalDoubleFacedCard) { + ModalDoubleFacedCard mdfc = (ModalDoubleFacedCard) card; if (mdfc.getLeftHalfCard().isLand(game)) { landSet.add(mdfc.getLeftHalfCard()); } diff --git a/Mage.Sets/src/mage/cards/z/ZofConsumption.java b/Mage.Sets/src/mage/cards/z/ZofConsumption.java index 40fa33648e..c04a9b0d45 100644 --- a/Mage.Sets/src/mage/cards/z/ZofConsumption.java +++ b/Mage.Sets/src/mage/cards/z/ZofConsumption.java @@ -4,9 +4,8 @@ import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.effects.common.GainLifeEffect; import mage.abilities.effects.common.LoseLifeOpponentsEffect; import mage.abilities.mana.BlackManaAbility; -import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.cards.ModalDoubleFacesCard; +import mage.cards.ModalDoubleFacedCard; import mage.constants.CardType; import mage.constants.SubType; @@ -15,7 +14,7 @@ import java.util.UUID; /** * @author JayDi85 */ -public final class ZofConsumption extends ModalDoubleFacesCard { +public final class ZofConsumption extends ModalDoubleFacedCard { public ZofConsumption(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/CommandersCastTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/CommandersCastTest.java index d23af1691d..2e7ba0b21b 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/CommandersCastTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/CommandersCastTest.java @@ -478,7 +478,7 @@ public class CommandersCastTest extends CardTestCommander4PlayersWithAIHelps { } @Test - public void test_ModalDoubleFacesCard_1() { + public void test_ModalDoubleFacedCard_1() { // Player order: A -> D -> C -> B // use case: @@ -533,7 +533,7 @@ public class CommandersCastTest extends CardTestCommander4PlayersWithAIHelps { } @Test - public void test_ModalDoubleFacesCard_CanReturnAfterKillAndCommanderControlCondition() { + public void test_ModalDoubleFacedCard_CanReturnAfterKillAndCommanderControlCondition() { // Player order: A -> D -> C -> B // Cosima, God of the Voyage, {2}{U}, creature, 2/4 diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/copy/CopySpellTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/copy/CopySpellTest.java index 9efcbb7ce2..a37845af21 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/copy/CopySpellTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/copy/CopySpellTest.java @@ -4,7 +4,7 @@ import mage.abilities.MageSingleton; import mage.abilities.keyword.FlyingAbility; import mage.cards.AdventureCard; import mage.cards.Card; -import mage.cards.ModalDoubleFacesCard; +import mage.cards.ModalDoubleFacedCard; import mage.cards.SplitCard; import mage.cards.repository.CardRepository; import mage.constants.PhaseStep; @@ -716,10 +716,10 @@ public class CopySpellTest extends CardTestPlayerBase { @Test public void test_SimpleCopy_MDFC() { - ModalDoubleFacesCard sourceCard = (ModalDoubleFacesCard) CardRepository.instance.findCard("Agadeem's Awakening").getCard(); - ModalDoubleFacesCard originalCard = (ModalDoubleFacesCard) CardRepository.instance.findCard("Agadeem's Awakening").getCard(); + ModalDoubleFacedCard sourceCard = (ModalDoubleFacedCard) CardRepository.instance.findCard("Agadeem's Awakening").getCard(); + ModalDoubleFacedCard originalCard = (ModalDoubleFacedCard) CardRepository.instance.findCard("Agadeem's Awakening").getCard(); prepareZoneAndZCC(originalCard); - ModalDoubleFacesCard copiedCard = (ModalDoubleFacesCard) currentGame.copyCard(originalCard, null, playerA.getId()); + ModalDoubleFacedCard copiedCard = (ModalDoubleFacedCard) currentGame.copyCard(originalCard, null, playerA.getId()); // main Assert.assertNotEquals("main - id must be different", originalCard.getId(), copiedCard.getId()); Assert.assertEquals("main - rules must be same", originalCard.getRules(), copiedCard.getRules()); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/cost/modaldoublefaces/ModalDoubleFacesCardsInCommanderTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/cost/modaldoublefaced/ModalDoubleFacedCardsInCommanderTest.java similarity index 97% rename from Mage.Tests/src/test/java/org/mage/test/cards/cost/modaldoublefaces/ModalDoubleFacesCardsInCommanderTest.java rename to Mage.Tests/src/test/java/org/mage/test/cards/cost/modaldoublefaced/ModalDoubleFacedCardsInCommanderTest.java index 6922b8bd63..a5e186ea3a 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/cost/modaldoublefaces/ModalDoubleFacesCardsInCommanderTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/cost/modaldoublefaced/ModalDoubleFacedCardsInCommanderTest.java @@ -1,4 +1,4 @@ -package org.mage.test.cards.cost.modaldoublefaces; +package org.mage.test.cards.cost.modaldoublefaced; import mage.constants.PhaseStep; import mage.constants.Zone; @@ -8,7 +8,7 @@ import org.mage.test.serverside.base.CardTestCommanderDuelBase; /** * @author JayDi85 */ -public class ModalDoubleFacesCardsInCommanderTest extends CardTestCommanderDuelBase { +public class ModalDoubleFacedCardsInCommanderTest extends CardTestCommanderDuelBase { @Test public void test_Triggers_MustAddTriggersOneTimeOnly() { diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/cost/modaldoublefaces/ModalDoubleFacesCardsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/cost/modaldoublefaced/ModalDoubleFacedCardsTest.java similarity index 99% rename from Mage.Tests/src/test/java/org/mage/test/cards/cost/modaldoublefaces/ModalDoubleFacesCardsTest.java rename to Mage.Tests/src/test/java/org/mage/test/cards/cost/modaldoublefaced/ModalDoubleFacedCardsTest.java index 850560b53f..984583b43e 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/cost/modaldoublefaces/ModalDoubleFacesCardsTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/cost/modaldoublefaced/ModalDoubleFacedCardsTest.java @@ -1,8 +1,8 @@ -package org.mage.test.cards.cost.modaldoublefaces; +package org.mage.test.cards.cost.modaldoublefaced; import mage.abilities.keyword.HasteAbility; import mage.cards.Card; -import mage.cards.ModalDoubleFacesCard; +import mage.cards.ModalDoubleFacedCard; import mage.constants.PhaseStep; import mage.constants.SubType; import mage.constants.Zone; @@ -18,7 +18,7 @@ import org.mage.test.serverside.base.CardTestPlayerBase; /** * @author JayDi85 */ -public class ModalDoubleFacesCardsTest extends CardTestPlayerBase { +public class ModalDoubleFacedCardsTest extends CardTestPlayerBase { @Test public void test_Playable_AsCreature() { @@ -417,8 +417,8 @@ public class ModalDoubleFacesCardsTest extends CardTestPlayerBase { .findFirst() .orElse(null); Assert.assertNotNull(card); - Assert.assertTrue("must be mdf card", card instanceof ModalDoubleFacesCard); - ModalDoubleFacesCard mdfCard = (ModalDoubleFacesCard) card; + Assert.assertTrue("must be mdf card", card instanceof ModalDoubleFacedCard); + ModalDoubleFacedCard mdfCard = (ModalDoubleFacedCard) card; Assert.assertEquals("card must be on exile", Zone.EXILED, currentGame.getState().getZone(mdfCard.getId())); Assert.assertEquals("left part must be on exile", Zone.EXILED, currentGame.getState().getZone(mdfCard.getLeftHalfCard().getId())); Assert.assertEquals("right part must be on exile", Zone.EXILED, currentGame.getState().getZone(mdfCard.getRightHalfCard().getId())); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/rix/ReleaseToTheWindTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/rix/ReleaseToTheWindTest.java index 10d6f1393a..751f1592f0 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/rix/ReleaseToTheWindTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/rix/ReleaseToTheWindTest.java @@ -37,7 +37,7 @@ public class ReleaseToTheWindTest extends CardTestPlayerBase { } @Test - public void test_Exile_ModalDoubleFacesCard() { + public void test_Exile_ModalDoubleFacedCard() { // Exile target nonland permanent. For as long as that card remains exiled, its owner may cast it without paying its mana cost. addCard(Zone.HAND, playerA, "Release to the Wind"); // {2}{U} addCard(Zone.BATTLEFIELD, playerA, "Island", 3); diff --git a/Mage.Tests/src/test/java/org/mage/test/sets/BoosterGenerationTest.java b/Mage.Tests/src/test/java/org/mage/test/sets/BoosterGenerationTest.java index 5e5b83e10c..a2c6dfe8f1 100644 --- a/Mage.Tests/src/test/java/org/mage/test/sets/BoosterGenerationTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/sets/BoosterGenerationTest.java @@ -5,7 +5,7 @@ import mage.abilities.Ability; import mage.abilities.keyword.PartnerWithAbility; import mage.cards.Card; import mage.cards.ExpansionSet; -import mage.cards.ModalDoubleFacesCard; +import mage.cards.ModalDoubleFacedCard; import mage.cards.repository.CardInfo; import mage.cards.repository.CardScanner; import mage.constants.Rarity; @@ -314,7 +314,7 @@ public class BoosterGenerationTest extends MageTestBase { ); assertEquals( "Booster must contain exactly 1 MDFC", 1, - booster.stream().filter(ModalDoubleFacesCard.class::isInstance).count() + booster.stream().filter(ModalDoubleFacedCard.class::isInstance).count() ); } } @@ -390,7 +390,7 @@ public class BoosterGenerationTest extends MageTestBase { fail("Booster can't have more than three snow lands"); } - long mdfcCount = booster.stream().filter(ModalDoubleFacesCard.class::isInstance).count(); + long mdfcCount = booster.stream().filter(ModalDoubleFacedCard.class::isInstance).count(); assertTrue("Booster can't have more than one MDFC", mdfcCount < 2); foundMDFC |= mdfcCount > 0; diff --git a/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java b/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java index 2ecc71fd4f..6598b59851 100644 --- a/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java +++ b/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java @@ -1871,7 +1871,7 @@ public class VerifyCardDataTest { Card card = CardImpl.createCard(cardInfo.getClassName(), testSet); System.out.println(); System.out.println(card.getName() + " " + card.getManaCost().getText()); - if (card instanceof SplitCard || card instanceof ModalDoubleFacesCard) { + if (card instanceof SplitCard || card instanceof ModalDoubleFacedCard) { card.getAbilities().getRules(card.getName()).forEach(this::printAbilityText); } else { card.getRules().forEach(this::printAbilityText); diff --git a/Mage/src/main/java/mage/abilities/effects/AsThoughEffectImpl.java b/Mage/src/main/java/mage/abilities/effects/AsThoughEffectImpl.java index a3cd1b1dc6..49061765cd 100644 --- a/Mage/src/main/java/mage/abilities/effects/AsThoughEffectImpl.java +++ b/Mage/src/main/java/mage/abilities/effects/AsThoughEffectImpl.java @@ -3,7 +3,7 @@ package mage.abilities.effects; import mage.abilities.Ability; import mage.abilities.ActivatedAbility; import mage.cards.Card; -import mage.cards.ModalDoubleFacesCard; +import mage.cards.ModalDoubleFacedCard; import mage.cards.SplitCard; import mage.constants.*; import mage.game.Game; @@ -94,9 +94,9 @@ public abstract class AsThoughEffectImpl extends ContinuousEffectImpl implements player.setCastSourceIdWithAlternateMana(leftCard.getId(), null, leftCard.getSpellAbility().getCosts()); Card rightCard = ((SplitCard) card).getRightHalfCard(); player.setCastSourceIdWithAlternateMana(rightCard.getId(), null, rightCard.getSpellAbility().getCosts()); - } else if (card instanceof ModalDoubleFacesCard) { - Card leftCard = ((ModalDoubleFacesCard) card).getLeftHalfCard(); - Card rightCard = ((ModalDoubleFacesCard) card).getRightHalfCard(); + } else if (card instanceof ModalDoubleFacedCard) { + Card leftCard = ((ModalDoubleFacedCard) card).getLeftHalfCard(); + Card rightCard = ((ModalDoubleFacedCard) card).getRightHalfCard(); // some MDFC's are land. IE: sea gate restoration if (!leftCard.isLand(game)) { player.setCastSourceIdWithAlternateMana(leftCard.getId(), null, leftCard.getSpellAbility().getCosts()); diff --git a/Mage/src/main/java/mage/abilities/effects/ContinuousEffects.java b/Mage/src/main/java/mage/abilities/effects/ContinuousEffects.java index 786c0f4d85..a5785f6741 100644 --- a/Mage/src/main/java/mage/abilities/effects/ContinuousEffects.java +++ b/Mage/src/main/java/mage/abilities/effects/ContinuousEffects.java @@ -24,7 +24,6 @@ import mage.game.stack.Spell; import mage.players.ManaPoolItem; import mage.players.Player; import mage.target.common.TargetCardInHand; -import mage.util.CardUtil; import mage.util.trace.TraceInfo; import org.apache.log4j.Logger; @@ -541,7 +540,7 @@ public class ContinuousEffects implements Serializable { } else if (!type.needPlayCardAbility() && objectToCheck instanceof AdventureCardSpell) { // adventure spell uses alternative characteristics for spell/stack, all other cases must use main card idToCheck = ((AdventureCardSpell) objectToCheck).getMainCard().getId(); - } else if (!type.needPlayCardAbility() && objectToCheck instanceof ModalDoubleFacesCardHalf) { + } else if (!type.needPlayCardAbility() && objectToCheck instanceof ModalDoubleFacedCardHalf) { // each mdf side uses own characteristics to check for playing, all other cases must use main card // rules: // "If an effect allows you to play a land or cast a spell from among a group of cards, @@ -549,7 +548,7 @@ public class ContinuousEffects implements Serializable { // of that effect. For example, if Sejiri Shelter / Sejiri Glacier is in your graveyard // and an effect allows you to play lands from your graveyard, you could play Sejiri Glacier. // That effect doesn't allow you to cast Sejiri Shelter." - idToCheck = ((ModalDoubleFacesCardHalf) objectToCheck).getMainCard().getId(); + idToCheck = ((ModalDoubleFacedCardHalf) objectToCheck).getMainCard().getId(); } else { idToCheck = objectId; } diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/CastFromHandWithoutPayingManaCostEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/CastFromHandWithoutPayingManaCostEffect.java index 872bc6dd5d..da6b9ddfdb 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/CastFromHandWithoutPayingManaCostEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/CastFromHandWithoutPayingManaCostEffect.java @@ -9,7 +9,7 @@ import mage.abilities.costs.AlternativeCostSourceAbility; import mage.abilities.effects.ContinuousEffectImpl; import mage.cards.AdventureCardSpell; import mage.cards.Card; -import mage.cards.ModalDoubleFacesCardHalf; +import mage.cards.ModalDoubleFacedCardHalf; import mage.cards.SplitCardHalf; import mage.constants.*; import mage.filter.FilterCard; @@ -89,7 +89,7 @@ enum IsBeingCastFromHandCondition implements Condition { @Override public boolean apply(Game game, Ability source) { MageObject object = game.getObject(source); - if (object instanceof SplitCardHalf || object instanceof AdventureCardSpell || object instanceof ModalDoubleFacesCardHalf) { + if (object instanceof SplitCardHalf || object instanceof AdventureCardSpell || object instanceof ModalDoubleFacedCardHalf) { UUID mainCardId = ((Card) object).getMainCard().getId(); object = game.getObject(mainCardId); } diff --git a/Mage/src/main/java/mage/abilities/keyword/FlashbackAbility.java b/Mage/src/main/java/mage/abilities/keyword/FlashbackAbility.java index f95107007c..7cc6d3411f 100644 --- a/Mage/src/main/java/mage/abilities/keyword/FlashbackAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/FlashbackAbility.java @@ -7,7 +7,7 @@ import mage.abilities.costs.Costs; import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.ReplacementEffectImpl; import mage.cards.Card; -import mage.cards.ModalDoubleFacesCard; +import mage.cards.ModalDoubleFacedCard; import mage.cards.SplitCard; import mage.constants.*; import mage.game.Game; @@ -75,11 +75,11 @@ public class FlashbackAbility extends SpellAbility { } else if (((SplitCard) card).getRightHalfCard().getName().equals(abilityName)) { return ((SplitCard) card).getRightHalfCard().getSpellAbility().canActivate(playerId, game); } - } else if (card instanceof ModalDoubleFacesCard) { - if (((ModalDoubleFacesCard) card).getLeftHalfCard().getName().equals(abilityName)) { - return ((ModalDoubleFacesCard) card).getLeftHalfCard().getSpellAbility().canActivate(playerId, game); - } else if (((ModalDoubleFacesCard) card).getRightHalfCard().getName().equals(abilityName)) { - return ((ModalDoubleFacesCard) card).getRightHalfCard().getSpellAbility().canActivate(playerId, game); + } else if (card instanceof ModalDoubleFacedCard) { + if (((ModalDoubleFacedCard) card).getLeftHalfCard().getName().equals(abilityName)) { + return ((ModalDoubleFacedCard) card).getLeftHalfCard().getSpellAbility().canActivate(playerId, game); + } else if (((ModalDoubleFacedCard) card).getRightHalfCard().getName().equals(abilityName)) { + return ((ModalDoubleFacedCard) card).getRightHalfCard().getSpellAbility().canActivate(playerId, game); } } return card.getSpellAbility().canActivate(playerId, game); @@ -100,11 +100,11 @@ public class FlashbackAbility extends SpellAbility { } else if (((SplitCard) card).getRightHalfCard().getName().equals(abilityName)) { spellAbilityCopy = ((SplitCard) card).getRightHalfCard().getSpellAbility().copy(); } - } else if (card instanceof ModalDoubleFacesCard) { - if (((ModalDoubleFacesCard) card).getLeftHalfCard().getName().equals(abilityName)) { - spellAbilityCopy = ((ModalDoubleFacesCard) card).getLeftHalfCard().getSpellAbility().copy(); - } else if (((ModalDoubleFacesCard) card).getRightHalfCard().getName().equals(abilityName)) { - spellAbilityCopy = ((ModalDoubleFacesCard) card).getRightHalfCard().getSpellAbility().copy(); + } else if (card instanceof ModalDoubleFacedCard) { + if (((ModalDoubleFacedCard) card).getLeftHalfCard().getName().equals(abilityName)) { + spellAbilityCopy = ((ModalDoubleFacedCard) card).getLeftHalfCard().getSpellAbility().copy(); + } else if (((ModalDoubleFacedCard) card).getRightHalfCard().getName().equals(abilityName)) { + spellAbilityCopy = ((ModalDoubleFacedCard) card).getRightHalfCard().getSpellAbility().copy(); } } else { spellAbilityCopy = card.getSpellAbility().copy(); diff --git a/Mage/src/main/java/mage/abilities/keyword/ForetellAbility.java b/Mage/src/main/java/mage/abilities/keyword/ForetellAbility.java index 62c464091b..887f5bcd56 100644 --- a/Mage/src/main/java/mage/abilities/keyword/ForetellAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/ForetellAbility.java @@ -232,9 +232,9 @@ public class ForetellAbility extends SpecialAction { ability.setAbilityName(rightHalfCard.getName()); game.getState().addOtherAbility(rightHalfCard, ability); } - } else if (card instanceof ModalDoubleFacesCard) { + } else if (card instanceof ModalDoubleFacedCard) { if (foretellCost != null) { - ModalDoubleFacesCardHalf leftHalfCard = ((ModalDoubleFacesCard) card).getLeftHalfCard(); + ModalDoubleFacedCardHalf leftHalfCard = ((ModalDoubleFacedCard) card).getLeftHalfCard(); // some MDFC's are land IE: sea gate restoration if (!leftHalfCard.isLand(game)) { ForetellCostAbility ability = new ForetellCostAbility(foretellCost); @@ -246,7 +246,7 @@ public class ForetellAbility extends SpecialAction { } } if (foretellSplitCost != null) { - ModalDoubleFacesCardHalf rightHalfCard = ((ModalDoubleFacesCard) card).getRightHalfCard(); + ModalDoubleFacedCardHalf rightHalfCard = ((ModalDoubleFacedCard) card).getRightHalfCard(); // some MDFC's are land IE: sea gate restoration if (!rightHalfCard.isLand(game)) { ForetellCostAbility ability = new ForetellCostAbility(foretellSplitCost); @@ -354,11 +354,11 @@ public class ForetellAbility extends SpecialAction { } else if (((SplitCard) card).getRightHalfCard().getName().equals(abilityName)) { return ((SplitCard) card).getRightHalfCard().getSpellAbility().canActivate(playerId, game); } - } else if (card instanceof ModalDoubleFacesCard) { - if (((ModalDoubleFacesCard) card).getLeftHalfCard().getName().equals(abilityName)) { - return ((ModalDoubleFacesCard) card).getLeftHalfCard().getSpellAbility().canActivate(playerId, game); - } else if (((ModalDoubleFacesCard) card).getRightHalfCard().getName().equals(abilityName)) { - return ((ModalDoubleFacesCard) card).getRightHalfCard().getSpellAbility().canActivate(playerId, game); + } else if (card instanceof ModalDoubleFacedCard) { + if (((ModalDoubleFacedCard) card).getLeftHalfCard().getName().equals(abilityName)) { + return ((ModalDoubleFacedCard) card).getLeftHalfCard().getSpellAbility().canActivate(playerId, game); + } else if (((ModalDoubleFacedCard) card).getRightHalfCard().getName().equals(abilityName)) { + return ((ModalDoubleFacedCard) card).getRightHalfCard().getSpellAbility().canActivate(playerId, game); } } else if (card instanceof AdventureCard) { if (card.getMainCard().getName().equals(abilityName)) { @@ -385,11 +385,11 @@ public class ForetellAbility extends SpecialAction { } else if (((SplitCard) card).getRightHalfCard().getName().equals(abilityName)) { spellAbilityCopy = ((SplitCard) card).getRightHalfCard().getSpellAbility().copy(); } - } else if (card instanceof ModalDoubleFacesCard) { - if (((ModalDoubleFacesCard) card).getLeftHalfCard().getName().equals(abilityName)) { - spellAbilityCopy = ((ModalDoubleFacesCard) card).getLeftHalfCard().getSpellAbility().copy(); - } else if (((ModalDoubleFacesCard) card).getRightHalfCard().getName().equals(abilityName)) { - spellAbilityCopy = ((ModalDoubleFacesCard) card).getRightHalfCard().getSpellAbility().copy(); + } else if (card instanceof ModalDoubleFacedCard) { + if (((ModalDoubleFacedCard) card).getLeftHalfCard().getName().equals(abilityName)) { + spellAbilityCopy = ((ModalDoubleFacedCard) card).getLeftHalfCard().getSpellAbility().copy(); + } else if (((ModalDoubleFacedCard) card).getRightHalfCard().getName().equals(abilityName)) { + spellAbilityCopy = ((ModalDoubleFacedCard) card).getRightHalfCard().getSpellAbility().copy(); } } else if (card instanceof AdventureCard) { if (card.getMainCard().getName().equals(abilityName)) { diff --git a/Mage/src/main/java/mage/cards/CardImpl.java b/Mage/src/main/java/mage/cards/CardImpl.java index 3099f47f52..790d51e8ce 100644 --- a/Mage/src/main/java/mage/cards/CardImpl.java +++ b/Mage/src/main/java/mage/cards/CardImpl.java @@ -477,10 +477,10 @@ public abstract class CardImpl extends MageObjectImpl implements Card { } // handle half of Modal Double Faces Cards on stack - if (stackObject == null && (this instanceof ModalDoubleFacesCard)) { - stackObject = game.getStack().getSpell(((ModalDoubleFacesCard) this).getLeftHalfCard().getId(), false); + if (stackObject == null && (this instanceof ModalDoubleFacedCard)) { + stackObject = game.getStack().getSpell(((ModalDoubleFacedCard) this).getLeftHalfCard().getId(), false); if (stackObject == null) { - stackObject = game.getStack().getSpell(((ModalDoubleFacesCard) this).getRightHalfCard().getId(), false); + stackObject = game.getStack().getSpell(((ModalDoubleFacedCard) this).getRightHalfCard().getId(), false); } } diff --git a/Mage/src/main/java/mage/cards/ModalDoubleFacesCard.java b/Mage/src/main/java/mage/cards/ModalDoubleFacedCard.java similarity index 94% rename from Mage/src/main/java/mage/cards/ModalDoubleFacesCard.java rename to Mage/src/main/java/mage/cards/ModalDoubleFacedCard.java index ce9066347f..dafe544bfb 100644 --- a/Mage/src/main/java/mage/cards/ModalDoubleFacesCard.java +++ b/Mage/src/main/java/mage/cards/ModalDoubleFacedCard.java @@ -21,12 +21,12 @@ import java.util.UUID; /** * @author JayDi85 */ -public abstract class ModalDoubleFacesCard extends CardImpl implements CardWithHalves { +public abstract class ModalDoubleFacedCard extends CardImpl implements CardWithHalves { protected Card leftHalfCard; // main card in all zone protected Card rightHalfCard; // second side card, can be only in stack and battlefield zones - public ModalDoubleFacesCard( + public ModalDoubleFacedCard( UUID ownerId, CardSetInfo setInfo, CardType[] typesLeft, SubType[] subTypesLeft, String costsLeft, String secondSideName, @@ -40,7 +40,7 @@ public abstract class ModalDoubleFacesCard extends CardImpl implements CardWithH ); } - public ModalDoubleFacesCard( + public ModalDoubleFacedCard( UUID ownerId, CardSetInfo setInfo, SuperType[] superTypesLeft, CardType[] typesLeft, SubType[] subTypesLeft, String costsLeft, String secondSideName, @@ -48,35 +48,35 @@ public abstract class ModalDoubleFacesCard extends CardImpl implements CardWithH ) { super(ownerId, setInfo, typesLeft, costsLeft + costsRight, SpellAbilityType.MODAL); // main card name must be same as left side - leftHalfCard = new ModalDoubleFacesCardHalfImpl( + leftHalfCard = new ModalDoubleFacedCardHalfImpl( this.getOwnerId(), setInfo.copy(), superTypesLeft, typesLeft, subTypesLeft, costsLeft, this, SpellAbilityType.MODAL_LEFT ); - rightHalfCard = new ModalDoubleFacesCardHalfImpl( + rightHalfCard = new ModalDoubleFacedCardHalfImpl( this.getOwnerId(), new CardSetInfo(secondSideName, setInfo), superTypesRight, typesRight, subTypesRight, costsRight, this, SpellAbilityType.MODAL_RIGHT ); } - public ModalDoubleFacesCard(ModalDoubleFacesCard card) { + public ModalDoubleFacedCard(ModalDoubleFacedCard card) { super(card); this.leftHalfCard = card.getLeftHalfCard().copy(); - ((ModalDoubleFacesCardHalf) leftHalfCard).setParentCard(this); + ((ModalDoubleFacedCardHalf) leftHalfCard).setParentCard(this); this.rightHalfCard = card.rightHalfCard.copy(); - ((ModalDoubleFacesCardHalf) rightHalfCard).setParentCard(this); + ((ModalDoubleFacedCardHalf) rightHalfCard).setParentCard(this); } - public ModalDoubleFacesCardHalf getLeftHalfCard() { - return (ModalDoubleFacesCardHalf) leftHalfCard; + public ModalDoubleFacedCardHalf getLeftHalfCard() { + return (ModalDoubleFacedCardHalf) leftHalfCard; } - public ModalDoubleFacesCardHalf getRightHalfCard() { - return (ModalDoubleFacesCardHalf) rightHalfCard; + public ModalDoubleFacedCardHalf getRightHalfCard() { + return (ModalDoubleFacedCardHalf) rightHalfCard; } - public void setParts(ModalDoubleFacesCardHalf leftHalfCard, ModalDoubleFacesCardHalf rightHalfCard) { + public void setParts(ModalDoubleFacedCardHalf leftHalfCard, ModalDoubleFacedCardHalf rightHalfCard) { // for card copy only - set new parts this.leftHalfCard = leftHalfCard; leftHalfCard.setParentCard(this); diff --git a/Mage/src/main/java/mage/cards/ModalDoubleFacesCardHalf.java b/Mage/src/main/java/mage/cards/ModalDoubleFacedCardHalf.java similarity index 60% rename from Mage/src/main/java/mage/cards/ModalDoubleFacesCardHalf.java rename to Mage/src/main/java/mage/cards/ModalDoubleFacedCardHalf.java index 7ebbf338fd..78cba6bd60 100644 --- a/Mage/src/main/java/mage/cards/ModalDoubleFacesCardHalf.java +++ b/Mage/src/main/java/mage/cards/ModalDoubleFacedCardHalf.java @@ -5,10 +5,10 @@ import mage.MageInt; /** * @author JayDi85 */ -public interface ModalDoubleFacesCardHalf extends SubCard { +public interface ModalDoubleFacedCardHalf extends SubCard { @Override - ModalDoubleFacesCardHalf copy(); + ModalDoubleFacedCardHalf copy(); void setPT(int power, int toughness); diff --git a/Mage/src/main/java/mage/cards/ModalDoubleFacesCardHalfImpl.java b/Mage/src/main/java/mage/cards/ModalDoubleFacedCardHalfImpl.java similarity index 82% rename from Mage/src/main/java/mage/cards/ModalDoubleFacesCardHalfImpl.java rename to Mage/src/main/java/mage/cards/ModalDoubleFacedCardHalfImpl.java index 9ae1d7627d..ec2abec180 100644 --- a/Mage/src/main/java/mage/cards/ModalDoubleFacesCardHalfImpl.java +++ b/Mage/src/main/java/mage/cards/ModalDoubleFacedCardHalfImpl.java @@ -12,14 +12,14 @@ import java.util.UUID; /** * @author JayDi85 */ -public class ModalDoubleFacesCardHalfImpl extends CardImpl implements ModalDoubleFacesCardHalf { +public class ModalDoubleFacedCardHalfImpl extends CardImpl implements ModalDoubleFacedCardHalf { - ModalDoubleFacesCard parentCard; + ModalDoubleFacedCard parentCard; - public ModalDoubleFacesCardHalfImpl( + public ModalDoubleFacedCardHalfImpl( UUID ownerId, CardSetInfo setInfo, SuperType[] cardSuperTypes, CardType[] cardTypes, SubType[] cardSubTypes, - String costs, ModalDoubleFacesCard parentCard, SpellAbilityType spellAbilityType + String costs, ModalDoubleFacedCard parentCard, SpellAbilityType spellAbilityType ) { super(ownerId, setInfo, cardTypes, costs, spellAbilityType); this.supertype.addAll(Arrays.asList(cardSuperTypes)); @@ -27,7 +27,7 @@ public class ModalDoubleFacesCardHalfImpl extends CardImpl implements ModalDoubl this.parentCard = parentCard; } - public ModalDoubleFacesCardHalfImpl(final ModalDoubleFacesCardHalfImpl card) { + public ModalDoubleFacedCardHalfImpl(final ModalDoubleFacedCardHalfImpl card) { super(card); this.parentCard = card.parentCard; } @@ -65,7 +65,7 @@ public class ModalDoubleFacesCardHalfImpl extends CardImpl implements ModalDoubl } @Override - public ModalDoubleFacesCard getMainCard() { + public ModalDoubleFacedCard getMainCard() { return parentCard; } @@ -77,17 +77,17 @@ public class ModalDoubleFacesCardHalfImpl extends CardImpl implements ModalDoubl } @Override - public ModalDoubleFacesCardHalfImpl copy() { - return new ModalDoubleFacesCardHalfImpl(this); + public ModalDoubleFacedCardHalfImpl copy() { + return new ModalDoubleFacedCardHalfImpl(this); } @Override - public void setParentCard(ModalDoubleFacesCard card) { + public void setParentCard(ModalDoubleFacedCard card) { this.parentCard = card; } @Override - public ModalDoubleFacesCard getParentCard() { + public ModalDoubleFacedCard getParentCard() { return this.parentCard; } diff --git a/Mage/src/main/java/mage/cards/mock/MockCard.java b/Mage/src/main/java/mage/cards/mock/MockCard.java index 5364a79f39..93e8585b1f 100644 --- a/Mage/src/main/java/mage/cards/mock/MockCard.java +++ b/Mage/src/main/java/mage/cards/mock/MockCard.java @@ -5,7 +5,7 @@ import mage.abilities.Ability; import mage.abilities.costs.mana.ManaCost; import mage.abilities.costs.mana.ManaCosts; import mage.cards.CardImpl; -import mage.cards.ModalDoubleFacesCard; +import mage.cards.ModalDoubleFacedCard; import mage.cards.repository.CardInfo; import mage.cards.repository.CardRepository; import mage.util.CardUtil; @@ -35,7 +35,7 @@ public class MockCard extends CardImpl { protected List manaCostRightStr; protected List manaCostStr; protected String adventureSpellName; - protected boolean isModalDoubleFacesCard; + protected boolean isModalDoubleFacedCard; protected int manaValue; public MockCard(CardInfo card) { @@ -74,11 +74,11 @@ public class MockCard extends CardImpl { this.adventureSpellName = card.getAdventureSpellName(); } - if (card.isModalDoubleFacesCard()) { - ModalDoubleFacesCard mdfCard = (ModalDoubleFacesCard) card.getCard(); + if (card.isModalDoubleFacedCard()) { + ModalDoubleFacedCard mdfCard = (ModalDoubleFacedCard) card.getCard(); CardInfo mdfSecondSide = new CardInfo(mdfCard.getRightHalfCard()); this.secondSideCard = new MockCard(mdfSecondSide); - this.isModalDoubleFacesCard = true; + this.isModalDoubleFacedCard = true; } this.startingLoyalty = CardUtil.convertLoyaltyOrDefense(card.getStartingLoyalty()); @@ -99,7 +99,7 @@ public class MockCard extends CardImpl { this.manaCostRightStr = new ArrayList<>(card.manaCostRightStr); this.manaCostStr = new ArrayList<>(card.manaCostStr); this.adventureSpellName = card.adventureSpellName; - this.isModalDoubleFacesCard = card.isModalDoubleFacesCard; + this.isModalDoubleFacedCard = card.isModalDoubleFacedCard; this.manaValue = card.manaValue; } @@ -154,7 +154,7 @@ public class MockCard extends CardImpl { if (adventureSpellName != null) { return getName() + ADVENTURE_NAME_SEPARATOR + adventureSpellName; - } else if (isModalDoubleFacesCard) { + } else if (isModalDoubleFacedCard) { return getName() + MODAL_DOUBLE_FACES_NAME_SEPARATOR + this.secondSideCard.getName(); } else { return getName(); @@ -178,6 +178,6 @@ public class MockCard extends CardImpl { @Override public boolean isTransformable() { // must enable toggle mode in deck editor (switch between card sides); - return super.isTransformable() || this.isModalDoubleFacesCard || this.secondSideCard != null; + return super.isTransformable() || this.isModalDoubleFacedCard || this.secondSideCard != null; } } diff --git a/Mage/src/main/java/mage/cards/repository/CardCriteria.java b/Mage/src/main/java/mage/cards/repository/CardCriteria.java index d390b7898f..51179a8c4d 100644 --- a/Mage/src/main/java/mage/cards/repository/CardCriteria.java +++ b/Mage/src/main/java/mage/cards/repository/CardCriteria.java @@ -244,7 +244,7 @@ public class CardCriteria { } if (modalDoubleFaced != null) { - where.eq("modalDoubleFacesCard", modalDoubleFaced); + where.eq("modalDoubleFacedCard", modalDoubleFaced); clausesCount++; } diff --git a/Mage/src/main/java/mage/cards/repository/CardInfo.java b/Mage/src/main/java/mage/cards/repository/CardInfo.java index 307b6796fd..21cdefba64 100644 --- a/Mage/src/main/java/mage/cards/repository/CardInfo.java +++ b/Mage/src/main/java/mage/cards/repository/CardInfo.java @@ -108,9 +108,9 @@ public class CardInfo { @DatabaseField protected String adventureSpellName; @DatabaseField - protected boolean modalDoubleFacesCard; + protected boolean modalDoubleFacedCard; @DatabaseField - protected String modalDoubleFacesSecondSideName; + protected String modalDoubleFacedSecondSideName; @DatabaseField protected String meldsToCardName; @@ -157,9 +157,9 @@ public class CardInfo { this.adventureSpellName = ((AdventureCard) card).getSpellCard().getName(); } - if (card instanceof ModalDoubleFacesCard) { - this.modalDoubleFacesCard = true; - this.modalDoubleFacesSecondSideName = ((ModalDoubleFacesCard) card).getRightHalfCard().getName(); + if (card instanceof ModalDoubleFacedCard) { + this.modalDoubleFacedCard = true; + this.modalDoubleFacedSecondSideName = ((ModalDoubleFacedCard) card).getRightHalfCard().getName(); } this.frameStyle = card.getFrameStyle().toString(); @@ -180,9 +180,9 @@ public class CardInfo { List manaCostLeft = ((SplitCard) card).getLeftHalfCard().getManaCostSymbols(); List manaCostRight = ((SplitCard) card).getRightHalfCard().getManaCostSymbols(); this.setManaCosts(CardUtil.concatManaSymbols(SPLIT_MANA_SEPARATOR_FULL, manaCostLeft, manaCostRight)); - } else if (card instanceof ModalDoubleFacesCard) { - List manaCostLeft = ((ModalDoubleFacesCard) card).getLeftHalfCard().getManaCostSymbols(); - List manaCostRight = ((ModalDoubleFacesCard) card).getRightHalfCard().getManaCostSymbols(); + } else if (card instanceof ModalDoubleFacedCard) { + List manaCostLeft = ((ModalDoubleFacedCard) card).getLeftHalfCard().getManaCostSymbols(); + List manaCostRight = ((ModalDoubleFacedCard) card).getRightHalfCard().getManaCostSymbols(); this.setManaCosts(CardUtil.concatManaSymbols(SPLIT_MANA_SEPARATOR_FULL, manaCostLeft, manaCostRight)); } else if (card instanceof AdventureCard) { List manaCostLeft = ((AdventureCard) card).getSpellCard().getManaCostSymbols(); @@ -460,12 +460,12 @@ public class CardInfo { return adventureSpellName; } - public boolean isModalDoubleFacesCard() { - return modalDoubleFacesCard; + public boolean isModalDoubleFacedCard() { + return modalDoubleFacedCard; } - public String getModalDoubleFacesSecondSideName() { - return modalDoubleFacesSecondSideName; + public String getModalDoubleFacedSecondSideName() { + return modalDoubleFacedSecondSideName; } @Override diff --git a/Mage/src/main/java/mage/cards/repository/CardRepository.java b/Mage/src/main/java/mage/cards/repository/CardRepository.java index c6183fdf1a..7cf8dd2dea 100644 --- a/Mage/src/main/java/mage/cards/repository/CardRepository.java +++ b/Mage/src/main/java/mage/cards/repository/CardRepository.java @@ -96,7 +96,7 @@ public enum CardRepository { } private void addNewNames(CardInfo card, Set namesList) { - // require before call: qb.distinct().selectColumns("name", "modalDoubleFacesSecondSideName"...); + // require before call: qb.distinct().selectColumns("name", "modalDoubleFacedSecondSideName"...); // normal names int result = card.getName().indexOf(" // "); @@ -111,8 +111,8 @@ public enum CardRepository { if (card.getSecondSideName() != null && !card.getSecondSideName().isEmpty()) { namesList.add(card.getSecondSideName()); } - if (card.getModalDoubleFacesSecondSideName() != null && !card.getModalDoubleFacesSecondSideName().isEmpty()) { - namesList.add(card.getModalDoubleFacesSecondSideName()); + if (card.getModalDoubleFacedSecondSideName() != null && !card.getModalDoubleFacedSecondSideName().isEmpty()) { + namesList.add(card.getModalDoubleFacedSecondSideName()); } if (card.getFlipCardName() != null && !card.getFlipCardName().isEmpty()) { namesList.add(card.getFlipCardName()); @@ -130,7 +130,7 @@ public enum CardRepository { Set names = new TreeSet<>(); try { QueryBuilder qb = cardDao.queryBuilder(); - qb.distinct().selectColumns("name", "modalDoubleFacesSecondSideName", "secondSideName", "flipCardName"); + qb.distinct().selectColumns("name", "modalDoubleFacedSecondSideName", "secondSideName", "flipCardName"); List results = cardDao.query(qb.prepare()); for (CardInfo card : results) { addNewNames(card, names); @@ -145,7 +145,7 @@ public enum CardRepository { Set names = new TreeSet<>(); try { QueryBuilder qb = cardDao.queryBuilder(); - qb.distinct().selectColumns("name", "modalDoubleFacesSecondSideName", "secondSideName", "flipCardName"); + qb.distinct().selectColumns("name", "modalDoubleFacedSecondSideName", "secondSideName", "flipCardName"); qb.where().not().like("types", new SelectArg('%' + CardType.LAND.name() + '%')); List results = cardDao.query(qb.prepare()); for (CardInfo card : results) { @@ -162,7 +162,7 @@ public enum CardRepository { Set names = new TreeSet<>(); try { QueryBuilder qb = cardDao.queryBuilder(); - qb.distinct().selectColumns("name", "modalDoubleFacesSecondSideName", "secondSideName", "flipCardName"); + qb.distinct().selectColumns("name", "modalDoubleFacedSecondSideName", "secondSideName", "flipCardName"); Where where = qb.where(); where.and( where.not().like("supertypes", '%' + SuperType.BASIC.name() + '%'), @@ -183,7 +183,7 @@ public enum CardRepository { Set names = new TreeSet<>(); try { QueryBuilder qb = cardDao.queryBuilder(); - qb.distinct().selectColumns("name", "modalDoubleFacesSecondSideName", "secondSideName", "flipCardName"); + qb.distinct().selectColumns("name", "modalDoubleFacedSecondSideName", "secondSideName", "flipCardName"); qb.where().not().like("supertypes", new SelectArg('%' + SuperType.BASIC.name() + '%')); List results = cardDao.query(qb.prepare()); for (CardInfo card : results) { @@ -200,7 +200,7 @@ public enum CardRepository { Set names = new TreeSet<>(); try { QueryBuilder qb = cardDao.queryBuilder(); - qb.distinct().selectColumns("name", "modalDoubleFacesSecondSideName", "secondSideName", "flipCardName"); + qb.distinct().selectColumns("name", "modalDoubleFacedSecondSideName", "secondSideName", "flipCardName"); qb.where().like("types", new SelectArg('%' + CardType.CREATURE.name() + '%')); List results = cardDao.query(qb.prepare()); for (CardInfo card : results) { @@ -217,7 +217,7 @@ public enum CardRepository { Set names = new TreeSet<>(); try { QueryBuilder qb = cardDao.queryBuilder(); - qb.distinct().selectColumns("name", "modalDoubleFacesSecondSideName", "secondSideName", "flipCardName"); + qb.distinct().selectColumns("name", "modalDoubleFacedSecondSideName", "secondSideName", "flipCardName"); qb.where().like("types", new SelectArg('%' + CardType.ARTIFACT.name() + '%')); List results = cardDao.query(qb.prepare()); for (CardInfo card : results) { @@ -234,7 +234,7 @@ public enum CardRepository { Set names = new TreeSet<>(); try { QueryBuilder qb = cardDao.queryBuilder(); - qb.distinct().selectColumns("name", "modalDoubleFacesSecondSideName", "secondSideName", "flipCardName"); + qb.distinct().selectColumns("name", "modalDoubleFacedSecondSideName", "secondSideName", "flipCardName"); Where where = qb.where(); where.and( where.not().like("types", '%' + CardType.CREATURE.name() + '%'), @@ -254,7 +254,7 @@ public enum CardRepository { Set names = new TreeSet<>(); try { QueryBuilder qb = cardDao.queryBuilder(); - qb.distinct().selectColumns("name", "modalDoubleFacesSecondSideName", "secondSideName", "flipCardName"); + qb.distinct().selectColumns("name", "modalDoubleFacedSecondSideName", "secondSideName", "flipCardName"); Where where = qb.where(); where.and( where.not().like("types", '%' + CardType.ARTIFACT.name() + '%'), @@ -478,7 +478,7 @@ public enum CardRepository { .eq("flipCardName", new SelectArg(name)).or() .eq("secondSideName", new SelectArg(name)).or() .eq("adventureSpellName", new SelectArg(name)).or() - .eq("modalDoubleFacesSecondSideName", new SelectArg(name)); + .eq("modalDoubleFacedSecondSideName", new SelectArg(name)); results = cardDao.query(queryBuilder.prepare()); } else { // Check that a full card was found and not a SplitCardHalf diff --git a/Mage/src/main/java/mage/filter/predicate/card/CardTextPredicate.java b/Mage/src/main/java/mage/filter/predicate/card/CardTextPredicate.java index 1df1d69b70..7f412b0e45 100644 --- a/Mage/src/main/java/mage/filter/predicate/card/CardTextPredicate.java +++ b/Mage/src/main/java/mage/filter/predicate/card/CardTextPredicate.java @@ -2,7 +2,7 @@ package mage.filter.predicate.card; import mage.cards.AdventureCard; import mage.cards.Card; -import mage.cards.ModalDoubleFacesCard; +import mage.cards.ModalDoubleFacedCard; import mage.cards.SplitCard; import mage.cards.mock.MockCard; import mage.constants.SubType; @@ -53,8 +53,8 @@ public class CardTextPredicate implements Predicate { String fullName = input.getName(); if (input instanceof MockCard) { fullName = ((MockCard) input).getFullName(true); - } else if (input instanceof ModalDoubleFacesCard) { - fullName = input.getName() + MockCard.MODAL_DOUBLE_FACES_NAME_SEPARATOR + ((ModalDoubleFacesCard) input).getRightHalfCard().getName(); + } else if (input instanceof ModalDoubleFacedCard) { + fullName = input.getName() + MockCard.MODAL_DOUBLE_FACES_NAME_SEPARATOR + ((ModalDoubleFacedCard) input).getRightHalfCard().getName(); } else if (input instanceof AdventureCard) { fullName = input.getName() + MockCard.ADVENTURE_NAME_SEPARATOR + ((AdventureCard) input).getSpellCard().getName(); } @@ -92,14 +92,14 @@ public class CardTextPredicate implements Predicate { } } - if (input instanceof ModalDoubleFacesCard) { - for (String rule : ((ModalDoubleFacesCard) input).getLeftHalfCard().getRules(game)) { + if (input instanceof ModalDoubleFacedCard) { + for (String rule : ((ModalDoubleFacedCard) input).getLeftHalfCard().getRules(game)) { if (rule.toLowerCase(Locale.ENGLISH).contains(token)) { found = true; break; } } - for (String rule : ((ModalDoubleFacesCard) input).getRightHalfCard().getRules(game)) { + for (String rule : ((ModalDoubleFacedCard) input).getRightHalfCard().getRules(game)) { if (rule.toLowerCase(Locale.ENGLISH).contains(token)) { found = true; break; diff --git a/Mage/src/main/java/mage/filter/predicate/card/DoubleFacedCardPredicate.java b/Mage/src/main/java/mage/filter/predicate/card/DoubleFacedCardPredicate.java index ffaeb61c91..c57c07dabe 100644 --- a/Mage/src/main/java/mage/filter/predicate/card/DoubleFacedCardPredicate.java +++ b/Mage/src/main/java/mage/filter/predicate/card/DoubleFacedCardPredicate.java @@ -1,7 +1,7 @@ package mage.filter.predicate.card; import mage.cards.Card; -import mage.cards.ModalDoubleFacesCard; +import mage.cards.ModalDoubleFacedCard; import mage.filter.predicate.Predicate; import mage.game.Game; @@ -13,7 +13,7 @@ public enum DoubleFacedCardPredicate implements Predicate { @Override public boolean apply(Card input, Game game) { - return input instanceof ModalDoubleFacesCard || input.getSecondCardFace() != null; + return input instanceof ModalDoubleFacedCard || input.getSecondCardFace() != null; } @Override diff --git a/Mage/src/main/java/mage/filter/predicate/mageobject/MulticoloredPredicate.java b/Mage/src/main/java/mage/filter/predicate/mageobject/MulticoloredPredicate.java index 30ae456bd6..ec34e60e40 100644 --- a/Mage/src/main/java/mage/filter/predicate/mageobject/MulticoloredPredicate.java +++ b/Mage/src/main/java/mage/filter/predicate/mageobject/MulticoloredPredicate.java @@ -1,9 +1,6 @@ package mage.filter.predicate.mageobject; import mage.MageObject; -import mage.cards.ModalDoubleFacesCardHalf; -import mage.cards.SplitCardHalf; -import mage.constants.Zone; import mage.filter.predicate.Predicate; import mage.game.Game; diff --git a/Mage/src/main/java/mage/game/GameImpl.java b/Mage/src/main/java/mage/game/GameImpl.java index 41ab29ccc7..b438e9c47f 100644 --- a/Mage/src/main/java/mage/game/GameImpl.java +++ b/Mage/src/main/java/mage/game/GameImpl.java @@ -330,13 +330,13 @@ public abstract class GameImpl implements Game { Card rightCard = ((SplitCard) card).getRightHalfCard(); rightCard.setOwnerId(ownerId); addCardToState(rightCard); - } else if (card instanceof ModalDoubleFacesCard) { + } else if (card instanceof ModalDoubleFacedCard) { // left - Card leftCard = ((ModalDoubleFacesCard) card).getLeftHalfCard(); + Card leftCard = ((ModalDoubleFacedCard) card).getLeftHalfCard(); leftCard.setOwnerId(ownerId); addCardToState(leftCard); // right - Card rightCard = ((ModalDoubleFacesCard) card).getRightHalfCard(); + Card rightCard = ((ModalDoubleFacedCard) card).getRightHalfCard(); rightCard.setOwnerId(ownerId); addCardToState(rightCard); } else if (card instanceof AdventureCard) { diff --git a/Mage/src/main/java/mage/game/GameState.java b/Mage/src/main/java/mage/game/GameState.java index ef85216894..7f35539e88 100644 --- a/Mage/src/main/java/mage/game/GameState.java +++ b/Mage/src/main/java/mage/game/GameState.java @@ -1357,19 +1357,19 @@ public class GameState implements Serializable, Copyable { copiedParts.add(rightCopied); // sync parts ((SplitCard) copiedCard).setParts(leftCopied, rightCopied); - } else if (copiedCard instanceof ModalDoubleFacesCard) { + } else if (copiedCard instanceof ModalDoubleFacedCard) { // left - ModalDoubleFacesCardHalf leftOriginal = ((ModalDoubleFacesCard) copiedCard).getLeftHalfCard(); - ModalDoubleFacesCardHalf leftCopied = leftOriginal.copy(); + ModalDoubleFacedCardHalf leftOriginal = ((ModalDoubleFacedCard) copiedCard).getLeftHalfCard(); + ModalDoubleFacedCardHalf leftCopied = leftOriginal.copy(); prepareCardForCopy(leftOriginal, leftCopied, newController); copiedParts.add(leftCopied); // right - ModalDoubleFacesCardHalf rightOriginal = ((ModalDoubleFacesCard) copiedCard).getRightHalfCard(); - ModalDoubleFacesCardHalf rightCopied = rightOriginal.copy(); + ModalDoubleFacedCardHalf rightOriginal = ((ModalDoubleFacedCard) copiedCard).getRightHalfCard(); + ModalDoubleFacedCardHalf rightCopied = rightOriginal.copy(); prepareCardForCopy(rightOriginal, rightCopied, newController); copiedParts.add(rightCopied); // sync parts - ((ModalDoubleFacesCard) copiedCard).setParts(leftCopied, rightCopied); + ((ModalDoubleFacedCard) copiedCard).setParts(leftCopied, rightCopied); } else if (copiedCard instanceof AdventureCard) { // right AdventureCardSpell rightOriginal = ((AdventureCard) copiedCard).getSpellCard(); diff --git a/Mage/src/main/java/mage/game/ZonesHandler.java b/Mage/src/main/java/mage/game/ZonesHandler.java index 8dfa40a976..67afac52f1 100644 --- a/Mage/src/main/java/mage/game/ZonesHandler.java +++ b/Mage/src/main/java/mage/game/ZonesHandler.java @@ -83,21 +83,21 @@ public final class ZonesHandler { ZoneChangeInfo info = itr.next(); if (info.event.getToZone().equals(Zone.BATTLEFIELD)) { Card card = game.getCard(info.event.getTargetId()); - if (card instanceof ModalDoubleFacesCard || card instanceof ModalDoubleFacesCardHalf) { + if (card instanceof ModalDoubleFacedCard || card instanceof ModalDoubleFacedCardHalf) { boolean forceToMainSide = false; // if effect put half mdf card to battlefield then it must be the main side only (example: return targeted half card to battle) - if (card instanceof ModalDoubleFacesCardHalf && !source.getAbilityType().isPlayCardAbility()) { + if (card instanceof ModalDoubleFacedCardHalf && !source.getAbilityType().isPlayCardAbility()) { forceToMainSide = true; } // if effect put mdf card to battlefield then it must be main side only - if (card instanceof ModalDoubleFacesCard) { + if (card instanceof ModalDoubleFacedCard) { forceToMainSide = true; } if (forceToMainSide) { - info.event.setTargetId(((ModalDoubleFacesCard) card.getMainCard()).getLeftHalfCard().getId()); + info.event.setTargetId(((ModalDoubleFacedCard) card.getMainCard()).getLeftHalfCard().getId()); } } } @@ -148,10 +148,10 @@ public final class ZonesHandler { // meld/group cards must be independent (use can choose order) cardsToMove = ((MeldCard) targetCard).getHalves(); cardsToUpdate.get(toZone).addAll(cardsToMove); - } else if (targetCard instanceof ModalDoubleFacesCard - || targetCard instanceof ModalDoubleFacesCardHalf) { + } else if (targetCard instanceof ModalDoubleFacedCard + || targetCard instanceof ModalDoubleFacedCardHalf) { // mdf cards must be moved as single object, but each half must be updated separately - ModalDoubleFacesCard mdfCard = (ModalDoubleFacesCard) targetCard.getMainCard(); + ModalDoubleFacedCard mdfCard = (ModalDoubleFacedCard) targetCard.getMainCard(); cardsToMove = new CardsImpl(mdfCard); cardsToUpdate.get(toZone).add(mdfCard); // example: cast left side @@ -349,7 +349,7 @@ public final class ZonesHandler { Permanent permanent; if (card instanceof MeldCard) { permanent = new PermanentMeld(card, event.getPlayerId(), game); - } else if (card instanceof ModalDoubleFacesCard) { + } else if (card instanceof ModalDoubleFacedCard) { // main mdf card must be processed before that call (e.g. only halfes can be moved to battlefield) throw new IllegalStateException("Unexpected trying of move mdf card to battlefield instead half"); } else if (card instanceof Permanent) { diff --git a/Mage/src/main/java/mage/game/command/emblems/WrennAndSixEmblem.java b/Mage/src/main/java/mage/game/command/emblems/WrennAndSixEmblem.java index 14f371cce8..186fcb963b 100644 --- a/Mage/src/main/java/mage/game/command/emblems/WrennAndSixEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/WrennAndSixEmblem.java @@ -70,9 +70,9 @@ class WrennAndSixEmblemEffect extends ContinuousEffectImpl { game.getState().addOtherAbility(rightHalfCard, ability); } } - if (card instanceof ModalDoubleFacesCard) { - ModalDoubleFacesCardHalf leftHalfCard = ((ModalDoubleFacesCard) card).getLeftHalfCard(); - ModalDoubleFacesCardHalf rightHalfCard = ((ModalDoubleFacesCard) card).getRightHalfCard(); + if (card instanceof ModalDoubleFacedCard) { + ModalDoubleFacedCardHalf leftHalfCard = ((ModalDoubleFacedCard) card).getLeftHalfCard(); + ModalDoubleFacedCardHalf rightHalfCard = ((ModalDoubleFacedCard) card).getRightHalfCard(); if (leftHalfCard.isInstantOrSorcery(game)) { Ability ability = new RetraceAbility(leftHalfCard); ability.setSourceId(cardId); diff --git a/Mage/src/main/java/mage/game/permanent/PermanentCard.java b/Mage/src/main/java/mage/game/permanent/PermanentCard.java index 2341d5c09a..4a6ca5e2e5 100644 --- a/Mage/src/main/java/mage/game/permanent/PermanentCard.java +++ b/Mage/src/main/java/mage/game/permanent/PermanentCard.java @@ -9,7 +9,7 @@ import mage.abilities.keyword.NightboundAbility; import mage.abilities.keyword.TransformAbility; import mage.cards.Card; import mage.cards.LevelerCard; -import mage.cards.ModalDoubleFacesCard; +import mage.cards.ModalDoubleFacedCard; import mage.cards.SplitCard; import mage.constants.SpellAbilityType; import mage.game.Game; @@ -41,7 +41,7 @@ public class PermanentCard extends PermanentImpl { // if you use it in test code then call CardUtil.getDefaultCardSideForBattlefield for default side // it's a basic check and still allows to create permanent from instant or sorcery boolean goodForBattlefield = true; - if (card instanceof ModalDoubleFacesCard) { + if (card instanceof ModalDoubleFacedCard) { goodForBattlefield = false; } else if (card instanceof SplitCard) { // fused spells allowed (it uses main card) diff --git a/Mage/src/main/java/mage/game/stack/Spell.java b/Mage/src/main/java/mage/game/stack/Spell.java index e6b36e2ed5..0e7da51854 100644 --- a/Mage/src/main/java/mage/game/stack/Spell.java +++ b/Mage/src/main/java/mage/game/stack/Spell.java @@ -193,8 +193,8 @@ public class Spell extends StackObjectImpl implements Card { + " as Adventure spell of " + GameLog.getColoredObjectIdName(adventureCard); } - if (card instanceof ModalDoubleFacesCardHalf) { - ModalDoubleFacesCard mdfCard = (ModalDoubleFacesCard) card.getMainCard(); + if (card instanceof ModalDoubleFacedCardHalf) { + ModalDoubleFacedCard mdfCard = (ModalDoubleFacedCard) card.getMainCard(); return GameLog.replaceNameByColoredName(card, getSpellAbility().toString(), mdfCard) + " as mdf side of " + GameLog.getColoredObjectIdName(mdfCard); } diff --git a/Mage/src/main/java/mage/players/PlayerImpl.java b/Mage/src/main/java/mage/players/PlayerImpl.java index 9238ac9a01..043afa56ef 100644 --- a/Mage/src/main/java/mage/players/PlayerImpl.java +++ b/Mage/src/main/java/mage/players/PlayerImpl.java @@ -1301,8 +1301,8 @@ public abstract class PlayerImpl implements Player, Serializable { game.fireEvent(landEventAfter); String playText = getLogName() + " plays " + card.getLogName(); - if (card instanceof ModalDoubleFacesCardHalf) { - ModalDoubleFacesCard mdfCard = (ModalDoubleFacesCard) card.getMainCard(); + if (card instanceof ModalDoubleFacedCardHalf) { + ModalDoubleFacedCard mdfCard = (ModalDoubleFacedCard) card.getMainCard(); playText = getLogName() + " plays " + GameLog.replaceNameByColoredName(card, card.getName(), mdfCard) + " as MDF side of " + GameLog.getColoredObjectIdName(mdfCard); } @@ -3797,8 +3797,8 @@ public abstract class PlayerImpl implements Player, Serializable { getPlayableFromObjectSingle(game, fromZone, mainCard.getLeftHalfCard(), mainCard.getLeftHalfCard().getAbilities(game), availableMana, output); getPlayableFromObjectSingle(game, fromZone, mainCard.getRightHalfCard(), mainCard.getRightHalfCard().getAbilities(game), availableMana, output); getPlayableFromObjectSingle(game, fromZone, mainCard, mainCard.getSharedAbilities(game), availableMana, output); - } else if (object instanceof ModalDoubleFacesCard) { - ModalDoubleFacesCard mainCard = (ModalDoubleFacesCard) object; + } else if (object instanceof ModalDoubleFacedCard) { + ModalDoubleFacedCard mainCard = (ModalDoubleFacedCard) object; getPlayableFromObjectSingle(game, fromZone, mainCard.getLeftHalfCard(), mainCard.getLeftHalfCard().getAbilities(game), availableMana, output); getPlayableFromObjectSingle(game, fromZone, mainCard.getRightHalfCard(), mainCard.getRightHalfCard().getAbilities(game), availableMana, output); getPlayableFromObjectSingle(game, fromZone, mainCard, mainCard.getSharedAbilities(game), availableMana, output); diff --git a/Mage/src/main/java/mage/util/CardUtil.java b/Mage/src/main/java/mage/util/CardUtil.java index 6caa83feac..a1e7323d4b 100644 --- a/Mage/src/main/java/mage/util/CardUtil.java +++ b/Mage/src/main/java/mage/util/CardUtil.java @@ -29,7 +29,6 @@ import mage.filter.predicate.mageobject.NamePredicate; import mage.game.CardState; import mage.game.Game; import mage.game.GameState; -import mage.game.command.CommandObject; import mage.game.command.Commander; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; @@ -1070,8 +1069,8 @@ public final class CardUtil { permCard = card; } else if (card instanceof AdventureCard) { permCard = card; - } else if (card instanceof ModalDoubleFacesCard) { - permCard = ((ModalDoubleFacesCard) card).getLeftHalfCard(); + } else if (card instanceof ModalDoubleFacedCard) { + permCard = ((ModalDoubleFacedCard) card).getLeftHalfCard(); } else { permCard = card; } @@ -1094,8 +1093,8 @@ public final class CardUtil { // it's ok to return one name only cause NamePredicate can find same card by first name if (card instanceof SplitCard) { return ((SplitCard) card).getLeftHalfCard().getName(); - } else if (card instanceof ModalDoubleFacesCard) { - return ((ModalDoubleFacesCard) card).getLeftHalfCard().getName(); + } else if (card instanceof ModalDoubleFacedCard) { + return ((ModalDoubleFacedCard) card).getLeftHalfCard().getName(); } else { return card.getName(); } @@ -1384,9 +1383,9 @@ public final class CardUtil { } // handle MDFC - if (card instanceof ModalDoubleFacesCard) { - ModalDoubleFacesCardHalf leftHalfCard = ((ModalDoubleFacesCard) card).getLeftHalfCard(); - ModalDoubleFacesCardHalf rightHalfCard = ((ModalDoubleFacesCard) card).getRightHalfCard(); + if (card instanceof ModalDoubleFacedCard) { + ModalDoubleFacedCardHalf leftHalfCard = ((ModalDoubleFacedCard) card).getLeftHalfCard(); + ModalDoubleFacedCardHalf rightHalfCard = ((ModalDoubleFacedCard) card).getRightHalfCard(); if (manaCost != null) { // some MDFC cards are lands. IE: sea gate restoration if (!leftHalfCard.isLand(game)) { @@ -1442,9 +1441,9 @@ public final class CardUtil { game.getState().setValue("PlayFromNotOwnHandZone" + leftHalfCard.getId(), null); game.getState().setValue("PlayFromNotOwnHandZone" + rightHalfCard.getId(), null); } - if (card instanceof ModalDoubleFacesCard) { - ModalDoubleFacesCardHalf leftHalfCard = ((ModalDoubleFacesCard) card).getLeftHalfCard(); - ModalDoubleFacesCardHalf rightHalfCard = ((ModalDoubleFacesCard) card).getRightHalfCard(); + if (card instanceof ModalDoubleFacedCard) { + ModalDoubleFacedCardHalf leftHalfCard = ((ModalDoubleFacedCard) card).getLeftHalfCard(); + ModalDoubleFacedCardHalf rightHalfCard = ((ModalDoubleFacedCard) card).getRightHalfCard(); game.getState().setValue("PlayFromNotOwnHandZone" + leftHalfCard.getId(), null); game.getState().setValue("PlayFromNotOwnHandZone" + rightHalfCard.getId(), null); } @@ -1582,8 +1581,8 @@ public final class CardUtil { res.add(mainCard); res.add(mainCard.getLeftHalfCard()); res.add(mainCard.getRightHalfCard()); - } else if (object instanceof ModalDoubleFacesCard || object instanceof ModalDoubleFacesCardHalf) { - ModalDoubleFacesCard mainCard = (ModalDoubleFacesCard) ((Card) object).getMainCard(); + } else if (object instanceof ModalDoubleFacedCard || object instanceof ModalDoubleFacedCardHalf) { + ModalDoubleFacedCard mainCard = (ModalDoubleFacedCard) ((Card) object).getMainCard(); res.add(mainCard); res.add(mainCard.getLeftHalfCard()); res.add(mainCard.getRightHalfCard()); diff --git a/Mage/src/main/java/mage/util/ManaUtil.java b/Mage/src/main/java/mage/util/ManaUtil.java index 012500d271..94a660ff97 100644 --- a/Mage/src/main/java/mage/util/ManaUtil.java +++ b/Mage/src/main/java/mage/util/ManaUtil.java @@ -15,7 +15,7 @@ import mage.abilities.effects.Effect; import mage.abilities.mana.*; import mage.cards.AdventureCard; import mage.cards.Card; -import mage.cards.ModalDoubleFacesCard; +import mage.cards.ModalDoubleFacedCard; import mage.cards.SplitCard; import mage.choices.Choice; import mage.constants.ColoredManaSymbol; @@ -631,8 +631,8 @@ public final class ManaUtil { secondSide = ((SplitCard) card).getRightHalfCard(); } else if (card instanceof AdventureCard) { secondSide = ((AdventureCard) card).getSpellCard(); - } else if (card instanceof ModalDoubleFacesCard) { - secondSide = ((ModalDoubleFacesCard) card).getRightHalfCard(); + } else if (card instanceof ModalDoubleFacedCard) { + secondSide = ((ModalDoubleFacedCard) card).getRightHalfCard(); } else { secondSide = card.getSecondCardFace(); }